From 07ada503939d63a5df08cd4701506a570efed37f Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 10:47:30 +0700
Subject: [PATCH] IDEMPIERE-3136:all stuff relate library of idempiere replace
 bundle dependency by use import package for jasper report

---
 .../model.generator.launch                    |   2 +-
 .../sign.database.build.launch                |   2 +-
 .../synchronize-terminology.app.launch        |   2 +-
 .../translation.app.launch                    |   2 +-
 org.adempiere.install/install.app.launch      |   2 +-
 .../install.console.app.launch                |   2 +-
 .../feature.xml                               |  90 --
 .../.classpath                                |  68 +-
 org.adempiere.report.jasper.library/.project  |  10 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   7 -
 .../.settings/org.eclipse.pde.core.prefs      |   3 +
 .../org.eclipse.wst.common.component          |   4 -
 ....eclipse.wst.common.project.facet.core.xml |   7 -
 .../JasperReportsTools.jardesc                |  17 -
 .../META-INF/MANIFEST.MF                      | 309 ++++---
 .../bin/.cvsignore                            |   1 -
 .../build.properties                          |  61 +-
 .../copyjars.xml                              |  63 +-
 .../note_for_update_jr_library.readme         |  25 +
 .../resource/test/OrderFormat.jrxml           | 133 ---
 .../resource/test/PurchaseOrder.jrxml         | 800 ------------------
 .../resource/test/Requisition.jrxml           | 431 ----------
 .../resource/test/VoidedDN.jrxml              | 245 ------
 .../report/jasper/ReportStarter.java          |   3 +-
 .../server.product.eventtest.launch           |   2 +-
 .../server.product.functionaltest.launch      |   2 +-
 .../server.product.launch                     |   2 +-
 .../swingclient.product.launch                |   2 +-
 28 files changed, 402 insertions(+), 1895 deletions(-)
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 org.adempiere.report.jasper.library/JasperReportsTools.jardesc
 delete mode 100644 org.adempiere.report.jasper.library/bin/.cvsignore
 create mode 100644 org.adempiere.report.jasper.library/note_for_update_jr_library.readme
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml

diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 73e58eaab0..183fc2327d 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index f5c2e48811..1c4ea275cb 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index fa79f2f81a..69c11a275c 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index b05648936f..507f5f1cb8 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index fe488cb30c..bdd21ce681 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -22,7 +22,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 2c1863dc01..98d3e83a05 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index 09ad431af4..102d89e1fc 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -16,10 +16,6 @@
       [Enter License Description here.]
    </license>
 
-   <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
-   </requires>
-
    <plugin
          id="org.adempiere.report.jasper"
          download-size="0"
@@ -32,91 +28,5 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.batik.bridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.css"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.dom"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.dom.svg"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.ext.awt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.extension"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.parser"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.css.sac"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.dom.smil"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.dom.svg"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.dom.fragment"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.util.gui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 4e864b50be..1b7ecbc1b8 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,20 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk14-140.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-5.6.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-codec-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8batik-parser-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-swing-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-core-1.3.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-xml-1.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-5.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/commons-javaflow-20160505.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/core-2.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/fop-transcoder-allinone-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.3.2.GA.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.js5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-6.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-6.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-6.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.23.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.19.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/js.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jxl-2.6.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-4.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-core-4.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-4.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mondrian-3.1.1.12687.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/olap4j-0.9.7.309-JS-3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/persistence-api-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-3.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rhino-1.7.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/spring-beans-2.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/spring-core-2.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/velocity-1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmpcore-5.1.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.report.jasper.library/.project b/org.adempiere.report.jasper.library/.project
index f318b073b7..d03a643160 100644
--- a/org.adempiere.report.jasper.library/.project
+++ b/org.adempiere.report.jasper.library/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -27,10 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index d0fc9a58ad..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="org.adempiere.report.jasper.library"/>
-</project-modules>
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index b84ac01796..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.8"/>
-</faceted-project>
diff --git a/org.adempiere.report.jasper.library/JasperReportsTools.jardesc b/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
deleted file mode 100644
index 4bb366d3c9..0000000000
--- a/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jardesc>
-    <jar path="./JasperReportsTools/JasperReportsTools.jar"/>
-    <options overwrite="true" compress="true" exportErrors="true" exportWarnings="true" saveDescription="true" descriptionLocation="/JasperReportsTools/JasperReportsTools.jardesc" useSourceFolders="false" buildIfNeeded="true" includeDirectoryEntries="false"/>
-    <manifest manifestVersion="1.0" usesManifest="true" reuseManifest="false" saveManifest="false" generateManifest="true" manifestLocation="">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportOutputFolder="false" exportJavaFiles="true">
-        <file path="/JasperReportsTools/.classpath"/>
-        <folder path="/JasperReportsTools/lib"/>
-        <file path="/JasperReportsTools/JasperReportsTools.jardesc"/>
-        <file path="/JasperReportsTools/.project"/>
-    </selectedElements>
-</jardesc>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 4c88f6dfb8..dd0df1aeab 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -1,28 +1,63 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: iDempiere JasperReports Dependency
-Bundle-SymbolicName: org.adempiere.report.jasper.library
-Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
+Bundle-Name: Library
+Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: lib/antlr-2.7.5.jar,
+ lib/batik-anim-1.8.jar,
+ lib/batik-awt-util-1.8.jar,
+ lib/batik-bridge-1.8.jar,
+ lib/batik-codec-1.8.jar,
+ lib/batik-css-1.8.jar,
+ lib/batik-dom-1.8.jar,
+ lib/batik-ext-1.8.jar,
+ lib/batik-extension-1.8.jar,
+ lib/batik-gui-util-1.8.jar,
+ lib/batik-gui-util-1.8batik-parser-1.8.jar,
+ lib/batik-gvt-1.8.jar,
+ lib/batik-parser-1.8.jar,
+ lib/batik-script-1.8.jar,
+ lib/batik-svg-dom-1.8.jar,
+ lib/batik-svggen-1.8.jar,
+ lib/batik-swing-1.8.jar,
+ lib/batik-transcoder-1.8.jar,
+ lib/batik-util-1.8.jar,
+ lib/batik-xml-1.8.jar,
+ lib/castor-core-1.3.3.jar,
+ lib/castor-xml-1.3.3.jar,
  lib/commons-digester-2.1.jar,
- lib/jasperreports-5.6.1.jar,
- lib/jasperreports-fonts-5.6.1.jar,
- lib/jackson-core-2.1.4.jar,
- lib/xalan-2.7.1.jar,
- lib/jasperreports-functions-5.6.1.jar,
- lib/joda-time-2.1.jar,
- lib/itext-2.1.7.jar,
- lib/bcprov-jdk14-140.jar
-Export-Package: .,
- com.fasterxml.jackson.core,
- com.fasterxml.jackson.core.base,
- com.fasterxml.jackson.core.format,
- com.fasterxml.jackson.core.io,
- com.fasterxml.jackson.core.json,
- com.fasterxml.jackson.core.sym,
- com.fasterxml.jackson.core.type,
- com.fasterxml.jackson.core.util,
- net.sf.jasperreports.ant,
+ lib/commons-javaflow-20160505.jar,
+ lib/core-2.3.0.jar,
+ lib/fop-transcoder-allinone-1.1.jar,
+ lib/hibernate-core-3.3.2.GA.jar,
+ lib/itext-2.1.7.js5.jar,
+ lib/jasperreports-6.3.0.jar,
+ lib/jasperreports-fonts-6.3.0.jar,
+ lib/jasperreports-functions-6.3.0.jar,
+ lib/jaxen-1.1.1.jar,
+ lib/jcommon-1.0.23.jar,
+ lib/jfreechart-1.0.19.jar,
+ lib/js.jar,
+ lib/jxl-2.6.10.jar,
+ lib/lucene-analyzers-common-4.5.1.jar,
+ lib/lucene-core-4.5.1.jar,
+ lib/lucene-queryparser-4.5.1.jar,
+ lib/mondrian-3.1.1.12687.jar,
+ lib/olap4j-0.9.7.309-JS-3.jar,
+ lib/persistence-api-1.0.jar,
+ lib/poi-3.10.1.jar,
+ lib/poi-ooxml-3.10.1.jar,
+ lib/rhino-1.7.6.jar,
+ lib/spring-beans-2.5.jar,
+ lib/spring-core-2.5.jar,
+ lib/velocity-1.7.jar,
+ lib/xalan-2.7.2.jar,
+ lib/xml-apis-ext-1.3.04.jar,
+ lib/xmlgraphics-commons-1.5.jar,
+ lib/xmpcore-5.1.1.jar,
+ .
+Export-Package: net.sf.jasperreports.ant,
  net.sf.jasperreports.charts,
  net.sf.jasperreports.charts.base,
  net.sf.jasperreports.charts.design,
@@ -38,15 +73,20 @@ Export-Package: .,
  net.sf.jasperreports.components.headertoolbar,
  net.sf.jasperreports.components.headertoolbar.actions,
  net.sf.jasperreports.components.headertoolbar.json,
+ net.sf.jasperreports.components.headertoolbar.json.resources,
  net.sf.jasperreports.components.headertoolbar.resources,
  net.sf.jasperreports.components.headertoolbar.resources.images,
  net.sf.jasperreports.components.headertoolbar.resources.images.format,
  net.sf.jasperreports.components.headertoolbar.resources.images.jive,
  net.sf.jasperreports.components.headertoolbar.resources.images.style,
+ net.sf.jasperreports.components.headertoolbar.resources.require,
  net.sf.jasperreports.components.iconlabel,
+ net.sf.jasperreports.components.items,
+ net.sf.jasperreports.components.items.fill,
  net.sf.jasperreports.components.list,
  net.sf.jasperreports.components.map,
  net.sf.jasperreports.components.map.fill,
+ net.sf.jasperreports.components.map.resources.require,
  net.sf.jasperreports.components.map.resources.templates,
  net.sf.jasperreports.components.map.type,
  net.sf.jasperreports.components.sort,
@@ -76,6 +116,7 @@ Export-Package: .,
  net.sf.jasperreports.data.excel,
  net.sf.jasperreports.data.hibernate,
  net.sf.jasperreports.data.hibernate.spring,
+ net.sf.jasperreports.data.http,
  net.sf.jasperreports.data.jdbc,
  net.sf.jasperreports.data.jndi,
  net.sf.jasperreports.data.json,
@@ -117,6 +158,7 @@ Export-Package: .,
  net.sf.jasperreports.engine.fill,
  net.sf.jasperreports.engine.fonts,
  net.sf.jasperreports.engine.images,
