Added to Mercurial version 1.0.0 of Shipments Awaiting Invoice report. 1.0.0
authorRafa Roda Palacios <rafael.roda@openbravo.com>
Wed, 11 Nov 2009 08:28:21 +0100
changeset 0 d990f4ee2e85
child 1 0459ebef7a72
Added to Mercurial version 1.0.0 of Shipments Awaiting Invoice report.
src-db/database/sourcedata/AD_MENU.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_PACKAGE.xml
src-db/database/sourcedata/AD_PROCESS.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-db/database/sourcedata/AD_TREENODE.xml
src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.html
src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.java
src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml
src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.xml
src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced_data.xsql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_MENU.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--F42880109549402C9A6133AA50148A22--><AD_MENU>
+<!--F42880109549402C9A6133AA50148A22-->  <AD_MENU_ID><![CDATA[F42880109549402C9A6133AA50148A22]]></AD_MENU_ID>
+<!--F42880109549402C9A6133AA50148A22-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F42880109549402C9A6133AA50148A22-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F42880109549402C9A6133AA50148A22-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F42880109549402C9A6133AA50148A22-->  <NAME><![CDATA[Shipments Awaiting Invoice Report]]></NAME>
+<!--F42880109549402C9A6133AA50148A22-->  <DESCRIPTION><![CDATA[Menu for Shipments Awaiting Invoice Report]]></DESCRIPTION>
+<!--F42880109549402C9A6133AA50148A22-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--F42880109549402C9A6133AA50148A22-->  <ACTION><![CDATA[R]]></ACTION>
+<!--F42880109549402C9A6133AA50148A22-->  <AD_PROCESS_ID><![CDATA[93FC254367D548DCB641CE258C0A68EF]]></AD_PROCESS_ID>
+<!--F42880109549402C9A6133AA50148A22-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--F42880109549402C9A6133AA50148A22--></AD_MENU>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--BA2AE435D381468CBACDA0947F93673C--><AD_MODEL_OBJECT>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <AD_MODEL_OBJECT_ID><![CDATA[BA2AE435D381468CBACDA0947F93673C]]></AD_MODEL_OBJECT_ID>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <ACTION><![CDATA[R]]></ACTION>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <CLASSNAME><![CDATA[org.openbravo.reports.shipmentsawaitinginvoice.erpCommon.ad_reports.ReportShipmentNotInvoiced]]></CLASSNAME>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <AD_PROCESS_ID><![CDATA[93FC254367D548DCB641CE258C0A68EF]]></AD_PROCESS_ID>
+<!--BA2AE435D381468CBACDA0947F93673C-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--BA2AE435D381468CBACDA0947F93673C--></AD_MODEL_OBJECT>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--5B4297F2DFF0408FA2FECF13C29BA970--><AD_MODEL_OBJECT_MAPPING>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[5B4297F2DFF0408FA2FECF13C29BA970]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <AD_MODEL_OBJECT_ID><![CDATA[BA2AE435D381468CBACDA0947F93673C]]></AD_MODEL_OBJECT_ID>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <MAPPINGNAME><![CDATA[/ad_reports/ReportShipmentNotInvoiced.html]]></MAPPINGNAME>
+<!--5B4297F2DFF0408FA2FECF13C29BA970-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--5B4297F2DFF0408FA2FECF13C29BA970--></AD_MODEL_OBJECT_MAPPING>
+
+<!--E0A5FAE1BC604486933A5CA8316E8AC3--><AD_MODEL_OBJECT_MAPPING>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[E0A5FAE1BC604486933A5CA8316E8AC3]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <AD_MODEL_OBJECT_ID><![CDATA[BA2AE435D381468CBACDA0947F93673C]]></AD_MODEL_OBJECT_ID>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <MAPPINGNAME><![CDATA[/ad_reports/ReportShipmentNotInvoiced.pdf]]></MAPPINGNAME>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--E0A5FAE1BC604486933A5CA8316E8AC3--></AD_MODEL_OBJECT_MAPPING>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--00028FF141CA4678B640E51E02902D21--><AD_MODULE>
+<!--00028FF141CA4678B640E51E02902D21-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--00028FF141CA4678B640E51E02902D21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00028FF141CA4678B640E51E02902D21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00028FF141CA4678B640E51E02902D21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00028FF141CA4678B640E51E02902D21-->  <NAME><![CDATA[Shipments Awaiting Invoice Report]]></NAME>
+<!--00028FF141CA4678B640E51E02902D21-->  <VERSION><![CDATA[1.0.0]]></VERSION>
+<!--00028FF141CA4678B640E51E02902D21-->  <DESCRIPTION><![CDATA[Module for Shipments Awaiting Invoice Report]]></DESCRIPTION>
+<!--00028FF141CA4678B640E51E02902D21-->  <HELP><![CDATA[http://forge.openbravo.com/svn/repos/shipmentawaitinginvoice]]></HELP>
+<!--00028FF141CA4678B640E51E02902D21-->  <URL><![CDATA[http://www.openbravo.com]]></URL>
+<!--00028FF141CA4678B640E51E02902D21-->  <TYPE><![CDATA[M]]></TYPE>
+<!--00028FF141CA4678B640E51E02902D21-->  <LICENSE><![CDATA[http://www.openbravo.com/legal/license.html]]></LICENSE>
+<!--00028FF141CA4678B640E51E02902D21-->  <JAVAPACKAGE><![CDATA[org.openbravo.reports.shipmentsawaitinginvoice]]></JAVAPACKAGE>
+<!--00028FF141CA4678B640E51E02902D21-->  <LICENSETYPE><![CDATA[OBPL]]></LICENSETYPE>
+<!--00028FF141CA4678B640E51E02902D21-->  <AUTHOR><![CDATA[Openbravo S.L.]]></AUTHOR>
+<!--00028FF141CA4678B640E51E02902D21-->  <ISTRANSLATIONREQUIRED><![CDATA[Y]]></ISTRANSLATIONREQUIRED>
+<!--00028FF141CA4678B640E51E02902D21-->  <AD_LANGUAGE><![CDATA[en_US]]></AD_LANGUAGE>
+<!--00028FF141CA4678B640E51E02902D21-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
+<!--00028FF141CA4678B640E51E02902D21-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
+<!--00028FF141CA4678B640E51E02902D21-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
+<!--00028FF141CA4678B640E51E02902D21--></AD_MODULE>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--18BB3FADCD7C4645A202DAD602350A99--><AD_MODULE_DEPENDENCY>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <AD_MODULE_DEPENDENCY_ID><![CDATA[18BB3FADCD7C4645A202DAD602350A99]]></AD_MODULE_DEPENDENCY_ID>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <STARTVERSION><![CDATA[2.50.14184]]></STARTVERSION>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
+<!--18BB3FADCD7C4645A202DAD602350A99-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
+<!--18BB3FADCD7C4645A202DAD602350A99--></AD_MODULE_DEPENDENCY>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_PACKAGE.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--01EE17E4B0854575A14A434CD5D76C96--><AD_PACKAGE>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <AD_PACKAGE_ID><![CDATA[01EE17E4B0854575A14A434CD5D76C96]]></AD_PACKAGE_ID>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <NAME><![CDATA[Shipments Awaiting Invoice Report]]></NAME>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <JAVAPACKAGE><![CDATA[org.openbravo.reports.shipmentsawaitinginvoice]]></JAVAPACKAGE>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--01EE17E4B0854575A14A434CD5D76C96-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--01EE17E4B0854575A14A434CD5D76C96--></AD_PACKAGE>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--93FC254367D548DCB641CE258C0A68EF--><AD_PROCESS>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <AD_PROCESS_ID><![CDATA[93FC254367D548DCB641CE258C0A68EF]]></AD_PROCESS_ID>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <VALUE><![CDATA[ReportShipmentNotInvoiced]]></VALUE>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <NAME><![CDATA[Shipments Awaiting Invoice Report]]></NAME>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <DESCRIPTION><![CDATA[Report for Shipments Awaiting Invoice]]></DESCRIPTION>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--93FC254367D548DCB641CE258C0A68EF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--93FC254367D548DCB641CE258C0A68EF--></AD_PROCESS>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,179 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--1F567CE8711F11DEA3B4001B388C05F0--><AD_TEXTINTERFACES>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[1F567CE8711F11DEA3B4001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <TEXT><![CDATA[Not invoiced shipments filter]]></TEXT>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.html]]></FILENAME>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1F567CE8711F11DEA3B4001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--1F567CE8711F11DEA3B4001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--1F966614711F11DE9EB1001B388C05F0--><AD_TEXTINTERFACES>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[1F966614711F11DE9EB1001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <TEXT><![CDATA[Shipment Document No.]]></TEXT>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.html]]></FILENAME>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1F966614711F11DE9EB1001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--1F966614711F11DE9EB1001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--1F9F6A48711F11DE8024001B388C05F0--><AD_TEXTINTERFACES>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[1F9F6A48711F11DE8024001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <TEXT><![CDATA[Form of Payment]]></TEXT>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.html]]></FILENAME>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1F9F6A48711F11DE8024001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--1F9F6A48711F11DE8024001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22DEB24A711F11DE9BD0001B388C05F0--><AD_TEXTINTERFACES>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22DEB24A711F11DE9BD0001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <TEXT><![CDATA[ORGANIZATION]]></TEXT>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22DEB24A711F11DE9BD0001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22DEB24A711F11DE9BD0001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22E788DE711F11DE9879001B388C05F0--><AD_TEXTINTERFACES>
+<!--22E788DE711F11DE9879001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22E788DE711F11DE9879001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22E788DE711F11DE9879001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22E788DE711F11DE9879001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22E788DE711F11DE9879001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22E788DE711F11DE9879001B388C05F0-->  <TEXT><![CDATA[PARTNER NAME]]></TEXT>
+<!--22E788DE711F11DE9879001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22E788DE711F11DE9879001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22E788DE711F11DE9879001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22E788DE711F11DE9879001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22EE9264711F11DE8B7B001B388C05F0--><AD_TEXTINTERFACES>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22EE9264711F11DE8B7B001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <TEXT><![CDATA[Shipment DATE]]></TEXT>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22EE9264711F11DE8B7B001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22EE9264711F11DE8B7B001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22F2E468711F11DEB65F001B388C05F0--><AD_TEXTINTERFACES>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22F2E468711F11DEB65F001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <TEXT><![CDATA[Payment terms]]></TEXT>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22F2E468711F11DEB65F001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22F2E468711F11DEB65F001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22F564EA711F11DEA3B8001B388C05F0--><AD_TEXTINTERFACES>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22F564EA711F11DEA3B8001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <TEXT><![CDATA[Qty Sold]]></TEXT>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22F564EA711F11DEA3B8001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22F564EA711F11DEA3B8001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22F6A7B0711F11DE8C0F001B388C05F0--><AD_TEXTINTERFACES>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22F6A7B0711F11DE8C0F001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <TEXT><![CDATA[Qty Shipped]]></TEXT>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22F6A7B0711F11DE8C0F001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22F6A7B0711F11DE8C0F001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--22F7ECBA711F11DEA420001B388C05F0--><AD_TEXTINTERFACES>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[22F7ECBA711F11DEA420001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <TEXT><![CDATA[Amount Invoice pending]]></TEXT>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--22F7ECBA711F11DEA420001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--22F7ECBA711F11DEA420001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--2304A310711F11DEBFFA001B388C05F0--><AD_TEXTINTERFACES>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[2304A310711F11DEBFFA001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <TEXT><![CDATA[Qty Invoiced]]></TEXT>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2304A310711F11DEBFFA001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--2304A310711F11DEBFFA001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--23075466711F11DE9DC6001B388C05F0--><AD_TEXTINTERFACES>
+<!--23075466711F11DE9DC6001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[23075466711F11DE9DC6001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--23075466711F11DE9DC6001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--23075466711F11DE9DC6001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--23075466711F11DE9DC6001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--23075466711F11DE9DC6001B388C05F0-->  <TEXT><![CDATA[STATUS]]></TEXT>
+<!--23075466711F11DE9DC6001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--23075466711F11DE9DC6001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--23075466711F11DE9DC6001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--23075466711F11DE9DC6001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--230895CE711F11DE8CEE001B388C05F0--><AD_TEXTINTERFACES>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[230895CE711F11DE8CEE001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <TEXT><![CDATA[Form of Pay.]]></TEXT>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--230895CE711F11DE8CEE001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--230895CE711F11DE8CEE001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--230A0288711F11DEBFAA001B388C05F0--><AD_TEXTINTERFACES>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[230A0288711F11DEBFAA001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <TEXT><![CDATA[Shipment Company]]></TEXT>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--230A0288711F11DEBFAA001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--230A0288711F11DEBFAA001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--230C626C711F11DEB80E001B388C05F0--><AD_TEXTINTERFACES>
+<!--230C626C711F11DEB80E001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[230C626C711F11DEB80E001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--230C626C711F11DEB80E001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--230C626C711F11DEB80E001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--230C626C711F11DEB80E001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--230C626C711F11DEB80E001B388C05F0-->  <TEXT><![CDATA[% Tax]]></TEXT>
+<!--230C626C711F11DEB80E001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--230C626C711F11DEB80E001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--230C626C711F11DEB80E001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--230C626C711F11DEB80E001B388C05F0--></AD_TEXTINTERFACES>
+
+<!--231BD9E0711F11DEBD3F001B388C05F0--><AD_TEXTINTERFACES>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[231BD9E0711F11DEBD3F001B388C05F0]]></AD_TEXTINTERFACES_ID>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <TEXT><![CDATA[Generated on]]></TEXT>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <FILENAME><![CDATA[/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml]]></FILENAME>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--231BD9E0711F11DEBD3F001B388C05F0-->  <AD_MODULE_ID><![CDATA[00028FF141CA4678B640E51E02902D21]]></AD_MODULE_ID>
+<!--231BD9E0711F11DEBD3F001B388C05F0--></AD_TEXTINTERFACES>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_TREENODE.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--E28B3B87653841499BED3A70499934D6--><AD_TREENODE>
+<!--E28B3B87653841499BED3A70499934D6-->  <AD_TREENODE_ID><![CDATA[E28B3B87653841499BED3A70499934D6]]></AD_TREENODE_ID>
+<!--E28B3B87653841499BED3A70499934D6-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--E28B3B87653841499BED3A70499934D6-->  <NODE_ID><![CDATA[F42880109549402C9A6133AA50148A22]]></NODE_ID>
+<!--E28B3B87653841499BED3A70499934D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E28B3B87653841499BED3A70499934D6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E28B3B87653841499BED3A70499934D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E28B3B87653841499BED3A70499934D6-->  <PARENT_ID><![CDATA[800075]]></PARENT_ID>
+<!--E28B3B87653841499BED3A70499934D6-->  <SEQNO><![CDATA[135]]></SEQNO>
+<!--E28B3B87653841499BED3A70499934D6--></AD_TREENODE>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.html	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SL
+ * All portions are Copyright (C) 2009 Openbravo SL
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Not invoiced shipments filter</title>
+    <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
+    <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS" />
+     
+    <script language="JavaScript" type="text/javascript" id="paramDirectory">
+      var baseDirectory = "../../../../../web/";
+      </script>
+      <script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript">
+      </script>
+      <script language="JavaScript" src="../utility/DynamicJS.js" type="text/javascript"></script>
+      <script language="JavaScript" type="text/javascript" id="paramLanguage">
+        var defaultLang = "en_US";
+      </script>
+      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/default/MessageBox.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../utility/DynamicJS.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/jscalendar/calendar.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/jscalendar/lang/calendar-es.js" type="text/javascript" id="fieldCalendar"></script>
+      <script language="JavaScript" src="../../../../../web/js/default/DateTextBox.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
+      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
+      <script type="text/javascript">
+        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+      </script>
+<script language="JavaScript" type="text/javascript">
+
+function onloadFunctions() {
+ keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/BusinessPartner.html', null, false, 'frmMain', 'inpcBPartnerId', 'inpBpartnerId_DES', inputValue(document.frmMain.inpBpartnerId_DES), 'inpIDValue', inputValue(document.frmMain.inpcBPartnerId), 'Command', 'KEY');", "inpBpartnerId_DES", "null");
+}
+</script>
+	<script language="JavaScript" type="text/javascript">
+	function validate()
+	{
+		var frm = document.frmMain;
+			if (inputValue(document.frmMain.inpCurrencyId) == null || inputValue(document.frmMain.inpCurrencyId) == "") {
+		    setWindowElementFocus(document.frmMain.inpCurrencyId);
+		    showJSMessage(7);
+		    return false;
+		  }
+		return true;
+	}
+	function onLoadDo(){
+		this.windowTables = new Array(
+		  new windowTableId('client', 'buttonHTML')
+		);
+		setWindowTableParentElement();
+		this.tabsTables = new Array(
+		  new tabTableId('tdtopTabs')
+		);
+		setTabTableParentElement();
+		enableShortcuts('edition');
+		setBrowserAutoComplete(false);
+		
+		try {
+		  onloadFunctions();
+		} catch (e) {}
+		resizeArea();
+		updateMenuIcon('buttonMenu');
+
+		setWindowElementFocus('firstElement');
+	}
+
+	function onResizeDo(){
+		resizeArea();
+	}
+	</script>
+</head>
+    <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+<form method="post" action="ReportOrderNotShipped.html" name="frmMain" id="form">
+  <input type="hidden" name="Command"></input>
+  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <tr><td class="Main_NavBar_bg_left" id="tdleftSeparator"></td></tr>
+          <tr><td class="Main_ToolBar_bg_left" valign="top"></td></tr>
+          <tr><td class="Main_Client_bg_left"></td></tr>
+          <tr><td class="Main_Bottom_bg_left"></td></tr>
+        </table>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <table width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <tr id="paramParentTabContainer"></tr>
+          <tr id="paramMainTabContainer"></tr>
+          <tr id="paramChildTabContainer"></tr>
+        </table>
+        <div class="Main_ContentPane_Client" style="overflow: auto; display: none;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <tbody>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <tbody>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <tbody>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <tbody>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </tbody>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </tbody>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </tbody>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </tbody>
+                            </table>
+                            <!-- USER CONTROLS -->
+              <table class="Main_Client_TableEdition">
+                <tr>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+                <tr>
+                  <td colspan="6">
+                    <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                      <tr class="FieldGroup_TopMargin"/>
+                      <tr>
+                        <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
+                        <td class="FieldGroupTitle">Filter</td>
+                        <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
+                        <td class="FieldGroupContent"/>
+                      </tr>
+                      <tr class="FieldGroup_BottomMargin"/>
+                    </tbody>
+                    </table>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="TitleCell"><span class="LabelText">From Date</span></td>
+                  <td class="TextBox_btn_ContentCell">
+                    <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <tr>
+                        <td class="TextBox_ContentCell">
+                          <input dojoType="openbravo:DateTextbox" lowerThan="paramDateTo" displayFormat="xx" saveFormat="yy"  class="TextBox_btn_OneCell_width" type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10" value="" onkeyup="autoCompleteDate(this.textbox, this.displayFormat);return true;"></input><script>djConfig.searchIds.push("paramDateFrom");</script>
+                        </td>
+                        <td class="FieldButton_bg">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="showCalendar('frmMain.inpDateFrom', document.frmMain.inpDateFrom.value, false);return false;">
+                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <tr>
+                              <td class="FieldButton_bg">
+                                <img alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></img>
+                              </td>
+                            </tr>
+                          </table>
+                          </a>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                  <td class="TitleCell"></td>
+                  <td class="TitleCell"><span class="LabelText">To Date</span></td>
+                  <td class="TextBox_btn_ContentCell">
+                    <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <tr>
+                        <td class="TextBox_ContentCell">
+                          <input dojoType="openbravo:DateTextbox" greaterThan="paramDateFrom" displayFormat="xx" saveFormat="yy"  class="TextBox_btn_OneCell_width" type="text" name="inpDateTo" id="paramDateTo" size="10" maxlength="10" value="" onkeyup="autoCompleteDate(this.textbox, this.displayFormat);return true;"></input><script>djConfig.searchIds.push("paramDateTo");</script>
+                        </td>
+                        <td class="FieldButton_bg">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="showCalendar('frmMain.inpDateTo', document.frmMain.inpDateTo.value, false);return false;" >
+                          <table class="FieldButton"onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <tr>
+                              <td class="FieldButton_bg">
+                                <img alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></img>
+                              </td>
+                            </tr>
+                          </table>
+                          </a>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                  <td class="ContentCell"></td>
+                </tr>
+                <tr>
+                  <td class="TitleCell"><span class="LabelText">Business Partner</span></td>
+                  <td class="TextBox_btn_ContentCell" colspan="2">
+                    <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <tr>
+                        <td class="TextBox_ContentCell">
+			              <input type="hidden" name="inpcBPartnerId" id="paramBPartnerId" value=""></input> 
+                          <input class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpBpartnerId_DES" maxlength="20" value=""></input>
+                        </td>
+                        <td class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Business Partner'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="openSearch(null, null, '../info/BusinessPartner.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpcBPartnerId', 'inpBpartnerId_DES', document.frmMain.inpBpartnerId_DES.value);return false;">
+                          <table class="FieldButton"  onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Search';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <tr>
+                              <td class="FieldButton_bg">
+                                <img alt="Business Partner" class="FieldButton_Icon FieldButton_Icon_BusinessPartner" title="Business Partner" src="../../../../../web/images/blank.gif" border="0"></img>
+                              </td>
+                            </tr>
+                          </table>
+                          </a>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                   <td class="TitleCell"><span class="LabelText">Organization</span></td>
+                  <td class="Combo_ContentCell" colspan="2">
+                    <select name="inpOrg" id="inpOrg" class="Combo Combo_TwoCells_width">
+                      <option value=""> <div id="reportAD_ORGID"></div></option>
+                    </select></td>
+                </tr>       
+                <tr>
+                  <td class="TitleCell"><span class="LabelText">Order Document No.</span></td>
+                  <td class="TextBox_ContentCell" colspan="2"><input class="dojoValidateValid TextBox_TwoCells_width" id="paramOrderDocNo" type="text" size="40" maxlenght="100" name="inpOrderDocNo" value=""></input><script>djConfig.searchIds.push("paramOrderDocNo");</script></td>
+                  <td class="TitleCell"><span class="LabelText">Shipment Document No.</span></td>
+                  <td class="TextBox_ContentCell" colspan="2"><input class="dojoValidateValid TextBox_TwoCells_width" id="paramShipmentDocNo" type="text" size="40" maxlenght="100" name="inpShipmentDocNo" value=""></input><script>djConfig.searchIds.push("paramShipmentDocNo");</script></td>
+                </tr>
+                <tr>
+                    <td class="TitleCell"><span class="LabelText">Currency</span></td>
+                  <td class="Combo_ContentCell">
+  		     		<select name="inpCurrencyId" id="inpCurrencyId" class="ComboKey Combo_OneCell_width" required="true">
+     		      	<option value=""><div id="reportC_Currency_ID"></div></option>
+   		     		</select>
+		   		  </td> 
+		   		  <td class="ContentCell"></td>
+		   		   <td class="TitleCell" id="PaymentRule_lbl_td"><span class="LabelText">Form of Payment</span></td>
+					<td class="Combo_ContentCell">
+                    <select  name="inppaymentrule" id="reportPaymentRule_inp_td" class="Combo Combo_OneCell_width">
+                      <option value=""> <div id="reportPaymentRule"></div></option>
+                    </select>
+                  </td>
+                  <td class="ContentCell"></td>
+                  <td class="ContentCell"></td>
+                </tr>
+                <tr>
+		   		  				
+					 <td class="TitleCell" id="PaymentRule_lbl_td"><span class="LabelText">Payment Terms</span></td>
+								
+					 <td class="Combo_ContentCell">
+                    <select  name="inppaymentterm" id="PaymentTerm_inp_td" class="Combo Combo_OneCell_width">
+                      <option value=""> <div id="reportPaymentTerm"></div></option>
+                    </select>
+                  </td>
+					<td class="ContentCell"></td>
+					<td class="TitleCell"><span class="LabelText">Delivery Terms</span></td>
+                  <td class="Combo_ContentCell" colspan="2">
+                    <select  name="inpDeliveryTerms" id="inpDeliveryTerms" class="Combo Combo_TwoCells_width">
+                      <option value=""> <div id="reportDeliveryTerms"></div></option>
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6">
+                    <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                      <tr class="FieldGroup_TopMargin"/>
+                      <tr>
+                        <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
+                        <td class="FieldGroupTitle">View Results</td>
+                        <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
+                        <td class="FieldGroupContent"/>
+                      </tr>
+                      <tr class="FieldGroup_BottomMargin"/>
+                    </tbody>
+                    </table>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="Button_RightAlign_ContentCell" colspan="2">
+                    <div>
+                      <button type="button" 
+                        id="buttonHTML" 
+                        class="ButtonLink" 
+                        onclick="openServletNewWindow('FIND_HTML', true, 'ReportShipmentNotInvoiced.html', 'ReportShipmentNotInvoiced', null, false, '700', '1000', true);return false;" 
+                        onfocus="buttonEvent('onfocus', this); window.status='View Results in a New Window'; return true;" 
+                        onblur="buttonEvent('onblur', this);" 
+                        onkeyup="buttonEvent('onkeyup', this);" 
+                        onkeydown="buttonEvent('onkeydown', this);" 
+                        onkeypress="buttonEvent('onkeypress', this);" 
+                        onmouseup="buttonEvent('onmouseup', this);" 
+                        onmousedown="buttonEvent('onmousedown', this);" 
+                        onmouseover="buttonEvent('onmouseover', this); window.status='View Results in a New Window'; return true;" 
+                        onmouseout="buttonEvent('onmouseout', this);">
+                        <table class="Button">
+                          <tr>
+                            <td class="Button_left"><img class="Button_Icon Button_Icon_html" alt="View Results in a New Window" title="View Results in a New Window" src="../../../../../web/images/blank.gif" border="0" /></td>
+                            <td class="Button_text">HTML Format</td>
+                            <td class="Button_right"></td>
+                          </tr>
+                        </table>
+                      </button>
+                    </div>
+                  </td>
+                  <td class="Button_LeftAlign_ContentCell" colspan="2">
+                    <div>
+                      <button type="button" 
+                        id="buttonHTML" 
+                        class="ButtonLink" 
+                        onclick="openServletNewWindow('FIND_PDF', true, 'ReportShipmentNotInvoiced.pdf', 'ReportShipmentNotInvoiced', null, false, '700', '1000', true);return false;" 
+                        onfocus="buttonEvent('onfocus', this); window.status='View Results in a New Window'; return true;" 
+                        onblur="buttonEvent('onblur', this);" 
+                        onkeyup="buttonEvent('onkeyup', this);" 
+                        onkeydown="buttonEvent('onkeydown', this);" 
+                        onkeypress="buttonEvent('onkeypress', this);" 
+                        onmouseup="buttonEvent('onmouseup', this);" 
+                        onmousedown="buttonEvent('onmousedown', this);" 
+                        onmouseover="buttonEvent('onmouseover', this); window.status='View Results in a New Window'; return true;" 
+                        onmouseout="buttonEvent('onmouseout', this);">
+                        <table class="Button">
+                          <tr>
+                            <td class="Button_left"><img class="Button_Icon Button_Icon_pdf" alt="View Results in a New Window" title="View Results in a New Window" src="../../../../../web/images/blank.gif" border="0" /></td>
+                            <td class="Button_text">PDF Format</td>
+                            <td class="Button_right"></td>
+                          </tr>
+                        </table>
+                      </button>
+                    </div>
+                  </td>
+                  <td class="ContentCell"></td>
+                  <td class="ContentCell"></td>
+                </tr>
+  		      </table>
+
+                      <!-- USER CONTROLS -->
+                </td>
+              </tr>
+              </table>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <table width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <tr>
+            <td class="Main_Bottom_bg"><img src="../../../../../web/images/blank.gif" border="0"></td>
+          </tr>
+        </table>
+      </td>
+      <td valign="top">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <tr><td class="Main_NavBar_bg_right"></td></tr>
+          <tr><td class="Main_ToolBar_bg_right" valign="top"></td></tr>
+          <tr><td class="Main_Client_bg_right"></td></tr>
+          <tr><td class="Main_Bottom_bg_right"></td></tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.java	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,265 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2009 Openbravo SL 
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.reports.shipmentsawaitinginvoice.erpCommon.ad_reports;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openbravo.base.secureApp.HttpSecureAppServlet;
+import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
+import org.openbravo.erpCommon.businessUtility.WindowTabs;
+import org.openbravo.erpCommon.utility.ComboTableData;
+import org.openbravo.erpCommon.utility.LeftTabsBar;
+import org.openbravo.erpCommon.utility.NavigationBar;
+import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.ToolBar;
+import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.xmlEngine.XmlDocument;
+
+public class ReportShipmentNotInvoiced extends HttpSecureAppServlet {
+  private static final long serialVersionUID = 1L;
+
+  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException,
+      ServletException {
+    VariablesSecureApp vars = new VariablesSecureApp(request);
+    String strUserCurrencyId = Utility.stringBaseCurrencyId(this, vars.getClient());
+    if (vars.commandIn("DEFAULT")) {
+      String strDateFrom = vars.getGlobalVariable("inpDateFrom",
+          "ReportShipmentNotInvoiced|dateFrom", "");
+      String strDateTo = vars
+          .getGlobalVariable("inpDateTo", "ReportShipmentNotInvoiced|dateTo", "");
+      String strCBpartnerId = vars.getGlobalVariable("inpcBPartnerId",
+          "ReportShipmentNotInvoiced|bpartner", "");
+      String strCOrgId = vars.getGlobalVariable("inpOrg", "ReportShipmentNotInvoiced|Org", "");
+      String strOrderDocNo = vars.getGlobalVariable("inpOrderDocNo",
+          "ReportShipmentNotInvoiced|orderDocNo", "");
+      String strDeliveryTerms = vars.getGlobalVariable("inpDeliveryTerms",
+          "ReportShipmentNotInvoiced|deliveryTerms", "");
+      String strTermPayment = vars.getGlobalVariable("inppaymentterm",
+          "ReportShipmentNotInvoiced|paymentterm", "");
+
+      String strPaymentTerms = vars.getGlobalVariable("inpCPaymentRuleId",
+          "ReportShipmentNotInvoiced|PaymentRule", "");
+      String strOrderRef = vars.getGlobalVariable("inpOrderRef",
+          "ReportShipmentNotInvoiced|orderRef", "");
+      String strCurrencyId = vars.getGlobalVariable("inpCurrencyId",
+          "ReportShipmentNotInvoiced|currency", strUserCurrencyId);
+      String strShipmentDocNo = vars.getGlobalVariable("inpShipmentDocNo",
+          "ReportShipmentNotInvoiced|shipmentDocNo", "");
+      printPageDataSheet(response, vars, strDateFrom, strDateTo, strCBpartnerId, strDeliveryTerms,
+          strOrderDocNo, strOrderRef, strCOrgId, strCurrencyId, strPaymentTerms, strTermPayment,
+          strShipmentDocNo);
+    } else if (vars.commandIn("FIND_HTML", "FIND_PDF")) {
+      String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom",
+          "ReportShipmentNotInvoiced|dateFrom");
+      String strDateTo = vars.getRequestGlobalVariable("inpDateTo",
+          "ReportShipmentNotInvoiced|dateTo");
+      String strCBpartnerId = vars.getRequestGlobalVariable("inpcBPartnerId",
+          "ReportShipmentNotInvoiced|bpartner");
+      String strDeliveryTerms = vars.getRequestGlobalVariable("inpDeliveryTerms",
+          "ReportShipmentNotInvoiced|deliveryTerms");
+      String strOrderDocNo = vars.getRequestGlobalVariable("inpOrderDocNo",
+          "ReportShipmentNotInvoiced|orderDocNo");
+      String strOrderRef = vars.getRequestGlobalVariable("inpOrderRef",
+          "ReportShipmentNotInvoiced|orderRef");
+      String strCOrgId = vars.getRequestGlobalVariable("inpOrg", "ReportShipmentNotInvoiced|Org");
+      String strOutput = "html";
+      String strShipmentDocNo = vars.getRequestGlobalVariable("inpShipmentDocNo",
+          "ReportShipmentNotInvoiced|shipmentDocNo");
+      String strPaymentForm = vars.getRequestGlobalVariable("inpCPaymentRuleId",
+          "ReportShipmentNotInvoiced|PaymentRule");
+      String strTermPayment = vars.getRequestGlobalVariable("inppaymentterm",
+          "ReportShipmentNotInvoiced|paymentterm");
+      String strCurrencyId = vars.getRequestGlobalVariable("inpCurrencyId",
+          "ReportShipmentNotInvoiced|currency");
+      if (vars.commandIn("FIND_PDF"))
+        strOutput = "pdf";
+      printPage(request, response, vars, strDateFrom, strDateTo, strCBpartnerId, strDeliveryTerms,
+          strOrderDocNo, strOrderRef, strCOrgId, strOutput, strShipmentDocNo, strPaymentForm,
+          strTermPayment, strCurrencyId);
+    } else
+      pageError(response);
+  }
+
+  private void printPageDataSheet(HttpServletResponse response, VariablesSecureApp vars,
+      String strdateFrom, String strdateTo, String strcBpartnerId, String strDeliveryTerms,
+      String strOrderDocNo, String strOrderRef, String strCOrgId, String strCurrencyId,
+      String strPaymentForm, String strTermPayment, String strShipmentDocNo) throws IOException,
+      ServletException {
+    if (log4j.isDebugEnabled())
+      log4j.debug("Output: dataSheet");
+    XmlDocument xmlDocument = null;
+    xmlDocument = xmlEngine
+        .readXmlTemplate(
+            "org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced")
+        .createXmlDocument();
+
+    ToolBar toolbar = new ToolBar(this, vars.getLanguage(), "ReportShipmentNotInvoiced", false, "",
+        "", "", false, "ad_reports", strReplaceWith, false, true);
+    toolbar.prepareSimpleToolBarTemplate();
+    xmlDocument.setParameter("toolbar", toolbar.toString());
+    try {
+      WindowTabs tabs = new WindowTabs(this, vars,
+          "org.openbravo.reports.shipmentsawaitinginvoice.erpCommon.ad_reports.ReportShipmentNotInvoiced");
+      xmlDocument.setParameter("parentTabContainer", tabs.parentTabs());
+      xmlDocument.setParameter("mainTabContainer", tabs.mainTabs());
+      xmlDocument.setParameter("childTabContainer", tabs.childTabs());
+      xmlDocument.setParameter("theme", vars.getTheme());
+      NavigationBar nav = new NavigationBar(this, vars.getLanguage(),
+          "ReportShipmentNotInvoiced.html", classInfo.id, classInfo.type, strReplaceWith, tabs
+              .breadcrumb());
+      xmlDocument.setParameter("navigationBar", nav.toString());
+      LeftTabsBar lBar = new LeftTabsBar(this, vars.getLanguage(),
+          "ReportShipmentNotInvoiced.html", strReplaceWith);
+      xmlDocument.setParameter("leftTabs", lBar.manualTemplate());
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+
+    OBError myMessage = vars.getMessage("ReportShipmentNotInvoiced");
+    vars.removeMessage("ReportShipmentNotInvoiced");
+    if (myMessage != null) {
+      xmlDocument.setParameter("messageType", myMessage.getType());
+      xmlDocument.setParameter("messageTitle", myMessage.getTitle());
+      xmlDocument.setParameter("messageMessage", myMessage.getMessage());
+    }
+    xmlDocument.setParameter("calendar", vars.getLanguage().substring(0, 2));
+    xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
+    xmlDocument.setParameter("paramLanguage", "defaultLang=\"" + vars.getLanguage() + "\";");
+    xmlDocument.setParameter("dateFrom", strdateFrom);
+    xmlDocument.setParameter("dateFromdisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
+    xmlDocument.setParameter("dateFromsaveFormat", vars.getSessionValue("#AD_SqlDateFormat"));
+    xmlDocument.setParameter("dateTo", strdateTo);
+    xmlDocument.setParameter("dateTodisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
+    xmlDocument.setParameter("dateTosaveFormat", vars.getSessionValue("#AD_SqlDateFormat"));
+    xmlDocument.setParameter("paramBPartnerId", strcBpartnerId);
+    xmlDocument.setParameter("paramBPartnerDescription", ReportShipmentNotInvoicedData
+        .bPartnerDescription(this, strcBpartnerId));
+    xmlDocument.setParameter("deliveryTerms", strDeliveryTerms);
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "LIST", "",
+          "C_Order DeliveryRule", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
+              "ReportShipmentNotInvoiced"), Utility.getContext(this, vars, "#User_Client",
+              "ReportShipmentNotInvoiced"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportShipmentNotInvoiced",
+          strDeliveryTerms);
+      xmlDocument.setData("reportDeliveryTerms", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+    xmlDocument.setParameter("ccurrencyid", strCurrencyId);
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "C_Currency_ID",
+          "", "",
+          Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportShipmentNotInvoiced"),
+          Utility.getContext(this, vars, "#User_Client", "ReportShipmentNotInvoiced"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportShipmentNotInvoiced",
+          strCurrencyId);
+      xmlDocument.setData("reportC_Currency_ID", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+    xmlDocument.setParameter("paymentRule", strPaymentForm);
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "LIST", "",
+          "All_Payment Rule", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
+              "ReportDebtPayment"), Utility.getContext(this, vars, "#User_Client",
+              "ReportDebtPayment"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportShipmentNotInvoiced",
+          strPaymentForm);
+      xmlDocument.setData("reportPaymentRule", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+    xmlDocument.setParameter("paymentTerm", strTermPayment);
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR",
+          "C_PaymentTerm_ID", "", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
+              "ReportShipmentNotInvoiced"), Utility.getContext(this, vars, "#User_Client",
+              "ReportShipmentNotInvoiced"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportShipmentNotInvoiced",
+          strTermPayment);
+      xmlDocument.setData("reportPaymentTerm", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+    xmlDocument.setParameter("orderDocNo", strOrderDocNo);
+    xmlDocument.setParameter("paramShipmentDocNo", strShipmentDocNo);
+    xmlDocument.setParameter("orderRef", strOrderRef);
+    xmlDocument.setParameter("adOrgId", strCOrgId);
+    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
+        vars.getRole()));
+    response.setContentType("text/html; charset=UTF-8");
+    PrintWriter out = response.getWriter();
+    out.println(xmlDocument.print());
+    out.close();
+  }
+
+  private void printPage(HttpServletRequest request, HttpServletResponse response,
+      VariablesSecureApp vars, String strdateFrom, String strdateTo, String strcBpartnerId,
+      String strDeliveryTerms, String strOrderDocNo, String strOrderRef, String strCOrgId,
+      String strOutput, String strShipmentDocNo, String strPaymentForm, String strTermPayment,
+      String strCurrencyId) throws IOException, ServletException {
+    if (log4j.isDebugEnabled())
+      log4j.debug("Output: print html");
+    ReportShipmentNotInvoicedData[] data = null;
+    String strConvRateErrorMsg = "";
+    OBError myMessage = null;
+    try {
+      data = ReportShipmentNotInvoicedData.select(this, strCurrencyId, vars.getLanguage(), Utility
+          .getContext(this, vars, "#User_Client", "ReportShipmentNotInvoiced"), Utility.getContext(
+          this, vars, "#AccessibleOrgTree", "ReportShipmentNotInvoiced"), strcBpartnerId,
+          strCOrgId, strdateFrom, strdateTo, strOrderDocNo, strShipmentDocNo, strDeliveryTerms,
+          strTermPayment, strPaymentForm);
+    } catch (ServletException ex) {
+      myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
+    }
+    if (myMessage != null) {
+      strConvRateErrorMsg = myMessage.getMessage();
+    }
+    if (!strConvRateErrorMsg.equals("") && strConvRateErrorMsg != null) {
+      advisePopUp(request, response, "ERROR", Utility.messageBD(this, "NoConversionRateHeader",
+          vars.getLanguage()), strConvRateErrorMsg);
+    } else {
+      String strReportName = "@basedesign@/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml";
+      if (strOutput.equals("pdf"))
+        response.setHeader("Content-disposition", "inline; filename=ReportShipmentNotInvoiced.pdf");
+
+      String strSubTitle = "";
+      strSubTitle = Utility.messageBD(this, "From", vars.getLanguage()) + " " + strdateFrom + " "
+          + Utility.messageBD(this, "To", vars.getLanguage()) + " " + strdateTo;
+
+      HashMap<String, Object> parameters = new HashMap<String, Object>();
+      parameters.put("REPORT_SUBTITLE", strSubTitle);
+      renderJR(vars, response, strReportName, strOutput, parameters, data, null);
+    }
+  }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.jrxml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,1659 @@
+<?xml version="1.0" encoding="UTF-8"  ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
+<jasperReport
+		 name="ReportOrderNotInvoiceJR"
+		 columnCount="1"
+		 printOrder="Vertical"
+		 orientation="Landscape"
+		 pageWidth="842"
+		 pageHeight="595"
+		 columnWidth="782"
+		 columnSpacing="0"
+		 leftMargin="30"
+		 rightMargin="30"
+		 topMargin="20"
+		 bottomMargin="20"
+		 whenNoDataType="NoPages"
+		 isTitleNewPage="false"
+		 isSummaryNewPage="false">
+	<property name="ireport.scriptlethandling" value="0" />
+	<property name="ireport.encoding" value="UTF-8" />
+	<import value="java.util.*" />
+	<import value="net.sf.jasperreports.engine.*" />
+	<import value="net.sf.jasperreports.engine.data.*" />
+
+	<style 
+		name="default"
+		isDefault="false"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+	>
+	</style>
+	<style 
+		name="Report_Title"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="18"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="Report_Subtitle"
+		isDefault="false"
+		forecolor="#555555"
+		fontName="Bitstream Vera Sans"
+		fontSize="14"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="Report_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Data_Field"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="false"
+	>
+	</style>
+	<style 
+		name="Total_Field"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="GroupHeader_DarkGray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#555555"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="12"
+		isBold="true"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="Group_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Group_Data_Field"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+	>
+	</style>
+	<style 
+		name="Detail_Header"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#5D5D5D"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+					<box leftPadding="5">					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+	</style>
+	<style 
+		name="Detail_Line"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+	>
+
+		<conditionalStyle>
+			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==0)]]></conditionExpression>
+			<style 
+				name="Detail_Line"
+				isDefault="false"
+				mode="Opaque"
+				backcolor="#CCCCCC"
+			>
+			</style>
+		</conditionalStyle>
+	</style>
+	<style 
+		name="Total_Gray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+	>
+	</style>
+	<style 
+		name="Detail_Data_Label"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#CCCCCC"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Detail_Data_Field"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#CCCCCC"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+	>
+	</style>
+	<style 
+		name="Group_Footer"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Footer"
+		isDefault="true"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+	>
+	</style>
+
+	<parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="BASE_DESIGN" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="LANGUAGE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["en_US"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["(1000000)"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["(0)"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["REPORT TITLE"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="REPORT_SUBTITLE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="ReportData" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DECIMAL_FORMAT" isForPrompting="false" class="java.text.DecimalFormat">
+		<defaultValueExpression ><![CDATA[new DecimalFormat()]]></defaultValueExpression>
+	</parameter>
+	<parameter name="NUMBERFORMAT" isForPrompting="true" class="java.text.DecimalFormat"/>
+	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
+	<queryString><![CDATA[SELECT ORGNAME, BPNAME, M_INOUT_ID, DOCUMENTNO, DATEORDERED, MOVEMENTDATE, DOCSTATUS, SHIPCOMP, 
+    GRANDTOTAL, PAYMENTFORM,  PAYMENTTERM, DELIVERYLOCATION,     
+	LINE, PRODNAME, SOLDQTY, SHIPPEDQTY, INVOICEDQTY, UOM, PRICE, 
+	AMOUNT, TAX, TAXBASE, AMOUNTPENDINGINVOICE,C_CURRENCY_SYMBOL('102', 0, 'Y') AS CURRENCY
+	FROM (
+		SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME, SP.M_INOUT_ID AS M_INOUT_ID, TO_DATE(SP.DATEORDERED) AS DATEORDERED,
+	    SP.DOCUMENTNO AS DOCUMENTNO, TO_DATE(SP.MOVEMENTDATE) AS MOVEMENTDATE, SP.DOCSTATUS AS DOCSTATUS, SH.NAME AS SHIPCOMP,
+	    REFLISTV.NAME AS PAYMENTFORM, PT.NAME AS PAYMENTTERM, COALESCE(DLOC.NAME, BPADD.NAME) AS DELIVERYLOCATION,
+	    PR.NAME || ' ' || COALESCE(TO_CHAR(PR.DESCRIPTION), '') AS PRODNAME, OL.LINE AS LINE, 
+        C_CURRENCY_CONVERT(O.GRANDTOTAL, COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), '102', TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS GRANDTOTAL,
+        OL.QTYORDERED AS SOLDQTY, OL.QTYDELIVERED AS SHIPPEDQTY, OL.QTYINVOICED AS INVOICEDQTY,
+	    COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS UOM,
+        C_CURRENCY_CONVERT(OL.PRICEACTUAL, COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), '102', TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS PRICE,
+        C_CURRENCY_CONVERT(OL.LINENETAMT, COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), '102', TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS AMOUNT,
+	    NULL AS TAX, NULL AS TAXBASE,
+        C_CURRENCY_CONVERT(((OL.QTYDELIVERED-OL.QTYINVOICED)*OL.PRICEACTUAL), COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), '102', TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS AMOUNTPENDINGINVOICE
+	    FROM 
+	    M_INOUT SP LEFT JOIN C_ORDER O
+	    ON SP.C_ORDER_ID = O.C_ORDER_ID
+	    LEFT JOIN M_SHIPPER SH
+	    ON SP.M_SHIPPER_ID = SH.M_SHIPPER_ID
+	    LEFT JOIN AD_REF_LIST_V REFLISTV
+	    ON (REFLISTV.VALUE = O.PAYMENTRULE AND REFLISTV.AD_LANGUAGE = 'en_US')
+	    LEFT JOIN C_PAYMENTTERM PT
+	    ON O.C_PAYMENTTERM_ID = PT.C_PAYMENTTERM_ID
+	    LEFT JOIN C_BPARTNER_LOCATION DLOC
+	    ON DLOC.C_BPARTNER_LOCATION_ID = O.DELIVERY_LOCATION_ID,
+	    C_ORDERLINE OL LEFT JOIN M_PRODUCT PR
+	    ON OL.M_PRODUCT_ID = PR.M_PRODUCT_ID,
+	    AD_ORG ORG, C_BPARTNER BP, C_UOM UO, C_BPARTNER_LOCATION BPADD
+	      WHERE SP.C_ORDER_ID=O.C_ORDER_ID
+	      AND O.C_ORDER_ID=OL.C_ORDER_ID
+	      AND SP.C_BPARTNER_ID = BP.C_BPARTNER_ID
+	      AND O.C_BPARTNER_LOCATION_ID = BPADD.C_BPARTNER_LOCATION_ID
+	      AND O.PAYMENTRULE = REFLISTV.VALUE
+	      AND OL.C_UOM_ID = UO.C_UOM_ID
+	      AND SP.AD_ORG_ID = ORG.AD_ORG_ID
+	      AND REFLISTV.AD_REFERENCE_ID = '195'
+	      AND O.PROCESSED = 'Y'
+	      AND O.ISSOTRX = 'Y'
+	      AND OL.QTYORDERED<>OL.QTYINVOICED 
+	      AND SP.AD_Client_ID IN ('1000000')
+	      AND SP.AD_ORG_ID IN ('1000000')
+	      AND 1=1
+	    UNION ALL
+	 	SELECT ORG1.NAME AS ORGNAME, BP1.NAME AS BPNAME, SP1.M_INOUT_ID AS M_INOUT_ID, TO_DATE(SP1.DATEORDERED) AS DATEORDERED,
+	    SP1.DOCUMENTNO AS DOCUMENTNO, TO_DATE(SP1.MOVEMENTDATE) AS MOVEMENTDATE, SP1.DOCSTATUS AS DOCSTATUS, SH1.NAME AS SHIPCOMP,
+	    REFLISTV1.NAME AS PAYMENTFORM, PT1.NAME AS PAYMENTTERM, COALESCE(DLOC1.NAME, BPADD1.NAME) AS DELIVERYLOCATION,
+	    T1.NAME AS PRODNAME, NULL AS LINE, 
+        C_CURRENCY_CONVERT(O1.GRANDTOTAL, O1.C_CURRENCY_ID, '102', TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, O1.AD_CLIENT_ID, O1.AD_ORG_ID) AS GRANDTOTAL,
+	    NULL AS SOLDQTY, NULL AS SHIPPEDQTY, NULL AS INVOICEDQTY,
+	    NULL AS UOM,
+	    NULL AS PRICE, 
+        C_CURRENCY_CONVERT(OT1.TAXAMT,  O1.C_CURRENCY_ID, '102', TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, OT1.AD_CLIENT_ID, OT1.AD_ORG_ID) AS AMOUNT,
+        T1.RATE AS TAX,  
+        C_CURRENCY_CONVERT(OT1.TAXBASEAMT, O1.C_CURRENCY_ID, '102', TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, OT1.AD_CLIENT_ID, OT1.AD_ORG_ID) AS TAXBASE,
+        C_CURRENCY_CONVERT(OT1.TAXAMT, O1.C_CURRENCY_ID, '102', TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, OT1.AD_CLIENT_ID, OT1.AD_ORG_ID) AS AMOUNTPENDINGINVOICE
+	    FROM 
+	    M_INOUT SP1 LEFT JOIN C_ORDER O1
+	    ON SP1.C_ORDER_ID = O1.C_ORDER_ID
+	    LEFT JOIN C_ORDERTAX OT1
+	    ON O1.C_ORDER_ID = OT1.C_ORDER_ID
+	    LEFT JOIN C_TAX T1
+	    ON OT1.C_TAX_ID = T1.C_TAX_ID
+	    LEFT JOIN M_SHIPPER SH1
+	    ON SP1.M_SHIPPER_ID = SH1.M_SHIPPER_ID
+	    LEFT JOIN AD_REF_LIST_V REFLISTV1
+	    ON (REFLISTV1.VALUE = O1.PAYMENTRULE AND REFLISTV1.AD_LANGUAGE = 'en_US')
+	    LEFT JOIN C_PAYMENTTERM PT1
+	    ON O1.C_PAYMENTTERM_ID = PT1.C_PAYMENTTERM_ID
+	   	LEFT JOIN C_BPARTNER_LOCATION DLOC1
+	    ON DLOC1.C_BPARTNER_LOCATION_ID = O1.DELIVERY_LOCATION_ID,
+	    AD_ORG ORG1, C_BPARTNER BP1,C_BPARTNER_LOCATION BPADD1
+	      WHERE SP1.C_ORDER_ID=O1.C_ORDER_ID
+	      AND O1.C_ORDER_ID=OT1.C_ORDER_ID
+	      AND OT1.C_TAX_ID = T1.C_TAX_ID
+	      AND SP1.C_BPARTNER_ID = BP1.C_BPARTNER_ID
+	      AND O1.C_BPARTNER_LOCATION_ID = BPADD1.C_BPARTNER_LOCATION_ID
+	      AND O1.PAYMENTRULE = REFLISTV1.VALUE
+	      AND SP1.AD_ORG_ID = ORG1.AD_ORG_ID
+	      AND REFLISTV1.AD_REFERENCE_ID = '195'
+	      AND O1.PROCESSED = 'Y'
+	      AND O1.ISSOTRX = 'Y'
+	      AND EXISTS (SELECT 1 FROM C_ORDER C2, C_ORDERLINE CL
+          	WHERE C2.C_ORDER_ID = O1.C_ORDER_ID
+         	 AND C2.C_ORDER_ID=CL.C_ORDER_ID
+         	 AND CL.QTYORDERED<>CL.QTYINVOICED)
+	      AND SP1.AD_Client_ID IN ('1000000')
+	      AND SP1.AD_ORG_ID IN ('1000000')
+	      AND 2=2) AAA     
+	ORDER BY ORGNAME, BPNAME, MOVEMENTDATE DESC, DOCUMENTNO, LINE]]></queryString>
+
+	<field name="orgname" class="java.lang.String"/>
+	<field name="bpname" class="java.lang.String"/>
+	<field name="m_inout_id" class="java.lang.String"/>
+	<field name="documentno" class="java.lang.String"/>
+	<field name="dateordered" class="java.util.Date"/>
+	<field name="movementdate" class="java.util.Date"/>
+	<field name="docstatus" class="java.lang.String"/>
+	<field name="shipcomp" class="java.lang.String"/>
+	<field name="grandtotal" class="java.math.BigDecimal"/>
+	<field name="paymentform" class="java.lang.String"/>
+	<field name="paymentterm" class="java.lang.String"/>
+	<field name="deliverylocation" class="java.lang.String"/>
+	<field name="line" class="java.math.BigDecimal"/>
+	<field name="prodname" class="java.lang.String"/>
+	<field name="soldqty" class="java.math.BigDecimal"/>
+	<field name="shippedqty" class="java.math.BigDecimal"/>
+	<field name="invoicedqty" class="java.math.BigDecimal"/>
+	<field name="uom" class="java.lang.String"/>
+	<field name="price" class="java.math.BigDecimal"/>
+	<field name="amount" class="java.math.BigDecimal"/>
+	<field name="tax" class="java.math.BigDecimal"/>
+	<field name="taxbase" class="java.math.BigDecimal"/>
+	<field name="amountpendinginvoice" class="java.math.BigDecimal"/>
+	<field name="currency" class="java.lang.String"/>
+
+	<variable name="DetailFieldTotal" class="java.lang.String" resetType="Report" calculation="Nothing">
+	</variable>
+
+		<group  name="ORGNAME" >
+			<groupExpression><![CDATA[$F{orgname}]]></groupExpression>
+			<groupHeader>
+			<band height="32"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="0"
+						y="0"
+						width="120"
+						height="18"
+						key="staticText"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<text><![CDATA[ORGANIZATION]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="120"
+						y="0"
+						width="661"
+						height="18"
+						key="textField"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{orgname}]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="18"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-2"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="32"
+						forecolor="#555555"
+						key="line-3"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="20"  isSplitAllowed="true" >
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-32"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-33"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="14"
+						width="782"
+						height="0"
+						forecolor="#555555"
+						key="line-34"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="C_BPARTNER_ID" >
+			<groupExpression><![CDATA[$F{bpname}]]></groupExpression>
+			<groupHeader>
+			<band height="32"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="130"
+						y="0"
+						width="194"
+						height="18"
+						key="textField"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{bpname}]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="10"
+						y="18"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-4"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="32"
+						forecolor="#555555"
+						key="line-6"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="0"
+						height="32"
+						forecolor="#555555"
+						key="line-8"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="10"
+						y="0"
+						width="120"
+						height="18"
+						key="staticText-9"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<text><![CDATA[PARTNER NAME]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="324"
+						y="0"
+						width="452"
+						height="18"
+						key="textField-28"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{deliverylocation}!=null)?$F{deliverylocation}:new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="20"  isSplitAllowed="true" >
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="0"
+						height="20"
+						forecolor="#555555"
+						key="line-28"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="10"
+						y="0"
+						width="0"
+						height="10"
+						forecolor="#555555"
+						key="line-29"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="20"
+						forecolor="#555555"
+						key="line-30"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="10"
+						y="10"
+						width="771"
+						height="0"
+						forecolor="#555555"
+						key="line-31"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="C_ORDER_ID" >
+			<groupExpression><![CDATA[$F{m_inout_id}]]></groupExpression>
+			<groupHeader>
+			<band height="62"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="20"
+						y="18"
+						width="80"
+						height="18"
+						key="textField"/>
+					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="62"
+						forecolor="#555555"
+						key="line-7"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="0"
+						height="62"
+						forecolor="#555555"
+						key="line-9"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="10"
+						y="0"
+						width="0"
+						height="62"
+						forecolor="#555555"
+						key="line-10"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="20"
+						y="0"
+						width="80"
+						height="18"
+						key="staticText-10"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<text><![CDATA[Shipment]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="100"
+						y="0"
+						width="117"
+						height="18"
+						key="staticText-11"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<text><![CDATA[Shipment DATE]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="100"
+						y="18"
+						width="117"
+						height="18"
+						key="textField-4"/>
+					<box leftPadding="5" rightPadding="4" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.util.Date"><![CDATA[$F{movementdate}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="217"
+						y="0"
+						width="111"
+						height="18"
+						key="staticText-12"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold"/>
+					</textElement>
+				<text><![CDATA[AMOUNT]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="217"
+						y="18"
+						width="111"
+						height="18"
+						key="textField-5"/>
+					<box leftPadding="5" rightPadding="4" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{grandtotal} != null)?(($P{NUMBERFORMAT}.format($F{grandtotal})).toString()+" " +$F{currency}):new String("")]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="562"
+						y="0"
+						width="115"
+						height="18"
+						key="staticText-14"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold"/>
+					</textElement>
+				<text><![CDATA[Payment terms]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" pattern="#,##0.00" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="562"
+						y="18"
+						width="115"
+						height="18"
+						key="textField-7"/>
+					<box leftPadding="5" rightPadding="4" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#666666"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{paymentterm}]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="20"
+						y="36"
+						width="0"
+						height="26"
+						forecolor="#555555"
+						key="line-35"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="30"
+						y="46"
+						width="100"
+						height="16"
+						key="staticText-16"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Concept]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="130"
+						y="46"
+						width="60"
+						height="16"
+						key="staticText-17"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Qty Sold]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="190"
+						y="46"
+						width="74"
+						height="16"
+						key="staticText-18"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Qty Shipped]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="643"
+						y="46"
+						width="133"
+						height="16"
+						key="staticText-21"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Amount Invoice pending]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="562"
+						y="46"
+						width="81"
+						height="16"
+						key="staticText-22"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Amount]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="503"
+						y="46"
+						width="59"
+						height="16"
+						key="staticText-23"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Base]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="383"
+						y="46"
+						width="61"
+						height="16"
+						key="staticText-24"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Price]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="264"
+						y="46"
+						width="71"
+						height="16"
+						key="staticText-25"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[Qty Invoiced]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="328"
+						y="0"
+						width="86"
+						height="18"
+						key="staticText-26"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold"/>
+					</textElement>
+				<text><![CDATA[STATUS]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="677"
+						y="0"
+						width="99"
+						height="18"
+						key="staticText-27"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold"/>
+					</textElement>
+				<text><![CDATA[Form of Pay.]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="414"
+						y="0"
+						width="148"
+						height="18"
+						key="staticText-28"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold"/>
+					</textElement>
+				<text><![CDATA[Shipment Company]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" pattern="#,##0.00" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="677"
+						y="18"
+						width="99"
+						height="18"
+						key="textField-27"/>
+					<box leftPadding="5" rightPadding="4" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#666666"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{paymentform}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="335"
+						y="46"
+						width="48"
+						height="16"
+						key="staticText-29"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[UOM]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="GroupHeader_DarkGray"
+						x="444"
+						y="46"
+						width="58"
+						height="16"
+						key="staticText-30"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" size="8"/>
+					</textElement>
+				<text><![CDATA[% Tax]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="20"
+						y="18"
+						width="80"
+						height="18"
+						key="textField"/>
+					<box leftPadding="4"></box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{documentno}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="414"
+						y="18"
+						width="148"
+						height="18"
+						key="textField-30"/>
+					<box leftPadding="5" rightPadding="2" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{shipcomp}!=null)?$F{shipcomp}:new String(" ")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="328"
+						y="18"
+						width="86"
+						height="18"
+						key="textField-31"/>
+					<box leftPadding="5" rightPadding="2" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{docstatus}]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="20"  isSplitAllowed="true" >
+				<line direction="TopDown">
+					<reportElement
+						x="20"
+						y="0"
+						width="0"
+						height="10"
+						forecolor="#555555"
+						key="line-23"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="0"
+						height="20"
+						forecolor="#555555"
+						key="line-24"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="10"
+						y="0"
+						width="0"
+						height="20"
+						forecolor="#555555"
+						key="line-25"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="20"
+						forecolor="#555555"
+						key="line-26"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="20"
+						y="10"
+						width="761"
+						height="0"
+						forecolor="#555555"
+						key="line-27"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						style="Report_Footer"
+						x="30"
+						y="0"
+						width="750"
+						height="0"
+						forecolor="#555555"
+						key="line-36"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="1.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+			</band>
+			</groupFooter>
+		</group>
+		<background>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</background>
+		<title>
+			<band height="20"  isSplitAllowed="true" >
+			</band>
+		</title>
+		<pageHeader>
+			<band height="65"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="true" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Title"
+						mode="Transparent"
+						x="0"
+						y="4"
+						width="782"
+						height="20"
+						key="textField"/>
+					<box leftPadding="5">					<pen lineWidth="0.0"/>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{REPORT_TITLE}]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="24"
+						width="782"
+						height="0"
+						key="line-1"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="1.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Subtitle"
+						x="0"
+						y="27"
+						width="782"
+						height="20"
+						key="textField"/>
+					<box></box>
+					<textElement>
+						<font size="14"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{REPORT_SUBTITLE}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement
+						style="Report_Data_Label"
+						x="0"
+						y="50"
+						width="91"
+						height="14"
+						key="staticText-3">
+							<printWhenExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()==1)]]></printWhenExpression>
+						</reportElement>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<text><![CDATA[Conditions:]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Data_Field"
+						x="91"
+						y="50"
+						width="88"
+						height="14"
+						key="textField-2">
+							<printWhenExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()==1)]]></printWhenExpression>
+						</reportElement>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{ReportData}]]></textFieldExpression>
+				</textField>
+			</band>
+		</pageHeader>
+		<columnHeader>
+			<band height="16"  isSplitAllowed="true" >
+			</band>
+		</columnHeader>
+		<detail>
+			<band height="14"  isSplitAllowed="true" >
+				<line direction="TopDown">
+					<reportElement
+						x="20"
+						y="0"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-15"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="781"
+						y="0"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-16"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-17"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="10"
+						y="0"
+						width="0"
+						height="14"
+						forecolor="#555555"
+						key="line-18"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight">
+					<pen lineWidth="2.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="30"
+						y="0"
+						width="100"
+						height="14"
+						key="textField"/>
+					<box leftPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{prodname}!=null)?$F{prodname}:new String(" ")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="130"
+						y="0"
+						width="60"
+						height="14"
+						key="textField"/>
+					<box leftPadding="4" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{soldqty} != null)?($F{soldqty}).toString():new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="562"
+						y="0"
+						width="81"
+						height="14"
+						key="textField-8"/>
+					<box leftPadding="5" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#555555"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{amount} != null)?(($P{NUMBERFORMAT}.format($F{amount})).toString()+" " +$F{currency}):new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="503"
+						y="0"
+						width="59"
+						height="14"
+						key="textField-9"/>
+					<box leftPadding="5" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{taxbase} != null)?(($P{NUMBERFORMAT}.format($F{taxbase})).toString()+" " +$F{currency}):new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="263"
+						y="0"
+						width="72"
+						height="14"
+						key="textField-10"/>
+					<box leftPadding="4" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{invoicedqty} != null)?($F{invoicedqty}).toString():new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="335"
+						y="0"
+						width="48"
+						height="14"
+						key="textField-32"/>
+					<box leftPadding="4" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{uom} != null)?$F{uom}:new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="383"
+						y="0"
+						width="61"
+						height="14"
+						key="textField-33"/>
+					<box leftPadding="4" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{price}!= null)?(($P{NUMBERFORMAT}.format($F{price})).toString()+" " +$F{currency}):new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="#,##0.00" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="643"
+						y="0"
+						width="133"
+						height="14"
+						key="textField-34"/>
+					<box leftPadding="5" rightPadding="4" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#555555"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#666666"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{amountpendinginvoice} != null)?(($P{NUMBERFORMAT}.format($F{amountpendinginvoice})).toString()+" " +$F{currency}):new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="190"
+						y="0"
+						width="73"
+						height="14"
+						key="textField-35"/>
+					<box leftPadding="4" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{shippedqty} != null)?($F{shippedqty}).toString():new String("")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Line"
+						x="444"
+						y="0"
+						width="59"
+						height="14"
+						key="textField-36"/>
+					<box leftPadding="4" rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#555555"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{tax} != null)?($F{tax}).toString():new String("")]]></textFieldExpression>
+				</textField>
+			</band>
+		</detail>
+		<columnFooter>
+			<band height="16"  isSplitAllowed="true" >
+			</band>
+		</columnFooter>
+		<pageFooter>
+			<band height="20"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="643"
+						y="4"
+						width="95"
+						height="16"
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Bottom">
+						<font fontName="Helvetica" size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="740"
+						y="4"
+						width="36"
+						height="16"
+						forecolor="#000000"
+						backcolor="#FFFFFF"
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Bottom" rotation="None" lineSpacing="Single">
+						<font fontName="Helvetica" pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="1"
+						width="782"
+						height="0"
+						forecolor="#000000"
+						key="line"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="1.0" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="383"
+						y="4"
+						width="69"
+						height="16"
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Bottom">
+						<font fontName="Times-Roman" size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="304"
+						y="4"
+						width="78"
+						height="16"
+						key="staticText-1"/>
+					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Bottom">
+						<font/>
+					</textElement>
+				<text><![CDATA[Generated on]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="0"
+						y="4"
+						width="140"
+						height="16"
+						key="staticText-5">
+							<printWhenExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()==1)]]></printWhenExpression>
+						</reportElement>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Bottom">
+						<font/>
+					</textElement>
+				<text><![CDATA[other footer data]]></text>
+				</staticText>
+			</band>
+		</pageFooter>
+		<summary>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</summary>
+</jasperReport>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced.xml	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html 
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License. 
+* The Original Code is Openbravo ERP. 
+* The Initial Developer of the Original Code is Openbravo SL 
+* All portions are Copyright (C) 2009 Openbravo SL 
+* All Rights Reserved. 
+* Contributor(s):  ______________________________________.
+************************************************************************
+-->
+<REPORT>
+  <TEMPLATE file="ReportShipmentNotInvoiced.html"/>
+  <PARAMETER id="paramToolBar" name="toolbar" default=""/>
+  <PARAMETER id="fieldCalendar" name="calendar" attribute="src" replace="es" default="en"/>
+  <PARAMETER id="paramDirectory" name="directory" default=""/>
+  <PARAMETER id="paramLanguage" name="paramLanguage" default=""/>
+  <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
+  <PARAMETER id="tdleftTabs" name="leftTabs" default=""/>
+  <PARAMETER id="paramParentTabContainer" name="parentTabContainer" default=" "/>
+  <PARAMETER id="paramMainTabContainer" name="mainTabContainer" default=" "/>
+  <PARAMETER id="paramChildTabContainer" name="childTabContainer" default=" "/>
+  <PARAMETER id="tdtopButtons" name="navigationBar" default=""/>
+  <PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
+  <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
+  <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
+  <PARAMETER id="paramDateFrom" name="dateFrom" attribute="value"/>
+  <PARAMETER id="paramDateFrom" name="dateFromdisplayFormat" attribute="displayformat" replace="xx"/>
+  <PARAMETER id="paramDateFrom" name="dateFromsaveFormat" attribute="saveformat" replace="yy"/>
+  <PARAMETER id="paramDateTo" name="dateTo" attribute="value"/>
+  <PARAMETER id="paramDateTo" name="dateTodisplayFormat" attribute="displayformat" replace="xx"/>
+  <PARAMETER id="paramDateTo" name="dateTosaveFormat" attribute="saveformat" replace="yy"/>
+  <PARAMETER id="paramBPartnerId" name="paramBPartnerId" attribute="value"/>
+  <PARAMETER id="paramBPartnerDescription" name="paramBPartnerDescription" attribute="value"/>
+  <PARAMETER id="paramDeliveryTerms" name="deliveryTerms" attribute=""/>
+  <SUBREPORT id="reportDeliveryTerms" name="reportDeliveryTerms" report="org/openbravo/erpCommon/reference/List">
+    <ARGUMENT name="parameterListSelected" withId="paramDeliveryTerms"/>
+  </SUBREPORT>
+  <PARAMETER id="paramOrderDocNo" name="paramOrderDocNo" attribute="value"/>
+  <PARAMETER id="paramShipmentDocNo" name="paramShipmentDocNo" attribute="value"/>
+  <PARAMETER id="paramC_Currency_ID" name="ccurrencyid" attribute="value"/>
+  <PARAMETER id="paramOrderRef" name="paramOrderRef" attribute="value"/>
+  <PARAMETER id="paramAD_ORGID" name="adOrgId"/>
+  <SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
+    <ARGUMENT name="parameterListSelected" withId="paramAD_ORGID"/>
+  </SUBREPORT>
+  <SUBREPORT id="reportC_Currency_ID" name="reportC_Currency_ID" report="org/openbravo/erpCommon/reference/List">
+    <ARGUMENT name="parameterListSelected" withId="paramC_Currency_ID"/>
+  </SUBREPORT>  
+  <PARAMETER id="paramPaymentRule" name="paymentRule" attribute=""/>
+  <SUBREPORT id="reportPaymentRule" name="reportPaymentRule" report="org/openbravo/erpCommon/reference/List">
+	  <ARGUMENT name="parameterListSelected" withId="paramPaymentRule"/>
+  </SUBREPORT>
+
+  <PARAMETER id="paramPaymentTerm" name="paymentTerm" attribute=""/>
+  <SUBREPORT id="reportPaymentTerm" name="reportPaymentTerm" report="org/openbravo/erpCommon/reference/List">
+	<ARGUMENT name="parameterListSelected" withId="paramPaymentTerm"/>
+  </SUBREPORT>
+  <DISCARD id="discard"/>
+</REPORT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/reports/shipmentsawaitinginvoice/erpCommon/ad_reports/ReportShipmentNotInvoiced_data.xsql	Wed Nov 11 08:28:21 2009 +0100
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2009 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+
+<SqlClass name="ReportShipmentNotInvoicedData" package="org.openbravo.reports.shipmentsawaitinginvoice.erpCommon.ad_reports">
+  <SqlClassComment></SqlClassComment>
+  <SqlMethod name="select" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+    <![CDATA[
+    SELECT ORGNAME, BPNAME, M_INOUT_ID, DOCUMENTNO, DATEORDERED, MOVEMENTDATE, DOCSTATUS, SHIPCOMP, 
+    GRANDTOTAL, PAYMENTFORM,  PAYMENTTERM, DELIVERYLOCATION,     
+	LINE, PRODNAME, SOLDQTY, SHIPPEDQTY, INVOICEDQTY, UOM, PRICE, 
+	AMOUNT, TAX, TAXBASE, AMOUNTPENDINGINVOICE,C_CURRENCY_SYMBOL(?, 0, 'Y') AS CURRENCY
+	FROM (
+		SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME, SP.M_INOUT_ID AS M_INOUT_ID, TO_DATE(SP.DATEORDERED) AS DATEORDERED,
+	    SP.DOCUMENTNO AS DOCUMENTNO, TO_DATE(SP.MOVEMENTDATE) AS MOVEMENTDATE, REFLISTDOC.NAME AS DOCSTATUS, SH.NAME AS SHIPCOMP,
+	    REFLISTV.NAME AS PAYMENTFORM, PT.NAME AS PAYMENTTERM, COALESCE(DLOC.NAME, BPADD.NAME) AS DELIVERYLOCATION,
+	    PR.NAME || ' ' || COALESCE(TO_CHAR(PR.DESCRIPTION), '') AS PRODNAME, OL.LINE AS LINE, 
+        C_CURRENCY_CONVERT(O.GRANDTOTAL, COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), ?, TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS GRANDTOTAL,
+        OL.QTYORDERED AS SOLDQTY, OL.QTYDELIVERED AS SHIPPEDQTY, OL.QTYINVOICED AS INVOICEDQTY,
+	    COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS UOM,
+        C_CURRENCY_CONVERT(OL.PRICEACTUAL, COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), ?, TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS PRICE,
+        C_CURRENCY_CONVERT(OL.LINENETAMT, COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), ?, TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS AMOUNT,
+	    NULL AS TAX, NULL AS TAXBASE,
+        C_CURRENCY_CONVERT(((OL.QTYDELIVERED-OL.QTYINVOICED)*OL.PRICEACTUAL), COALESCE(OL.C_CURRENCY_ID, O.C_CURRENCY_ID), ?, TO_DATE(COALESCE(OL.DATEORDERED, O.DATEORDERED, NOW())), NULL, OL.AD_CLIENT_ID, OL.AD_ORG_ID) AS AMOUNTPENDINGINVOICE
+	    FROM 
+	    M_INOUT SP LEFT JOIN C_ORDER O
+	    ON SP.C_ORDER_ID = O.C_ORDER_ID
+	    LEFT JOIN M_SHIPPER SH
+	    ON SP.M_SHIPPER_ID = SH.M_SHIPPER_ID
+	    LEFT JOIN AD_REF_LIST_V REFLISTV
+	    ON (REFLISTV.VALUE = O.PAYMENTRULE AND REFLISTV.AD_LANGUAGE = ?)
+	    LEFT JOIN AD_REF_LIST_V REFLISTDOC
+	    ON (REFLISTDOC.VALUE = SP.DOCSTATUS AND REFLISTDOC.AD_LANGUAGE = ?)
+	    LEFT JOIN C_PAYMENTTERM PT
+	    ON O.C_PAYMENTTERM_ID = PT.C_PAYMENTTERM_ID
+	    LEFT JOIN C_BPARTNER_LOCATION DLOC
+	    ON DLOC.C_BPARTNER_LOCATION_ID = O.DELIVERY_LOCATION_ID,
+	    C_ORDERLINE OL LEFT JOIN M_PRODUCT PR
+	    ON OL.M_PRODUCT_ID = PR.M_PRODUCT_ID,
+	    AD_ORG ORG, C_BPARTNER BP, C_UOM UO, C_BPARTNER_LOCATION BPADD
+	      WHERE SP.C_ORDER_ID=O.C_ORDER_ID
+	      AND O.C_ORDER_ID=OL.C_ORDER_ID
+	      AND SP.C_BPARTNER_ID = BP.C_BPARTNER_ID
+          AND O.C_BPARTNER_LOCATION_ID = BPADD.C_BPARTNER_LOCATION_ID
+	      AND O.PAYMENTRULE = REFLISTV.VALUE
+	      AND OL.C_UOM_ID = UO.C_UOM_ID
+	      AND SP.AD_ORG_ID = ORG.AD_ORG_ID
+	      AND REFLISTV.AD_REFERENCE_ID = '195'
+	      AND REFLISTDOC.AD_REFERENCE_ID = '131'
+	      AND O.PROCESSED = 'Y'
+	      AND O.ISSOTRX = 'Y'
+	      AND OL.QTYDELIVERED<>OL.QTYINVOICED 
+	      AND SP.AD_Client_ID IN ('1')
+	      AND SP.AD_ORG_ID IN ('1')
+	      AND 1=1
+	    UNION ALL
+	 	SELECT ORG1.NAME AS ORGNAME, BP1.NAME AS BPNAME, SP1.M_INOUT_ID AS M_INOUT_ID, TO_DATE(SP1.DATEORDERED) AS DATEORDERED,
+	    SP1.DOCUMENTNO AS DOCUMENTNO, TO_DATE(SP1.MOVEMENTDATE) AS MOVEMENTDATE, REFLISTDOC1.NAME AS DOCSTATUS, SH1.NAME AS SHIPCOMP,
+	    REFLISTV1.NAME AS PAYMENTFORM, PT1.NAME AS PAYMENTTERM, COALESCE(DLOC1.NAME, BPADD1.NAME) AS DELIVERYLOCATION,
+	    T1.NAME AS PRODNAME, NULL AS LINE, 
+        C_CURRENCY_CONVERT(O1.GRANDTOTAL, O1.C_CURRENCY_ID, ?, TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, O1.AD_CLIENT_ID, O1.AD_ORG_ID) AS GRANDTOTAL,
+	    NULL AS SOLDQTY, NULL AS SHIPPEDQTY, NULL AS INVOICEDQTY,
+	    NULL AS UOM,
+	    NULL AS PRICE, 
+        C_CURRENCY_CONVERT(OT1.TAXAMT,  O1.C_CURRENCY_ID, ?, TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, OT1.AD_CLIENT_ID, OT1.AD_ORG_ID) AS AMOUNT,
+        T1.RATE AS TAX,  
+        C_CURRENCY_CONVERT(OT1.TAXBASEAMT, O1.C_CURRENCY_ID, ?, TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, OT1.AD_CLIENT_ID, OT1.AD_ORG_ID) AS TAXBASE,
+        C_CURRENCY_CONVERT(OT1.TAXAMT, O1.C_CURRENCY_ID, ?, TO_DATE(COALESCE(O1.DATEORDERED, NOW())), NULL, OT1.AD_CLIENT_ID, OT1.AD_ORG_ID) AS AMOUNTPENDINGINVOICE
+	    FROM 
+	    M_INOUT SP1 LEFT JOIN C_ORDER O1
+	    ON SP1.C_ORDER_ID = O1.C_ORDER_ID
+	    LEFT JOIN C_ORDERTAX OT1
+	    ON O1.C_ORDER_ID = OT1.C_ORDER_ID
+	    LEFT JOIN C_TAX T1
+	    ON OT1.C_TAX_ID = T1.C_TAX_ID
+	    LEFT JOIN M_SHIPPER SH1
+	    ON SP1.M_SHIPPER_ID = SH1.M_SHIPPER_ID
+	    LEFT JOIN AD_REF_LIST_V REFLISTV1
+	    ON (REFLISTV1.VALUE = O1.PAYMENTRULE AND REFLISTV1.AD_LANGUAGE = ?)
+	    LEFT JOIN AD_REF_LIST_V REFLISTDOC1
+	    ON (REFLISTDOC1.VALUE = SP1.DOCSTATUS AND REFLISTDOC1.AD_LANGUAGE = ?)
+	    LEFT JOIN C_PAYMENTTERM PT1
+	    ON O1.C_PAYMENTTERM_ID = PT1.C_PAYMENTTERM_ID
+	   	LEFT JOIN C_BPARTNER_LOCATION DLOC1
+	    ON DLOC1.C_BPARTNER_LOCATION_ID = O1.DELIVERY_LOCATION_ID,
+	    AD_ORG ORG1, C_BPARTNER BP1,C_BPARTNER_LOCATION BPADD1
+	      WHERE SP1.C_ORDER_ID=O1.C_ORDER_ID
+	      AND O1.C_ORDER_ID=OT1.C_ORDER_ID
+	      AND OT1.C_TAX_ID = T1.C_TAX_ID
+	      AND SP1.C_BPARTNER_ID = BP1.C_BPARTNER_ID
+          AND O1.C_BPARTNER_LOCATION_ID = BPADD1.C_BPARTNER_LOCATION_ID
+	      AND O1.PAYMENTRULE = REFLISTV1.VALUE
+	      AND SP1.AD_ORG_ID = ORG1.AD_ORG_ID
+	      AND REFLISTV1.AD_REFERENCE_ID = '195'
+	      AND REFLISTDOC1.AD_REFERENCE_ID = '131'
+	      AND O1.PROCESSED = 'Y'
+	      AND O1.ISSOTRX = 'Y'
+	      AND EXISTS (SELECT 1 FROM C_ORDER C2, C_ORDERLINE CL
+          	WHERE C2.C_ORDER_ID = O1.C_ORDER_ID
+         	 AND C2.C_ORDER_ID=CL.C_ORDER_ID
+         	 AND CL.QTYDELIVERED<>CL.QTYINVOICED)
+	      AND SP1.AD_Client_ID IN ('2')
+	      AND SP1.AD_ORG_ID IN ('2')
+	      AND 2=2) AAA     
+	ORDER BY ORGNAME, BPNAME, MOVEMENTDATE DESC, DOCUMENTNO, LINE
+      ]]>
+     </Sql>
+
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="adLanguage"/>
+    <Parameter name="adLanguage"/>
+    <Parameter name="adUserClient" type="replace" optional="true" after="SP.AD_Client_ID IN (" text="'1'"/>
+    <Parameter name="adUserOrg" type="replace" optional="true" after="SP.AD_ORG_ID IN (" text="'1'"/>
+    <Parameter name="cBpartnerId" optional="true" after="1=1">AND SP.C_BPARTNER_ID = ?</Parameter>
+    <Parameter name="cOrgId" optional="true" after="1=1">AND SP.AD_ORG_ID = ?</Parameter>
+    <Parameter name="dateFrom" optional="true" after="1=1"><![CDATA[ AND SP.MOVEMENTDATE >= to_date(?) ]]></Parameter>
+    <Parameter name="dateTo" optional="true" after="1=1"><![CDATA[ AND SP.MOVEMENTDATE < to_date(?) ]]></Parameter>
+    <Parameter name="orderDocNo" optional="true" after="1=1"><![CDATA[AND UPPER(O.DOCUMENTNO) LIKE '%'||UPPER(?)||'%']]></Parameter>
+    <Parameter name="shipmentDocNo" optional="true" after="1=1"><![CDATA[AND UPPER(SP.DOCUMENTNO) LIKE '%'||UPPER(?)||'%']]></Parameter>
+    <Parameter name="deliveryTerm" optional="true" after="1=1"><![CDATA[ AND O.DELIVERYRULE = ? ]]></Parameter>
+    <Parameter name="paymentTerm" optional="true" after="1=1"><![CDATA[ AND PT.C_PaymentTerm_ID = ? ]]></Parameter>
+    <Parameter name="paymentForm" optional="true" after="1=1"><![CDATA[ AND O.PAYMENTRULE = ? ]]></Parameter>
+     
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="adLanguage"/>
+    <Parameter name="adLanguage"/>    
+    <Parameter name="adUserClient" type="replace" optional="true" after="SP1.AD_Client_ID IN (" text="'2'"/>
+    <Parameter name="adUserOrg" type="replace" optional="true" after="SP1.AD_ORG_ID IN (" text="'2'"/>
+    <Parameter name="cBpartnerId" optional="true" after="2=2">AND SP1.C_BPARTNER_ID = ?</Parameter>
+    <Parameter name="cOrgId" optional="true" after="2=2">AND SP1.AD_ORG_ID = ?</Parameter>
+    <Parameter name="dateFrom" optional="true" after="2=2"><![CDATA[ AND SP1.MOVEMENTDATE >= to_date(?) ]]></Parameter>
+    <Parameter name="dateTo" optional="true" after="2=2"><![CDATA[ AND SP1.MOVEMENTDATE < to_date(?) ]]></Parameter>
+    <Parameter name="orderDocNo" optional="true" after="2=2"><![CDATA[AND UPPER(O1.DOCUMENTNO) LIKE '%'||UPPER(?)||'%']]></Parameter>
+    <Parameter name="shipmentDocNo" optional="true" after="2=2"><![CDATA[AND UPPER(SP1.DOCUMENTNO) LIKE '%'||UPPER(?)||'%']]></Parameter>
+    <Parameter name="deliveryTerm" optional="true" after="2=2"><![CDATA[ AND O1.DELIVERYRULE = ? ]]></Parameter>
+    <Parameter name="paymentTerm" optional="true" after="2=2"><![CDATA[ AND PT1.C_PaymentTerm_ID = ? ]]></Parameter>
+    <Parameter name="paymentForm" optional="true" after="2=2"><![CDATA[ AND O1.PAYMENTRULE = ? ]]></Parameter>
+      
+  </SqlMethod>
+  
+  <SqlMethod name="set" type="constant" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql></Sql>
+  </SqlMethod>
+  
+  <SqlMethod name="bPartnerDescription" type="preparedStatement" return="String" default="">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+    SELECT MAX(NAME) AS name FROM C_BPARTNER 
+    WHERE C_BPARTNER_ID = ?
+    </Sql>
+    <Parameter name="cBpartnerId"/>
+  </SqlMethod>
+</SqlClass>
\ No newline at end of file