details: https://code.openbravo.com/erp/devel/main/rev/ab571092c694 changeset: 22327:ab571092c694 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 03 10:04:32 2014 +0100 summary: related to 6041: remove Xinha editor, removed legal info
details: https://code.openbravo.com/erp/devel/main/rev/8845de885b87 changeset: 22328:8845de885b87 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 03 11:06:05 2014 +0100 summary: Fixes Issue 24405. Fixes problem with more than 1000 Pending Trx. details: https://code.openbravo.com/erp/devel/main/rev/8bed44ca01d9 changeset: 22329:8bed44ca01d9 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue Feb 25 12:05:58 2014 +0530 summary: Fixes Issue 25112 Valued stock report does not filter by stocked products details: https://code.openbravo.com/erp/devel/main/rev/06abdef2633f changeset: 22330:06abdef2633f user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Mar 03 12:13:22 2014 +0100 summary: Fixed bug 25876: Error when reactivating payments details: https://code.openbravo.com/erp/devel/main/rev/ee9a0da05d43 changeset: 22331:ee9a0da05d43 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Mar 03 12:13:55 2014 +0100 summary: Fixed bug 25877: Error when adding payments details: https://code.openbravo.com/erp/devel/main/rev/fbadcf337117 changeset: 22332:fbadcf337117 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Feb 25 11:23:37 2014 +0530 summary: Fixes Issue 24938: Reset accounting process doesn't work with date from and periods in the future details: https://code.openbravo.com/erp/devel/main/rev/411bc9e9060e changeset: 22333:411bc9e9060e user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 03 16:37:13 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/a7f8d171c573 changeset: 22334:a7f8d171c573 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 03 18:55:21 2014 +0100 summary: Related to Issue 24405. Checks if needed to update in Modulescript. details: https://code.openbravo.com/erp/devel/main/rev/ee45d9f4b830 changeset: 22335:ee45d9f4b830 user: Gaurav Deshmukh <gaurav.deshmukh <at> openbravo.com> date: Tue Feb 04 17:39:02 2014 +0530 summary: Fixes Issue 25408: MRP must not take into account generic products details: https://code.openbravo.com/erp/devel/main/rev/77cbc3497ee0 changeset: 22336:77cbc3497ee0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Mar 04 08:02:13 2014 +0100 summary: fixed bug 25887: Hidden stack executing failing module script details: https://code.openbravo.com/erp/devel/main/rev/fe9797a7d6cd changeset: 22337:fe9797a7d6cd user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Mar 04 08:42:24 2014 +0100 summary: fixed bug 25883: can't clear filter in P&E grid details: https://code.openbravo.com/erp/devel/main/rev/ca2e7eff07ba changeset: 22338:ca2e7eff07ba user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Mar 04 09:26:45 2014 +0100 summary: Related to Issue 24405. Pushes Modulescript .class updated file. details: https://code.openbravo.com/erp/devel/main/rev/438064e1336a changeset: 22339:438064e1336a user: Atul Gaware <atul.gaware <at> openbravo.com> date: Thu Feb 27 11:57:02 2014 +0530 summary: Related To Issue 24866 details: https://code.openbravo.com/erp/devel/main/rev/091f2518a7dd changeset: 22340:091f2518a7dd user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Mar 04 10:50:40 2014 +0100 summary: Fixes Issue 25888. Adds UpdateMTransactionCostingStatusData.class file. details: https://code.openbravo.com/erp/devel/main/rev/e878aac6159c changeset: 22341:e878aac6159c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Mar 04 13:50:41 2014 +0100 summary: fixed bug 25889: focus field changed when opening Linked Items/Notes sections The focus was not set to the section causing the focused field to be reset details: https://code.openbravo.com/erp/devel/main/rev/5ccb08d7767d changeset: 22342:5ccb08d7767d user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue Mar 04 20:56:47 2014 +0530 summary: Related to Issue 24866: value='Y' replaced by to_char('Y') in xsql details: https://code.openbravo.com/erp/devel/main/rev/ba0d445a51cf changeset: 22343:ba0d445a51cf user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Mar 04 13:42:29 2014 +0100 summary: Fixed bug 25895 impossible to pay a invoice with generated credit details: https://code.openbravo.com/erp/devel/main/rev/94e3b048685e changeset: 22344:94e3b048685e user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Mar 04 20:54:42 2014 +0530 summary: Fixes Issue 25590: Region filter in Sales order report is showing US regions details: https://code.openbravo.com/erp/devel/main/rev/d34c34b81a92 changeset: 22345:d34c34b81a92 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Mar 05 14:52:15 2014 +0000 summary: CI: update AD_MODULE to version 22344 diffstat: legal/Xinha_htmlArea_license.txt | 30 -- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class | 0 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-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java | 5 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql | 26 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java | 71 ++++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 144 +++++---- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 1 + 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-section.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.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.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.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-core/src/org/openbravo/modulescript/ModuleScriptHandler.java | 4 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 1 + src-db/database/model/tables/M_TRANSACTION.xml | 5 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 38 ++ src-db/database/sourcedata/AD_COLUMN.xml | 34 ++ src-db/database/sourcedata/AD_ELEMENT.xml | 12 + src-db/database/sourcedata/AD_FIELD.xml | 26 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 66 ++++ src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateMTransactionCostingStatus.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateMTransactionCostingStatusData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateMTransactionCostingStatus.java | 24 +- src-util/modulescript/src/org/openbravo/modulescript/UpdateMTransactionCostingStatus_data.xsql | 75 +++++ src/org/openbravo/costing/CostingBackground.java | 46 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html | 16 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.xml | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java | 15 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 3 +- src/org/openbravo/financial/ResetAccounting.java | 8 +- 73 files changed, 616 insertions(+), 259 deletions(-) diffs (truncated from 2075 to 300 lines): diff -r 52f5288bc3dd -r d34c34b81a92 legal/Xinha_htmlArea_license.txt --- a/legal/Xinha_htmlArea_license.txt Mon Mar 03 09:40:29 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -htmlArea License (based on BSD license) -Copyright (c) 2002-2004, interactivetools.com, inc. -Copyright (c) 2003-2004 dynarch.com -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1) Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2) Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3) Neither the name of interactivetools.com, inc. nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class has changed diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class has changed diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Mar 05 14:52:15 2014 +0000 @@ -8863,7 +8863,7 @@ <!--80D2CCB125DAECE6E040007F01000DDE--> <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID> <!--80D2CCB125DAECE6E040007F01000DDE--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--80D2CCB125DAECE6E040007F01000DDE--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--80D2CCB125DAECE6E040007F01000DDE--> <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'&@IsPaid@='N']]></DISPLAYLOGIC> +<!--80D2CCB125DAECE6E040007F01000DDE--> <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'&@IsPaid@='N' &@showAddPayment@='Y' | @showAddPayment@ ='']]></DISPLAYLOGIC> <!--80D2CCB125DAECE6E040007F01000DDE--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--80D2CCB125DAECE6E040007F01000DDE--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--80D2CCB125DAECE6E040007F01000DDE--> <SEQNO><![CDATA[510]]></SEQNO> @@ -14455,7 +14455,7 @@ <!--AD7C15BA367642AFB471EFAFD768FB2D--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--AD7C15BA367642AFB471EFAFD768FB2D--> <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID> <!--AD7C15BA367642AFB471EFAFD768FB2D--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--AD7C15BA367642AFB471EFAFD768FB2D--> <DISPLAYLOGIC><![CDATA[@Processed@='Y'&@IsPaid@='N']]></DISPLAYLOGIC> +<!--AD7C15BA367642AFB471EFAFD768FB2D--> <DISPLAYLOGIC><![CDATA[@Processed@='Y'&@IsPaid@='N'& (@showAddPayment@='Y' | @showAddPayment@ ='')]]></DISPLAYLOGIC> <!--AD7C15BA367642AFB471EFAFD768FB2D--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> <!--AD7C15BA367642AFB471EFAFD768FB2D--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--AD7C15BA367642AFB471EFAFD768FB2D--> <SEQNO><![CDATA[352]]></SEQNO> diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 05 14:52:15 2014 +0000 @@ -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.22292]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.22344]]></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 52f5288bc3dd -r d34c34b81a92 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 Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 05 14:52:15 2014 +0000 @@ -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.22292]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.22344]]></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.22292]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.22344]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java --- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java Wed Mar 05 14:52:15 2014 +0000 @@ -33,6 +33,11 @@ ConnectionProvider cp = getConnectionProvider(); // Check if the modulescript has been executed before. // If the preference does not exist in the database yet the modulescript must be executed. + boolean isCustomerBalanceRestoredWithValue = UpdateCustomerBalanceData.hasIsCustomerBalanceRestoredWithValue(cp); + if(isCustomerBalanceRestoredWithValue) { + UpdateCustomerBalanceData.deleteIsCustomerBalanceRestoredWithValue(cp); + } + boolean isCustomerBalanceFixed = UpdateCustomerBalanceData.isCustomerBalanceFixed(cp); if (!isCustomerBalanceFixed) { UpdateCustomerBalanceData.createPreference(cp); diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql --- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql Wed Mar 05 14:52:15 2014 +0000 @@ -23,8 +23,26 @@ <![CDATA[ SELECT count(*) as existpreference FROM ad_preference - WHERE attribute = 'IsCustomerBalanceRestored' - AND ad_module_id = NULL + WHERE attribute = 'IsCustomerBalanceRestored' + ]]> + </Sql> + </SqlMethod> + <SqlMethod name="hasIsCustomerBalanceRestoredWithValue" type="preparedStatement" return="boolean"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + SELECT count(*) as existpreference + FROM ad_preference + WHERE attribute = 'IsCustomerBalanceRestored' AND to_char(value)='Y' + ]]> + </Sql> + </SqlMethod> + <SqlMethod name="deleteIsCustomerBalanceRestoredWithValue" type="preparedStatement" return="rowcount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + DELETE FROM ad_preference + WHERE attribute = 'IsCustomerBalanceRestored' AND to_char(value)='Y' ]]> </Sql> </SqlMethod> @@ -74,11 +92,11 @@ INSERT INTO ad_preference ( ad_preference_id, ad_client_id, ad_org_id, isactive, createdby, created, updatedby, updated, - attribute, value + attribute ) VALUES ( get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(), - 'IsCustomerBalanceRestored', 'Y' + 'IsCustomerBalanceRestored' ) ]]> </Sql> diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java --- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java Wed Mar 05 14:52:15 2014 +0000 @@ -96,8 +96,7 @@ strSql = strSql + " SELECT count(*) as existpreference" + " FROM ad_preference" + - " WHERE attribute = 'IsCustomerBalanceRestored'" + - " AND ad_module_id = NULL "; + " WHERE attribute = 'IsCustomerBalanceRestored' "; ResultSet result; boolean boolReturn = false; @@ -127,6 +126,70 @@ return(boolReturn); } + public static boolean hasIsCustomerBalanceRestoredWithValue(ConnectionProvider connectionProvider) throws ServletException { + String strSql = ""; + strSql = strSql + + " SELECT count(*) as existpreference" + + " FROM ad_preference" + + " WHERE attribute = 'IsCustomerBalanceRestored' AND to_char(value)='Y' "; + + ResultSet result; + boolean boolReturn = false; + PreparedStatement st = null; + + try { + st = connectionProvider.getPreparedStatement(strSql); + + result = st.executeQuery(); + if(result.next()) { + boolReturn = !UtilSql.getValue(result, "existpreference").equals("0"); + } + result.close(); + } catch(SQLException e){ + log4j.error("SQL error in query: " + strSql + "Exception:"+ e); + throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage()); + } catch(Exception ex){ + log4j.error("Exception in query: " + strSql + "Exception:"+ ex); + throw new ServletException("@CODE=@" + ex.getMessage()); + } finally { + try { + connectionProvider.releasePreparedStatement(st); + } catch(Exception ignore){ + ignore.printStackTrace(); + } + } + return(boolReturn); + } + + public static int deleteIsCustomerBalanceRestoredWithValue(ConnectionProvider connectionProvider) throws ServletException { + String strSql = ""; + strSql = strSql + + " DELETE FROM ad_preference" + + " WHERE attribute = 'IsCustomerBalanceRestored' AND to_char(value)='Y' "; + + int updateCount = 0; + PreparedStatement st = null; + + try { + st = connectionProvider.getPreparedStatement(strSql); + + updateCount = st.executeUpdate(); + } catch(SQLException e){ + log4j.error("SQL error in query: " + strSql + "Exception:"+ e); + throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage()); + } catch(Exception ex){ + log4j.error("Exception in query: " + strSql + "Exception:"+ ex); + throw new ServletException("@CODE=@" + ex.getMessage()); + } finally { + try { + connectionProvider.releasePreparedStatement(st); + } catch(Exception ignore){ + ignore.printStackTrace(); + } + } + return(updateCount); + } + public static int resetCustomerCredit(ConnectionProvider connectionProvider) throws ServletException { String strSql = ""; strSql = strSql + @@ -259,11 +322,11 @@ " INSERT INTO ad_preference (" + " ad_preference_id, ad_client_id, ad_org_id, isactive," + " createdby, created, updatedby, updated," + - " attribute, value" + + " attribute" + " ) VALUES (" + " get_uuid(), '0', '0', 'Y'," + " '0', NOW(), '0', NOW()," + - " 'IsCustomerBalanceRestored', 'Y'" + + " 'IsCustomerBalanceRestored'" + " )"; int updateCount = 0; diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Wed Mar 05 14:52:15 2014 +0000 @@ -1926,15 +1926,14 @@ obcPayment.add(Restrictions.in("organization.id", orgIds)); obcPayment.addOrderBy(FIN_Payment.PROPERTY_PAYMENTDATE, true); obcPayment.addOrderBy(FIN_Payment.PROPERTY_DOCUMENTNO, true); + List<FIN_Payment> paymentList = new ArrayList<FIN_Payment>(); for (FIN_Payment fp : obcPayment.list()) { - for (FIN_PaymentDetail fpd : fp.getFINPaymentDetailList()) { - for (FIN_PaymentScheduleDetail fpsd : fpd.getFINPaymentScheduleDetailList()) { - if (fpsd.isInvoicePaid()) { - paymentList.add(fp); - } - } + if ((FIN_Utility.seqnumberpaymentstatus(fp.getStatus())) >= (FIN_Utility + .seqnumberpaymentstatus(FIN_Utility.invoicePaymentStatus(fp)))) { + paymentList.add(fp); } + } return paymentList; } finally { diff -r 52f5288bc3dd -r d34c34b81a92 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Wed Mar 05 14:52:15 2014 +0000 @@ -384,7 +384,9 @@ : "PPM")) >= (FIN_Utility.seqnumberpaymentstatus(FIN_Utility .invoicePaymentStatus(payment))); paymentScheduleDetail.setInvoicePaid(false); - if (invoicePaidAmounts) { + // Payment = 0 when the payment is generated by a invoice that consume credit + if (invoicePaidAmounts + | (payment.getAmount().compareTo(new BigDecimal("0.00")) == 0)) { if (paymentScheduleDetail.getInvoicePaymentSchedule() != null) { // BP SO_CreditUsed businessPartner = paymentScheduleDetail.getInvoicePaymentSchedule() @@ -849,89 +851,91 @@ decreaseCustomerCredit(businessPartner, amount); } } - if (strAction.equals("R") - || (strAction.equals("RE") - && paymentScheduleDetail.getInvoicePaymentSchedule() == null - && paymentScheduleDetail.getOrderPaymentSchedule() == null && paymentScheduleDetail - .getPaymentDetails().getGLItem() == null)) { - FIN_AddPayment.mergePaymentScheduleDetails(paymentScheduleDetail); - removedPDS.add(paymentScheduleDetail); ------------------------------------------------------------------------------ Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce. With Perforce, you get hassle-free workflows. Merge that actually works. Faster operations. Version large binaries. Built-in WAN optimization and the freedom to use Git, Perforce or both. Make the move to Perforce. http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