+ net.sf.jasperreports.engine.part,
  net.sf.jasperreports.engine.print,
  net.sf.jasperreports.engine.query,
  net.sf.jasperreports.engine.scriptlets,
@@ -134,6 +176,7 @@ Export-Package: .,
  net.sf.jasperreports.extensions,
  net.sf.jasperreports.fonts,
  net.sf.jasperreports.fonts.dejavu,
+ net.sf.jasperreports.fonts.pictonic,
  net.sf.jasperreports.functions,
  net.sf.jasperreports.functions.annotations,
  net.sf.jasperreports.functions.standard,
@@ -145,7 +188,10 @@ Export-Package: .,
  net.sf.jasperreports.olap.olap4j,
  net.sf.jasperreports.olap.result,
  net.sf.jasperreports.olap.xmla,
+ net.sf.jasperreports.parts,
+ net.sf.jasperreports.parts.subreport,
  net.sf.jasperreports.renderers,
+ net.sf.jasperreports.renderers.util,
  net.sf.jasperreports.repo,
  net.sf.jasperreports.search,
  net.sf.jasperreports.swing,
@@ -160,89 +206,140 @@ Export-Package: .,
  net.sf.jasperreports.web.listeners,
  net.sf.jasperreports.web.servlets,
  net.sf.jasperreports.web.servlets.resources,
+ net.sf.jasperreports.web.servlets.resources.require.report,
+ net.sf.jasperreports.web.servlets.resources.require.util,
+ net.sf.jasperreports.web.servlets.resources.require.viewer,
  net.sf.jasperreports.web.servlets.resources.templates,
  net.sf.jasperreports.web.servlets.resources.viewer,
- net.sf.jasperreports.web.util,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.apache.commons.beanutils,
- org.apache.commons.beanutils.converters,
- org.apache.commons.beanutils.expression,
- org.apache.commons.beanutils.locale,
- org.apache.commons.beanutils.locale.converters,
- org.apache.commons.collections,
- org.apache.commons.digester,
- org.apache.commons.digester.annotations,
- org.apache.commons.digester.annotations.handlers,
- org.apache.commons.digester.annotations.internal,
- org.apache.commons.digester.annotations.providers,
- org.apache.commons.digester.annotations.reflect,
- org.apache.commons.digester.annotations.rules,
- org.apache.commons.digester.annotations.spi,
- org.apache.commons.digester.annotations.utils,
- org.apache.commons.digester.parser,
- org.apache.commons.digester.plugins,
- org.apache.commons.digester.plugins.strategies,
- org.apache.commons.digester.substitution,
- org.apache.commons.digester.xmlrules,
- org.apache.regexp,
- org.apache.xalan,
- org.apache.xalan.client,
- org.apache.xalan.extensions,
- org.apache.xalan.lib,
- org.apache.xalan.lib.sql,
- org.apache.xalan.processor,
- org.apache.xalan.res,
- org.apache.xalan.serialize,
- org.apache.xalan.templates,
- org.apache.xalan.trace,
- org.apache.xalan.transformer,
- org.apache.xalan.xslt,
- org.apache.xalan.xsltc,
- org.apache.xalan.xsltc.cmdline,
- org.apache.xalan.xsltc.cmdline.getopt,
- org.apache.xalan.xsltc.compiler,
- org.apache.xalan.xsltc.compiler.util,
- org.apache.xalan.xsltc.dom,
- org.apache.xalan.xsltc.runtime,
- org.apache.xalan.xsltc.runtime.output,
- org.apache.xalan.xsltc.trax,
- org.apache.xalan.xsltc.util,
- org.apache.xml.dtm,
- org.apache.xml.dtm.ref,
- org.apache.xml.dtm.ref.dom2dtm,
- org.apache.xml.dtm.ref.sax2dtm,
- org.apache.xml.res,
- org.apache.xml.utils,
- org.apache.xml.utils.res,
- org.apache.xpath,
- org.apache.xpath.axes,
- org.apache.xpath.compiler,
- org.apache.xpath.domapi,
- org.apache.xpath.functions,
- org.apache.xpath.jaxp,
- org.apache.xpath.objects,
- org.apache.xpath.operations,
- org.apache.xpath.patterns,
- org.apache.xpath.res,
- org.joda.time,
- org.joda.time.base,
- org.joda.time.chrono,
- org.joda.time.convert,
- org.joda.time.field,
- org.joda.time.format,
- org.joda.time.tz,
- org.w3c.tools.codec
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.commons.collections,
- org.w3c.tools.codec
-DynamicImport-Package: *
-Eclipse-BuddyPolicy: registered
-Require-Bundle: bcprov;bundle-version="1.53.0"
-
+ net.sf.jasperreports.web.util
+Require-Bundle: bcprov;bundle-version="1.54.0",
+ org.apache.commons.beanutils;bundle-version="0.0.0",
+ org.apache.commons.collections;bundle-version="0.0.0",
+ org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0",
+ org.apache.httpcomponents.httpclient;bundle-version="0.0.0",
+ org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
+ groovy-all;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
+ joda-time;bundle-version="0.0.0",
+ com.ibm.icu;bundle-version="0.0.0"
+Import-Package: bsh,
+ bsh.classpath,
+ bsh.collection,
+ bsh.commands,
+ bsh.engine,
+ bsh.org.objectweb.asm,
+ bsh.reflect,
+ bsh.servlet,
+ bsh.util,
+ javax.servlet;version="3.1.0",
+ javax.servlet.http;version="3.1.0",
+ javax.servlet.resources;version="3.1.0",
+ net.sourceforge.barbecue,
+ net.sourceforge.barbecue.env,
+ net.sourceforge.barbecue.formatter,
+ net.sourceforge.barbecue.linear,
+ net.sourceforge.barbecue.linear.codabar,
+ net.sourceforge.barbecue.linear.code128,
+ net.sourceforge.barbecue.linear.code39,
+ net.sourceforge.barbecue.linear.ean,
+ net.sourceforge.barbecue.linear.postnet,
+ net.sourceforge.barbecue.linear.twoOfFive,
+ net.sourceforge.barbecue.linear.upc,
+ net.sourceforge.barbecue.output,
+ net.sourceforge.barbecue.twod.pdf417,
+ org.apache.commons.codec.digest;version="1.6.0",
+ org.apache.tools.ant,
+ org.apache.tools.ant.attribute,
+ org.apache.tools.ant.dispatch,
+ org.apache.tools.ant.filters,
+ org.apache.tools.ant.filters.util,
+ org.apache.tools.ant.helper,
+ org.apache.tools.ant.input,
+ org.apache.tools.ant.launch,
+ org.apache.tools.ant.listener,
+ org.apache.tools.ant.loader,
+ org.apache.tools.ant.property,
+ org.apache.tools.ant.taskdefs,
+ org.apache.tools.ant.taskdefs.compilers,
+ org.apache.tools.ant.taskdefs.condition,
+ org.apache.tools.ant.taskdefs.cvslib,
+ org.apache.tools.ant.taskdefs.email,
+ org.apache.tools.ant.taskdefs.launcher,
+ org.apache.tools.ant.taskdefs.optional,
+ org.apache.tools.ant.taskdefs.optional.ccm,
+ org.apache.tools.ant.taskdefs.optional.clearcase,
+ org.apache.tools.ant.taskdefs.optional.depend,
+ org.apache.tools.ant.taskdefs.optional.depend.constantpool,
+ org.apache.tools.ant.taskdefs.optional.ejb,
+ org.apache.tools.ant.taskdefs.optional.extension,
+ org.apache.tools.ant.taskdefs.optional.extension.resolvers,
+ org.apache.tools.ant.taskdefs.optional.i18n,
+ org.apache.tools.ant.taskdefs.optional.image,
+ org.apache.tools.ant.taskdefs.optional.j2ee,
+ org.apache.tools.ant.taskdefs.optional.javacc,
+ org.apache.tools.ant.taskdefs.optional.javah,
+ org.apache.tools.ant.taskdefs.optional.jdepend,
+ org.apache.tools.ant.taskdefs.optional.jlink,
+ org.apache.tools.ant.taskdefs.optional.jsp,
+ org.apache.tools.ant.taskdefs.optional.jsp.compilers,
+ org.apache.tools.ant.taskdefs.optional.junit,
+ org.apache.tools.ant.taskdefs.optional.native2ascii,
+ org.apache.tools.ant.taskdefs.optional.net,
+ org.apache.tools.ant.taskdefs.optional.pvcs,
+ org.apache.tools.ant.taskdefs.optional.script,
+ org.apache.tools.ant.taskdefs.optional.sos,
+ org.apache.tools.ant.taskdefs.optional.sound,
+ org.apache.tools.ant.taskdefs.optional.splash,
+ org.apache.tools.ant.taskdefs.optional.ssh,
+ org.apache.tools.ant.taskdefs.optional.testing,
+ org.apache.tools.ant.taskdefs.optional.unix,
+ org.apache.tools.ant.taskdefs.optional.vss,
+ org.apache.tools.ant.taskdefs.optional.windows,
+ org.apache.tools.ant.taskdefs.rmic,
+ org.apache.tools.ant.types,
+ org.apache.tools.ant.types.mappers,
+ org.apache.tools.ant.types.optional,
+ org.apache.tools.ant.types.optional.depend,
+ org.apache.tools.ant.types.optional.image,
+ org.apache.tools.ant.types.resolver,
+ org.apache.tools.ant.types.resources,
+ org.apache.tools.ant.types.resources.comparators,
+ org.apache.tools.ant.types.resources.selectors,
+ org.apache.tools.ant.types.selectors,
+ org.apache.tools.ant.types.selectors.modifiedselector,
+ org.apache.tools.ant.types.spi,
+ org.apache.tools.ant.util,
+ org.apache.tools.ant.util.depend,
+ org.apache.tools.ant.util.depend.bcel,
+ org.apache.tools.ant.util.facade,
+ org.apache.tools.ant.util.java15,
+ org.apache.tools.ant.util.optional,
+ org.apache.tools.ant.util.regexp,
+ org.apache.tools.bzip2,
+ org.apache.tools.mail,
+ org.apache.tools.tar,
+ org.apache.tools.zip,
+ org.apache.xml.serializer;version="2.7.1",
+ org.krysalis.barcode4j,
+ org.krysalis.barcode4j.ant,
+ org.krysalis.barcode4j.cli,
+ org.krysalis.barcode4j.impl,
+ org.krysalis.barcode4j.impl.codabar,
+ org.krysalis.barcode4j.impl.code128,
+ org.krysalis.barcode4j.impl.code39,
+ org.krysalis.barcode4j.impl.datamatrix,
+ org.krysalis.barcode4j.impl.fourstate,
+ org.krysalis.barcode4j.impl.int2of5,
+ org.krysalis.barcode4j.impl.pdf417,
+ org.krysalis.barcode4j.impl.postnet,
+ org.krysalis.barcode4j.impl.upcean,
+ org.krysalis.barcode4j.output,
+ org.krysalis.barcode4j.output.bitmap,
+ org.krysalis.barcode4j.output.eps,
+ org.krysalis.barcode4j.output.java2d,
+ org.krysalis.barcode4j.output.svg,
+ org.krysalis.barcode4j.servlet,
+ org.krysalis.barcode4j.tools,
+ org.krysalis.barcode4j.xalan
diff --git a/org.adempiere.report.jasper.library/bin/.cvsignore b/org.adempiere.report.jasper.library/bin/.cvsignore
deleted file mode 100644
index d3f5a12faa..0000000000
--- a/org.adempiere.report.jasper.library/bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index dc4d13af94..fd53389ce7 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -1,11 +1,54 @@
 bin.includes = META-INF/,\
