details: https://code.openbravo.com/erp/devel/main/rev/2b4515770947 changeset: 22028:2b4515770947 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Thu Feb 06 12:47:30 2014 +0530 summary: Fixes Issue 0025618: Wrong currency after posting multicurrency matched invoices
details: https://code.openbravo.com/erp/devel/main/rev/b6dad5dc6d68 changeset: 22029:b6dad5dc6d68 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Feb 10 18:40:25 2014 +0530 summary: Fixes Issue 25462: Products movement report is not filtering correcly by lot details: https://code.openbravo.com/erp/devel/main/rev/303f6522150c changeset: 22030:303f6522150c user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Feb 13 13:30:22 2014 +0100 summary: Fixed bug 25723 Is impossible to reconcile a transaction that it doesn't have a payment details: https://code.openbravo.com/erp/devel/main/rev/e2e4ee246202 changeset: 22031:e2e4ee246202 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Feb 13 20:19:32 2014 +0530 summary: Related to Issue 0025023: Added missing message definition. details: https://code.openbravo.com/erp/devel/main/rev/e510966c00fd changeset: 22032:e510966c00fd user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Feb 13 21:00:30 2014 +0530 summary: Related to Issue 25644: Cannot create a work effort from a work requirement if operation time / quantity returns a repeating decimal value details: https://code.openbravo.com/erp/devel/main/rev/8626778d85f2 changeset: 22033:8626778d85f2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Feb 13 15:36:48 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/70df6ccc76b2 changeset: 22034:70df6ccc76b2 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Feb 13 21:21:28 2014 +0530 summary: Fixes Issue 25616: Process option in a purchase order without lines, change the status to booked details: https://code.openbravo.com/erp/devel/main/rev/99858c127329 changeset: 22035:99858c127329 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Feb 13 17:23:11 2014 +0100 summary: fixes issue 25686: Selectors with out fields are not working properly in pick and execute windows details: https://code.openbravo.com/erp/devel/main/rev/af9e83d05902 changeset: 22036:af9e83d05902 user: Gaurav Deshmukh <gaurav.deshmukh <at> openbravo.com> date: Thu Jan 30 11:29:06 2014 +0530 summary: Fixes Issue 25174: Goods shipment can be booked without product and quantity. details: https://code.openbravo.com/erp/devel/main/rev/12b3d243b293 changeset: 22037:12b3d243b293 user: Gaurav Deshmukh <gaurav.deshmukh <at> openbravo.com> date: Wed Feb 05 15:01:07 2014 +0530 summary: Fixes Issue 25532: Price list creation is not working fine details: https://code.openbravo.com/erp/devel/main/rev/e6196eede0f8 changeset: 22038:e6196eede0f8 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Feb 14 10:18:02 2014 +0100 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/cac61a7acbc6 changeset: 22039:cac61a7acbc6 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Feb 14 13:32:00 2014 +0100 summary: related to issue 25686: revert changes details: https://code.openbravo.com/erp/devel/main/rev/b28f62b0e588 changeset: 22040:b28f62b0e588 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Feb 14 15:32:23 2014 +0100 summary: Fixed 25742: Fixup small javadoc related errors details: https://code.openbravo.com/erp/devel/main/rev/90b0b23defc9 changeset: 22041:90b0b23defc9 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Feb 15 00:36:19 2014 +0000 summary: CI: update AD_MODULE to version 22040 diffstat: .hgsigs | 1 + .hgtags | 1 + 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-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 61 +++++---- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 3 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java | 5 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/KernelUtilTest.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 2 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java | 2 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseTemplateProcessor.java | 1 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java | 4 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 1 - 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.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 4 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceService.java | 12 +- 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/JsonDataService.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 5 +- 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-db/database/model/functions/C_ORDER_POST1.xml | 2 +- src-db/database/model/functions/M_INOUT_POST.xml | 21 +++- src-db/database/model/functions/M_PRICELIST_CREATE.xml | 12 +- src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 25 ++++ src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/authentication/AuthenticationManager.java | 8 +- src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 15 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql | 3 +- src/org/openbravo/erpCommon/utility/AttributeSetInstanceValue.java | 2 +- src/org/openbravo/erpCommon/utility/ErrorTextParser.java | 2 +- src/org/openbravo/event/MInOutLineEventHandler.java | 27 ++++- src/org/openbravo/service/db/QueryTimeOutUtil.java | 7 - 72 files changed, 241 insertions(+), 187 deletions(-) diffs (truncated from 1597 to 300 lines): diff -r 62a611060740 -r 90b0b23defc9 .hgsigs --- a/.hgsigs Thu Feb 13 09:07:36 2014 +0100 +++ b/.hgsigs Sat Feb 15 00:36:19 2014 +0000 @@ -143,3 +143,4 @@ eb8e78cfd919a9685a7c62d95dea0c33da5cd020 0 iEYEABECAAYFAlLfapIACgkQCX/oGf+2qkOsgQCfZ++nSoqIqaQLLAq8xjW7qzJG3pUAn0+PMbOjJt6kpXwYS8llobEit6Pw dabb8fba63b9659c127420f07461871b3c9bebda 0 iEYEABECAAYFAlL8P1gACgkQCX/oGf+2qkOoYwCg/3/+oc1NxA/d8WSRpVMs0TYNOQwAoKUC5zxZqvJk+LivRSN/+eskflS7 2cbbd8417ae97c721014374b56300f9359801fc2 0 iEYEABECAAYFAlLX0sMACgkQCX/oGf+2qkPBDgCeOEYN+sAUu4baZ1tz3jNaubocaCcAoL/oSf0PxmUybuQg3kMSTINTsbOt +43f6f77b25a9c7d51084945606d9047edc330fd9 0 iEYEABECAAYFAlL8iUMACgkQCX/oGf+2qkNl7ACfSjVPsngbBzCPO8LvR265DeT4c/QAni8NT/G2mfMPQIToawozPiOKNtQl diff -r 62a611060740 -r 90b0b23defc9 .hgtags --- a/.hgtags Thu Feb 13 09:07:36 2014 +0100 +++ b/.hgtags Sat Feb 15 00:36:19 2014 +0000 @@ -154,3 +154,4 @@ 80961289f4cd77842d94594c7e3b05be7fbcb845 3.0MP30.2 305302e510c295adf7ac53425f45a64a8bb6f2b2 3.0MP30.3 e6661b2604e820c2df1269029e688e49d611a1e7 3.0MP31 +510340c73c5073cf20afd52a02e411cebdc017f6 3.0MP31.1 diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Feb 15 00:36:19 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.21988]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.22040]]></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 62a611060740 -r 90b0b23defc9 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 Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Feb 15 00:36:19 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.21988]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.22040]]></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.21988]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.22040]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java --- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java Sat Feb 15 00:36:19 2014 +0000 @@ -457,10 +457,10 @@ * Method used to generating payment document with refund amount. * * @param payment - * . Created Payment. + * Created Payment. * @param refundAmount - * . Refund Amount need to transfer to the customer. - * @return. Created FIN_Payment object. + * Refund Amount need to transfer to the customer. + * @return Created FIN_Payment object. * @throws Exception * In case of executing invalid data. */ diff -r 62a611060740 -r 90b0b23defc9 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 Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Sat Feb 15 00:36:19 2014 +0000 @@ -558,12 +558,6 @@ * accounting dimension * @param salesRegion * accounting dimension - * @param costCenter - * accounting dimension - * @param user1 - * accounting dimension - * @param user2 - * accounting dimension */ public static void saveGLItem(FIN_Payment payment, BigDecimal glitemAmount, GLItem glitem, BusinessPartner businessPartner, Product product, Project project, Campaign campaign, @@ -669,9 +663,9 @@ * * @param vars * VariablseSecureApp with the session data. - * @param selectedPaymentScheduleDetails - * List of FIN_PaymentScheduleDetails that need to be included in the HashMap. - * @return A HashMap mapping the FIN_PaymentScheduleDetail's Id with the corresponding amount. + * @param selectedBaseOBObjects + * List of bobs that need to be included in the HashMap. + * @return A HashMap mapping the Id with the corresponding amount. */ public static <T extends BaseOBObject> HashMap<String, BigDecimal> getSelectedBaseOBObjectAmount( VariablesSecureApp vars, List<T> selectedBaseOBObjects, String htmlElementId) diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java Sat Feb 15 00:36:19 2014 +0000 @@ -110,25 +110,26 @@ Boolean invoicePaidold = false; for (FIN_FinaccTransaction finacctransaction : reconciliation.getFINFinaccTransactionList()) { - for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) { - for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { - invoicePaidold = psd.isInvoicePaid(); - if (!invoicePaidold) { - if ((FIN_Utility.invoicePaymentStatus(finacctransaction.getFinPayment() - .getPaymentMethod(), reconciliation.getAccount(), finacctransaction - .getFinPayment().isReceipt()).equals(finacctransaction.getFinPayment() - .getStatus()))) { - psd.setInvoicePaid(true); - } - if (psd.isInvoicePaid()) { - FIN_Utility.updatePaymentAmounts(psd); + if (finacctransaction.getFinPayment() != null) { + for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) { + for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { + invoicePaidold = psd.isInvoicePaid(); + if (!invoicePaidold) { + if ((FIN_Utility.invoicePaymentStatus(finacctransaction.getFinPayment() + .getPaymentMethod(), reconciliation.getAccount(), finacctransaction + .getFinPayment().isReceipt()).equals(finacctransaction.getFinPayment() + .getStatus()))) { + psd.setInvoicePaid(true); + } + if (psd.isInvoicePaid()) { + FIN_Utility.updatePaymentAmounts(psd); + } } } } + FIN_Utility.updateBusinessPartnerCredit(finacctransaction.getFinPayment()); } - FIN_Utility.updateBusinessPartnerCredit(finacctransaction.getFinPayment()); } - // *********************** // Reactivate Reconciliation // *********************** @@ -162,21 +163,23 @@ Boolean invoicePaidold = false; for (FIN_FinaccTransaction finacctransaction : reconciliation.getFINFinaccTransactionList()) { - for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) { - for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { - invoicePaidold = psd.isInvoicePaid(); - if (invoicePaidold) { - if (FIN_Utility.invoicePaymentStatus( - finacctransaction.getFinPayment().getPaymentMethod(), - reconciliation.getAccount(), finacctransaction.getFinPayment().isReceipt()) - .equals(finacctransaction.getFinPayment().getStatus())) { - boolean restore = (FIN_Utility.seqnumberpaymentstatus(finacctransaction - .getFinPayment().getStatus())) <= (FIN_Utility - .seqnumberpaymentstatus(FIN_Utility.invoicePaymentStatus(finacctransaction - .getFinPayment().getPaymentMethod(), reconciliation.getAccount(), - finacctransaction.getFinPayment().isReceipt()))); - if (restore) { - FIN_Utility.restorePaidAmounts(psd); + if (finacctransaction.getFinPayment() != null) { + for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) { + for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { + invoicePaidold = psd.isInvoicePaid(); + if (invoicePaidold) { + if (FIN_Utility.invoicePaymentStatus( + finacctransaction.getFinPayment().getPaymentMethod(), + reconciliation.getAccount(), finacctransaction.getFinPayment().isReceipt()) + .equals(finacctransaction.getFinPayment().getStatus())) { + boolean restore = (FIN_Utility.seqnumberpaymentstatus(finacctransaction + .getFinPayment().getStatus())) <= (FIN_Utility + .seqnumberpaymentstatus(FIN_Utility.invoicePaymentStatus(finacctransaction + .getFinPayment().getPaymentMethod(), reconciliation.getAccount(), + finacctransaction.getFinPayment().isReceipt()))); + if (restore) { + FIN_Utility.restorePaidAmounts(psd); + } } } } diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Sat Feb 15 00:36:19 2014 +0000 @@ -1382,6 +1382,9 @@ } public static void updateBusinessPartnerCredit(FIN_Payment payment) { + if (payment == null) { + return; + } // When credit is used (consumed) we compensate so_creditused as this amount is already // included in the payment details. Credit consumed should not affect to so_creditused if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0 diff -r 62a611060740 -r 90b0b23defc9 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 Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Feb 15 00:36:19 2014 +0000 @@ -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.21988]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.22040]]></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 62a611060740 -r 90b0b23defc9 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 Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Feb 15 00:36:19 2014 +0000 @@ -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.21988]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.22040]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 62a611060740 -r 90b0b23defc9 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 Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat Feb 15 00:36:19 2014 +0000 @@ -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.21988]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.22040]]></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 62a611060740 -r 90b0b23defc9 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 Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Feb 15 00:36:19 2014 +0000 @@ -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.21988]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.22040]]></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.21988]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.22040]]></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.21988]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.22040]]></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.21988]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.22040]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Sat Feb 15 00:36:19 2014 +0000 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.21988]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.22040]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Feb 15 00:36:19 2014 +0000 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.21988]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.22040]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 62a611060740 -r 90b0b23defc9 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 13 09:07:36 2014 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Sat Feb 15 00:36:19 2014 +0000 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.21988]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.22040]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
