Merge branch 'develop' into feature/adempiere#1697-Add-Row-Style-Change

Conflicts: db/ddlutils/oracle/views/AD_FIELD_V.sql db/ddlutils/oracle/views/AD_FIELD_VT.sql db/ddlutils/postgresql/views/AD_FIELD_V.sql
erpcya · Oct 3, 2018 · 48e061d · 48e061d
2 parents 592ad7b + 483ecee
commit 48e061d
Show file tree

Hide file tree

Showing 292 changed files with 147,248 additions and 57,253 deletions.
diff --git a/.classpath b/.classpath
@@ -164,11 +164,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="tools/lib/swingx-1.6.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -289,11 +284,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-2.4.7.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.18.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
@@ -42,7 +42,13 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/org.adempiere.production/src/main/java/base"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/org.eevolution.fleet/src/main/java/base"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/org.adempiere.crm/src/main/java"/>
+        <dependent-module archiveName="jasperreports-fonts-6.6.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/adempiere/JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="jasperreports-6.6.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/adempiere/JasperReportsTools/lib/jasperreports-6.6.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
 		<property name="java-output-path" value="build/classes"/>
 		<property name="context-root" value="webui"/>
 	</wb-module>
-</project-modules>
+</project-modules>
diff --git a/JasperReports/.classpath b/JasperReports/.classpath
@@ -11,5 +11,7 @@
 	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="/JasperReportsTools/lib/jasperreports-6.6.0.jar"/>
+	<classpathentry kind="lib" path="/JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/adempiere.iml b/adempiere.iml
@@ -27,7 +27,8 @@
     <libelement value="jar://$MODULE_DIR$/tools/lib/xercesImpl.jar!/" />
     <libelement value="jar://$MODULE_DIR$/tools/lib/xjavadoc-1.1.jar!/" />
     <libelement value="jar://$MODULE_DIR$/tools/lib/xml-apis.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/tools/lib/jpedal.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/tools/lib/icepdf-core-6.2.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/tools/lib/icepdf-viewer-6.2.2.jar!/" />
     <libelement value="jar://$MODULE_DIR$/tools/lib/swingx-1.6.jar!/" />
     <libelement value="jar://$MODULE_DIR$/tools/lib/bsh-2.0b6.jar!/" />
     <libelement value="jar://$MODULE_DIR$/tools/lib/bsh-engine.jar!/" />
@@ -446,9 +447,18 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="jpedal.jar">
+      <library name="icepdf-core-6.2.2.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/tools/lib/jpedal.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/icepdf-core-6.2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="icepdf-viewer-6.2.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/tools/lib/icepdf-viewer-6.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

diff --git a/base/.classpath b/base/.classpath
@@ -1,122 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-		<accessrules>
-			<accessrule kind="discouraged" pattern="com/sun/rowset/**"/>
-			<accessrule kind="discouraged" pattern="sun/security/provider/**"/>
-			<accessrule kind="discouraged" pattern="sun/swing/**"/>
-			<accessrule kind="discouraged" pattern="sun/awt/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="/tools"/>
-	<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/ant.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jpedal.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jnlp.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="lib" path="/tools/lib/junit.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/postgresql.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/c3p0-0.9.1.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/script-api.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/poi-3.14-20160307.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/commons-collections-3.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.7.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/cron4j-2.2.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/JasperReportsTools"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="lib" path="/tools/lib/harness-1.0.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/icepdf-core-6.2.2.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/icepdf-viewer-6.2.2.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/itext-carriage-0.8.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/itext-pdfa-5.5.2.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/itextpdf-5.5.2.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.18.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.15.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/kernel-7.1.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/io-7.1.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/layout-7.1.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/pdfa-7.1.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/javax.inject-1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/mariadb-java-client.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/commons-io.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.adempiere.project"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.adempiere.request"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+		<accessrules>
+			<accessrule kind="discouraged" pattern="com/sun/rowset/**"/>
+			<accessrule kind="discouraged" pattern="sun/security/provider/**"/>
+			<accessrule kind="discouraged" pattern="sun/swing/**"/>
+			<accessrule kind="discouraged" pattern="sun/awt/**"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="/tools"/>
+	<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/ant.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/jnlp.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="lib" path="/tools/lib/junit.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/postgresql.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/c3p0-0.9.1.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/script-api.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/commons-collections-3.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.7.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/cron4j-2.2.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="/JasperReportsTools"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="/tools/lib/harness-1.0.0.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/icepdf-core-6.2.2.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/icepdf-viewer-6.2.2.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/itext-carriage-0.8.0.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/itext-pdfa-5.5.2.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/itextpdf-5.5.2.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.18.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.15.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/kernel-7.1.1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/io-7.1.1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/layout-7.1.1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/pdfa-7.1.1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/javax.inject-1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/mariadb-java-client.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/commons-io.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.adempiere.project"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.adempiere.request"/>
+	<classpathentry kind="lib" path="/tools/lib/poi-3.17.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/poi-ooxml-3.17.jar"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
diff --git a/base/src/org/adempiere/controller/SmallViewController.java b/base/src/org/adempiere/controller/SmallViewController.java
@@ -67,8 +67,10 @@ public SmallViewController() {
 		StackTraceElement[] stElements = Thread.currentThread().getStackTrace();
         for (int i=1; i<stElements.length; i++) {
             StackTraceElement ste = stElements[i];
-            if (ste.getClassName().contains("webui")) {
+            if (ste.getClassName().contains("webui")
+            		|| ste.getClassName().contains("zk.ui")) {
                 m_IsSwing = false;
+                break;
             }
         }
 	}	
@@ -708,7 +710,7 @@ private void verifyChangedField(GridField field, String columnName) {
 	 * Validate all fields for values and mandatory
 	 * @return null if nothing happens
 	 */
-	public String 	validateFields() {
+	public String validateFields() {
 		log.config("");
 
 		StringBuffer sb = new StringBuffer();

diff --git a/base/src/org/adempiere/pdf/Document.java b/base/src/org/adempiere/pdf/Document.java
@@ -34,7 +34,7 @@
 /**
  * Generate PDF document using iText
  * @author Low Heng Sin
- *
+ * @deprecated use singleton ITextDocument 
  */
 public class Document {