diff --git a/JasperReports/build.xml b/JasperReports/build.xml
index 3f3b458e09..1a9e086002 100644
--- a/JasperReports/build.xml
+++ b/JasperReports/build.xml
@@ -64,14 +64,14 @@
-
+
-
+
-
+
@@ -139,7 +139,7 @@
duplicate="preserve">
-
+
@@ -150,11 +150,11 @@
-
+
-
+
diff --git a/JasperReports/src/org/compiere/report/JasperReportViewer.java b/JasperReports/src/org/compiere/report/JasperReportViewer.java
index b80fdfcba2..9145143615 100644
--- a/JasperReports/src/org/compiere/report/JasperReportViewer.java
+++ b/JasperReports/src/org/compiere/report/JasperReportViewer.java
@@ -18,7 +18,7 @@
import net.sf.jasperreports.engine.export.JRRtfExporter;
import net.sf.jasperreports.engine.export.JRXlsExporter;
import net.sf.jasperreports.engine.export.JRXlsExporterParameter;
-import net.sf.jasperreports.view.JRViewer;
+import net.sf.jasperreports.swing.JRViewer;
import org.compiere.apps.EMailDialog;
import org.compiere.model.MUser;
import org.compiere.util.CLogger;
@@ -63,8 +63,8 @@ public JasperReportViewer(final JasperViewer jasperViewer, final JasperPrint jas
tlbToolBar.add(comboBox);
// Set default viewer zoom level
- btnFitPage.setSelected(true);
- setZooms();
+ setFitWidthZoomRatio();
+ setFitPageZoomRatio();
}
public JasperPrint getJasperPrint() {
diff --git a/JasperReportsTools/lib/commons-beanutils-1.8.0.jar b/JasperReportsTools/lib/commons-beanutils-1.8.0.jar
deleted file mode 100644
index caf7ae3360..0000000000
Binary files a/JasperReportsTools/lib/commons-beanutils-1.8.0.jar and /dev/null differ
diff --git a/JasperReportsTools/lib/commons-beanutils-1.9.3.jar b/JasperReportsTools/lib/commons-beanutils-1.9.3.jar
new file mode 100644
index 0000000000..6728154e56
Binary files /dev/null and b/JasperReportsTools/lib/commons-beanutils-1.9.3.jar differ
diff --git a/JasperReportsTools/lib/jasperreports-5.1.0.jar b/JasperReportsTools/lib/jasperreports-5.1.0.jar
deleted file mode 100644
index 59586d5be7..0000000000
Binary files a/JasperReportsTools/lib/jasperreports-5.1.0.jar and /dev/null differ
diff --git a/JasperReportsTools/lib/jasperreports-6.3.1.jar b/JasperReportsTools/lib/jasperreports-6.3.1.jar
deleted file mode 100644
index 521ae4f18c..0000000000
Binary files a/JasperReportsTools/lib/jasperreports-6.3.1.jar and /dev/null differ
diff --git a/JasperReportsTools/lib/jasperreports-6.6.0.jar b/JasperReportsTools/lib/jasperreports-6.6.0.jar
new file mode 100644
index 0000000000..07b6c65494
Binary files /dev/null and b/JasperReportsTools/lib/jasperreports-6.6.0.jar differ
diff --git a/JasperReportsTools/lib/jasperreports-fonts-5.1.0.jar b/JasperReportsTools/lib/jasperreports-fonts-5.1.0.jar
deleted file mode 100644
index d74843ff79..0000000000
Binary files a/JasperReportsTools/lib/jasperreports-fonts-5.1.0.jar and /dev/null differ
diff --git a/JasperReportsTools/lib/jasperreports-fonts-6.3.1.jar b/JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar
similarity index 99%
rename from JasperReportsTools/lib/jasperreports-fonts-6.3.1.jar
rename to JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar
index d91ec2c905..25e8ba93c1 100644
Binary files a/JasperReportsTools/lib/jasperreports-fonts-6.3.1.jar and b/JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar differ
diff --git a/base/build.xml b/base/build.xml
index 18a190d970..a83dd2a703 100644
--- a/base/build.xml
+++ b/base/build.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/base/src/org/adempiere/excel/SmjXlsReport.java b/base/src/org/adempiere/excel/SmjXlsReport.java
index 438cb0e5dc..639dab5042 100644
--- a/base/src/org/adempiere/excel/SmjXlsReport.java
+++ b/base/src/org/adempiere/excel/SmjXlsReport.java
@@ -19,7 +19,11 @@
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.CellRangeAddress;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
import org.compiere.model.MImage;
import org.compiere.report.MReportColumn;
import org.compiere.util.CLogger;
@@ -65,13 +69,13 @@ public HSSFWorkbook generate(LinkedList data,
HSSFFont font = book.createFont();
font.setFontHeightInPoints((short) 13);
font.setFontName(HSSFFont.FONT_ARIAL);
- font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+ font.setBold(true);
// estio celda - cell style
HSSFCellStyle cellStyle = book.createCellStyle();
cellStyle.setWrapText(true);
- cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
- cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_TOP);
+ cellStyle.setAlignment(HorizontalAlignment.CENTER);
+ cellStyle.setVerticalAlignment(VerticalAlignment.TOP);
cellStyle.setFont(font);
// //////////////////////////////////////////////////////////////////////////////////////
// agrega el logo
@@ -82,7 +86,7 @@ public HSSFWorkbook generate(LinkedList data,
HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
HSSFClientAnchor anchor;
anchor = new HSSFClientAnchor(100,50,200,255,(short)0,0,(short)1,1);
- anchor.setAnchorType( HSSFClientAnchor.MOVE_DONT_RESIZE );
+ anchor.setAnchorType( ClientAnchor.AnchorType.MOVE_AND_RESIZE);
int pictureIndex = book.addPicture(imageData, HSSFWorkbook.PICTURE_TYPE_PNG );
patriarch.createPicture(anchor, pictureIndex);
for (int i=0;i<5;i++)
@@ -171,10 +175,10 @@ public HSSFWorkbook generate(LinkedList data,
/**
* Crea la fila de titulos - create title row
- * @param wb
- * @param hs
+ * @param book
+ * @param sheet
* @param fila
- * @param colsName
+ * @param m_columns
*/
private void titleTable(HSSFWorkbook book, HSSFSheet sheet, int fila,
MReportColumn[] m_columns) {
@@ -183,13 +187,13 @@ private void titleTable(HSSFWorkbook book, HSSFSheet sheet, int fila,
HSSFFont font = book.createFont();
font.setFontHeightInPoints((short) 13);
font.setFontName(HSSFFont.FONT_ARIAL);
- font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+ font.setBold(true);
// font.setColor(HSSFColor.BLUE.index);
// estio celda - cell style
HSSFCellStyle cellStyle = book.createCellStyle();
cellStyle.setWrapText(true);
- cellStyle.setAlignment(HSSFCellStyle.ALIGN_JUSTIFY);
- cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_TOP);
+ cellStyle.setAlignment(HorizontalAlignment.JUSTIFY);
+ cellStyle.setVerticalAlignment(VerticalAlignment.TOP);
// cellStyle.setFillPattern(HSSFCellStyle.SPARSE_DOTS);
// cellStyle.setFillBackgroundColor(HSSFColor.GREY_40_PERCENT.index);
cellStyle.setFont(font);
@@ -267,11 +271,12 @@ public void reportTable(HSSFWorkbook book, LinkedList data,
HSSFFont fontT = book.createFont();
fontT.setFontHeightInPoints((short) 12);
fontT.setFontName(HSSFFont.FONT_ARIAL);
- fontT.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+ //fontT.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+ fontT.setBold(true);
HSSFCellStyle cellStyleT = book.createCellStyle();
cellStyleT.setWrapText(true);
- cellStyleT.setAlignment(HSSFCellStyle.ALIGN_CENTER);
- cellStyleT.setVerticalAlignment(HSSFCellStyle.VERTICAL_TOP);
+ cellStyleT.setAlignment(HorizontalAlignment.CENTER);
+ cellStyleT.setVerticalAlignment(VerticalAlignment.TOP);
cellStyleT.setFont(fontT);
CellRangeAddress region = new CellRangeAddress(fila-1,(short)0,fila-1,endRegion);
sheet.addMergedRegion(region);
@@ -283,27 +288,27 @@ public void reportTable(HSSFWorkbook book, LinkedList data,
} else if (rpt.getReportlinestyle() != null && rpt.getReportlinestyle().equals("L")) {
// coloca linea en el reporte - Put under line in the report
cellStyle.setWrapText(true);
- cellStyle.setBorderTop(HSSFCellStyle.BORDER_MEDIUM);
+ cellStyle.setBorderTop(BorderStyle.MEDIUM);
cellStyle.setBottomBorderColor((short)8);
cellStyleD.setWrapText(true);
- cellStyleD.setBorderTop(HSSFCellStyle.BORDER_MEDIUM);
+ cellStyleD.setBorderTop(BorderStyle.MEDIUM);
cellStyleD.setBottomBorderColor((short)8);
cellStyleN.setWrapText(true);
- cellStyleN.setBorderTop(HSSFCellStyle.BORDER_MEDIUM);
+ cellStyleN.setBorderTop(BorderStyle.MEDIUM);
cellStyleN.setBottomBorderColor((short)8);
newRow = true;
} else if (rpt.getReportlinestyle() != null && rpt.getReportlinestyle().equals("X")) {
// coloca linea de total - Put total line
cellStyle.setWrapText(true);
- cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_TOP);
- cellStyle.setBorderTop(HSSFCellStyle.BORDER_MEDIUM);
+ cellStyle.setVerticalAlignment(VerticalAlignment.TOP);
+ cellStyle.setBorderTop(BorderStyle.MEDIUM);
cellStyle.setBottomBorderColor((short)8);
newRow = true;
}else if (rpt.getReportlinestyle() != null && rpt.getReportlinestyle().equals("Z")) {
// coloca linea doble de total - Put total line doble
cellStyle.setWrapText(true);
- cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_TOP);
- cellStyle.setBorderTop(HSSFCellStyle.BORDER_DOUBLE);
+ cellStyle.setVerticalAlignment(VerticalAlignment.TOP);
+ cellStyle.setBorderTop(BorderStyle.DOUBLE);
cellStyle.setBottomBorderColor((short)8);
//--------------
row = sheet.createRow(fila++);
@@ -314,8 +319,8 @@ public void reportTable(HSSFWorkbook book, LinkedList data,
}else if (rpt.getReportlinestyle() != null && rpt.getReportlinestyle().equals("D")) {
// coloca liena de descripcion - put description line
cellStyleD.setWrapText(true);
- cellStyleD.setVerticalAlignment(HSSFCellStyle.VERTICAL_TOP);
- cellStyleD.setBorderTop(HSSFCellStyle.BORDER_MEDIUM);
+ cellStyleD.setVerticalAlignment(VerticalAlignment.TOP);
+ cellStyleD.setBorderTop(BorderStyle.MEDIUM);
cellStyleD.setBottomBorderColor((short)8);
newRow = true;
}else if (rpt.getReportlinestyle() != null && rpt.getReportlinestyle().equals("S")) {
@@ -359,7 +364,7 @@ private void putRow(HSSFCellStyle cellStyle, HSSFCellStyle cellStyleD, HSSFCellS
HSSFSheet sheet, HSSFRow row, int fila, ReportTO rpt){
HSSFRichTextString text;
short col = 0;
- cellStyle.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
+ cellStyle.setAlignment(HorizontalAlignment.RIGHT);
//Nombre - Name
text = new HSSFRichTextString(rpt.getName());
HSSFCell cell = row.createCell(col++);
diff --git a/base/src/org/adempiere/impexp/AbstractExcelExporter.java b/base/src/org/adempiere/impexp/AbstractExcelExporter.java
index b49cac2c59..99ea75d240 100644
--- a/base/src/org/adempiere/impexp/AbstractExcelExporter.java
+++ b/base/src/org/adempiere/impexp/AbstractExcelExporter.java
@@ -24,6 +24,7 @@
import java.util.Properties;
import java.util.logging.Level;
+import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.DataFormat;
@@ -172,13 +173,13 @@ private Font getFont(boolean isHeader) {
if (isHeader) {
if (m_fontHeader == null) {
m_fontHeader = m_workbook.createFont();
- m_fontHeader.setBoldweight(Font.BOLDWEIGHT_BOLD);
+ m_fontHeader.setBold(true);
}
font = m_fontHeader;
}
else if (isFunctionRow()) {
font = m_workbook.createFont();
- font.setBoldweight(Font.BOLDWEIGHT_BOLD);
+ font.setBold(true);
font.setItalic(true);
}
else {
@@ -239,10 +240,10 @@ private CellStyle getStyle(int row, int col) {
Font font = getFont(false);
cs.setFont(font);
// Border
- cs.setBorderLeft((short)1);
- cs.setBorderTop((short)1);
- cs.setBorderRight((short)1);
- cs.setBorderBottom((short)1);
+ cs.setBorderLeft(BorderStyle.THIN);
+ cs.setBorderTop(BorderStyle.THIN);
+ cs.setBorderRight(BorderStyle.THIN);
+ cs.setBorderBottom(BorderStyle.THIN);
String formatPattern = getFormatPattern(col);
//
if (DisplayType.isDate(displayType)) {
@@ -276,10 +277,10 @@ private CellStyle getHeaderStyle(int col)
Font font_header = getFont(true);
cs_header = m_workbook.createCellStyle();
cs_header.setFont(font_header);
- cs_header.setBorderLeft((short)2);
- cs_header.setBorderTop((short)2);
- cs_header.setBorderRight((short)2);
- cs_header.setBorderBottom((short)2);
+ cs_header.setBorderLeft(BorderStyle.THIN);
+ cs_header.setBorderTop(BorderStyle.THIN);
+ cs_header.setBorderRight(BorderStyle.THIN);
+ cs_header.setBorderBottom(BorderStyle.THIN);
//cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text"));
cs_header.setDataFormat(m_workbook.createDataFormat().getFormat("text"));
cs_header.setWrapText(true);
diff --git a/tools/build.xml b/tools/build.xml
index 5b23c6fe22..7572429138 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -327,10 +327,10 @@
-
+
-
+
@@ -354,6 +354,9 @@
+
+
+
@@ -535,10 +538,10 @@
-
+
-
+
@@ -558,6 +561,9 @@
+
+
+
diff --git a/tools/lib/commons-collections4-4.1.jar b/tools/lib/commons-collections4-4.1.jar
new file mode 100644
index 0000000000..43a9413b93
Binary files /dev/null and b/tools/lib/commons-collections4-4.1.jar differ
diff --git a/tools/lib/poi-3.14-20160307.jar b/tools/lib/poi-3.14-20160307.jar
deleted file mode 100644
index 5df21105d4..0000000000
Binary files a/tools/lib/poi-3.14-20160307.jar and /dev/null differ
diff --git a/tools/lib/poi-3.17.jar b/tools/lib/poi-3.17.jar
new file mode 100644
index 0000000000..353ce765c2
Binary files /dev/null and b/tools/lib/poi-3.17.jar differ
diff --git a/tools/lib/poi-ooxml-3.14-20160307.jar b/tools/lib/poi-ooxml-3.14-20160307.jar
deleted file mode 100644
index 56384e9144..0000000000
Binary files a/tools/lib/poi-ooxml-3.14-20160307.jar and /dev/null differ
diff --git a/tools/lib/poi-ooxml-3.17.jar b/tools/lib/poi-ooxml-3.17.jar
new file mode 100644
index 0000000000..68086e8d78
Binary files /dev/null and b/tools/lib/poi-ooxml-3.17.jar differ