-               lib/commons-beanutils-1.8.0.jar,\
+               .,\
+               lib/antlr-2.7.5.jar,\
+               lib/batik-anim-1.8.jar,\
+               lib/batik-awt-util-1.8.jar,\
+               lib/batik-bridge-1.8.jar,\
+               lib/batik-codec-1.8.jar,\
+               lib/batik-css-1.8.jar,\
+               lib/batik-dom-1.8.jar,\
+               lib/batik-ext-1.8.jar,\
+               lib/batik-extension-1.8.jar,\
+               lib/batik-gui-util-1.8.jar,\
+               lib/batik-gui-util-1.8batik-parser-1.8.jar,\
+               lib/batik-gvt-1.8.jar,\
+               lib/batik-parser-1.8.jar,\
+               lib/batik-script-1.8.jar,\
+               lib/batik-svg-dom-1.8.jar,\
+               lib/batik-svggen-1.8.jar,\
+               lib/batik-swing-1.8.jar,\
+               lib/batik-transcoder-1.8.jar,\
+               lib/batik-util-1.8.jar,\
+               lib/batik-xml-1.8.jar,\
+               lib/castor-core-1.3.3.jar,\
+               lib/castor-xml-1.3.3.jar,\
                lib/commons-digester-2.1.jar,\
-               lib/jasperreports-5.6.1.jar,\
-               lib/jasperreports-fonts-5.6.1.jar,\
-               lib/jackson-core-2.1.4.jar,\
-               lib/xalan-2.7.1.jar,\
-               lib/jasperreports-functions-5.6.1.jar,\
-               lib/joda-time-2.1.jar,\
-               lib/itext-2.1.7.jar,\
-               lib/bcprov-jdk14-140.jar
+               lib/commons-javaflow-20160505.jar,\
+               lib/core-2.3.0.jar,\
+               lib/fop-transcoder-allinone-1.1.jar,\
+               lib/hibernate-core-3.3.2.GA.jar,\
+               lib/itext-2.1.7.js5.jar,\
+               lib/jasperreports-6.3.0.jar,\
+               lib/jasperreports-fonts-6.3.0.jar,\
+               lib/jasperreports-functions-6.3.0.jar,\
+               lib/jaxen-1.1.1.jar,\
+               lib/jcommon-1.0.23.jar,\
+               lib/jfreechart-1.0.19.jar,\
+               lib/js.jar,\
+               lib/jxl-2.6.10.jar,\
+               lib/lucene-analyzers-common-4.5.1.jar,\
+               lib/lucene-core-4.5.1.jar,\
+               lib/lucene-queryparser-4.5.1.jar,\
+               lib/mondrian-3.1.1.12687.jar,\
+               lib/olap4j-0.9.7.309-JS-3.jar,\
+               lib/persistence-api-1.0.jar,\
+               lib/poi-3.10.1.jar,\
+               lib/poi-ooxml-3.10.1.jar,\
+               lib/rhino-1.7.6.jar,\
+               lib/spring-beans-2.5.jar,\
+               lib/spring-core-2.5.jar,\
+               lib/velocity-1.7.jar,\
+               lib/xalan-2.7.2.jar,\
+               lib/xml-apis-ext-1.3.04.jar,\
+               lib/xmlgraphics-commons-1.5.jar,\
+               lib/xmpcore-5.1.1.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 56058ecfef..75a08ac32d 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -1,15 +1,58 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="lib" />
-		<get src="${url.maven2.lib}/maven2/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" dest="lib/commons-beanutils-1.8.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-digester/commons-digester/2.1/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/net/sf/jasperreports/jasperreports/5.6.1/jasperreports-5.6.1.jar" dest="lib/jasperreports-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/net/sf/jasperreports/jasperreports-fonts/5.6.1/jasperreports-fonts-5.6.1.jar" dest="lib/jasperreports-fonts-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar" dest="lib/jackson-core-2.1.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="lib/itext-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
-    <get src="${url.maven2.lib}/maven2/bouncycastle/bcprov-jdk14/140/bcprov-jdk14-140.jar" dest="lib/bcprov-jdk14-140.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/antlr-2.7.5.jar" dest="lib/antlr-2.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-anim-1.8.jar" dest="lib/batik-anim-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-awt-util-1.8.jar" dest="lib/batik-awt-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-bridge-1.8.jar" dest="lib/batik-bridge-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-codec-1.8.jar" dest="lib/batik-codec-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-css-1.8.jar" dest="lib/batik-css-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-dom-1.8.jar" dest="lib/batik-dom-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-ext-1.8.jar" dest="lib/batik-ext-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-extension-1.8.jar" dest="lib/batik-extension-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-gui-util-1.8batik-parser-1.8.jar" dest="lib/batik-gui-util-1.8batik-parser-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-gui-util-1.8.jar" dest="lib/batik-gui-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-gvt-1.8.jar" dest="lib/batik-gvt-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-parser-1.8.jar" dest="lib/batik-parser-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-script-1.8.jar" dest="lib/batik-script-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-svg-dom-1.8.jar" dest="lib/batik-svg-dom-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-svggen-1.8.jar" dest="lib/batik-svggen-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-swing-1.8.jar" dest="lib/batik-swing-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-transcoder-1.8.jar" dest="lib/batik-transcoder-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-util-1.8.jar" dest="lib/batik-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-xml-1.8.jar" dest="lib/batik-xml-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/castor-core-1.3.3.jar" dest="lib/castor-core-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/castor-xml-1.3.3.jar" dest="lib/castor-xml-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/commons-javaflow-20160505.jar" dest="lib/commons-javaflow-20160505.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/core-2.3.0.jar" dest="lib/core-2.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/fop-transcoder-allinone-1.1.jar" dest="lib/fop-transcoder-allinone-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/hibernate-core-3.3.2.GA.jar" dest="lib/hibernate-core-3.3.2.GA.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/httpcore-4.3.2.jar" dest="lib/httpcore-4.3.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/itext-2.1.7.js5.jar" dest="lib/itext-2.1.7.js5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-6.3.0.jar" dest="lib/jasperreports-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-fonts-6.3.0.jar" dest="lib/jasperreports-fonts-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-functions-6.3.0.jar" dest="lib/jasperreports-functions-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jaxen-1.1.1.jar" dest="lib/jaxen-1.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jcommon-1.0.23.jar" dest="lib/jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jfreechart-1.0.19.jar" dest="lib/jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/js.jar" dest="lib/js.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jxl-2.6.10.jar" dest="lib/jxl-2.6.10.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/lucene-analyzers-common-4.5.1.jar" dest="lib/lucene-analyzers-common-4.5.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/lucene-core-4.5.1.jar" dest="lib/lucene-core-4.5.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/lucene-queryparser-4.5.1.jar" dest="lib/lucene-queryparser-4.5.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/mondrian-3.1.1.12687.jar" dest="lib/mondrian-3.1.1.12687.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/olap4j-0.9.7.309-JS-3.jar" dest="lib/olap4j-0.9.7.309-JS-3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/persistence-api-1.0.jar" dest="lib/persistence-api-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/poi-3.10.1.jar" dest="lib/poi-3.10.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/poi-ooxml-3.10.1.jar" dest="lib/poi-ooxml-3.10.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/rhino-1.7.6.jar" dest="lib/rhino-1.7.6.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/spring-beans-2.5.jar" dest="lib/spring-beans-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/spring-core-2.5.jar" dest="lib/spring-core-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/velocity-1.7.jar" dest="lib/velocity-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xalan-2.7.2.jar" dest="lib/xalan-2.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext-1.3.04.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xmlgraphics-commons-1.5.jar" dest="lib/xmlgraphics-commons-1.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />	
 	</target>
 </project>
