details: https://code.openbravo.com/erp/devel/pi/rev/e8c7c63ae9a4 changeset: 17841:e8c7c63ae9a4 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Aug 28 23:21:11 2012 +0200 summary: CI: update AD_MODULE to version 17787
details: https://code.openbravo.com/erp/devel/pi/rev/27572925a53f changeset: 17842:27572925a53f user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Aug 31 15:27:48 2012 +0200 summary: CI: promote changesets from pi to main details: https://code.openbravo.com/erp/devel/pi/rev/64d15cf83d31 changeset: 17843:64d15cf83d31 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Sep 01 00:45:37 2012 +0200 summary: CI: update AD_MODULE to version 17839 details: https://code.openbravo.com/erp/devel/pi/rev/05b3ea484705 changeset: 17844:05b3ea484705 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Sep 01 00:54:34 2012 +0200 summary: CI: promote changesets from pi to main details: https://code.openbravo.com/erp/devel/pi/rev/2bbfc245d4ff changeset: 17845:2bbfc245d4ff user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Sep 01 00:57:37 2012 +0200 summary: CI: merge back from main diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java | 31 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html | 3 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml | 1 - modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 7 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 44 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 58 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 4 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java | 23 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 26 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 6 +- src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG.xml | 4 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 7 +- src-db/database/model/triggers/M_INOUTLINE_TRG2.xml | 49 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 25 +- src-db/database/sourcedata/AD_ELEMENT.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateCostingRulesWhenNotCalculatedCosts.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateCostingRulesWhenNotCalculatedCosts.java | 51 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 7 + src/org/openbravo/costing/CostingBackground.java | 42 +- src/org/openbravo/costing/CostingMigrationProcess.java | 9 +- src/org/openbravo/costing/CostingRuleProcess.java | 443 ++++++--- src/org/openbravo/erpCommon/ad_actionButton/MRPManufacturingPlanProcess.java | 1 + src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java | 16 +- src/org/openbravo/erpCommon/ad_reports/ReportProductionCost_data.xsql | 10 +- 81 files changed, 755 insertions(+), 352 deletions(-) diffs (truncated from 2732 to 300 lines): diff -r 979f4f2bc4af -r 2bbfc245d4ff .hgsigs --- a/.hgsigs Fri Aug 24 14:48:06 2012 +0200 +++ b/.hgsigs Sat Sep 01 00:57:37 2012 +0200 @@ -77,3 +77,4 @@ 747753a54e2eecdc25f659780f62b70802b11735 0 iEYEABECAAYFAk/2WecACgkQCX/oGf+2qkOzUACcDDn8V+yk9lsiWNjYaKmHT27rmSgAoLrxg9SWAmwu7DBYqGfrqrB9Eanr e73588ed4b71972072141cda206f2382c618fbc8 0 iEYEABECAAYFAlAlOJcACgkQCX/oGf+2qkN2uwCg1Nd3SJnzR1OdCXmMDHxOm/C8kEsAoMF+P+CltaPNylrKX7B4wimfTW/e a934dbe3f5fad31293f1a5a2cc6f2ca630fd0f31 0 iEYEABECAAYFAlAGLkgACgkQCX/oGf+2qkOu/ACfYJXb8JwO69uZVxLM2u6BHOwQHj4AoJ08uNluEH3iB94pfMnCsD2URUX8 +3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz diff -r 979f4f2bc4af -r 2bbfc245d4ff .hgtags --- a/.hgtags Fri Aug 24 14:48:06 2012 +0200 +++ b/.hgtags Sat Sep 01 00:57:37 2012 +0200 @@ -88,3 +88,4 @@ 1b0f90676e38f67c46ea0f27b9c28beca1cbf79d 3.0MP12.1 6319e314cf98d9fd0df44324e8a5b2aead800b54 3.0MP12.2 33314611486b1823d42d1059110369d7705ef13f 3.0MP13 +35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14 diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Sat Sep 01 00:57:37 2012 +0200 @@ -6951,7 +6951,7 @@ <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <DESCRIPTION><![CDATA[It is the method by which payment is expected to be made or received.]]></DESCRIPTION> <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <AD_TABLE_ID><![CDATA[DC814AB3BC84486CA5411131724BC95A]]></AD_TABLE_ID> -<!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <ISKEY><![CDATA[N]]></ISKEY> <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <ISPARENT><![CDATA[N]]></ISPARENT> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Sat Sep 01 00:57:37 2012 +0200 @@ -90,7 +90,7 @@ <!--583D70554DDA45BD8C80C0AF11C64FC5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--583D70554DDA45BD8C80C0AF11C64FC5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--583D70554DDA45BD8C80C0AF11C64FC5--> <COLUMNNAME><![CDATA[Invoice_Documentno]]></COLUMNNAME> -<!--583D70554DDA45BD8C80C0AF11C64FC5--> <NAME><![CDATA[Invoice Documentno]]></NAME> +<!--583D70554DDA45BD8C80C0AF11C64FC5--> <NAME><![CDATA[Invoice Document No.]]></NAME> <!--583D70554DDA45BD8C80C0AF11C64FC5--> <PRINTNAME><![CDATA[Invoice_Documentno]]></PRINTNAME> <!--583D70554DDA45BD8C80C0AF11C64FC5--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--583D70554DDA45BD8C80C0AF11C64FC5--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> @@ -126,7 +126,7 @@ <!--64B01B6184B84599B2B073BC7971EA19--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--64B01B6184B84599B2B073BC7971EA19--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--64B01B6184B84599B2B073BC7971EA19--> <COLUMNNAME><![CDATA[Order_Documentno]]></COLUMNNAME> -<!--64B01B6184B84599B2B073BC7971EA19--> <NAME><![CDATA[Order Documentno]]></NAME> +<!--64B01B6184B84599B2B073BC7971EA19--> <NAME><![CDATA[Order Document No.]]></NAME> <!--64B01B6184B84599B2B073BC7971EA19--> <PRINTNAME><![CDATA[Order_Documentno]]></PRINTNAME> <!--64B01B6184B84599B2B073BC7971EA19--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--64B01B6184B84599B2B073BC7971EA19--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Sat Sep 01 00:57:37 2012 +0200 @@ -8765,7 +8765,7 @@ <!--8AFD30956A0E4A079AA0D80B41A0A494--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8AFD30956A0E4A079AA0D80B41A0A494--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8AFD30956A0E4A079AA0D80B41A0A494--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--8AFD30956A0E4A079AA0D80B41A0A494--> <NAME><![CDATA[Order Documentno]]></NAME> +<!--8AFD30956A0E4A079AA0D80B41A0A494--> <NAME><![CDATA[Order Document No.]]></NAME> <!--8AFD30956A0E4A079AA0D80B41A0A494--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--8AFD30956A0E4A079AA0D80B41A0A494--> <AD_TAB_ID><![CDATA[81644A22CC4D4B879AA71C33C30E00A4]]></AD_TAB_ID> <!--8AFD30956A0E4A079AA0D80B41A0A494--> <AD_COLUMN_ID><![CDATA[02EF18D28F1B4C43ADF91B3E73C2BF12]]></AD_COLUMN_ID> @@ -12548,7 +12548,7 @@ <!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <NAME><![CDATA[Invoice Documentno]]></NAME> +<!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <NAME><![CDATA[Invoice Document No.]]></NAME> <!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <AD_TAB_ID><![CDATA[81644A22CC4D4B879AA71C33C30E00A4]]></AD_TAB_ID> <!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <AD_COLUMN_ID><![CDATA[41DAD5FF72274650A3C41D103F20C111]]></AD_COLUMN_ID> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Sep 01 00:57:37 2012 +0200 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17596]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17839]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Sep 01 00:57:37 2012 +0200 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17596]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17839]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17596]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17839]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Sat Sep 01 00:57:37 2012 +0200 @@ -251,9 +251,9 @@ <!--81644A22CC4D4B879AA71C33C30E00A4--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> <!--81644A22CC4D4B879AA71C33C30E00A4--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--81644A22CC4D4B879AA71C33C30E00A4--> <UIPATTERN><![CDATA[STD]]></UIPATTERN> -<!--81644A22CC4D4B879AA71C33C30E00A4--> <HQLWHERECLAUSE><![CDATA[((e.obSelected = true and e.paymentProposal.id = @FIN_Payment_Proposal.id@) or e.obSelected = false) and e.salesTransaction = false]]></HQLWHERECLAUSE> +<!--81644A22CC4D4B879AA71C33C30E00A4--> <HQLWHERECLAUSE><![CDATA[((e.obSelected = true and e.paymentProposal.id = @FIN_Payment_Proposal.id@) or e.obSelected = false) and e.salesTransaction = false and e.currency.id= @FIN_Payment_Proposal.currency@ and (@FIN_Payment_Proposal.businessPartner@ is null OR @FIN_Payment_Proposal.businessPartner@ = '' OR @FIN_Payment_Proposal.businessPartner@ = e.businessPartner.id) and (@FIN_Payment_Proposal.duedate@ = '' OR @FIN_Payment_Proposal.duedate@ is null OR @FIN_Payment_Proposal.duedate@ = 'null' OR e.expectedDate <= to_date(@FIN_Payment_Proposal.duedate@,'YYYY-MM-DD'))]]></HQLWHERECLAUSE> <!--81644A22CC4D4B879AA71C33C30E00A4--> <HQLORDERBYCLAUSE><![CDATA[obSelected desc, paymentPriority, expectedDate, coalesce(orderDocumentno, invoiceorderDocumentno)]]></HQLORDERBYCLAUSE> -<!--81644A22CC4D4B879AA71C33C30E00A4--> <HQLFILTERCLAUSE><![CDATA[(e.obSelected = true) OR (e.paymentMethod.id = @FIN_Payment_Proposal.paymentMethod@ and e.currency.id= @FIN_Payment_Proposal.currency@ and (@FIN_Payment_Proposal.businessPartner@ is null OR @FIN_Payment_Proposal.businessPartner@ = '' OR @FIN_Payment_Proposal.businessPartner@ = e.businessPartner.id) and (@FIN_Payment_Proposal.duedate@ = '' OR @FIN_Payment_Proposal.duedate@ is null OR e.expectedDate <= to_date(@FIN_Payment_Proposal.duedate@,'YYYY-MM-DD')))]]></HQLFILTERCLAUSE> +<!--81644A22CC4D4B879AA71C33C30E00A4--> <HQLFILTERCLAUSE><![CDATA[(e.obSelected = true) OR (e.paymentMethod.id = @FIN_Payment_Proposal.paymentMethod@)]]></HQLFILTERCLAUSE> <!--81644A22CC4D4B879AA71C33C30E00A4--> <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS> <!--81644A22CC4D4B879AA71C33C30E00A4--> <EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.selectionChangePaymentProposalPickAndEdit]]></EM_OBUIAPP_SELECTION> <!--81644A22CC4D4B879AA71C33C30E00A4--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql Sat Sep 01 00:57:37 2012 +0200 @@ -46,13 +46,16 @@ AND NOT EXISTS (SELECT 1 FROM fin_payment_scheduledetail psd JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id WHERE il.c_invoice_id = psi.c_invoice_id - AND psd.fin_payment_schedule_order = pso.fin_payment_schedule_id)) + AND psd.fin_payment_schedule_order = pso.fin_payment_schedule_id) + GROUP BY il.c_invoice_id + HAVING sum(il.linenetamt +coalesce(c_getinvoiceline_taxamount(il.c_invoiceline_id),0)) != 0) AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail psdo WHERE psdo.fin_payment_schedule_order = pso.fin_payment_schedule_id)) o JOIN c_orderline ol ON ol.c_order_id = o.c_order_id JOIN c_invoiceline il ON il.c_orderline_id = ol.c_orderline_id JOIN c_invoice i ON i.c_invoice_id = il.c_invoice_id WHERE i.docstatus <> 'VO' + AND NOT EXITS (SELECT 1 FROM c_invoice_reverse WHERE c_invoice_reverse.c_invoice_id = inv.c_invoice_id) ]]></Sql> </SqlMethod> <SqlMethod name="getUUID" type="preparedStatement" return="string"> @@ -165,13 +168,16 @@ AND NOT EXISTS (SELECT 1 FROM fin_payment_scheduledetail psd JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id WHERE il.c_invoice_id = psi.c_invoice_id - AND psd.fin_payment_schedule_order = pso.fin_payment_schedule_id)) + AND psd.fin_payment_schedule_order = pso.fin_payment_schedule_id) + GROUP BY il.c_invoice_id + HAVING sum(il.linenetamt +coalesce(c_getinvoiceline_taxamount(il.c_invoiceline_id),0)) != 0) AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail psdo WHERE psdo.fin_payment_schedule_order = pso.fin_payment_schedule_id)) o JOIN c_orderline ol ON ol.c_order_id = o.c_order_id JOIN c_invoiceline il ON il.c_orderline_id = ol.c_orderline_id JOIN c_invoice inv ON inv.c_invoice_id = il.c_invoice_id - WHERE inv.docstatus <> ''VO'' ' + WHERE inv.docstatus <> ''VO'' + AND NOT EXITS (SELECT 1 FROM c_invoice_reverse WHERE c_invoice_reverse.c_invoice_id = inv.c_invoice_id)' ) ]]></Sql> <Parameter name="alertRuleId"/> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java Sat Sep 01 00:57:37 2012 +0200 @@ -20,6 +20,7 @@ package org.openbravo.advpaymentmngt.actionHandler; import java.math.BigDecimal; +import java.util.HashMap; import java.util.Map; import org.apache.log4j.Logger; @@ -34,6 +35,7 @@ import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod; import org.openbravo.model.financialmgmt.payment.FIN_PaymentPropDetail; import org.openbravo.model.financialmgmt.payment.FIN_PaymentProposal; import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail; @@ -57,14 +59,22 @@ final String strPaymentProposalId = jsonRequest.getString("Fin_Payment_Proposal_ID"); FIN_PaymentProposal paymentProposal = OBDal.getInstance().get(FIN_PaymentProposal.class, strPaymentProposalId); + final String strPaymentMethodId = jsonRequest.getString("inpfinPaymentmethodId"); + FIN_PaymentMethod paymentMethod = OBDal.getInstance().get(FIN_PaymentMethod.class, + strPaymentMethodId); if (cleanPaymentProposalDetails(paymentProposal)) { - int cont = createPaymentProposalDetails(jsonRequest); + HashMap<String, String> map = createPaymentProposalDetails(jsonRequest, paymentMethod); jsonRequest = new JSONObject(); JSONObject errorMessage = new JSONObject(); errorMessage.put("severity", "success"); errorMessage.put("text", OBMessageUtils.messageBD("Success")); + if (map.get("DifferentPaymentMethod").equals("true")) { + errorMessage.put("severity", "warning"); + errorMessage.put("text", + OBMessageUtils.messageBD("APRM_Different_PaymentMethod_Selected")); + } jsonRequest.put("message", errorMessage); } @@ -110,25 +120,34 @@ return true; } - private int createPaymentProposalDetails(JSONObject jsonRequest) throws JSONException, - OBException { + private HashMap<String, String> createPaymentProposalDetails(JSONObject jsonRequest, + FIN_PaymentMethod paymentMethod) throws JSONException, OBException { + HashMap<String, String> map = new HashMap<String, String>(); + map.put("DifferentPaymentMethod", "false"); + map.put("Count", "0"); JSONArray selectedLines = jsonRequest.getJSONArray("_selection"); // if no lines selected don't do anything. if (selectedLines.length() == 0) { - return 0; + return map; } final String strPaymentProposalId = jsonRequest.getString("Fin_Payment_Proposal_ID"); FIN_PaymentProposal paymentProposal = OBDal.getInstance().get(FIN_PaymentProposal.class, strPaymentProposalId); BigDecimal totalAmount = BigDecimal.ZERO, totalWriteOff = BigDecimal.ZERO; int cont = 0; + String differentPaymentMethod = "false"; for (int i = 0; i < selectedLines.length(); i++) { JSONObject selectedLine = selectedLines.getJSONObject((int) i); log.debug(selectedLine); BigDecimal paidAmount = new BigDecimal(selectedLine.getString("payment")); if (paidAmount.compareTo(BigDecimal.ZERO) != 0) { + FIN_PaymentMethod linePaymentMethod = OBDal.getInstance().get(FIN_PaymentMethod.class, + selectedLine.getString("paymentMethod")); + if (!paymentMethod.equals(linePaymentMethod)) { + differentPaymentMethod = "true"; + } FIN_PaymentPropDetail newPPD = OBProvider.getInstance().get(FIN_PaymentPropDetail.class); newPPD.setOrganization(paymentProposal.getOrganization()); newPPD.setClient(paymentProposal.getClient()); @@ -156,6 +175,8 @@ paymentProposal.setAmount(totalAmount); paymentProposal.setWriteoffAmount(totalWriteOff); OBDal.getInstance().save(paymentProposal); - return cont; + map.put("DifferentPaymentMethod", differentPaymentMethod); + map.put("Count", Integer.toString(cont)); + return map; } } diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Sat Sep 01 00:57:37 2012 +0200 @@ -163,6 +163,9 @@ } function openAddTransaction(bankStatementLineId){ document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId; + if ( document.getElementById('inpCheckBox_' + bankStatementLineId) && document.getElementById('inpCheckBox_' + bankStatementLineId).checked){ + unMatchLine(bankStatementLineId, false); + } openServletNewWindow('DEFAULT', false, '../org.openbravo.advpaymentmngt.ad_actionbutton/AddTransaction.html', 'ADDTRANSACTION', '2EED9BC16DB34D2B80BA40A21564BECF', false,600, 900, null, null, false, true, true); return true; } diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Sep 01 00:57:37 2012 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17596]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17839]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Sep 01 00:57:37 2012 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17596]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17839]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 24 14:48:06 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat Sep 01 00:57:37 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17596]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17839]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 979f4f2bc4af -r 2bbfc245d4ff modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Aug 24 14:48:06 2012 +0200 ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
