details: https://code.openbravo.com/erp/devel/main/rev/2637b0fb27bb changeset: 17410:2637b0fb27bb user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Jun 30 05:09:30 2012 +0200 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/a4d3cc40e39f changeset: 17411:a4d3cc40e39f user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Jul 02 11:16:42 2012 +0200 summary: Issue 20891: new AccountingTabsData.class version New compilation of the AccountingTabsData.class to synchronize with the code details: https://code.openbravo.com/erp/devel/main/rev/0f7d2b1391ac changeset: 17412:0f7d2b1391ac user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Jul 02 12:18:03 2012 +0200 summary: Fixes issue 20905: change in 20858 uses wrong limit. It probably causes bad performance compile time warnings. details: https://code.openbravo.com/erp/devel/main/rev/5d6156c121d6 changeset: 17413:5d6156c121d6 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 02 15:27:54 2012 +0200 summary: [Costing]fix issue in valuation stock rpt.Do not group by org. details: https://code.openbravo.com/erp/devel/main/rev/f313b3335867 changeset: 17414:f313b3335867 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 02 16:27:37 2012 +0200 summary: [Costing]Fix issue in migration process.setMaxResult to 1. details: https://code.openbravo.com/erp/devel/main/rev/1171fec5325a changeset: 17415:1171fec5325a user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 02 17:52:26 2012 +0200 summary: [Costing]Fix issues in valued stock report. details: https://code.openbravo.com/erp/devel/main/rev/6b96be838bc8 changeset: 17416:6b96be838bc8 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jul 03 10:52:18 2012 +0200 summary: [Costing]Add javadoc to public method. details: https://code.openbravo.com/erp/devel/main/rev/344b8a379592 changeset: 17417:344b8a379592 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jul 03 11:46:43 2012 +0200 summary: Fixes issue 20914.Delete the alert rule of the migration process. details: https://code.openbravo.com/erp/devel/main/rev/b492edbdd2e6 changeset: 17418:b492edbdd2e6 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jul 03 13:56:45 2012 +0200 summary: Fixes bug 20849 details: https://code.openbravo.com/erp/devel/main/rev/e88820b22b7a changeset: 17419:e88820b22b7a user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Jul 03 14:48:29 2012 +0200 summary: Fixes issue 20853: Grid view: Call-outs are not working properly in some circumstances Solve callout problem when changing focus using the mouse, instead of disabling the complete form, prevent keyboard and mouse input Select the complete value in grid mode when setting the focus on a numeric field Removed not needed override for selectvalue and ie At cell edit end only do blur if the celleditend is for the current focused item details: https://code.openbravo.com/erp/devel/main/rev/3e1b145beae8 changeset: 17420:3e1b145beae8 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Jul 03 17:33:12 2012 +0200 summary: Fixes issue 20839: Invoice Term Combo is not working properly details: https://code.openbravo.com/erp/devel/main/rev/28f9ecda938f changeset: 17421:28f9ecda938f user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Wed Jul 04 16:33:31 2012 +0200 summary: Fixes issue 20923: Fixes twitter widget and removes Facebook's - The twitter widget was using http:// to load the widget .js file, now we use the protocol relative // and delegate request to the browser - The facebook widget includes a .js file using a hardcoded http:// protocol there is no way to fix it. We'll notify the developer details: https://code.openbravo.com/erp/devel/main/rev/7ba314cca740 changeset: 17422:7ba314cca740 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jul 04 18:39:21 2012 +0200 summary: Fixed bug 20849: Unbalanced calls to setAdminMode are also fixed details: https://code.openbravo.com/erp/devel/main/rev/678c8dc1b0fe changeset: 17423:678c8dc1b0fe user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Jul 03 13:47:14 2012 +0200 summary: Fixed bug 20895 It shows warning message when there is no data to display It shows warning message when there is no data to display in Dimensional Reports. details: https://code.openbravo.com/erp/devel/main/rev/2597a297ed6f changeset: 17424:2597a297ed6f user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Jul 03 17:02:55 2012 +0200 summary: Fixed bug 20918 Add to Client Definition m_costing_rule and m_costing_rule_init details: https://code.openbravo.com/erp/devel/main/rev/57adb61dfb3e changeset: 17425:57adb61dfb3e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Jul 05 12:07:53 2012 +0200 summary: Fixed bug 20920 Updated in migration process cost reports and process access details: https://code.openbravo.com/erp/devel/main/rev/4b990d5f82bc changeset: 17426:4b990d5f82bc user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Jul 05 18:06:26 2012 +0200 summary: fixed bug 20921 New instances shouldn't use legacy cost engine details: https://code.openbravo.com/erp/devel/main/rev/40e6ff497d25 changeset: 17427:40e6ff497d25 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Jul 02 13:13:59 2012 +0200 summary: Fixed bug 20818 update PercentageOverDue,DaysOutStanding and FinalSettlementDate details: https://code.openbravo.com/erp/devel/main/rev/2e48b8785e56 changeset: 17428:2e48b8785e56 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Jul 06 09:45:07 2012 +0200 summary: Fixed bug 20818: implemented code review - Optimized code that calculates overdue amount - Implemented code that properly gets the current PSD - Percentage Paid Late field is only displayed if != 0 details: https://code.openbravo.com/erp/devel/main/rev/74d816f9789d changeset: 17429:74d816f9789d user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Jul 06 10:54:36 2012 +0200 summary: Fixes issue 20618: in general ledger journal, 'Show Entry Description' check is not possible to unselect. details: https://code.openbravo.com/erp/devel/main/rev/caac0a361f3e changeset: 17430:caac0a361f3e user: Priya Muthukumar <priya.muthukumar <at> openbravo.com> date: Mon Jul 09 12:16:39 2012 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/9f5eedec4e1a changeset: 17431:9f5eedec4e1a user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jul 10 10:18:42 2012 +0200 summary: CI: update AD_MODULE to version 17430 diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 5 +- 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/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 88 ++- 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/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 42 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 5 +- 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.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.client.widgets/web/org.openbravo.client.widgets/twitter.html | 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.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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 11 - 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 +- referencedata/sampledata/F_B_International_Group.xml | 322 ---------- src-db/database/model/functions/MA_PRODUCTION_COST_GENERATE.xml | 11 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 4 +- src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 3 +- src-db/database/model/triggers/M_COSTING_TRG.xml | 14 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 - src-db/database/sourcedata/AD_DATASET_TABLE.xml | 28 + src-db/database/sourcedata/AD_FIELD.xml | 8 +- src-db/database/sourcedata/AD_MENU.xml | 14 +- src-db/database/sourcedata/AD_MESSAGE.xml | 11 - src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 8 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 20 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 35 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 14 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/AccountingTabsData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeCostingMigrationPreference.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeCostingMigrationPreferenceData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/InitializeCostingMigrationPreference.java | 52 + src-util/modulescript/src/org/openbravo/modulescript/InitializeCostingMigrationPreference_data.xsql | 77 ++ src/org/openbravo/costing/CostingMigrationProcess.java | 78 ++- src/org/openbravo/costing/CostingStatus.java | 27 +- src/org/openbravo/costing/CostingUtils.java | 3 + src/org/openbravo/erpCommon/ad_actionButton/Posted.java | 34 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 17 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 37 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy.java | 36 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java | 27 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 38 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java | 42 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 60 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 30 +- 85 files changed, 767 insertions(+), 679 deletions(-) diffs (truncated from 3230 to 300 lines): diff -r ce760b148e29 -r 9f5eedec4e1a .hgsigs --- a/.hgsigs Sat Jun 30 04:59:59 2012 +0200 +++ b/.hgsigs Tue Jul 10 10:18:42 2012 +0200 @@ -74,3 +74,4 @@ 358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n 844318ff24456a1905b684f09c9c8f7ace47c320 0 iEYEABECAAYFAk/pPW4ACgkQCX/oGf+2qkOKWgCgj9Z/3LJeZKGbSU+F2vvjb8e5tMsAn39e0czGuicNxPRDtB/o/7Q4p3Tk 3680c0f596f2fe0f97d8bb1aeb84e2c314124542 0 iEYEABECAAYFAk/ipvEACgkQCX/oGf+2qkNetgCgyHS5dvbLKKKbSN/Qo4Psv2PvI80AmwQczT1lS/sxnlMJV/RDtj+2y4U+ +747753a54e2eecdc25f659780f62b70802b11735 0 iEYEABECAAYFAk/2WecACgkQCX/oGf+2qkOzUACcDDn8V+yk9lsiWNjYaKmHT27rmSgAoLrxg9SWAmwu7DBYqGfrqrB9Eanr diff -r ce760b148e29 -r 9f5eedec4e1a .hgtags --- a/.hgtags Sat Jun 30 04:59:59 2012 +0200 +++ b/.hgtags Tue Jul 10 10:18:42 2012 +0200 @@ -85,3 +85,4 @@ f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11 fb07998d8c76243c27156403bb2735d6548c8831 3.0MP11.1 2781e1fb77af40758a1e18d97f609c05a130a4e6 3.0MP12 +1b0f90676e38f67c46ea0f27b9c28beca1cbf79d 3.0MP12.1 diff -r ce760b148e29 -r 9f5eedec4e1a modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Tue Jul 10 10:18:42 2012 +0200 @@ -742,7 +742,10 @@ UPDATE C_INVOICE SET TOTALPAID = TOTALPAID + COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0), OUTSTANDINGAMT = OUTSTANDINGAMT - COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0), - DUEAMT = V_DueAmount + DUEAMT = V_DueAmount, + FINALSETTLEMENT = cur_paymentschedule.duedate, + DAYSOUTSTANDING = 0, + PERCENTAGEOVERDUE = 0 WHERE C_INVOICE_ID = P_RECORD_ID; UPDATE C_INVOICE SET ISPAID = 'Y' diff -r ce760b148e29 -r 9f5eedec4e1a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jul 10 10:18:42 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.17393]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17430]]></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 ce760b148e29 -r 9f5eedec4e1a 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 Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jul 10 10:18:42 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.17393]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17430]]></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.17393]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17430]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ce760b148e29 -r 9f5eedec4e1a modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Tue Jul 10 10:18:42 2012 +0200 @@ -1224,13 +1224,13 @@ private void addPaymentMethodList(OBCriteria obc, List<String> paymentMethods) { List<String> paymentMethodsToRemove; Criterion compoundExp = null; - while (paymentMethods.size() > 2) { - paymentMethodsToRemove = new ArrayList(paymentMethods.subList(0, 2)); + while (paymentMethods.size() > 999) { + paymentMethodsToRemove = new ArrayList<String>(paymentMethods.subList(0, 999)); if (compoundExp == null) { - compoundExp = Restrictions.in("id", paymentMethods.subList(0, 2)); + compoundExp = Restrictions.in("id", paymentMethods.subList(0, 999)); } else { compoundExp = Restrictions.or(compoundExp, - Restrictions.in("id", paymentMethods.subList(0, 2))); + Restrictions.in("id", paymentMethods.subList(0, 999))); } paymentMethods.removeAll(paymentMethodsToRemove); } diff -r ce760b148e29 -r 9f5eedec4e1a modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Tue Jul 10 10:18:42 2012 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -34,6 +34,7 @@ import org.hibernate.Query; import org.hibernate.Session; +import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; @@ -63,6 +64,7 @@ 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_PaymentSchedInvV; import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule; import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail; import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod; @@ -962,23 +964,23 @@ } OBDal.getInstance().save(paymentSchedule); if (paymentSchedule.getInvoice() != null) { - updateInvoicePaymentMonitor(paymentSchedule.getInvoice(), paymentSchedule.getDueDate(), - amount, writeOffAmount); + updateInvoicePaymentMonitor(paymentSchedule, amount, writeOffAmount); } } /** * Method used to update the payment monitor based on the payment made by the user. * - * @param invoice - * Invoice object going to be updated based on the payment. {Invoice} + * @param invoicePaymentSchedule * @param amount * Amount of the transaction. * @param writeOffAmount * Amount that has been wrote off. */ - private static void updateInvoicePaymentMonitor(Invoice invoice, Date dueDate, BigDecimal amount, - BigDecimal writeOffAmount) { + private static void updateInvoicePaymentMonitor(FIN_PaymentSchedule invoicePaymentSchedule, + BigDecimal amount, BigDecimal writeOffAmount) { + Invoice invoice = invoicePaymentSchedule.getInvoice(); + Date dueDate = invoicePaymentSchedule.getDueDate(); boolean isDueDateFlag = dueDate.compareTo(new Date()) <= 0; invoice.setTotalPaid(invoice.getTotalPaid().add(amount)); invoice.setLastCalculatedOnDate(new Date()); @@ -991,7 +993,15 @@ if (isDueDateFlag) invoice.setDueAmount(invoice.getDueAmount().subtract(writeOffAmount)); } + if (0 == invoice.getOutstandingAmount().compareTo(BigDecimal.ZERO)) { + Date finalSettlementDate = getFinalSettlementDate(invoice); + // If date is null invoice amount = 0 then nothing to set + if (finalSettlementDate != null) { + invoice.setFinalSettlementDate(finalSettlementDate); + invoice.setDaysSalesOutstanding(FIN_Utility.getDaysBetween(invoice.getInvoiceDate(), + finalSettlementDate)); + } invoice.setPaymentComplete(true); } else invoice.setPaymentComplete(false); @@ -1002,6 +1012,11 @@ && (firstDueDate == null || firstDueDate.after(paymentSchedule.getDueDate()))) firstDueDate = paymentSchedule.getDueDate(); } + + BigDecimal overdueAmount = calculateOverdueAmount(invoicePaymentSchedule); + invoice.setPercentageOverdue(overdueAmount.multiply(new BigDecimal("100")) + .divide(invoice.getGrandTotalAmount(), 2, BigDecimal.ROUND_HALF_UP).longValue()); + if (firstDueDate != null) invoice.setDaysTillDue(FIN_Utility.getDaysToDue(firstDueDate)); else @@ -1009,6 +1024,65 @@ OBDal.getInstance().save(invoice); } + private static BigDecimal calculateOverdueAmount(FIN_PaymentSchedule invoicePaymentSchedule) { + Invoice invoice = invoicePaymentSchedule.getInvoice(); + BigDecimal overdueOriginal = BigDecimal.ZERO; + FIN_PaymentScheduleDetail currentPSD = getLastCreatedPaymentScheduleDetail(invoicePaymentSchedule); + for (FIN_PaymentSchedule paymentSchedule : invoice.getFINPaymentScheduleList()) { + Date paymentDueDate = paymentSchedule.getDueDate(); + for (FIN_PaymentScheduleDetail psd : paymentSchedule + .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) { + if (!psd.isCanceled() + && psd.getPaymentDetails() != null + && (FIN_Utility.isPaymentConfirmed(psd.getPaymentDetails().getFinPayment().getStatus(), + psd) || currentPSD.getId().equals(psd.getId()))) { + Date paymentDate = psd.getPaymentDetails().getFinPayment().getPaymentDate(); + if (paymentDate.after(paymentDueDate)) { + overdueOriginal = overdueOriginal.add(psd.getAmount()); + } + } + } + + } + return overdueOriginal; + } + + private static FIN_PaymentScheduleDetail getLastCreatedPaymentScheduleDetail( + FIN_PaymentSchedule invoicePaymentSchedule) { + final OBCriteria<FIN_PaymentScheduleDetail> obc = OBDal.getInstance().createCriteria( + FIN_PaymentScheduleDetail.class); + OBContext.setAdminMode(); + try { + obc.add(Restrictions.eq(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, + invoicePaymentSchedule)); + obc.addOrderBy(FIN_PaymentScheduleDetail.PROPERTY_CREATIONDATE, false); + obc.setMaxResults(1); + return (FIN_PaymentScheduleDetail) obc.uniqueResult(); + } finally { + OBContext.restorePreviousMode(); + } + + } + + /** + * Returns the date in which last payment for this invoice took place + * + * @param invoice + * @return + */ + private static Date getFinalSettlementDate(Invoice invoice) { + final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria( + FIN_PaymentSchedInvV.class); + OBContext.setAdminMode(); + try { + obc.add(Restrictions.eq(FIN_PaymentSchedInvV.PROPERTY_INVOICE, invoice)); + obc.setProjection(Projections.max(FIN_PaymentSchedInvV.PROPERTY_LASTPAYMENT)); + return (Date) obc.uniqueResult(); + } finally { + OBContext.restorePreviousMode(); + } + } + /** * Returns true if a financial account transactions has to be automatically triggered after * payment is processed. diff -r ce760b148e29 -r 9f5eedec4e1a 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 Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Jul 10 10:18:42 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.17393]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17430]]></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 ce760b148e29 -r 9f5eedec4e1a 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 Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jul 10 10:18:42 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.17393]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17430]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ce760b148e29 -r 9f5eedec4e1a 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 Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Jul 10 10:18:42 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.17393]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17430]]></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 ce760b148e29 -r 9f5eedec4e1a 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 Sat Jun 30 04:59:59 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jul 10 10:18:42 2012 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.17393]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.17430]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.17393]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.17430]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.17393]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.17430]]></STARTVERSION> ------------------------------------------------------------------------------ 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