diff --git a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
new file mode 100644
index 0000000000..91a8fad01e
--- /dev/null
+++ b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
@@ -0,0 +1,25 @@
+jasper report use some library have osgi version on maven or orbit.
+but alot not yet have osgi version or have but outdate.
+it ever use a modify version like itext
+
+guide for update:
+1. download distribute at https://sourceforge.net/projects/jasperreports/files/jasperreports/
+   download file (jasperreports-x.x.x-project.zip)
+
+2. extract it and run ant to get all dependency library
+(ant just get normal library to let Jasperreport do common job, 
+for extra like encrypt, have go to sample project to get dependency
+but just focus common job and already know extra like encrypt)
+
+3. also download jasperreports-functions-x.x.x.jar
+
+4. now edit org.adempiere.report.jasper.library follow bellow rule
+   + if library have same version with library already use on idempiere, just use import package or bundle dependency
+   + if library have osgi on net (manven, orbit,...), add to org.adempiere.base-feature or org.adempiere.report.jasper-feature to materialize it
+   + if library not yet have osgi version, push it in lib folder and use Bundle-ClassPath
+   
+note for version 6.3.0
+poi-3.10.1 haven't yet osgi version, ever on newest obit repository. so use  Bundle-ClassPath
+batik haven't yet osgi version, ever on newest obit repository. so use  Bundle-ClassPath
+current batik osgi version isn't use by other bundle, so can remove it. 
+itext is very old and have modify code from JP community, so use version from JP
\ No newline at end of file
diff --git a/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml b/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
deleted file mode 100644
index 1adbafd85f..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="OrderFormat" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="519" leftMargin="38" rightMargin="38" topMargin="38" bottomMargin="38" uuid="385b8f49-623c-4260-b1fd-9943131f1fef">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box>
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_ROLE_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_USER_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="RECORD_ID" class="java.lang.Integer">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="RESOURCE_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT  IsSOTrx
-FROM C_Order
-WHERE C_Order_ID = $P{RECORD_ID}]]>
-	</queryString>
-	<field name="issotrx" class="java.lang.String"/>
-	<background>
-		<band height="766" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="7b7e36cb-b4c4-467b-a117-dff02366cd18" x="310" y="6" width="208" height="22"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="837fbfef-be58-4ad2-a53a-4f2eae058cd4" x="0" y="6" width="258" height="22"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="10" isBold="true"/>
-				</textElement>
-				<text><![CDATA[COMPANY NAME]]></text>
-			</staticText>
-			<line>
-				<reportElement uuid="0355a655-9fb5-44ac-90c5-fabbcd35f2e1" x="0" y="37" width="519" height="1"/>
-			</line>
-			<staticText>
-				<reportElement uuid="8a5c234e-868b-4e6b-9918-8ee9756b57a7" x="0" y="748" width="519" height="17"/>
-				<textElement textAlignment="Center">
-					<font size="7"/>
-				</textElement>
-				<text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae consequat nunc. Curabitur convallis est at erat mattis tincidunt. Donec consequat,
-odio sed cursus sodales, quam magna placerat dui, at molestie leo nisi id leo. Pellentesque ante lectus, ultricies id laoreet ac, tempus vel felis.]]></text>
-			</staticText>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="8773235e-76ad-4cda-8eeb-15173cff21b6" x="397" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "9001.jpg"]]></imageExpression>
-			</image>
-			<staticText>
-				<reportElement uuid="7199355e-5611-4b4a-9cd2-5a32d8b2cdca" x="487" y="721" width="32" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="5"/>
-				</textElement>
-				<text><![CDATA[E&OE]]></text>
-			</staticText>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="f50898e9-fd85-4c3a-93e5-d3e2873a9a07" x="277" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "2200.jpg"]]></imageExpression>
-			</image>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="d78dff55-6d72-4d13-a5a7-69fa969b56b0" x="157" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "18001.jpg"]]></imageExpression>
-			</image>
-			<textField pattern="h.mm a">
-				<reportElement uuid="107fe3b6-3e59-44b5-87a3-283019ef58e3" x="487" y="707" width="32" height="14"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="6548fbcf-523f-4be9-a7be-1f9c7efcb987" x="37" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "14001.jpg"]]></imageExpression>
-			</image>
-			<line>
-				<reportElement uuid="b8baff98-5837-470d-ac97-5068f4c8883f" x="0" y="702" width="519" height="1"/>
-			</line>
-		</band>
-	</background>
-	<detail>
-		<band height="60">
-			<printWhenExpression><![CDATA[$F{issotrx}.equals( 'N' )]]></printWhenExpression>
-			<subreport>
-				<reportElement uuid="15a217b1-99e7-438e-a5a5-5a938d6ca3c8" x="0" y="0" width="518" height="60"/>
-				<subreportParameter name="AD_ROLE_ID"/>
-				<subreportParameter name="RECORD_ID">
-					<subreportParameterExpression><![CDATA[$P{RECORD_ID}]]></subreportParameterExpression>
-				</subreportParameter>
-				<subreportParameter name="AD_USER_ID"/>
-				<subreportParameter name="AD_CLIENT_ID"/>
-				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "PurchaseOrder.jasper"]]></subreportExpression>
-			</subreport>
-		</band>
-		<band height="61">
-			<printWhenExpression><![CDATA[$F{issotrx}.equals( 'Y' )]]></printWhenExpression>
-		</band>
-	</detail>
-</jasperReport>
diff --git a/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml b/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
deleted file mode 100644
index fba1538c20..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
+++ /dev/null
@@ -1,800 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PurchaseOrder" language="groovy" pageWidth="519" pageHeight="766" whenNoDataType="AllSectionsNoDetail" columnWidth="519" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isTitleNewPage="true" uuid="385b8f49-623c-4260-b1fd-9943131f1fef">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box>
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<subDataset name="Bank Data" whenResourceMissingType="Empty" uuid="ed1d6c81-23a7-44b4-a841-61d7bac92d0f">
-		<parameter name="C_BPartner_ID" class="java.math.BigDecimal" isForPrompting="false"/>
-		<queryString>
-			<![CDATA[SELECT
-	b.Name BankName,
-	ba.A_Name AccountName,
-	ba.AccountNo,
-	b.SwiftCode,
-	b.RoutingNo,
-	bl.Address1,
-	bl.Address2,
-	bl.City,
-	bcon.Name BankCountry
-FROM C_BP_BankAccount ba
-	INNER JOIN C_Bank b ON b.C_Bank_ID = ba.C_Bank_ID
-	LEFT JOIN C_Location bl ON b.C_Location_ID = bl.C_Location_ID
-	LEFT JOIN C_Country bcon ON bl.C_Country_ID = bcon.C_Country_ID
-WHERE C_BPartner_ID = $P{C_BPartner_ID}
-AND ba.IsActive = 'Y'
-AND ba.IsACH = 'Y']]>
-		</queryString>
-		<field name="bankname" class="java.lang.String"/>
-		<field name="accountname" class="java.lang.String"/>
-		<field name="accountno" class="java.lang.String"/>
-		<field name="swiftcode" class="java.lang.String"/>
-		<field name="routingno" class="java.lang.String"/>
-		<field name="address1" class="java.lang.String"/>
-		<field name="address2" class="java.lang.String"/>
-		<field name="city" class="java.lang.String"/>
-		<field name="bankcountry" class="java.lang.String"/>
-	</subDataset>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_ROLE_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_USER_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="RECORD_ID" class="java.lang.Integer">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT  DISTINCT
-	o.DocumentNo,
-	o.DocStatus,
-	o.Description OrderDescription,
-	o.DateOrdered,
-	o.DatePromised,
-	o.POReference,
-	o.GrandTotal,
-	ocur.ISO_Code OrderCurrency,
-	bp.Name PartnerName,
-	l.Address1 Address1,
-	l.Address2 Address2,
-	l.Postal Postal,
-	l.City City,
-	con.Name CountryName,
-	con.CountryCode,
-	bpl.Phone Phone,
-	bpl.Phone2 Phone2,
-	bpl.Fax Fax,
-	bpu.Name ContactName,
-	pt.Name PaymentTermName,
-	pt.DocumentNote PaymentTermNote,
-	w.Name WarehouseName,
-	wl.Address1 WarehouseAddress1,
-	wl.Address2 WarehouseAddress2,
-	wl.City WarehouseCity,
-	wl.Postal WarehousePostal,
-	wl.Address3 WarehousePhone,
-	wl.Address4 WarehouseFax,
-	ol.Line,
-	COALESCE(p.Name, c.Name) ProductName,
-	ol.Description LineDescription,
-	ol.QtyEntered,
-	ol.PriceActual,
-	ol.LineNetAmt,
-	ol.Discount,
-	ol.PriceList,
-	o.IsDiscountPrinted,
-	cur.ISO_Code CurrencyCode,
-	cur.Description CurrencyDesc,
-	uom.UOMSymbol,
-	bp.C_BPartner_ID
-FROM
-	C_Order o INNER JOIN C_OrderLine ol ON o.C_Order_ID = ol.C_Order_ID
-	LEFT JOIN C_BPartner bp ON o.C_BPartner_ID = bp.C_BPartner_ID
-	LEFT JOIN C_BPartner_Location bpl ON o.C_BPartner_Location_ID = bpl.C_BPartner_Location_ID
-	LEFT JOIN C_Location l ON bpl.C_Location_ID = l.C_Location_ID
-	LEFT JOIN C_Country con ON l.C_Country_ID = con.C_Country_ID
-	LEFT JOIN AD_User bpu ON o.AD_User_ID = bpu.AD_User_ID
-	LEFT JOIN M_Warehouse w ON o.M_Warehouse_ID = w.M_Warehouse_ID
-	LEFT JOIN C_Location wl ON w.C_Location_ID = wl.C_Location_ID
-	LEFT JOIN M_Product p ON ol.M_Product_ID = p.M_Product_ID
-	LEFT JOIN C_UOM uom ON ol.C_UOM_ID = uom.C_UOM_ID
-	LEFT JOIN C_Currency cur ON ol.C_Currency_ID = cur.C_Currency_ID
-	LEFT JOIN C_Currency ocur ON o.C_Currency_ID = ocur.C_Currency_ID
-	LEFT JOIN C_PaymentTerm pt ON o.C_PaymentTerm_ID = pt.C_PaymentTerm_ID
-	LEFT JOIN C_Charge c ON ol.C_Charge_ID = c.C_Charge_ID
-WHERE o.IsSOTrx = 'N'
-AND o.C_Order_ID = $P{RECORD_ID}
-ORDER BY ol.Line]]>
-	</queryString>
-	<field name="documentno" class="java.lang.String"/>
-	<field name="docstatus" class="java.lang.String"/>
-	<field name="orderdescription" class="java.lang.String"/>
-	<field name="dateordered" class="java.sql.Timestamp"/>
-	<field name="datepromised" class="java.sql.Timestamp"/>
-	<field name="poreference" class="java.lang.String"/>
-	<field name="grandtotal" class="java.math.BigDecimal"/>
-	<field name="ordercurrency" class="java.lang.String"/>
-	<field name="partnername" class="java.lang.String"/>
-	<field name="address1" class="java.lang.String"/>
-	<field name="address2" class="java.lang.String"/>
-	<field name="postal" class="java.lang.String"/>
-	<field name="city" class="java.lang.String"/>
-	<field name="countryname" class="java.lang.String"/>
-	<field name="countrycode" class="java.lang.String"/>
-	<field name="phone" class="java.lang.String"/>
-	<field name="phone2" class="java.lang.String"/>
-	<field name="fax" class="java.lang.String"/>
-	<field name="contactname" class="java.lang.String"/>
-	<field name="paymenttermname" class="java.lang.String"/>
-	<field name="paymenttermnote" class="java.lang.String"/>
-	<field name="warehousename" class="java.lang.String"/>
-	<field name="warehouseaddress1" class="java.lang.String"/>
-	<field name="warehouseaddress2" class="java.lang.String"/>
-	<field name="warehousecity" class="java.lang.String"/>
-	<field name="warehousepostal" class="java.lang.String"/>
-	<field name="warehousephone" class="java.lang.String"/>
-	<field name="warehousefax" class="java.lang.String"/>
-	<field name="line" class="java.math.BigDecimal"/>
-	<field name="productname" class="java.lang.String"/>
-	<field name="linedescription" class="java.lang.String"/>
-	<field name="qtyentered" class="java.math.BigDecimal"/>
-	<field name="priceactual" class="java.math.BigDecimal"/>
-	<field name="linenetamt" class="java.math.BigDecimal"/>
-	<field name="discount" class="java.math.BigDecimal"/>
-	<field name="pricelist" class="java.math.BigDecimal"/>
-	<field name="isdiscountprinted" class="java.lang.String"/>
-	<field name="currencycode" class="java.lang.String"/>
-	<field name="currencydesc" class="java.lang.String"/>
-	<field name="uomsymbol" class="java.lang.String"/>
-	<field name="c_bpartner_id" class="java.math.BigDecimal"/>
-	<variable name="linenetamt_1" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{linenetamt}]]></variableExpression>
-	</variable>
-	<title>
-		<band height="705" splitType="Stretch">
-			<rectangle radius="15">
-				<reportElement uuid="99af1176-b4e6-4bcd-843b-4c2ebd71c345" x="172" y="64" width="336" height="32" forecolor="#000000" backcolor="#FFFFFF"/>
-			</rectangle>
-			<staticText>
-				<reportElement uuid="0191a55b-2f3d-4b49-9467-05871c720834" x="172" y="64" width="336" height="32" forecolor="#000000"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Arial" size="18" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Purchase Order (PO)]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="607d0892-67e1-47ff-a96b-9e9b61b05863" x="341" y="107" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="d7b7df10-01e8-4344-95ea-eb40fa8e30d6" x="341" y="127" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{dateordered}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="ddb6ebf4-c5e1-41ce-ba05-c0f681561c84" x="72" y="238" width="436" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{contactname}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="88cc6600-a60f-41ef-bc7c-3c0c1b4a3153" x="72" y="258" width="436" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{orderdescription}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement uuid="6d9564a8-1575-4027-9bc8-fc73cba44c5d" x="1" y="289" width="518" height="1"/>
-			</line>
-			<frame>
-				<reportElement uuid="252b3c50-1d3b-426e-b296-1e4849ba5bf9" x="5" y="136" width="246" height="92"/>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="b5ee249b-5912-44a1-b433-f7cffae723d0" x="0" y="0" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{partnername}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="5c8e495d-6723-402f-9457-434eac704ed5" positionType="Float" x="0" y="72" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{fax} != null ?
-    "Fax: " + $F{fax}
-    : null]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="28e28fa1-eff1-4f57-b510-73d437ae9b25" positionType="Float" x="0" y="60" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{phone} != null ?
-    "Phone: " + $F{phone}
-    : null]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="69c52846-66ab-4a94-97fb-9328ccfa4d65" positionType="Float" x="0" y="24" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{address2}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="9c82a651-1acc-43e2-8a7b-c00080ccc224" positionType="Float" x="0" y="36" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{city}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="2d41e8e5-e468-4c6b-97b5-ced0256e46b3" positionType="Float" x="0" y="12" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{address1}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="c128ea97-cc13-461a-8388-50296f6d1548" positionType="Float" x="0" y="48" width="235" height="12"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{countryname}]]></textFieldExpression>
-				</textField>
-			</frame>
-			<staticText>
-				<reportElement uuid="42afe8aa-2e25-40f7-b11f-81ebcd59bf81" x="263" y="107" width="77" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="96fb64dc-dd78-4b42-aebe-8ac4d37db4b8" x="468" y="107" width="50" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b7927e9b-51a0-4a48-8c1f-eb2e3003f731" x="251" y="127" width="89" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial"/>
-				</textElement>
-				<text><![CDATA[Date:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="e5f44ce8-42f7-4837-bffd-1f8643292ebd" x="468" y="127" width="62" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[التاريخ:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="cede6cbf-1771-40b1-8ab8-7958f2d2032d" x="5" y="116" width="100" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[To:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="0d7ac135-bac5-4e54-b2be-5451e76036e8" x="5" y="238" width="67" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Attn:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="db75ddae-ae49-48bc-a908-55c16e757875" x="5" y="258" width="67" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Subject:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5184afd4-1e31-4836-8ed3-d6bf3130b8ec" x="5" y="299" width="503" height="20"/>
-				<textElement/>
-				<text><![CDATA[We are pleased to place our order as per the following terms and conditions.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="e7540143-27e6-41bd-bcfa-2a0d6b8dc09e" x="5" y="425" width="100" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Note:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b8607489-9f93-4d0a-a8ff-0158a6d1c54f" x="37" y="445" width="450" height="118">
-					<printWhenExpression><![CDATA[$F{countrycode}.equals( "SA" )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[1 - Please send you Invoice/Order Confirmation to process the payment upon receipt of this order.
-
-2 - Our Purchase Order number must appear on Invoices and Delivery notes.
-
-3 - Any error and omissions are excepted from this order.
-
-4 - Send all correspondence to the procurement manager.
-
-5 - Supplier has to comply with all precautions like spillage, leakage and statutory requirements related to health, safety & environment aspects in delivering this order.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="0bc95ecd-c5f7-400e-8e73-d43838542ce2" x="5" y="593" width="253" height="12"/>
-				<textElement/>
-				<text><![CDATA[For COMPANY NAME]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="59616d29-fb34-41a5-96d0-d4f931d56099" x="5" y="661" width="135" height="20"/>
-				<box>
-					<topPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[Procurement Department]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="825bbcb2-067c-4aa0-9b4d-a2209d90d157" x="174" y="661" width="152" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="0.0"/>
-					<bottomPen lineWidth="0.0"/>
-					<rightPen lineWidth="0.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[Department Head]]></text>
-			</staticText>
-			<textField evaluationTime="Report">
-				<reportElement uuid="c8d8338c-44bd-4c13-bd1b-5f49162c2df5" x="483" y="689" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="35562288-17c4-41b6-b5e0-773c3ea6d628" x="403" y="689" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="72fd6ff3-1202-44ac-ab7a-a5fe11b05b13" x="0" y="689" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="2518fb3c-a5c5-4101-aae6-b8eccdc19c65" x="251" y="147" width="89" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial"/>
-				</textElement>
-				<text><![CDATA[Quotation Ref:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="65132faa-eddb-4de9-bb7e-be78621da847" x="468" y="147" width="62" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[رقم العرض:]]></text>
-			</staticText>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="2b66dcd9-5c32-4dff-8c09-73bcb9500ee7" x="341" y="147" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{poreference}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="30ba4070-8d4a-4703-a5d0-80e0d63cf401" x="37" y="445" width="450" height="118">
-					<printWhenExpression><![CDATA[!$F{countrycode}.equals( "SA" )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[1 - Please send you Invoice/Order Confirmation to process the payment upon receipt of this order.
-
-2 - Documents required for shipment
-	a - Chambered Invoice (1+3 Original)
-	b - Chambered Certificate of Origin (1+1)
-	c - Packing List (1+2)
-
-3 - Supplier has to comply with all precautions like spillage, leakage and statutory requirements related to health, safety & environment aspects in delivering this order.]]></text>
-			</staticText>
-			<frame>
-				<reportElement uuid="9d38ab41-c6ae-44d7-89b4-02b7751b33ba" positionType="Float" x="5" y="322" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="cfe8e27f-0f84-48ad-87c6-4cd94d325acf" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="930f3a37-a9f2-42fa-bfeb-083b7ff16714" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[A - Scope of Supply]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="e6d4c9b9-b007-44ab-bd61-8959207a4735" x="150" y="0" width="295" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[As per attached list]]></text>
-				</staticText>
-			</frame>
-			<frame>
-				<reportElement uuid="55ca0544-97cf-46a8-b1a6-023dc68d3427" positionType="Float" x="5" y="337" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="21adce03-6225-49c2-8317-8916a83941e5" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="a612f025-64b7-4d1c-9d54-5670846e6619" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[B - Total Amount]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true">
-					<reportElement uuid="ba9492d1-5e23-4b12-abeb-db96a49b8a50" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{ordercurrency}
-+ " "
-+ java.lang.String.format("%-,1.2f", [$F{grandtotal}] as Object[])
-+ " ("
-+ $F{currencydesc} + " "
-+ org.compiere.util.Msg.getAmtInWords(org.compiere.util.Language.getLoginLanguage(), java.lang.String.format("%-3.2f", [$F{grandtotal}] as Object[]))
-+ ")"]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<reportElement uuid="0c286e68-89b6-4c4b-87d6-a562e5aa48e6" positionType="Float" x="5" y="352" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="5710aed7-90c9-415d-a1c8-2ae143a58d13" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="bfced459-3740-450b-88ec-ace1a99c481c" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[C - Payment Terms]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="a9004540-6394-4ab1-91f1-aa3e91016d60" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{paymenttermname}
-+ ($F{paymenttermnote} != null ? ", " + $F{paymenttermnote} : "")]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<reportElement uuid="38ffdc64-dcd7-4ce9-8713-f4b7b36ced73" positionType="Float" x="5" y="367" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="a3559bc6-6c01-4e52-94ab-41a69ea6ea1b" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="7d984508-633f-46e8-ad83-eae6b5750457" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[D - Delivery Date]]></text>
-				</staticText>
-				<textField pattern="dd/MM/yyyy">
-					<reportElement uuid="7b688c17-8383-4d7a-995d-dc50060e9ec5" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{datepromised}]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<reportElement uuid="c515e9cd-24c6-4f83-b7ca-ec3ccd7894de" positionType="Float" x="5" y="382" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="6bd07502-d49c-423e-bd94-ed3066d181ec" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="647d108b-0ec9-45d7-a8b8-2f1b226c2eb8" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[E - Delivery Place]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true">
-					<reportElement uuid="2ae449c4-50bd-42a1-a606-fa6ad97419ef" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{warehousename}
-+ ($F{warehouseaddress1} != null ? ", " + $F{warehouseaddress1} : "")
-+ ($F{warehouseaddress2} != null ? ", " + $F{warehouseaddress2} : "")
-+ ($F{warehousecity} != null ? ", " + $F{warehousecity} : "")
-+ ($F{warehousephone} != null ? ", " + $F{warehousephone} : "")
-+ ($F{warehousefax} != null ? ", " + $F{warehousefax} : "")]]></textFieldExpression>
-				</textField>
-			</frame>
-			<staticText>
-				<reportElement uuid="1c3f4e9b-5650-4769-add2-cffd8dd1a8a7" x="360" y="661" width="152" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="0.0"/>
-					<bottomPen lineWidth="0.0"/>
-					<rightPen lineWidth="0.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[Operation Director]]></text>
-			</staticText>
-			<componentElement>
-				<reportElement uuid="f4e23ad0-bcca-4ef8-9c23-01e6ccba7283" x="297" y="192" width="200" height="28"/>
-				<jr:barbecue xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" type="Code128" drawText="false" checksumRequired="false" evaluationTime="Report">
-					<jr:codeExpression><![CDATA[$F{documentno}]]></jr:codeExpression>
-				</jr:barbecue>
-			</componentElement>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="96" splitType="Stretch">
-			<printWhenExpression><![CDATA[$V{PAGE_NUMBER} != 1]]></printWhenExpression>
-			<staticText>
-				<reportElement uuid="14213c35-db64-4617-88fd-6a013eb3d57b" x="263" y="54" width="77" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="13a43b75-2f42-4f60-b569-4fe235801758" x="341" y="54" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="4090cc65-bf1e-4d94-9e23-73c1067dbd2c" x="468" y="54" width="50" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5f1c80b5-d50f-41f6-ae99-8219bf2d6eea" x="0" y="54" width="67" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Subject:]]></text>
-			</staticText>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="9bb16fc8-94d2-4420-96ef-419733811853" x="67" y="54" width="196" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{orderdescription}]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="20">
-			<staticText>
-				<reportElement uuid="313775e0-ede5-4603-8ded-0b27f10f6628" style="BoxedHeader" x="0" y="0" width="37" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="845206e4-101f-4b2b-ba49-5e3c4cd1e8fe" style="BoxedHeader" x="37" y="0" width="221" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Description]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="371cd165-1d58-4da3-8d5a-934d87687e94" style="BoxedHeader" x="258" y="0" width="39" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Qty]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="6f5e6271-7785-4487-aba4-031c5537f26e" style="BoxedHeader" x="341" y="0" width="83" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Unit Price]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="802d2718-9a56-486d-9f9b-86984e2d54ab" style="BoxedHeader" x="297" y="0" width="44" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[UoM]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="20484da8-7b6a-4e7b-9f8e-b4885c27fbd1" style="BoxedHeader" x="424" y="0" width="94" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Total Value]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="72216a78-3140-46c5-b053-002468aec069" style="BoxedHeader" x="378" y="0" width="46" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Discount]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="313775e0-ede5-4603-8ded-0b27f10f6628" style="BoxedHeader" x="0" y="0" width="37" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="845206e4-101f-4b2b-ba49-5e3c4cd1e8fe" style="BoxedHeader" x="37" y="0" width="175" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Description]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="371cd165-1d58-4da3-8d5a-934d87687e94" style="BoxedHeader" x="212" y="0" width="39" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Qty]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="802d2718-9a56-486d-9f9b-86984e2d54ab" style="BoxedHeader" x="251" y="0" width="44" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[UoM]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="6f5e6271-7785-4487-aba4-031c5537f26e" style="BoxedHeader" x="295" y="0" width="83" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Unit Price]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="20484da8-7b6a-4e7b-9f8e-b4885c27fbd1" style="BoxedHeader" x="424" y="0" width="94" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Total Value]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="20">
-			<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-			<textField>
-				<reportElement uuid="5bdaf8db-9dae-4e66-99fb-8224b56f49c8" style="BoxedDetail" stretchType="RelativeToBandHeight" x="0" y="0" width="37" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{line}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="8bb16467-dc7b-457c-8f5b-56df838abb34" style="BoxedDetail" stretchType="RelativeToBandHeight" x="37" y="0" width="221" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[($F{productname} != null ? $F{productname} : "") +
-($F{linedescription} != null ? "\n" + $F{linedescription}
-    : "")]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="bced812b-5378-4935-a5cc-800d66c3aeef" style="BoxedDetail" stretchType="RelativeToBandHeight" x="258" y="0" width="39" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qtyentered}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="0cde8765-7117-4c85-be34-a1265498f8c5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="341" y="0" width="83" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{priceactual}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="66e492e3-f34d-490e-a48d-95d6e4c6f0ab" style="BoxedDetail" stretchType="RelativeToBandHeight" x="297" y="0" width="44" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="8db0967e-92e9-46bd-832a-ef90aac89fc5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="424" y="0" width="94" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{linenetamt}]]></textFieldExpression>
-			</textField>
-		</band>
-		<band height="20">
-			<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-			<textField>
-				<reportElement uuid="5bdaf8db-9dae-4e66-99fb-8224b56f49c8" style="BoxedDetail" stretchType="RelativeToBandHeight" x="0" y="0" width="37" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{line}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="8bb16467-dc7b-457c-8f5b-56df838abb34" style="BoxedDetail" stretchType="RelativeToBandHeight" x="37" y="0" width="175" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[($F{productname} != null ? $F{productname} : "") +
-($F{linedescription} != null ? "\n" + $F{linedescription}
-    : "")]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="bced812b-5378-4935-a5cc-800d66c3aeef" style="BoxedDetail" stretchType="RelativeToBandHeight" x="212" y="0" width="39" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qtyentered}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="66e492e3-f34d-490e-a48d-95d6e4c6f0ab" style="BoxedDetail" stretchType="RelativeToBandHeight" x="251" y="0" width="44" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="0cde8765-7117-4c85-be34-a1265498f8c5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="295" y="0" width="83" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{pricelist}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0.00">
-				<reportElement uuid="e91d48ab-fb4f-41d4-8d46-de86c786546d" style="BoxedDetail" x="378" y="0" width="46" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{discount}.toString().concat(" %")]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="8db0967e-92e9-46bd-832a-ef90aac89fc5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="424" y="0" width="94" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{linenetamt}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<pageFooter>
-		<band height="78" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement uuid="a95b0e12-c0af-42a0-8116-a2d497754271" x="484" y="0" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="ee0f6630-eb29-46af-97d7-e6ffaf3c7799" x="0" y="0" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="20aa33da-2c6a-4fc2-936f-6384db7babaa" x="404" y="0" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<summary>
-		<band height="100" splitType="Stretch">
-			<textField pattern="#,##0.00">
-				<reportElement uuid="744fe6a7-64c3-471d-9de3-84bc919f05a6" style="BoxedHeader" x="424" y="0" width="94" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$V{linenetamt_1}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="91e06a1d-8901-476f-9082-cd176cb49430" style="BoxedHeader" x="211" y="0" width="213" height="20"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Total Amount " + $F{ordercurrency} + ":  "]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="57f61f32-124f-41e8-9d57-e396d54648c0" x="1" y="35" width="100" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font isBold="true"/>
-				</textElement>
-				<text><![CDATA[Bank Details:]]></text>
-			</staticText>
-			<componentElement>
-				<reportElement uuid="dc9e5bf6-b3d1-4306-94d5-d6302bd9d3c7" key="table" x="0" y="55" width="519" height="45"/>
-				<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
-					<datasetRun subDataset="Bank Data" uuid="70636702-ede3-4f49-856a-6d5db6394905">
-						<datasetParameter name="C_BPartner_ID">
-							<datasetParameterExpression><![CDATA[$F{c_bpartner_id}]]></datasetParameterExpression>
-						</datasetParameter>
-						<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					</datasetRun>
-					<jr:column uuid="820d7587-e279-4daf-adbe-c435c7c385b2" width="519">
-						<jr:detailCell height="32" rowSpan="1">
-							<box>
-								<topPen lineWidth="0.0"/>
-								<leftPen lineWidth="0.0"/>
-								<bottomPen lineWidth="0.0"/>
-								<rightPen lineWidth="0.0"/>
-							</box>
-							<textField isStretchWithOverflow="true" evaluationTime="Auto">
-								<reportElement uuid="0300c7fc-7f12-4baa-9e97-81bb0617d0f7" x="0" y="0" width="519" height="20"/>
-								<textElement/>
-								<textFieldExpression><![CDATA["A/C Holder: " + $F{accountname} + "\n"
-+ "Bank Name: " + $F{bankname} + "\n"
-+ ($F{address1} != null ? "Branch: " + $F{address1} + "\n" : "")
-+ ($F{city} != null ? "City: " + $F{city} : "")
-+ ($F{bankcountry} != null ? ", " + $F{bankcountry} : "") + "\n"
-+ "Clearing No: " + $F{routingno} + "\n"
-+ ($F{swiftcode} != null ? "SWIFT Code: " + $F{swiftcode} + "\n" : "")
-+ "Account/IBAN No: " + $F{accountno} + "\n"]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-				</jr:table>
-			</componentElement>
-		</band>
-	</summary>
-</jasperReport>
diff --git a/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml b/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
deleted file mode 100644
index fabd7db036..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="LocalPurchaseRequest" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="519" leftMargin="38" rightMargin="38" topMargin="38" bottomMargin="38" uuid="8d6070fd-c1c6-4a92-8c36-46e15d09e000">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="768"/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="AdempiereDev"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box>
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_ROLE_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_USER_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="RECORD_ID" class="java.lang.Integer">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<parameter name="RESOURCE_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT
-	r.DocumentNo,
-	r.Description, --justification
-	r.DateDoc,
-	r.DateRequired,
-	r.TotalLines, --estimate value
-	r.DocStatus,
-	u.Name RequesterName, -- Requester Name
-	bpg.Name Department, -- Department
-	w.Name DeliverTo, -- Deliver To
-	rl.Line,
-	p.Value ProductNo, --product no
-	p.Name ProductName, -- Product Name
-	rl.Description LineDescription, -- Product Description
-	rl.Qty,
-	uom.UOMSymbol,
-	rl.LineNetAmt
-FROM M_Requisition r
-	INNER JOIN M_RequisitionLine rl ON r.M_Requisition_ID = rl.M_Requisition_ID
-	LEFT JOIN C_UOM uom ON  rl.C_UOM_ID = uom.C_UOM_ID
-	LEFT JOIN AD_User u ON r.AD_User_ID = u.AD_User_ID
-	LEFT JOIN C_BPartner bp ON u.C_BPartner_ID = bp.C_BPartner_ID
-	LEFT JOIN C_BP_Group bpg ON bp.C_BP_Group_ID = bpg.C_BP_Group_ID
-	LEFT JOIN M_Warehouse w ON r.M_Warehouse_ID = w.M_Warehouse_ID
-	LEFT JOIN M_Product p ON rl.M_Product_ID = p.M_Product_ID
-WHERE r.M_Requisition_ID = $P{RECORD_ID}
-ORDER BY rl.Line]]>
-	</queryString>
-	<field name="documentno" class="java.lang.String"/>
-	<field name="description" class="java.lang.String"/>
-	<field name="datedoc" class="java.sql.Timestamp"/>
-	<field name="daterequired" class="java.sql.Timestamp"/>
-	<field name="totallines" class="java.math.BigDecimal"/>
-	<field name="docstatus" class="java.lang.String"/>
-	<field name="requestername" class="java.lang.String"/>
-	<field name="department" class="java.lang.String"/>
-	<field name="deliverto" class="java.lang.String"/>
-	<field name="line" class="java.math.BigDecimal"/>
-	<field name="productno" class="java.lang.String"/>
-	<field name="productname" class="java.lang.String"/>
-	<field name="linedescription" class="java.lang.String"/>
-	<field name="qty" class="java.math.BigDecimal"/>
-	<field name="uomsymbol" class="java.lang.String"/>
-	<field name="linenetamt" class="java.math.BigDecimal"/>
-	<background>
-		<band height="766" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="00227d6d-401e-4cc2-afac-f161d5953f7e" x="310" y="6" width="208" height="22"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="1623617d-d456-4af2-a954-0e3887d92c0f" x="0" y="6" width="258" height="22"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="10" isBold="true"/>
-				</textElement>
-				<text><![CDATA[COMPANY NAME]]></text>
-			</staticText>
-			<line>
-				<reportElement uuid="8c8d18a4-a3cd-466c-8375-10eec65ffda5" x="0" y="37" width="519" height="1"/>
-			</line>
-			<staticText>
-				<reportElement uuid="925bd6b3-6f75-4e2f-ac4e-7f9c033dc8f5" x="0" y="748" width="519" height="17"/>
-				<textElement textAlignment="Center">
-					<font size="7"/>
-				</textElement>
-				<text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae consequat nunc. Curabitur convallis est at erat mattis tincidunt. Donec consequat,
-odio sed cursus sodales, quam magna placerat dui, at molestie leo nisi id leo. Pellentesque ante lectus, ultricies id laoreet ac, tempus vel felis.]]></text>
-			</staticText>
-			<image onErrorType="Blank">
-				<reportElement uuid="f95ea447-de3f-4b74-a9d1-cbc5cb4d1c47" x="397" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "9001.jpg"]]></imageExpression>
-			</image>
-			<staticText>
-				<reportElement uuid="7e9cd737-98c9-44cc-a30a-6c516097c95e" x="487" y="721" width="32" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="5"/>
-				</textElement>
-				<text><![CDATA[E&OE]]></text>
-			</staticText>
-			<image onErrorType="Blank">
-				<reportElement uuid="581b3fad-1f4b-4ca8-9a8c-9baf69d010b0" x="277" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "2200.jpg"]]></imageExpression>
-			</image>
-			<image onErrorType="Blank">
-				<reportElement uuid="3fc06ae7-d529-4853-b7dc-f09990d00672" x="157" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "18001.jpg"]]></imageExpression>
-			</image>
-			<textField pattern="h.mm a">
-				<reportElement uuid="091484c4-f756-40c1-a374-690d2111f2f3" x="487" y="707" width="32" height="14"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<image onErrorType="Blank">
-				<reportElement uuid="15f145e6-04b5-495c-8b64-3a9cfc320add" x="37" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "14001.jpg"]]></imageExpression>
-			</image>
-			<line>
-				<reportElement uuid="dfd6a4fb-6c43-4ebe-b160-19539fa303f5" x="0" y="702" width="519" height="1"/>
-			</line>
-		</band>
-	</background>
-	<title>
-		<band height="231" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="b2d0c2f1-74ed-47d5-b2de-dd54d42eb5e0" x="240" y="124" width="89" height="72"/>
-				<textElement textAlignment="Right">
-					<font fontName="Arial" size="10" isBold="false"/>
-				</textElement>
-				<text><![CDATA[Date:
-Required Date:
-Requester Name:
-Department:
-Estimate Value:
-Deliver To:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5faf863c-a519-4dd4-a188-ac422ef62fce" x="252" y="104" width="77" height="20"/>
-				<textElement textAlignment="Right">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<rectangle radius="15">
-				<reportElement uuid="7951f135-1401-4e96-acdc-01e7e8ca403d" x="183" y="66" width="336" height="32" forecolor="#000000" backcolor="#FFFFFF"/>
-			</rectangle>
-			<staticText>
-				<reportElement uuid="b93194a9-4c71-4407-ba5e-ad7cec80f41c" x="183" y="66" width="336" height="32" forecolor="#000000"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Arial" size="18" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Purchase Request (PR)
-]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="edbc84ec-4162-4ea6-be85-990b007bfa4a" x="456" y="124" width="62" height="72"/>
-				<textElement>
-					<font fontName="Arial" size="10" isBold="false" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[التاريخ:
-تاريخ الطلب:
-اسم الطالب:
-القسم:
-سعر التقدير:
-التوصيل الى:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="187587ae-ea97-4496-948d-bc4eedec09eb" x="456" y="104" width="50" height="20"/>
-				<textElement>
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="557d8657-2a76-4007-8e1f-c23962e366a1" x="329" y="104" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="9aa2f29e-2913-4a36-831c-8f4cefa255d4" x="329" y="124" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{datedoc}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="378061f3-6445-4c31-9736-a862493647e8" x="329" y="136" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{daterequired}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="4dabac0b-f594-4124-8d65-b462fe2cc47f" x="329" y="148" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{requestername}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="87874a93-1fe9-4f7f-b4aa-f7cf7820c6fd" x="329" y="160" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{department}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="dba6924e-7d15-4840-b79c-f0923033c42b" x="329" y="184" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{deliverto}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="85f23771-d9e6-42a1-9d97-90c2617683c1" x="329" y="172" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{totallines}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="288d4269-e9c6-47ed-bf4c-94bff4718b6e" x="0" y="124" width="232" height="72"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{description}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="cac0b756-b744-42c8-89ff-9779864709f5" x="0" y="104" width="112" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font isBold="true"/>
-				</textElement>
-				<text><![CDATA[Justification:]]></text>
-			</staticText>
-			<componentElement>
-				<reportElement uuid="2055affb-1068-41b4-9d64-48c987106fbc" x="17" y="200" width="200" height="28"/>
-				<jr:barbecue xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" type="Code128" drawText="false" checksumRequired="false" evaluationTime="Report">
-					<jr:codeExpression><![CDATA[$F{documentno}]]></jr:codeExpression>
-				</jr:barbecue>
-			</componentElement>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="96" splitType="Stretch">
-			<printWhenExpression><![CDATA[$V{PAGE_NUMBER} != 1]]></printWhenExpression>
-			<textField>
-				<reportElement uuid="557d8657-2a76-4007-8e1f-c23962e366a1" x="329" y="63" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="5faf863c-a519-4dd4-a188-ac422ef62fce" x="252" y="63" width="77" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="187587ae-ea97-4496-948d-bc4eedec09eb" x="456" y="63" width="50" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="40">
-			<staticText>
-				<reportElement uuid="b3782001-2989-4172-b4bf-e6eac2be97ac" style="BoxedHeader" x="0" y="0" width="47" height="40"/>
-				<textElement/>
-				<text><![CDATA[Sl No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="ede5b212-2567-49dc-b5aa-b453d497df59" style="BoxedHeader" x="47" y="0" width="81" height="40"/>
-				<textElement/>
-				<text><![CDATA[Product No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5a5b58b8-d9f2-4b4a-ab9d-f23cc1bba888" style="BoxedHeader" x="128" y="0" width="182" height="40"/>
-				<textElement/>
-				<text><![CDATA[Description]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="e4013810-1b24-444e-a301-d11d7710fac4" style="BoxedHeader" x="310" y="0" width="42" height="40"/>
-				<textElement/>
-				<text><![CDATA[Qty]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="8a8a035c-fc86-42e9-ae50-4b900d460e86" style="BoxedHeader" x="352" y="0" width="68" height="40"/>
-				<textElement/>
-				<text><![CDATA[UoM]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="44e13c3f-2a33-4bf6-99f4-4ca8c5b43538" style="BoxedHeader" x="420" y="0" width="100" height="40"/>
-				<textElement/>
-				<text><![CDATA[Line Total]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="20">
-			<textField>
-				<reportElement uuid="566c991c-b416-411d-a8c4-a5c7e3942a42" style="BoxedDetail" stretchType="RelativeToBandHeight" x="0" y="0" width="47" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{line}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="0c22ec8c-8ad3-4e86-b3da-0d63343f49da" style="BoxedDetail" stretchType="RelativeToBandHeight" x="47" y="0" width="81" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{productno}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="3b41b69e-b698-423c-9b35-bf626713c92c" style="BoxedDetail" stretchType="RelativeToBandHeight" x="128" y="0" width="182" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{productname}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0">
-				<reportElement uuid="51193f35-f5c1-4f37-b5fe-3d21334e495e" style="BoxedDetail" stretchType="RelativeToBandHeight" x="310" y="0" width="42" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qty}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="7c0edc58-b69f-4991-a5cc-65a78c5e384f" style="BoxedDetail" stretchType="RelativeToBandHeight" x="352" y="0" width="68" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="2e541b7a-23ca-4a05-9022-2e2830b60f59" style="BoxedDetail" stretchType="RelativeToBandHeight" x="420" y="0" width="100" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{linenetamt}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<pageFooter>
-		<band height="78" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement uuid="d40e242b-9c33-4d20-a9ad-6de6c47adb80" x="484" y="0" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="971104a9-7117-4ecf-a07f-82f191ee770f" x="0" y="0" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="6d1247c4-3eb9-48ec-8996-90db829a053b" x="404" y="0" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<lastPageFooter>
-		<band height="187">
-			<staticText>
-				<reportElement uuid="3398e14a-d21e-4b8e-90f7-43cb0a8ccce3" style="BoxedHeader" x="0" y="0" width="173" height="20"/>
-				<textElement/>
-				<text><![CDATA[Prepared By]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="d6f54e22-eec9-43fc-9ee6-c3f49c5b2545" style="BoxedHeader" x="173" y="0" width="173" height="20"/>
-				<textElement/>
-				<text><![CDATA[Reviewed By]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="1d47c62a-4903-440f-9b7c-a5050a7d4535" style="BoxedHeader" x="345" y="0" width="173" height="20"/>
-				<textElement/>
-				<text><![CDATA[Approved By]]></text>
-			</staticText>
-			<rectangle>
-				<reportElement uuid="19fb8338-89f6-4aed-9fe5-24a290d34c63" x="0" y="20" width="173" height="54"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="9ed7f145-7634-49db-9105-373ba093902a" x="173" y="20" width="172" height="54"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="2ff6928a-6bfb-47d1-8638-4173edfb300f" x="345" y="20" width="173" height="54"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="294c9025-896f-4bb5-86d3-c6640c1ea83b" x="345" y="74" width="173" height="20"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="908671ed-f9a7-4e72-a249-a6bb4ca5b3a2" x="173" y="74" width="172" height="20"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="c986af10-8f07-4442-b480-3b71c6f1c36e" x="0" y="74" width="173" height="20"/>
-			</rectangle>
-			<textField evaluationTime="Report">
-				<reportElement uuid="2102cdc1-3c12-47e7-b461-7ee9ea82d4db" x="485" y="109" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="5aeefb44-a674-4d2f-b62b-df9ec4027017" x="405" y="109" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="96e58102-43bc-461c-a5cf-8eae0680df95" x="0" y="109" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-		</band>
-	</lastPageFooter>
-	<summary>
-		<band height="12">
-			<staticText>
-				<reportElement uuid="155168f8-f795-4781-8eaf-6d3444adf13f" x="73" y="0" width="373" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true"/>
-				</textElement>
-				<text><![CDATA[**** End of List ****]]></text>
-			</staticText>
-		</band>
-	</summary>
-</jasperReport>
diff --git a/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml b/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml
deleted file mode 100644
index d558bbc594..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="VoidedDN" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="766" leftMargin="38" rightMargin="38" topMargin="38" bottomMargin="38" isSummaryWithPageHeaderAndFooter="true" uuid="5b68a071-d552-43a8-8a9c-4842a004cb32">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" isBlankWhenNull="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-		<conditionalStyle>
-			<conditionExpression><![CDATA[$F{invoicenum}!=null]]></conditionExpression>
-			<style mode="Opaque" backcolor="#FF9090" isBlankWhenNull="true"/>
-		</conditionalStyle>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false">
-		<defaultValueExpression><![CDATA[1000000]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DATE_FROM" class="java.util.Date">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DATE_TO" class="java.util.Date">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT io.documentno, io.movementdate, io.updated, bp.name, bp.name2, p.value productvalue, iol.qtyentered, io.description, io.docstatus dnstatus,
-	i.documentno invoicenum, i.docstatus invoicestatus
-FROM  m_inout io
-INNER JOIN m_inoutline iol ON io.m_inout_id = iol.m_inout_id
-LEFT JOIN c_invoiceline il ON iol.m_inoutline_id = il.m_inoutline_id
-LEFT JOIN c_invoice i ON il.c_invoice_id = i.c_invoice_id
-LEFT JOIN c_bpartner bp ON io.c_Bpartner_Id = bp.C_BPartner_ID
-LEFT JOIN m_product p ON iol.m_product_id = p.m_product_id
-WHERE io.docstatus IN ('VO', 'RE')
-AND io.AD_CLIENT_ID = $P{AD_CLIENT_ID}
-AND io.movementdate BETWEEN $P{DATE_FROM} AND $P{DATE_TO}]]>
-	</queryString>
-	<field name="documentno" class="java.lang.String"/>
-	<field name="movementdate" class="java.sql.Timestamp"/>
-	<field name="updated" class="java.sql.Timestamp"/>
-	<field name="name" class="java.lang.String"/>
-	<field name="name2" class="java.lang.String"/>
-	<field name="productvalue" class="java.lang.String"/>
-	<field name="qtyentered" class="java.math.BigDecimal"/>
-	<field name="description" class="java.lang.String"/>
-	<field name="dnstatus" class="java.lang.String"/>
-	<field name="invoicenum" class="java.lang.String"/>
-	<field name="invoicestatus" class="java.lang.String"/>
-	<title>
-		<band height="97" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="e9cb2c71-efff-43fe-9b1d-9e938fb0dd38" x="266" y="69" width="55" height="16"/>
-				<textElement textAlignment="Right"/>
-				<text><![CDATA[From Date:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="2e207f4a-b02f-48df-8f92-17bfe0866968" x="124" y="49" width="519" height="20"/>
-				<textElement textAlignment="Center">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Voided/Reversed Delivery Notes]]></text>
-			</staticText>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="6b1a0b3e-aa22-4494-a44d-db4c33c807f9" x="324" y="69" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$P{DATE_FROM}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="1ad5649b-bf29-4aed-9079-f128721b3f75" x="396" y="69" width="50" height="16"/>
-				<textElement textAlignment="Right"/>
-				<text><![CDATA[To Date:]]></text>
-			</staticText>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="61eeb302-80bd-448a-9b1c-f7a16efe6722" x="448" y="69" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$P{DATE_TO}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="64" splitType="Stretch">
-			<printWhenExpression><![CDATA[$V{PAGE_NUMBER} != 1]]></printWhenExpression>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="40" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="fa0a9fdc-a297-4d12-bc72-21716ecfc40d" style="BoxedHeader" x="0" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[DN No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="138a341d-3fca-4395-bb43-d6e242491fde" style="BoxedHeader" x="70" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[DN Date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="781d8435-88e1-4f64-9e51-247d1fe5179b" style="BoxedHeader" x="140" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[Void Date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="497dc179-abca-42e2-b7c1-c7136cd20af3" style="BoxedHeader" x="210" y="0" width="100" height="40"/>
-				<textElement/>
-				<text><![CDATA[Customer Name]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b8e9e4c1-7549-46d3-a9c0-d940ca66a8b4" style="BoxedHeader" x="360" y="0" width="50" height="40"/>
-				<textElement/>
-				<text><![CDATA[Quantity]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="1110dc44-b88c-4e17-86d8-4c7002a0d1df" style="BoxedHeader" x="310" y="0" width="50" height="40"/>
-				<textElement/>
-				<text><![CDATA[Product Value]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="d7444f2a-78f8-4681-830f-075ce2bfee3c" style="BoxedHeader" x="410" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[Invoice Number]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="51cdef60-c5de-4295-bdc5-cf80fd0941d9" style="BoxedHeader" x="480" y="0" width="286" height="40"/>
-				<textElement/>
-				<text><![CDATA[Void Reason]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="20" splitType="Stretch">
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="28e5f108-f94a-4f8f-9263-303801158761" style="BoxedDetail" stretchType="RelativeToTallestObject" x="0" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="0c20f539-8068-4e8a-8496-f86b5e9945ba" style="BoxedDetail" stretchType="RelativeToTallestObject" x="70" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{movementdate}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="2cb4c364-026d-478b-9d29-9c6aeeecc004" style="BoxedDetail" stretchType="RelativeToTallestObject" x="140" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{updated}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="4de7a8fe-7760-49a6-87f7-09301c828828" style="BoxedDetail" stretchType="RelativeToTallestObject" x="210" y="0" width="100" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[($F{name2} == null ? $F{name} : $F{name2})]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="d718ef32-7bcc-463f-90f4-65fd8a27d5ba" style="BoxedDetail" stretchType="RelativeToTallestObject" x="310" y="0" width="50" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{productvalue}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="8a37a753-e308-48b8-a97a-dfac32771c86" style="BoxedDetail" stretchType="RelativeToTallestObject" x="360" y="0" width="50" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qtyentered}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="db59a7ba-604f-4119-a3fb-1d908ec73cfe" style="BoxedDetail" stretchType="RelativeToTallestObject" x="410" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{invoicenum}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="80b32326-cc7d-4e2f-b4f1-e81040b739eb" style="BoxedDetail" stretchType="RelativeToTallestObject" x="480" y="0" width="286" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{description}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<columnFooter>
-		<band height="31" splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band height="77" splitType="Stretch">
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="0087af29-67de-403a-aa54-f7b3dbc5518e" x="0" y="0" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="0b03ab04-0716-4f8b-b757-2af195a2c26c" x="651" y="0" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement uuid="db258e74-b94c-40cc-8ed1-7a83013fa968" x="731" y="0" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<summary>
-		<band height="105" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="d5f2b64c-754f-48cc-b12c-09983ac4ee02" x="47" y="60" width="202" height="28"/>
-				<box>
-					<pen lineStyle="Dashed"/>
-					<topPen lineWidth="1.0" lineStyle="Dashed"/>
-					<leftPen lineStyle="Dashed"/>
-					<bottomPen lineStyle="Dashed"/>
-					<rightPen lineStyle="Dashed"/>
-				</box>
-				<textElement textAlignment="Center"/>
-				<text><![CDATA[Reviewed By]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="f89d2a93-cccb-4852-8aef-ef419fb64e01" x="510" y="60" width="202" height="28"/>
-				<box>
-					<pen lineStyle="Dashed"/>
-					<topPen lineWidth="1.0" lineStyle="Dashed"/>
-					<leftPen lineStyle="Dashed"/>
-					<bottomPen lineStyle="Dashed"/>
-					<rightPen lineStyle="Dashed"/>
-				</box>
-				<textElement textAlignment="Center"/>
-				<text><![CDATA[Approved By]]></text>
-			</staticText>
-		</band>
-	</summary>
-</jasperReport>
diff --git a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
index 5e7840195f..670166f218 100644
--- a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
@@ -85,6 +85,7 @@ import net.sf.jasperreports.export.SimplePrintServiceExporterConfiguration;
 import net.sf.jasperreports.export.SimpleTextExporterConfiguration;
 import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 import net.sf.jasperreports.export.SimpleXlsExporterConfiguration;
+import net.sf.jasperreports.export.SimpleXmlExporterOutput;
 
 import org.adempiere.base.Service;
 import org.adempiere.exceptions.AdempiereException;
@@ -741,7 +742,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
             				JRXmlExporter export = new JRXmlExporter(jasperContext);
             				SimpleExporterConfiguration config = new SimpleExporterConfiguration();
             				export.setConfiguration(config);
-            				export.setExporterOutput(new SimpleWriterExporterOutput(strm));
+            				export.setExporterOutput(new SimpleXmlExporterOutput(strm));
             				exporter = export;
             			} else if (ext.equals("csv") || ext.equals("ssv") ) {
             				JRCsvExporter export = new JRCsvExporter(jasperContext);
diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch
index 5fa163f036..7b4b4c5c5f 100644
--- a/org.adempiere.server-feature/server.product.eventtest.launch
+++ b/org.adempiere.server-feature/server.product.eventtest.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 4c8b4657a2..a5703955dc 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@2:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false,org.zkoss.zk.library@default:true"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.zkoss.zk.library@default:true"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index deb3559e23..ad89995a22 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -25,7 +25,7 @@
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index 19b17453fe..d68504eb00 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="product" value="org.adempiere.ui.swing.client_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.ui.swing-feature/swingclient.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:true,org.restlet.ext.servlet@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>