midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert as per https://sourceforge.net/projects/adempiere/forums/forum/610548/topic/3502040 

commits 11204, 11205 and 11207
This commit is contained in:
mjudd 2010-01-12 09:11:57 +00:00
parent c95d84825c
commit 71a9fc9c3f
22 changed files with 158 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -135,7 +135,7 @@
<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.5.3.jar"/> <classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="packages/liberoHR.jar"/> <classpathentry exported="true" kind="lib" path="packages/liberoHR.jar"/>
<classpathentry exported="true" kind="lib" path="packages/liberoMFG.jar"/> <classpathentry exported="true" kind="lib" path="packages/liberoMFG.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/iText-2.1.7.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/miglayout-3.7.1-swing.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/miglayout-3.7.1-swing.jar"/>
<classpathentry kind="lib" path="tools/lib/iText-5.0.0.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

16
base/src/org/adempiere/pdf/Document.java
View File

@ -24,12 +24,12 @@ import java.io.OutputStream;
import org.adempiere.pdf.viewer.PDFViewerBean; import org.adempiere.pdf.viewer.PDFViewerBean;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import com.itextpdf.text.FontFactory; import com.lowagie.text.FontFactory;
import com.itextpdf.text.Rectangle; import com.lowagie.text.Rectangle;
import com.itextpdf.text.pdf.DefaultFontMapper; import com.lowagie.text.pdf.DefaultFontMapper;
import com.itextpdf.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfTemplate; import com.lowagie.text.pdf.PdfTemplate;
import com.itextpdf.text.pdf.PdfWriter; import com.lowagie.text.pdf.PdfWriter;
/** /**
* Generate PDF document using iText * Generate PDF document using iText
@ -49,8 +49,8 @@ public class Document {
try { try {
final PageFormat pf = pageable.getPageFormat(0); final PageFormat pf = pageable.getPageFormat(0);
final com.itextpdf.text.Document document = final com.lowagie.text.Document document =
new com.itextpdf.text.Document(new Rectangle( new com.lowagie.text.Document(new Rectangle(
(int) pf.getWidth(), (int) pf.getHeight())); (int) pf.getWidth(), (int) pf.getHeight()));
final PdfWriter writer = PdfWriter.getInstance( final PdfWriter writer = PdfWriter.getInstance(
document, output); document, output);

2
client/src/org/compiere/grid/VPanel.java
View File

@ -61,7 +61,7 @@ import org.compiere.util.Util;
import org.jdesktop.swingx.JXCollapsiblePane; import org.jdesktop.swingx.JXCollapsiblePane;
import org.jdesktop.swingx.border.DropShadowBorder; import org.jdesktop.swingx.border.DropShadowBorder;
import com.itextpdf.text.Font; import com.lowagie.text.Font;
/** /**
* Single Row Panel. * Single Row Panel.

25
posterita/posterita/src/main/org/posterita/businesslogic/administration/CustomerManager.java
View File

@ -67,18 +67,17 @@ import org.posterita.lib.UdiConstants;
import org.posterita.util.PathInfo; import org.posterita.util.PathInfo;
import org.posterita.util.PoManager; import org.posterita.util.PoManager;
import com.itextpdf.text.BaseColor; import com.lowagie.text.Document;
import com.itextpdf.text.Document; import com.lowagie.text.DocumentException;
import com.itextpdf.text.DocumentException; import com.lowagie.text.Element;
import com.itextpdf.text.Element; import com.lowagie.text.Font;
import com.itextpdf.text.Font; import com.lowagie.text.FontFactory;
import com.itextpdf.text.FontFactory; import com.lowagie.text.Image;
import com.itextpdf.text.Image; import com.lowagie.text.PageSize;
import com.itextpdf.text.PageSize; import com.lowagie.text.Phrase;
import com.itextpdf.text.Phrase; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfWriter;
import com.itextpdf.text.pdf.PdfWriter;
public class CustomerManager public class CustomerManager
{ {
@ -910,7 +909,7 @@ public class CustomerManager
PdfPTable main = new PdfPTable(2); PdfPTable main = new PdfPTable(2);
main.setWidthPercentage(71.0f); main.setWidthPercentage(71.0f);
main.getDefaultCell().setBorderColor(BaseColor.GRAY); main.getDefaultCell().setBorderColor(Color.gray);
PdfPCell cell = new PdfPCell(); PdfPCell cell = new PdfPCell();
cell.setMinimumHeight(150.0f); cell.setMinimumHeight(150.0f);

27
posterita/posterita/src/main/org/posterita/businesslogic/performanceanalysis/POSReportManager.java
View File

@ -116,18 +116,17 @@ import org.posterita.order.UDIOrderTypes;
import org.posterita.util.PathInfo; import org.posterita.util.PathInfo;
import org.posterita.util.TmkPrinterConstants; import org.posterita.util.TmkPrinterConstants;
import com.itextpdf.text.BaseColor; import com.lowagie.text.Chunk;
import com.itextpdf.text.Chunk; import com.lowagie.text.Document;
import com.itextpdf.text.Document; import com.lowagie.text.Element;
import com.itextpdf.text.Element; import com.lowagie.text.Font;
import com.itextpdf.text.Font; import com.lowagie.text.Image;
import com.itextpdf.text.Image; import com.lowagie.text.PageSize;
import com.itextpdf.text.PageSize; import com.lowagie.text.Paragraph;
import com.itextpdf.text.Paragraph; import com.lowagie.text.Phrase;
import com.itextpdf.text.Phrase; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfWriter;
import com.itextpdf.text.pdf.PdfWriter;
public class POSReportManager { public class POSReportManager {
@ -1209,12 +1208,12 @@ public class POSReportManager {
// ----------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------
// setting table footer // setting table footer
t.getDefaultCell().setBackgroundColor(BaseColor.LIGHT_GRAY); t.getDefaultCell().setBackgroundColor(new Color(240, 240, 240));
PdfPCell c = new PdfPCell(new Paragraph(new Chunk("ORDER TOTAL", PdfPCell c = new PdfPCell(new Paragraph(new Chunk("ORDER TOTAL",
headerFont))); headerFont)));
c.setColspan(2); c.setColspan(2);
c.setBackgroundColor(BaseColor.LIGHT_GRAY); c.setBackgroundColor(new Color(240, 240, 240));
t.addCell(c); t.addCell(c);
t.addCell(new Paragraph(new Chunk(totalQty + "", simpleFont))); t.addCell(new Paragraph(new Chunk(totalQty + "", simpleFont)));

26
posterita/posterita/src/main/org/posterita/core/CrossTabReportGenerator.java
View File

@ -25,17 +25,15 @@ import java.awt.Color;
import java.util.Iterator; import java.util.Iterator;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import com.lowagie.text.Chunk;
import com.itextpdf.text.BaseColor; import com.lowagie.text.Document;
import com.itextpdf.text.Chunk; import com.lowagie.text.DocumentException;
import com.itextpdf.text.Document; import com.lowagie.text.Element;
import com.itextpdf.text.DocumentException; import com.lowagie.text.Image;
import com.itextpdf.text.Element; import com.lowagie.text.Paragraph;
import com.itextpdf.text.Image; import com.lowagie.text.Rectangle;
import com.itextpdf.text.Paragraph; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.Rectangle; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable;
public class CrossTabReportGenerator extends PDFReportGenerator public class CrossTabReportGenerator extends PDFReportGenerator
@ -111,7 +109,7 @@ public class CrossTabReportGenerator extends PDFReportGenerator
if(j == noOfRows - 1) if(j == noOfRows - 1)
{ {
cell.setBackgroundColor(BaseColor.GRAY); cell.setBackgroundColor(new Color(170,170,170));
} }
cell.setHorizontalAlignment(Element.ALIGN_LEFT); cell.setHorizontalAlignment(Element.ALIGN_LEFT);
@ -129,7 +127,7 @@ public class CrossTabReportGenerator extends PDFReportGenerator
if(k == columnCount-1) if(k == columnCount-1)
{ {
PdfPCell cell = new PdfPCell(new Paragraph(txtck)); PdfPCell cell = new PdfPCell(new Paragraph(txtck));
cell.setBackgroundColor(BaseColor.GRAY); cell.setBackgroundColor(new Color(170,170,170));
cell.setHorizontalAlignment(Element.ALIGN_CENTER); cell.setHorizontalAlignment(Element.ALIGN_CENTER);
cell.setVerticalAlignment(Element.ALIGN_MIDDLE); cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
cell.setPaddingBottom(5); cell.setPaddingBottom(5);
@ -147,7 +145,7 @@ public class CrossTabReportGenerator extends PDFReportGenerator
if(j == noOfRows - 1) if(j == noOfRows - 1)
{ {
cell.setBackgroundColor(BaseColor.GRAY); cell.setBackgroundColor(new Color(170,170,170));
} }
table.addCell(cell); table.addCell(cell);

30
posterita/posterita/src/main/org/posterita/core/PDFReportGenerator.java
View File

@ -28,20 +28,18 @@ import java.util.Properties;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import org.posterita.lib.PropertiesConstant; import org.posterita.lib.PropertiesConstant;
import com.lowagie.text.Chunk;
import com.itextpdf.text.BaseColor; import com.lowagie.text.Document;
import com.itextpdf.text.Chunk; import com.lowagie.text.Element;
import com.itextpdf.text.Document; import com.lowagie.text.Font;
import com.itextpdf.text.Element; import com.lowagie.text.FontFactory;
import com.itextpdf.text.Font; import com.lowagie.text.Image;
import com.itextpdf.text.FontFactory; import com.lowagie.text.PageSize;
import com.itextpdf.text.Image; import com.lowagie.text.Paragraph;
import com.itextpdf.text.PageSize; import com.lowagie.text.Rectangle;
import com.itextpdf.text.Paragraph; import com.lowagie.text.pdf.BaseFont;
import com.itextpdf.text.Rectangle; import com.lowagie.text.pdf.PdfTemplate;
import com.itextpdf.text.pdf.BaseFont; import com.lowagie.text.pdf.PdfWriter;
import com.itextpdf.text.pdf.PdfTemplate;
import com.itextpdf.text.pdf.PdfWriter;
public abstract class PDFReportGenerator public abstract class PDFReportGenerator
{ {
@ -49,8 +47,8 @@ public abstract class PDFReportGenerator
protected float MARGIN = 30f; protected float MARGIN = 30f;
//setting default fonts //setting default fonts
protected Font TITLE_FONT = FontFactory.getFont(FontFactory.HELVETICA,18,Font.BOLD,BaseColor.BLUE); protected Font TITLE_FONT = FontFactory.getFont(FontFactory.HELVETICA,18,Font.BOLD,new Color(255,0,0));
protected Font SUBTITLE_FONT = FontFactory.getFont(FontFactory.HELVETICA,15,Font.BOLD,BaseColor.BLUE); protected Font SUBTITLE_FONT = FontFactory.getFont(FontFactory.HELVETICA,15,Font.BOLD,new Color(255,0,0));
protected Font HEADER_FONT = FontFactory.getFont(FontFactory.HELVETICA,10,Font.BOLD); protected Font HEADER_FONT = FontFactory.getFont(FontFactory.HELVETICA,10,Font.BOLD);
protected Font DATA_FONT = FontFactory.getFont(FontFactory.HELVETICA,10); protected Font DATA_FONT = FontFactory.getFont(FontFactory.HELVETICA,10);

18
posterita/posterita/src/main/org/posterita/core/PDFReportPageEventHelper.java
View File

@ -24,15 +24,15 @@ package org.posterita.core;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import com.itextpdf.text.Document; import com.lowagie.text.Document;
import com.itextpdf.text.Font; import com.lowagie.text.Font;
import com.itextpdf.text.FontFactory; import com.lowagie.text.FontFactory;
import com.itextpdf.text.Rectangle; import com.lowagie.text.Rectangle;
import com.itextpdf.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfPageEventHelper; import com.lowagie.text.pdf.PdfPageEventHelper;
import com.itextpdf.text.pdf.PdfTemplate; import com.lowagie.text.pdf.PdfTemplate;
import com.itextpdf.text.pdf.PdfWriter; import com.lowagie.text.pdf.PdfWriter;
/** /**
* This class extends the page event handler that displays the * This class extends the page event handler that displays the

16
posterita/posterita/src/main/org/posterita/core/SimpleReportGenerator.java
View File

@ -24,14 +24,14 @@ package org.posterita.core;
import java.util.Iterator; import java.util.Iterator;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import com.itextpdf.text.Chunk; import com.lowagie.text.Chunk;
import com.itextpdf.text.Document; import com.lowagie.text.Document;
import com.itextpdf.text.Element; import com.lowagie.text.Element;
import com.itextpdf.text.PageSize; import com.lowagie.text.PageSize;
import com.itextpdf.text.Paragraph; import com.lowagie.text.Paragraph;
import com.itextpdf.text.Rectangle; import com.lowagie.text.Rectangle;
import com.itextpdf.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfPTable;
public class SimpleReportGenerator extends PDFReportGenerator public class SimpleReportGenerator extends PDFReportGenerator
{ {

51
posterita/posterita/src/main/org/posterita/core/TabularReport.java
View File

@ -43,18 +43,17 @@ import org.posterita.businesslogic.OrganisationManager;
import org.posterita.businesslogic.performanceanalysis.ReportManager; import org.posterita.businesslogic.performanceanalysis.ReportManager;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import com.itextpdf.text.BaseColor; import com.lowagie.text.Chunk;
import com.itextpdf.text.Chunk; import com.lowagie.text.Document;
import com.itextpdf.text.Document; import com.lowagie.text.DocumentException;
import com.itextpdf.text.DocumentException; import com.lowagie.text.Element;
import com.itextpdf.text.Element; import com.lowagie.text.Font;
import com.itextpdf.text.Font; import com.lowagie.text.PageSize;
import com.itextpdf.text.PageSize; import com.lowagie.text.Paragraph;
import com.itextpdf.text.Paragraph; import com.lowagie.text.Phrase;
import com.itextpdf.text.Phrase; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfWriter;
import com.itextpdf.text.pdf.PdfWriter;
public class TabularReport public class TabularReport
{ {
@ -511,7 +510,7 @@ public class TabularReport
PdfPCell header = new PdfPCell(new Paragraph(getTitle() + "\n" + getSubtitle(), style1)); PdfPCell header = new PdfPCell(new Paragraph(getTitle() + "\n" + getSubtitle(), style1));
header.setColspan(7); header.setColspan(7);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
// Table sub header // Table sub header
@ -618,29 +617,29 @@ public class TabularReport
PdfPCell header = new PdfPCell(new Paragraph(new Chunk(getTitle(), style1) + "\n" + new Chunk(getSubtitle(), style2) + "\n", style1)); PdfPCell header = new PdfPCell(new Paragraph(new Chunk(getTitle(), style1) + "\n" + new Chunk(getSubtitle(), style2) + "\n", style1));
header.setColspan(4); header.setColspan(4);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
//Date Header //Date Header
PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(fromDate), style1), style1)); PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(fromDate), style1), style1));
dateHeader.setColspan(1); dateHeader.setColspan(1);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
dateHeader = new PdfPCell(new Paragraph("To : " +new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(toDate), style1), style1)); dateHeader = new PdfPCell(new Paragraph("To : " +new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(toDate), style1), style1));
dateHeader.setColspan(3); dateHeader.setColspan(3);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
// Info Header // Info Header
PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT - SALES FIGURES ARE TAKEN AFTER DISCOUNT", style5)); PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT - SALES FIGURES ARE TAKEN AFTER DISCOUNT", style5));
infoHeader.setColspan(4); infoHeader.setColspan(4);
infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER); infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER);
infoHeader.setBackgroundColor(BaseColor.BLACK); infoHeader.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(infoHeader); mytable.addCell(infoHeader);
// Rows Header // Rows Header
@ -716,29 +715,29 @@ public class TabularReport
PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1)); PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1));
header.setColspan(6); header.setColspan(6);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
//Date Header //Date Header
PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(fromDate), style1), style1)); PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(fromDate), style1), style1));
dateHeader.setColspan(2); dateHeader.setColspan(2);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
dateHeader = new PdfPCell(new Paragraph("To : " + new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(toDate), style1), style1)); dateHeader = new PdfPCell(new Paragraph("To : " + new Chunk(TimestampConvertor.convertTimeStampToFyracleDate(toDate), style1), style1));
dateHeader.setColspan(4); dateHeader.setColspan(4);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
// Info Header // Info Header
PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT & BASED ON PURCHASE PRICES", style5)); PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT & BASED ON PURCHASE PRICES", style5));
infoHeader.setColspan(6); infoHeader.setColspan(6);
infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER); infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER);
infoHeader.setBackgroundColor(BaseColor.BLACK); infoHeader.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(infoHeader); mytable.addCell(infoHeader);
// Rows Header // Rows Header
@ -815,7 +814,7 @@ public class TabularReport
PdfPCell header = new PdfPCell(new Paragraph(getTitle() + "\n" + getSubtitle(), style1)); PdfPCell header = new PdfPCell(new Paragraph(getTitle() + "\n" + getSubtitle(), style1));
header.setColspan(9); header.setColspan(9);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
// Table sub header // Table sub header

22
posterita/posterita/src/main/org/posterita/core/TabularReport2.java
View File

@ -36,17 +36,17 @@ import org.apache.ecs.xhtml.tr;
import org.posterita.businesslogic.performanceanalysis.ReportManager; import org.posterita.businesslogic.performanceanalysis.ReportManager;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import com.itextpdf.text.Chunk; import com.lowagie.text.Chunk;
import com.itextpdf.text.Document; import com.lowagie.text.Document;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
import com.itextpdf.text.Element; import com.lowagie.text.Element;
import com.itextpdf.text.Font; import com.lowagie.text.Font;
import com.itextpdf.text.PageSize; import com.lowagie.text.PageSize;
import com.itextpdf.text.Paragraph; import com.lowagie.text.Paragraph;
import com.itextpdf.text.Phrase; import com.lowagie.text.Phrase;
import com.itextpdf.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfWriter; import com.lowagie.text.pdf.PdfWriter;
public class TabularReport2 public class TabularReport2
{ {

49
posterita/posterita/src/main/org/posterita/core/TabularReportMerge.java
View File

@ -40,18 +40,17 @@ import org.posterita.Constants;
import org.posterita.businesslogic.performanceanalysis.ReportManager; import org.posterita.businesslogic.performanceanalysis.ReportManager;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import com.itextpdf.text.BaseColor; import com.lowagie.text.Chunk;
import com.itextpdf.text.Chunk; import com.lowagie.text.Document;
import com.itextpdf.text.Document; import com.lowagie.text.DocumentException;
import com.itextpdf.text.DocumentException; import com.lowagie.text.Element;
import com.itextpdf.text.Element; import com.lowagie.text.Font;
import com.itextpdf.text.Font; import com.lowagie.text.PageSize;
import com.itextpdf.text.PageSize; import com.lowagie.text.Paragraph;
import com.itextpdf.text.Paragraph; import com.lowagie.text.Phrase;
import com.itextpdf.text.Phrase; import com.lowagie.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfWriter;
import com.itextpdf.text.pdf.PdfWriter;
public class TabularReportMerge public class TabularReportMerge
{ {
@ -264,7 +263,7 @@ public class TabularReportMerge
PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1)); PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1));
header.setColspan(7); header.setColspan(7);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
// Table sub header // Table sub header
@ -371,29 +370,29 @@ public class TabularReportMerge
PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1)); PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1));
header.setColspan(4); header.setColspan(4);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
//Date Header //Date Header
PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStamp(fromDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1)); PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStamp(fromDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1));
dateHeader.setColspan(1); dateHeader.setColspan(1);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
dateHeader = new PdfPCell(new Paragraph("To : " + new Chunk(TimestampConvertor.convertTimeStamp(toDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1)); dateHeader = new PdfPCell(new Paragraph("To : " + new Chunk(TimestampConvertor.convertTimeStamp(toDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1));
dateHeader.setColspan(3); dateHeader.setColspan(3);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
// Info Header // Info Header
PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT - SALES FIGURES ARE TAKEN AFTER DISCOUNT", style5)); PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT - SALES FIGURES ARE TAKEN AFTER DISCOUNT", style5));
infoHeader.setColspan(4); infoHeader.setColspan(4);
infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER); infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER);
infoHeader.setBackgroundColor(BaseColor.BLACK); infoHeader.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(infoHeader); mytable.addCell(infoHeader);
// Rows Header // Rows Header
@ -469,29 +468,29 @@ public class TabularReportMerge
PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1)); PdfPCell header = new PdfPCell(new Paragraph(new Chunk(title, style1) + "\n" + new Chunk(subtitle, style2) + "\n", style1));
header.setColspan(6); header.setColspan(6);
header.setHorizontalAlignment(Element.ALIGN_CENTER); header.setHorizontalAlignment(Element.ALIGN_CENTER);
header.setBackgroundColor(BaseColor.BLACK); header.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(header); mytable.addCell(header);
//Date Header //Date Header
PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStamp(fromDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1)); PdfPCell dateHeader = new PdfPCell(new Paragraph("From : " + new Chunk(TimestampConvertor.convertTimeStamp(fromDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1));
dateHeader.setColspan(2); dateHeader.setColspan(2);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
dateHeader = new PdfPCell(new Paragraph("To : " + new Chunk(TimestampConvertor.convertTimeStamp(toDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1)); dateHeader = new PdfPCell(new Paragraph("To : " + new Chunk(TimestampConvertor.convertTimeStamp(toDate, TimestampConvertor.DEFAULT_DATE_PATTERN1), style1), style1));
dateHeader.setColspan(4); dateHeader.setColspan(4);
dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT); dateHeader.setHorizontalAlignment(Element.ALIGN_LEFT);
dateHeader.setBackgroundColor(BaseColor.GRAY); dateHeader.setBackgroundColor(Color.GRAY);
dateHeader.setBorderColor(BaseColor.WHITE); dateHeader.setBorderColor(Color.WHITE);
mytable.addCell(dateHeader); mytable.addCell(dateHeader);
// Info Header // Info Header
PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT & BASED ON PURCHASE PRICES", style5)); PdfPCell infoHeader = new PdfPCell(new Paragraph("ALL VALUES ARE EXCLUSIVE OF VAT & BASED ON PURCHASE PRICES", style5));
infoHeader.setColspan(6); infoHeader.setColspan(6);
infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER); infoHeader.setHorizontalAlignment(Element.ALIGN_CENTER);
infoHeader.setBackgroundColor(BaseColor.BLACK); infoHeader.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
mytable.addCell(infoHeader); mytable.addCell(infoHeader);
// Rows Header // Rows Header

2
posterita/posterita/src/main/org/posterita/pos/help/POSHelpAction.java
View File

@ -38,7 +38,7 @@ import org.posterita.exceptions.OperationException;
import org.posterita.form.POSHelpForm; import org.posterita.form.POSHelpForm;
import org.posterita.struts.core.BaseDispatchAction; import org.posterita.struts.core.BaseDispatchAction;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
public class POSHelpAction extends BaseDispatchAction public class POSHelpAction extends BaseDispatchAction
{ {

2
posterita/posterita/src/main/org/posterita/struts/pos/BarcodeAction.java
View File

@ -65,7 +65,7 @@ import org.posterita.form.OrderLineForm;
import org.posterita.lib.UdiConstants; import org.posterita.lib.UdiConstants;
import org.posterita.struts.core.DefaultForm; import org.posterita.struts.core.DefaultForm;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
public class BarcodeAction extends POSDispatchAction public class BarcodeAction extends POSDispatchAction
{ {

2
posterita/posterita/src/main/org/posterita/struts/pos/DocumentAction.java
View File

@ -59,7 +59,7 @@ import org.posterita.exceptions.OperationException;
import org.posterita.form.InventoryForm; import org.posterita.form.InventoryForm;
import org.posterita.struts.core.DefaultForm; import org.posterita.struts.core.DefaultForm;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
public class DocumentAction extends POSDispatchAction public class DocumentAction extends POSDispatchAction
{ {

2
posterita/posterita/src/main/org/posterita/struts/pos/InventoryCartAction.java
View File

@ -73,7 +73,7 @@ import org.posterita.exceptions.UOMValuePrecisionNotValidException;
import org.posterita.form.InventoryLineForm; import org.posterita.form.InventoryLineForm;
import org.posterita.struts.core.DefaultForm; import org.posterita.struts.core.DefaultForm;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
public class InventoryCartAction extends POSDispatchAction public class InventoryCartAction extends POSDispatchAction
{ {

2
posterita/posterita/src/main/org/posterita/struts/pos/POSInfoAction.java
View File

@ -52,7 +52,7 @@ import org.posterita.exceptions.ApplicationException;
import org.posterita.exceptions.OperationException; import org.posterita.exceptions.OperationException;
import org.posterita.struts.core.DefaultForm; import org.posterita.struts.core.DefaultForm;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
public class POSInfoAction extends POSDispatchAction public class POSInfoAction extends POSDispatchAction
{ {

2
posterita/posterita/src/main/org/posterita/struts/pos/POSReportAction.java
View File

@ -102,7 +102,7 @@ import org.posterita.struts.core.BaseDispatchAction;
import org.posterita.struts.core.DefaultForm; import org.posterita.struts.core.DefaultForm;
import org.posterita.util.PathInfo; import org.posterita.util.PathInfo;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
public class POSReportAction extends BaseDispatchAction public class POSReportAction extends BaseDispatchAction

2
tools/.classpath
View File

@ -7,6 +7,7 @@
<classpathentry exported="true" kind="lib" path="lib/barbecue-1.5-beta1.jar"/> <classpathentry exported="true" kind="lib" path="lib/barbecue-1.5-beta1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/> <classpathentry exported="true" kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/> <classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/>
<classpathentry exported="true" kind="lib" path="lib/iText-2.1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/swingx-0.9.0.jar"/> <classpathentry exported="true" kind="lib" path="lib/swingx-0.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/miglayout-3.7.1-swing.jar"/> <classpathentry exported="true" kind="lib" path="lib/miglayout-3.7.1-swing.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@ -24,6 +25,5 @@
<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.14.jar"/> <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.14.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.11.jar"/> <classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javaee.jar"/> <classpathentry exported="true" kind="lib" path="lib/javaee.jar"/>
<classpathentry exported="true" kind="lib" path="lib/iText-5.0.0.jar"/>
<classpathentry kind="output" path="build"/> <classpathentry kind="output" path="build"/>
</classpath> </classpath>

4
tools/build.xml
View File

@ -260,7 +260,7 @@
<zipfileset src="lib/jpedal.jar"> <zipfileset src="lib/jpedal.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/iText-5.0.0.jar"> <zipfileset src="lib/iText-2.1.7.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<!-- JFreeChart --> <!-- JFreeChart -->
@ -423,7 +423,7 @@
<zipfileset src="lib/jpedal.jar"> <zipfileset src="lib/jpedal.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/iText-5.0.0.jar"> <zipfileset src="lib/iText-2.1.7.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/swingx-0.9.0.jar"> <zipfileset src="lib/swingx-0.9.0.jar">

12
zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -56,12 +56,12 @@ import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Execution; import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import com.itextpdf.text.Document; import com.lowagie.text.Document;
import com.itextpdf.text.DocumentException; import com.lowagie.text.DocumentException;
import com.itextpdf.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfImportedPage; import com.lowagie.text.pdf.PdfImportedPage;
import com.itextpdf.text.pdf.PdfReader; import com.lowagie.text.pdf.PdfReader;
import com.itextpdf.text.pdf.PdfWriter; import com.lowagie.text.pdf.PdfWriter;
/** /**
* ZK Application Environment and utilities * ZK Application Environment and utilities

10
zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -40,11 +40,11 @@ import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox; import org.zkoss.zul.Hbox;
import org.zkoss.zul.Html; import org.zkoss.zul.Html;
import com.itextpdf.text.Document; import com.lowagie.text.Document;
import com.itextpdf.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfImportedPage; import com.lowagie.text.pdf.PdfImportedPage;
import com.itextpdf.text.pdf.PdfReader; import com.lowagie.text.pdf.PdfReader;
import com.itextpdf.text.pdf.PdfWriter; import com.lowagie.text.pdf.PdfWriter;
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *