details: https://code.openbravo.com/erp/devel/main/rev/ebc30f182594 changeset: 20016:ebc30f182594 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Mar 27 12:41:13 2013 +0100 summary: Related to issue 23295 applied feedback
details: https://code.openbravo.com/erp/devel/main/rev/3d38da89c24f changeset: 20017:3d38da89c24f user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Mar 27 10:40:48 2013 +0100 summary: Fixed bug 23361 Sample data (F&B client)monthly update details: https://code.openbravo.com/erp/devel/main/rev/1da96e09abea changeset: 20018:1da96e09abea user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Mar 27 13:05:59 2013 +0100 summary: Fixes issue 23411: Fixed wrong hql where clause The hql where clause had an extra closing parenthesis. This was making the hql query work improperly, and the client and organization filters were not being applied. details: https://code.openbravo.com/erp/devel/main/rev/bc2062961ed8 changeset: 20019:bc2062961ed8 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Mar 27 13:42:46 2013 +0100 summary: Related to sisue 23411: Removes extra parenthesis from two hql where clauses details: https://code.openbravo.com/erp/devel/main/rev/9a1d0505551b changeset: 20020:9a1d0505551b user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 27 15:36:30 2013 +0100 summary: Fixes Issue 23414. When Setting an Organization as ready, in 13th Period, avoid creating Period Control Entries for Document Categories different than GLJournal. details: https://code.openbravo.com/erp/devel/main/rev/a0ce156187d7 changeset: 20021:a0ce156187d7 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 27 15:59:36 2013 +0100 summary: Fixes Issue 23415. Adds OBContext.SetAdminMode(true) before accessing the Currency. details: https://code.openbravo.com/erp/devel/main/rev/73835a1bd881 changeset: 20022:73835a1bd881 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 27 16:08:21 2013 +0100 summary: Fixes Issue 23416. Adds OBContext.setAdminMode(false) for allowing to access other Organizations. details: https://code.openbravo.com/erp/devel/main/rev/0e144d68eb28 changeset: 20023:0e144d68eb28 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 27 16:15:38 2013 +0100 summary: Fixes Issue 23417. In Open/Close Period Control Window, in Documents Tab, adds the Organization and changes the Identifier of the Table. details: https://code.openbravo.com/erp/devel/main/rev/f2a7875273c1 changeset: 20024:f2a7875273c1 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Tue Mar 12 17:19:32 2013 +0100 summary: Fixes issue 23288: Payment proposal: ability to generate single payment for all the purchase orders/invoices details: https://code.openbravo.com/erp/devel/main/rev/8a755239b390 changeset: 20025:8a755239b390 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Mar 27 16:16:22 2013 +0100 summary: Related to issue 23288 update Copyright details: https://code.openbravo.com/erp/devel/main/rev/3f1d1d393dcb changeset: 20026:3f1d1d393dcb user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Mar 27 16:38:52 2013 +0100 summary: Related to issue 22300 and open/close period project details: https://code.openbravo.com/erp/devel/main/rev/de2ea1d36314 changeset: 20027:de2ea1d36314 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed Mar 27 17:07:22 2013 +0100 summary: Fixes issue 23420: Accounting background process has really poor performance details: https://code.openbravo.com/erp/devel/main/rev/5c1ad90975cf changeset: 20028:5c1ad90975cf user: Jon AlegrÃa <jon.alegria <at> openbravo.com> date: Wed Mar 27 23:41:36 2013 +0100 summary: Fixes issue 0023427: Error when deactivating a locator details: https://code.openbravo.com/erp/devel/main/rev/dcf503f0d385 changeset: 20029:dcf503f0d385 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 28 01:13:39 2013 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/4ff12360eb74 changeset: 20030:4ff12360eb74 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Mar 30 17:37:33 2013 +0100 summary: [calendar] Related to issue 23432: Changed API in doPostXX functions in DefaultJsonDataService.java to get also original arguments details: https://code.openbravo.com/erp/devel/main/rev/e3e68152ff62 changeset: 20031:e3e68152ff62 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Mar 30 18:44:07 2013 +0100 summary: Fixed missing copyright year details: https://code.openbravo.com/erp/devel/main/rev/80299f4b6436 changeset: 20032:80299f4b6436 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Apr 01 18:15:08 2013 +0200 summary: CI: update AD_MODULE to version 20031 diffstat: 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_REF_LIST.xml | 15 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java | 28 +- 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/org/openbravo/client/application/event/OpenClosePeriodHandler.java | 46 +- 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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 32 +- 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 +- referencedata/sampledata/F_B_International_Group.xml | 1199552 +++++---- src-db/database/model/functions/AD_ORG_READY.xml | 6 +- src-db/database/model/triggers/M_LOCATOR_TRG.xml | 8 +- src-db/database/sourcedata/AD_COLUMN.xml | 6 +- src-db/database/sourcedata/AD_FIELD.xml | 8 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_TAB.xml | 6 +- src/org/openbravo/erpCommon/ad_actionButton/Posted.java | 4 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 11 +- src/org/openbravo/erpCommon/ad_forms/CallAcctServer.java | 12 +- src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java | 20 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess.java | 4 +- src/org/openbravo/erpCommon/ad_process/ResetAccountingProcess.java | 10 - src/org/openbravo/erpCommon/businessUtility/PeriodControlUtility.java | 6 +- src/org/openbravo/financial/ResetAccounting.java | 205 +- 60 files changed, 663282 insertions(+), 536866 deletions(-) diffs (truncated from 1307584 to 300 lines): diff -r 8c156e06ac9a -r 80299f4b6436 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 01 18:15:08 2013 +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.20000]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20031]]></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 8c156e06ac9a -r 80299f4b6436 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 Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 01 18:15:08 2013 +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.20000]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20031]]></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.20000]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.20031]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 8c156e06ac9a -r 80299f4b6436 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Mon Apr 01 18:15:08 2013 +0200 @@ -25,6 +25,18 @@ <!--2C29C3C687FC403A802A15DEAF9E0D26--> <SEQNO><![CDATA[10]]></SEQNO> <!--2C29C3C687FC403A802A15DEAF9E0D26--></AD_REF_LIST> +<!--3F087596A0A14DE5BAECAD211AB393BA--><AD_REF_LIST> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <AD_REF_LIST_ID><![CDATA[3F087596A0A14DE5BAECAD211AB393BA]]></AD_REF_LIST_ID> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <VALUE><![CDATA[GONEP]]></VALUE> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <NAME><![CDATA[Group all orders/invoices into one payment]]></NAME> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <AD_REFERENCE_ID><![CDATA[79FDE7805FC84C2BB251EE57E96C0AEE]]></AD_REFERENCE_ID> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--3F087596A0A14DE5BAECAD211AB393BA--> <SEQNO><![CDATA[40]]></SEQNO> +<!--3F087596A0A14DE5BAECAD211AB393BA--></AD_REF_LIST> + <!--432DB5DD63B449ACB9DEFF26D21B219F--><AD_REF_LIST> <!--432DB5DD63B449ACB9DEFF26D21B219F--> <AD_REF_LIST_ID><![CDATA[432DB5DD63B449ACB9DEFF26D21B219F]]></AD_REF_LIST_ID> <!--432DB5DD63B449ACB9DEFF26D21B219F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -34,6 +46,7 @@ <!--432DB5DD63B449ACB9DEFF26D21B219F--> <NAME><![CDATA[Generate Payments]]></NAME> <!--432DB5DD63B449ACB9DEFF26D21B219F--> <AD_REFERENCE_ID><![CDATA[79FDE7805FC84C2BB251EE57E96C0AEE]]></AD_REFERENCE_ID> <!--432DB5DD63B449ACB9DEFF26D21B219F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--432DB5DD63B449ACB9DEFF26D21B219F--> <SEQNO><![CDATA[10]]></SEQNO> <!--432DB5DD63B449ACB9DEFF26D21B219F--></AD_REF_LIST> <!--4A633A692495425FA27BEF840905D29E--><AD_REF_LIST> @@ -45,6 +58,7 @@ <!--4A633A692495425FA27BEF840905D29E--> <NAME><![CDATA[Reactivate]]></NAME> <!--4A633A692495425FA27BEF840905D29E--> <AD_REFERENCE_ID><![CDATA[79FDE7805FC84C2BB251EE57E96C0AEE]]></AD_REFERENCE_ID> <!--4A633A692495425FA27BEF840905D29E--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--4A633A692495425FA27BEF840905D29E--> <SEQNO><![CDATA[20]]></SEQNO> <!--4A633A692495425FA27BEF840905D29E--></AD_REF_LIST> <!--4A647396E4CE4E8B90D58E9FE4C12BBA--><AD_REF_LIST> @@ -210,6 +224,7 @@ <!--C5D1596D065545B49156C1F9426C9E14--> <NAME><![CDATA[Group separate payments for the same vendor into one payment]]></NAME> <!--C5D1596D065545B49156C1F9426C9E14--> <AD_REFERENCE_ID><![CDATA[79FDE7805FC84C2BB251EE57E96C0AEE]]></AD_REFERENCE_ID> <!--C5D1596D065545B49156C1F9426C9E14--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C5D1596D065545B49156C1F9426C9E14--> <SEQNO><![CDATA[30]]></SEQNO> <!--C5D1596D065545B49156C1F9426C9E14--></AD_REF_LIST> <!--E047F81FACD0440EACB0EE63EB18A4EE--><AD_REF_LIST> diff -r 8c156e06ac9a -r 80299f4b6436 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.java Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.java Mon Apr 01 18:15:08 2013 +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-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -65,7 +65,7 @@ OBContext.setAdminMode(); try { - if (strProcessProposalAction.equals("GSP")) { + if (strProcessProposalAction.equals("GSP") || strProcessProposalAction.equals("GONEP")) { try { List<FIN_PaymentPropDetail> ppd = new AdvPaymentMngtDao().getObject( FIN_PaymentProposal.class, strFinPaymentProposalId).getFINPaymentPropDetailList(); @@ -139,6 +139,7 @@ discard[0] = "displayCheckBox"; filterActions.put(fpp.getAPRMProcessProposal(), fpp.getAPRMProcessProposal()); } else { + filterActions.put("GONEP", "GONEP"); filterActions.put("GSP", "GSP"); } XmlDocument xmlDocument = xmlEngine.readXmlTemplate( diff -r 8c156e06ac9a -r 80299f4b6436 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java Mon Apr 01 18:15:08 2013 +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-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -70,7 +70,8 @@ final FIN_PaymentProposal paymentProposal = dao .getObject(FIN_PaymentProposal.class, recordID); - if (strAction.equals("GSP")) { + if (strAction.equals("GSP") || strAction.equals("GONEP")) { + boolean groupByVendor = strAction.equals("GSP"); if (paymentProposal.isProcessed()) { OBError msg = new OBError(); String strMessage = "@DocumentProcessed@" + paymentProposal.getDocumentNo(); @@ -121,7 +122,7 @@ .getOrderPaymentSchedule().getOrder().getBusinessPartner().getId(); } - if (!strBusinessPartner_old.equals(strBusinessPartner) + if (groupByVendor && !strBusinessPartner_old.equals(strBusinessPartner) && !strBusinessPartner_old.equals("-1")) { // String strPaymentDocumentNo = Utility.getDocumentNo(conProvider, vars, @@ -177,12 +178,14 @@ long faPrecision = financialAccountCurrency.getStandardPrecision(); finAccTxnAmount = finAccTxnAmount.setScale((int) faPrecision, RoundingMode.HALF_UP); + BusinessPartner businessPartner = groupByVendor ? dao.getObject(BusinessPartner.class, + strBusinessPartner) : null; + FIN_Payment payment = FIN_AddPayment.savePayment(null, isReceipt, dao.getObject(DocumentType.class, strDocTypeId), strPaymentDocumentNo, - dao.getObject(BusinessPartner.class, strBusinessPartner), paymentMethodId, - financialAccountId, paymentTotal.toString(), paymentDate, orgId, null, - selectedPaymentDetails, selectedPaymentDetailsAmounts, isWriteOff, isRefund, - paymentCurrency, exchangeRate, finAccTxnAmount); + businessPartner, paymentMethodId, financialAccountId, paymentTotal.toString(), + paymentDate, orgId, null, selectedPaymentDetails, selectedPaymentDetailsAmounts, + isWriteOff, isRefund, paymentCurrency, exchangeRate, finAccTxnAmount); paymentProposal.setStatus(isReceipt ? "RPR" : "PPM"); // process payment message = FIN_AddPayment.processPayment(vars, conProvider, "P", payment); @@ -192,13 +195,18 @@ OBDal.getInstance().flush(); } if (message.getType().equals("Error")) { - String exceptionMessage = payment.getBusinessPartner().getName(); + String exceptionMessage = payment.getBusinessPartner() != null ? payment + .getBusinessPartner().getName() : payment.getDocumentNo(); exceptionMessage += ": " + message.getMessage(); throw new OBException(exceptionMessage); - } else if (message.getType().equals("Warning")) + } else if (message.getType().equals("Warning")) { strMessageType = message.getType(); + } strMessageResult.append("@Payment@ ").append(payment.getDocumentNo()); - strMessageResult.append(" (").append(payment.getBusinessPartner().getName()).append(")"); + if (payment.getBusinessPartner() != null) { + strMessageResult.append(" (").append(payment.getBusinessPartner().getName()) + .append(")"); + } if (!"".equals(message.getMessage())) strMessageResult.append(": ").append(message.getMessage()); strMessageResult.append("<br>"); diff -r 8c156e06ac9a -r 80299f4b6436 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 Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 01 18:15:08 2013 +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.20000]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.20031]]></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 8c156e06ac9a -r 80299f4b6436 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 Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 01 18:15:08 2013 +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.20000]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.20031]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 8c156e06ac9a -r 80299f4b6436 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 Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 01 18:15:08 2013 +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.20000]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.20031]]></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 8c156e06ac9a -r 80299f4b6436 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 Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 01 18:15:08 2013 +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.20000]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.20031]]></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.20000]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.20031]]></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.20000]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.20031]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.20000]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.20031]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 8c156e06ac9a -r 80299f4b6436 modules/org.openbravo.client.application/src/org/openbravo/client/application/event/OpenClosePeriodHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/OpenClosePeriodHandler.java Wed Mar 27 11:48:53 2013 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/OpenClosePeriodHandler.java Mon Apr 01 18:15:08 2013 +0200 @@ -29,6 +29,7 @@ import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.client.kernel.BaseActionHandler; import org.openbravo.client.kernel.RequestContext; +import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.data.FieldProvider; import org.openbravo.erpCommon.businessUtility.PeriodControlUtility; @@ -43,7 +44,7 @@ import org.openbravo.service.db.DbUtility; public class OpenClosePeriodHandler extends BaseActionHandler { - static Logger log4j = Logger.getLogger(OpenClosePeriodHandler.class); + private static final Logger log4j = Logger.getLogger(OpenClosePeriodHandler.class); @Override protected JSONObject execute(Map<String, Object> parameters, String content) { @@ -108,8 +109,13 @@ continue; } pc.setPeriodAction(action); - OBDal.getInstance().save(pc); - OBDal.getInstance().flush(); + OBContext.setAdminMode(false); + try { + OBDal.getInstance().save(pc); + OBDal.getInstance().flush(); + } finally { + OBContext.restorePreviousMode(); + } OBError error = PeriodControlUtility.openClosePeriodControl(id); if ("Error".equals(error.getType())) { throw new OBException(error.getMessage()); @@ -128,8 +134,13 @@ pcl.setYear(p.getYear()); pcl.setProcessed(false); pcl.setProcessNow(false); - OBDal.getInstance().save(pcl); - OBDal.getInstance().flush(); + OBContext.setAdminMode(false); + try { + OBDal.getInstance().save(pcl); ------------------------------------------------------------------------------ Own the Future-Intel® Level Up Game Demo Contest 2013 Rise to greatness in Intel's independent game demo contest. Compete for recognition, cash, and the chance to get your game on Steam. $5K grand prize plus 10 genre and skill prizes. Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
