details: /erp/devel/pi/rev/1ebaafa19c66
changeset: 8855:1ebaafa19c66
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Oct 26 14:22:31 2010 +0200
summary: [moduleMerge] Added DB infrastructure to define merges
details: /erp/devel/pi/rev/168e7d1c1bcb
changeset: 8856:168e7d1c1bcb
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Oct 26 17:17:43 2010 +0200
summary: [moduleMerge] Display merged modules info
details: /erp/devel/pi/rev/c937164f7b7e
changeset: 8857:c937164f7b7e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Oct 26 17:50:51 2010 +0200
summary: [moduleMerge] Uninstall merged modules
details: /erp/devel/pi/rev/ffe1638d320c
changeset: 8858:ffe1638d320c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Oct 26 18:41:16 2010 +0200
summary: [moduleMerge] Do not need to use UninstallModule class
details: /erp/devel/pi/rev/81954251704b
changeset: 8859:81954251704b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 08:55:47 2010 +0200
summary: [moduleMerge] Allow multiple DBPrefixes for modules with merge
details: /erp/devel/pi/rev/e3b5c4bb9a83
changeset: 8860:e3b5c4bb9a83
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 08:56:19 2010 +0200
summary: [moduleMerge] Check module is in dev for changes in ad_module_merge
details: /erp/devel/pi/rev/cfadfe2ea8f0
changeset: 8861:cfadfe2ea8f0
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 10:11:48 2010 +0200
summary: [moduleMerge] Exclude audit info when exporting ad_module_merge
details: /erp/devel/pi/rev/74bc87419871
changeset: 8862:74bc87419871
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 11:00:23 2010 +0200
summary: [moduleMerge] Merge modules installing from obx
details: /erp/devel/pi/rev/01da1fe4bfd0
changeset: 8863:01da1fe4bfd0
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 11:47:39 2010 +0200
summary: [moduleMerge] Read merges properly installing from obx
details: /erp/devel/pi/rev/c27791767fef
changeset: 8864:c27791767fef
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 11:59:15 2010 +0200
summary: [moduleMerge] Dependencies of local modules where not read when
installing obx files
details: /erp/devel/pi/rev/5b54f4233003
changeset: 8865:5b54f4233003
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 12:34:06 2010 +0200
summary: [moduleMerge] Invalid merges are checked at the same time of
dependencies
details: /erp/devel/pi/rev/8558917a807f
changeset: 8866:8558917a807f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 12:37:18 2010 +0200
summary: [moduleMerge] Comments
details: /erp/devel/pi/rev/be89645840aa
changeset: 8867:be89645840aa
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 12:56:15 2010 +0200
summary: [moduleMerge] Uninstall merges from obx
details: /erp/devel/pi/rev/72ca4b07d0fb
changeset: 8868:72ca4b07d0fb
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 13:12:22 2010 +0200
summary: [moduleMerge] Added messages
details: /erp/devel/pi/rev/1c3810849a8a
changeset: 8869:1c3810849a8a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 13:58:01 2010 +0200
summary: [moduleMerge] Added text interfaces
details: /erp/devel/pi/rev/39646654b4e8
changeset: 8870:39646654b4e8
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Oct 27 14:47:42 2010 +0200
summary: [moduleMerge] Fixed pg db inconsitency
details: /erp/devel/pi/rev/8e7f8a4ea099
changeset: 8871:8e7f8a4ea099
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Oct 28 12:05:48 2010 +0200
summary: [moduleMerge] Allow adding DB prefix of registered modules
details: /erp/devel/pi/rev/f15e547340d1
changeset: 8872:f15e547340d1
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Oct 28 12:06:26 2010 +0200
summary: [moduleMerge] Prevent obx new installation of merged modules
details: /erp/devel/pi/rev/42e0485ea81e
changeset: 8873:42e0485ea81e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Oct 28 12:29:36 2010 +0200
summary: [moduleMerge] Message
details: /erp/devel/pi/rev/b416665f2906
changeset: 8874:b416665f2906
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Oct 28 12:56:36 2010 +0200
summary: [moduleMerge] Allow merged DBPrefixes in WADValidation
details: /erp/devel/pi/rev/98cdebdb4b02
changeset: 8875:98cdebdb4b02
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Oct 28 16:13:38 2010 +0200
summary: [moduleMerge] Prevent local changes when setting modules to be
uninstalled
details: /erp/devel/pi/rev/afdbc22ea781
changeset: 8876:afdbc22ea781
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Oct 28 17:52:57 2010 +0200
summary: fixed issue 15071
A new ant task check.module.consistency has been added to main build.xml.
This task checks locally installed modules define correctly their
dependencies.
details: /erp/devel/pi/rev/030529f8b2d4
changeset: 8877:030529f8b2d4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Nov 02 10:17:09 2010 +0100
summary: [moduleMerge] Successful consistency can add info messages
details: /erp/devel/pi/rev/983f5acc3ecd
changeset: 8878:983f5acc3ecd
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Nov 02 10:17:27 2010 +0100
summary: [moduleMerge] Unneded code
details: /erp/devel/pi/rev/96ecf2159eea
changeset: 8879:96ecf2159eea
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Nov 02 10:31:41 2010 +0100
summary: related to issue 15071
Local check consistency is not taking into account includes.
details: /erp/devel/pi/rev/ffb0632e9153
changeset: 8880:ffb0632e9153
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Nov 08 08:29:07 2010 +0100
summary: [moduleMerge] Prevent a module to be a dependency and a merge
details: /erp/devel/pi/rev/d36e9fc06332
changeset: 8881:d36e9fc06332
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Nov 10 13:16:51 2010 +0100
summary: [moduleMerge] Module Merge delete cascade
details: /erp/devel/pi/rev/22dd82c2e5f4
changeset: 8882:22dd82c2e5f4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Nov 10 13:30:38 2010 +0100
summary: [moduleMerge] Improved message when trying to isntall merged module
details: /erp/devel/pi/rev/a3acee9f6867
changeset: 8883:a3acee9f6867
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Nov 11 13:57:09 2010 +0100
summary: [moduleMerge] Message to uninsntall a merged module is in orange
details: /erp/devel/pi/rev/7844c1d1a058
changeset: 8884:7844c1d1a058
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Nov 11 15:32:09 2010 +0100
summary: [moduleMerge] Improved messages
details: /erp/devel/pi/rev/f09309154fe3
changeset: 8885:f09309154fe3
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Nov 11 18:11:49 2010 +0100
summary: Merged back support for module merge
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
build.xml
| 9 +-
config/Openbravo.properties.template
| 6 +-
referencedata/standard/Initial_Setup.xml
| 124 +-
src-db/database/model/functions/A_ASSET_CREATE.xml
| 4 +-
src-db/database/model/prescript-PostgreSql.sql
| 4 +-
src-db/database/model/tables/AD_HEARTBEAT_LOG.xml
| 8 +
src-db/database/model/tables/AD_MODULE_MERGE.xml
| 63 +
src-db/database/model/tables/AD_SESSION_USAGE_AUDIT.xml
| 2 +-
src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml
| 6 +-
src-db/database/model/triggers/AD_MODULE_DBPREFIX_UNIQUE_TRG.xml
| 5 +-
src-db/database/model/triggers/AD_MODULE_DENPENDENCY_TRG.xml
| 13 +-
src-db/database/model/triggers/AD_MODULE_MERGE_MOD_TRG.xml
| 84 +
src-db/database/model/triggers/AD_MODULE_MERGE_TRG.xml
| 38 +
src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml
| 29 +-
src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml
| 4 +
src-db/database/sourcedata/AD_COLUMN.xml
| 440 +-
src-db/database/sourcedata/AD_DATASET_TABLE.xml
| 14 +
src-db/database/sourcedata/AD_ELEMENT.xml
| 64 +-
src-db/database/sourcedata/AD_FIELD.xml
| 275 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 87 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 38 +-
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 86 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_PROCESS.xml
| 61 +-
src-db/database/sourcedata/AD_TAB.xml
| 34 +-
src-db/database/sourcedata/AD_TABLE.xml
| 23 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 198 +-
src-db/database/sourcedata/AD_VAL_RULE.xml
| 14 +-
src-db/database/sourcedata/referencedData/AD_ALERTRULE.xml
| 8 +-
src-test/org/openbravo/test/dal/IssuesTest.java
| 14 +
src-test/org/openbravo/test/dal/ViewTest.java
| 24 +
src-wad/src/org/openbravo/wad/javasource.javaxml
| 3 +-
src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql
| 42 +-
src/org/openbravo/base/model/ModelProvider.java
| 1 +
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html
| 15 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 4 +
src/org/openbravo/dal/core/DalMappingGenerator.java
| 25 +-
src/org/openbravo/dal/core/DalUtil.java
| 2 +-
src/org/openbravo/dal/service/OBQuery.java
| 3 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value.java
| 31 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java
| 5 +
src/org/openbravo/erpCommon/ad_forms/Heartbeat.html
| 12 +-
src/org/openbravo/erpCommon/ad_forms/Heartbeat.java
| 3 +-
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html
| 55 +-
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java
| 3 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 44 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementAdd.html
| 10 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html
| 9 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 9 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
| 23 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.xml
| 6 +
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP4.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/Registration.html
| 12 +-
src/org/openbravo/erpCommon/ad_forms/ShowLogFile.html
| 7 +
src/org/openbravo/erpCommon/ad_help/DisplayHelp.html
| 8 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.html
| 5 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F2.html
| 2 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.html
| 5 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F2.html
| 6 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html
| 5 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F2.html
| 6 +-
src/org/openbravo/erpCommon/ad_process/ApplyModules.html
| 26 +-
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java
| 38 +-
src/org/openbravo/erpCommon/ad_process/HeartbeatRedirect.html
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
| 6 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
| 3 +
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.jrxml
| 70 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.jrxml
| 2427 ++++-----
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoiced_data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html
| 5 +
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
| 4 +
src/org/openbravo/erpCommon/modules/ApplyModuleTask.java
| 19 +
src/org/openbravo/erpCommon/modules/CheckLocalConsistency.java
| 63 +
src/org/openbravo/erpCommon/modules/ImportModule.java
| 271 +-
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 163 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 4 +-
src/org/openbravo/erpCommon/utility/Home.html
| 27 +-
src/org/openbravo/erpCommon/utility/Home.java
| 50 +-
src/org/openbravo/erpCommon/utility/Home.xml
| 2 +
src/org/openbravo/erpCommon/utility/HttpsUtils.java
| 2 +-
src/org/openbravo/erpCommon/utility/SystemInfo.java
| 38 +-
src/org/openbravo/erpCommon/utility/ToolBar.java
| 6 +-
src/org/openbravo/erpCommon/utility/Utility.java
| 54 +
src/org/openbravo/erpCommon/utility/VerticalMenu.html
| 2 +-
src/org/openbravo/erpCommon/utility/reporting/DocumentType.java
| 2 +-
src/org/openbravo/erpCommon/utility/reporting/Report.java
| 13 +-
src/org/openbravo/erpCommon/utility/reporting/ReportManager.java
| 6 +
src/org/openbravo/erpCommon/utility/reporting/Report_data.xsql
| 25 +
src/org/openbravo/erpCommon/utility/reporting/TemplateInfo.java
| 22 +-
src/org/openbravo/erpCommon/utility/reporting/Template_data.xsql
| 13 +-
src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql
| 33 +-
src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java
| 17 +
src/org/openbravo/erpCommon/utility/reporting/printing/PrintController_data.xsql
| 13 +
src/org/openbravo/erpCommon/utility/reporting/printing/PrintPayments.java
| 59 +
src/org/openbravo/erpReports/C_OrderJR.jrxml
| 2 +-
src/org/openbravo/erpReports/RptC_Invoice.jrxml
| 2 +-
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
| 2 +-
src/org/openbravo/erpReports/RptFIN_Payment.jrxml
| 465 +
src/org/openbravo/erpReports/RptFIN_PaymentLines.jrxml
| 342 +
src/org/openbravo/erpReports/RptM_InOut.jrxml
| 2 +-
src/org/openbravo/scheduling/ProcessRunner.java
| 9 +-
web/html/en_US/StaticCommunityBranding-2.50-Basic.html
| 8 +-
web/html/en_US/StaticCommunityBranding-2.50-Comm.html
| 4 +-
web/html/en_US/StaticCommunityBranding-2.50-STD.html
| 14 +-
web/js/messages.js
| 8 +-
web/js/shortcuts.js
| 2 +-
web/js/utils.js
| 233 +-
120 files changed, 5001 insertions(+), 1794 deletions(-)
diffs (truncated from 10610 to 300 lines):
diff -r b72bd31277e4 -r f09309154fe3 .hgsigs
--- a/.hgsigs Tue Oct 26 15:37:24 2010 +0530
+++ b/.hgsigs Thu Nov 11 18:11:49 2010 +0100
@@ -23,3 +23,4 @@
618363224a381737439e0bd4461e2d36c4fd986e 0
iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
6563372bc2fbf0bc2e15f70c2a8da81fad8cbc2e 0
iEYEABECAAYFAkyDw4sACgkQCX/oGf+2qkMZ1ACePoFeipRkNAN6bW7yIUeiRYgEMBMAni+gFwpEp8kfGKryvixvdudRgGoQ
b033dcbeeabc1db396798b8e5cbe196522f43a53 0
iEYEABECAAYFAkydFwMACgkQCX/oGf+2qkM1NwCbBJjgs9qM221q415Ygu/EVvhE31sAn2+O6DOYQNbM3xFuCnhhtuDQWDa/
+323d74d7ad1c7a2c4e92b6cfbc08f8ef406315f9 0
iEYEABECAAYFAkzTE3gACgkQCX/oGf+2qkPsRQCeMcvruESd9p1/uezSdZNtrlZS5UYAoMIolxQ5ig1o5yOB2Xxgvm5R9Jel
diff -r b72bd31277e4 -r f09309154fe3 .hgtags
--- a/.hgtags Tue Oct 26 15:37:24 2010 +0530
+++ b/.hgtags Thu Nov 11 18:11:49 2010 +0100
@@ -33,3 +33,4 @@
99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
a3c1cffa8af7b60cab6949251fce1faaa13ca5bb 2.50MP21
8ede6ac265f1dd70536888ce3e20ffd54e3a3bc6 2.50MP22
+974f18d14979e367da4ea591def9d1da816159ff 2.50MP23
diff -r b72bd31277e4 -r f09309154fe3 build.xml
--- a/build.xml Tue Oct 26 15:37:24 2010 +0530
+++ b/build.xml Thu Nov 11 18:11:49 2010 +0100
@@ -766,7 +766,7 @@
-->
<target name="apply.module" depends="compile.apply.module">
<java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
- <arg line="'${base.src}'" />
+ <arg line="'${base.src}' '${friendlyWarnings}'" />
<classpath refid="apply.module.runtime.classpath" />
</java>
<delete includeEmptyDirs="true" dir="${build.apply.module}" />
@@ -1079,4 +1079,11 @@
</classpath>
</java>
</target>
+
+ <target name="check.module.consistency">
+ <taskdef name="checkConsistency"
classname="org.openbravo.erpCommon.modules.CheckLocalConsistency">
+ <classpath refid="project.class.path" />
+ </taskdef>
+ <checkConsistency userId="0" adminMode="true"
propertiesFile="${base.config}/Openbravo.properties"/>
+ </target>
</project>
diff -r b72bd31277e4 -r f09309154fe3 config/Openbravo.properties.template
--- a/config/Openbravo.properties.template Tue Oct 26 15:37:24 2010 +0530
+++ b/config/Openbravo.properties.template Thu Nov 11 18:11:49 2010 +0100
@@ -111,7 +111,7 @@
# Authentication #
##################
-# Leave this empty to use the default login hardler.
+# Leave this empty to use the default login handler.
# LAM server example: org.openbravo.authentication.lam.LamAuthenticationManager
authentication.class=
@@ -170,8 +170,8 @@
# Log in security #
###################
-# If these properties are set, after log in trail failed the response time
-# will be delayed, and the user can be blocked.
+# If these properties are set, after a failed login the response time
+# will be delayed, and the user account can be blocked.
login.trial.delay.increment=0
login.trial.delay.max=0
login.trial.user.lock=0
diff -r b72bd31277e4 -r f09309154fe3 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Tue Oct 26 15:37:24 2010 +0530
+++ b/referencedata/standard/Initial_Setup.xml Thu Nov 11 18:11:49 2010 +0100
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<ob:Openbravo xmlns:ob="http://www.openbravo.com";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <EmailTemplate id="0680791915544EDAA32727AD21542EE3" identifier="AR Receipt
Report template - ">
+ <id>0680791915544EDAA32727AD21542EE3</id>
+ <active>true</active>
+ <pocDocumentType id="8E2539C66CFB43F79613217E35CC5D14"
entity-name="DocumentTemplate" identifier="AR Receipt Report template"/>
+ <subject xsi:nil="true"/>
+ <body xsi:nil="true"/>
+ <default>true</default>
+ <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
+ </EmailTemplate>
<EmailTemplate id="878ECF0D5A238C7BE040007F010129BA" identifier="AR Invoice
Report template - ">
<id>878ECF0D5A238C7BE040007F010129BA</id>
<active>true</active>
@@ -144,6 +153,15 @@
<default>true</default>
<language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
</EmailTemplate>
+ <EmailTemplate id="E8CBFC5AD3784396BC2D14CD1A104316" identifier="AP Payment
Report template - ">
+ <id>E8CBFC5AD3784396BC2D14CD1A104316</id>
+ <active>true</active>
+ <pocDocumentType id="FA45DFAC61A542658CC02B64E476F4C0"
entity-name="DocumentTemplate" identifier="AP Payment Report template"/>
+ <subject xsi:nil="true"/>
+ <body xsi:nil="true"/>
+ <default>true</default>
+ <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
+ </EmailTemplate>
<FinancialMgmtGLCategory id="102C08DF5D4341D5B7FDF758632503D2"
identifier="AR Invoice">
<id>102C08DF5D4341D5B7FDF758632503D2</id>
<active>true</active>
@@ -548,7 +566,7 @@
<salesTransaction>true</salesTransaction>
<sOSubType>WR</sOSubType>
<documentTypeForShipment id="F8CC92C7234644DEAD9F63174F45B2BF"
entity-name="DocumentType" identifier="MM Shipment Indirect"/>
- <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice Indirect"/>
+ <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice"/>
<sequencedDocument>true</sequencedDocument>
<documentSequence id="FFB42B38D6A34634B534AB499B13644C"
entity-name="ADSequence" identifier="POS Order"/>
<gLCategory id="745A2B441A2644DF934D1B1E462292E9"
entity-name="FinancialMgmtGLCategory" identifier="None"/>
@@ -1449,147 +1467,219 @@
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
<DocumentTemplate id="02376C41DA824413A9BE649443924C03" identifier="Purchase
Order Report template">
- <name>Purchase Order Report template</name>
<id>02376C41DA824413A9BE649443924C03</id>
<active>true</active>
<documentType id="808F8818F724497D94282AC83493F394"
entity-name="DocumentType" identifier="Purchase Order"/>
+ <name>Purchase Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Purchase ord...@our_ref@</reportFilename>
<templateFilename>RptC_OrderPO.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="11DD7B13EAC94215B6F8F735BBED4D55"
identifier="Quotation Report template">
- <name>Quotation Report template</name>
<id>11DD7B13EAC94215B6F8F735BBED4D55</id>
<active>true</active>
<documentType id="0A1D4A2DB7144D81A821E31A9B332ACB"
entity-name="DocumentType" identifier="Quotation"/>
+ <name>Quotation Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="4F23CD7CD64D468EA4753C0C7B09FD53" identifier="Return
Material Report template">
- <name>Return Material Report template</name>
<id>4F23CD7CD64D468EA4753C0C7B09FD53</id>
<active>true</active>
<documentType id="2D7C15F0F44E4F289A729415EFD700C1"
entity-name="DocumentType" identifier="Return Material"/>
+ <name>Return Material Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="70AEA0C77DB743A4A89058BFE091FEEA" identifier="Standard
order report template">
- <name>Standard order report template</name>
<id>70AEA0C77DB743A4A89058BFE091FEEA</id>
<active>true</active>
<documentType id="CB6EEA256BBC41109911215C5A14D39B"
entity-name="DocumentType" identifier="Standard Order"/>
+ <name>Standard order report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>standardord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
+ </DocumentTemplate>
+ <DocumentTemplate id="8E2539C66CFB43F79613217E35CC5D14" identifier="AR
Receipt Report template">
+ <id>8E2539C66CFB43F79613217E35CC5D14</id>
+ <active>true</active>
+ <documentType id="D132517AE775435B8EB2832CC61FCAB1"
entity-name="DocumentType" identifier="AR Receipt"/>
+ <name>AR Receipt Report template</name>
+ <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
+ <reportFilename>Payment i...@our_ref@</reportFilename>
+ <templateFilename>RptFIN_Payment.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="9FB97CCA66EA49F29A0EF5080E2AFF29" identifier="AR
Credit Memo Report template">
- <name>AR Credit Memo Report template</name>
<id>9FB97CCA66EA49F29A0EF5080E2AFF29</id>
<active>true</active>
<documentType id="B476CFAE109047DEB5BC9AC80A03297A"
entity-name="DocumentType" identifier="AR Credit Memo"/>
+ <name>AR Credit Memo Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="A16BD46A069F4502BDDFD9A555AEAA48" identifier="AR
Invoice Report template">
- <name>AR Invoice Report template</name>
<id>A16BD46A069F4502BDDFD9A555AEAA48</id>
<active>true</active>
<documentType id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice"/>
+ <name>AR Invoice Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="A76CE6794C2E467394C21675524DBA9C" identifier="Proposal
Report template">
- <name>Proposal Report template</name>
<id>A76CE6794C2E467394C21675524DBA9C</id>
<active>true</active>
<documentType id="15C8DCE82DA841968ABCD614FED68576"
entity-name="DocumentType" identifier="Proposal"/>
+ <name>Proposal Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="AF10A903167240F883C7EE7A3325981D" identifier="POS
Order Report template">
- <name>POS Order Report template</name>
<id>AF10A903167240F883C7EE7A3325981D</id>
<active>true</active>
<documentType id="511A9371A0F74195AA3F6D66C722729D"
entity-name="DocumentType" identifier="POS Order"/>
+ <name>POS Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="B1DF02E45C4946C7BB1D45C065C49577" identifier="AP
Credit Report template">
- <name>AP Credit Report template</name>
<id>B1DF02E45C4946C7BB1D45C065C49577</id>
<active>true</active>
<documentType id="42B7DE94BC324C3F9CC0934375E90FFF"
entity-name="DocumentType" identifier="AP CreditMemo"/>
+ <name>AP Credit Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Purchase invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="B94A012B25FB4C319804BED013BD584B" identifier="Prepay
Order Report template">
- <name>Prepay Order Report template</name>
<id>B94A012B25FB4C319804BED013BD584B</id>
<active>true</active>
<documentType id="15F495A6290040F194A9AA4622FE0C01"
entity-name="DocumentType" identifier="Prepay Order"/>
+ <name>Prepay Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="BC7220FEA2F44F9C9FB6619FC58B6944" identifier="MM
Receipt Report template">
- <name>MM Receipt Report template</name>
<id>BC7220FEA2F44F9C9FB6619FC58B6944</id>
<active>true</active>
<documentType id="2030AD7DD4284E2B936E261662EF735A"
entity-name="DocumentType" identifier="MM Receipt"/>
+ <name>MM Receipt Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Goods recei...@our_ref@</reportFilename>
<templateFilename>RptM_InOut.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="C6A6AF1CA3C94B3899CAEC27EE427402" identifier="MM
Shipment Report template">
- <name>MM Shipment Report template</name>
<id>C6A6AF1CA3C94B3899CAEC27EE427402</id>
<active>true</active>
<documentType id="0CD50184705A42CCBECA4EC967646440"
entity-name="DocumentType" identifier="MM Shipment"/>
+ <name>MM Shipment Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Goods shipme...@our_ref@</reportFilename>
<templateFilename>RptM_InOut.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="C76E1DE89DA04BF6B6FAEDDA0216EE7A"
identifier="Warehouse Order Memo Report template">
- <name>Warehouse Order Memo Report template</name>
<id>C76E1DE89DA04BF6B6FAEDDA0216EE7A</id>
<active>true</active>
<documentType id="76E7C671FCE34556908E563F825C2937"
entity-name="DocumentType" identifier="Warehouse Order"/>
+ <name>Warehouse Order Memo Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="D9BB431F120746C8A84266CA42D02029" identifier="On
Credit Order Report template">
- <name>On Credit Order Report template</name>
<id>D9BB431F120746C8A84266CA42D02029</id>
<active>true</active>
<documentType id="E7F4802D902A42A59143DCCBEDE4DE85"
entity-name="DocumentType" identifier="Credit Order"/>
+ <name>On Credit Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
