details: https://code.openbravo.com/erp/devel/pi/rev/8d1e52794b1e changeset: 22332:8d1e52794b1e user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 03 16:20:19 2014 +0000 summary: CI: update AD_MODULE to version 22325
details: https://code.openbravo.com/erp/devel/pi/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 diffstat: legal/Xinha_htmlArea_license.txt | 30 -- 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/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 140 +++++---- 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.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-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 | 2 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateMTransactionCostingStatus.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateMTransactionCostingStatus.java | 2 + src/org/openbravo/costing/CostingBackground.java | 44 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 3 +- src/org/openbravo/financial/ResetAccounting.java | 8 +- 54 files changed, 304 insertions(+), 204 deletions(-) diffs (truncated from 1410 to 300 lines): diff -r 52f5288bc3dd -r 411bc9e9060e 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 411bc9e9060e 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 Mon Mar 03 16:37:13 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 411bc9e9060e 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 Mon Mar 03 16:37:13 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.22325]]></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 411bc9e9060e 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 Mon Mar 03 16:37:13 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.22325]]></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.22325]]></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 411bc9e9060e 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 Mon Mar 03 16:37:13 2014 +0000 @@ -849,89 +849,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); - } } - paymentDetail.getFINPaymentScheduleDetailList().removeAll(removedPDS); - if (strAction.equals("R")) { + if (strAction.equals("R") + || (strAction.equals("RE") + && paymentScheduleDetail.getInvoicePaymentSchedule() == null + && paymentScheduleDetail.getOrderPaymentSchedule() == null && paymentScheduleDetail + .getPaymentDetails().getGLItem() == null)) { + FIN_AddPayment.mergePaymentScheduleDetails(paymentScheduleDetail); + removedPDS.add(paymentScheduleDetail); + } + + } + paymentDetail.getFINPaymentScheduleDetailList().removeAll(removedPDS); + if (strAction.equals("R")) { + OBDal.getInstance().getSession().refresh(paymentDetail); + } + // If there is any schedule detail with amount zero, those are deleted + for (FIN_PaymentScheduleDetail psd : removedPDS) { + if (BigDecimal.ZERO.compareTo(psd.getAmount()) == 0 + && BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0) { + paymentDetail.getFINPaymentScheduleDetailList().remove(psd); OBDal.getInstance().getSession().refresh(paymentDetail); + psd.getInvoicePaymentSchedule() + .getFINPaymentScheduleDetailInvoicePaymentScheduleList().remove(psd); + psd.getOrderPaymentSchedule().getFINPaymentScheduleDetailOrderPaymentScheduleList() + .remove(psd); + OBDal.getInstance().remove(psd); } - // If there is any schedule detail with amount zero, those are deleted - for (FIN_PaymentScheduleDetail psd : removedPDS) { - if (BigDecimal.ZERO.compareTo(psd.getAmount()) == 0 - && BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0) { - paymentDetail.getFINPaymentScheduleDetailList().remove(psd); - OBDal.getInstance().getSession().refresh(paymentDetail); - psd.getInvoicePaymentSchedule() - .getFINPaymentScheduleDetailInvoicePaymentScheduleList().remove(psd); - psd.getOrderPaymentSchedule() - .getFINPaymentScheduleDetailOrderPaymentScheduleList().remove(psd); - OBDal.getInstance().remove(psd); - } - } - if (paymentDetail.getFINPaymentScheduleDetailList().size() == 0) { - removedPD.add(paymentDetail); - removedPDIds.add(paymentDetail.getId()); - } - OBDal.getInstance().save(paymentDetail); } - for (String pdToRm : removedPDIds) { - OBDal.getInstance().remove(OBDal.getInstance().get(FIN_PaymentDetail.class, pdToRm)); + if (paymentDetail.getFINPaymentScheduleDetailList().size() == 0) { + removedPD.add(paymentDetail); + removedPDIds.add(paymentDetail.getId()); } - payment.getFINPaymentDetailList().removeAll(removedPD); - if (strAction.equals("R")) { - payment.getCurrencyConversionRateDocList().removeAll(conversionRates); - payment.setFinancialTransactionConvertRate(BigDecimal.ZERO); - } - OBDal.getInstance().save(payment); + OBDal.getInstance().save(paymentDetail); + } + for (String pdToRm : removedPDIds) { + OBDal.getInstance().remove(OBDal.getInstance().get(FIN_PaymentDetail.class, pdToRm)); + } + payment.getFINPaymentDetailList().removeAll(removedPD); + if (strAction.equals("R")) { + payment.getCurrencyConversionRateDocList().removeAll(conversionRates); + payment.setFinancialTransactionConvertRate(BigDecimal.ZERO); + } + OBDal.getInstance().save(payment); - if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0 - && payment.getUsedCredit().compareTo(BigDecimal.ZERO) != 0) { - undoUsedCredit(payment, vars, invoiceDocNos); - } + if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0 + && payment.getUsedCredit().compareTo(BigDecimal.ZERO) != 0) { + undoUsedCredit(payment, vars, invoiceDocNos); + } - List<FIN_Payment> creditPayments = new ArrayList<FIN_Payment>(); - for (final FIN_Payment_Credit pc : payment.getFINPaymentCreditList()) { - creditPayments.add(pc.getCreditPaymentUsed()); - } - for (final FIN_Payment creditPayment : creditPayments) { - // Update Description - final String payDesc = creditPayment.getDescription(); - if (payDesc != null) { - final String invoiceDocNoMsg = Utility.messageBD(new DalConnectionProvider(), - "APRM_CreditUsedinInvoice", vars.getLanguage()); - if (invoiceDocNoMsg != null) { - final StringBuffer newDesc = new StringBuffer(); - for (final String line : payDesc.split("\n")) { - boolean include = true; - if (line.startsWith(invoiceDocNoMsg.substring(0, - invoiceDocNoMsg.lastIndexOf("%s")))) { - for (final String docNo : invoiceDocNos) { - if (line.indexOf(docNo) > 0) { - include = false; - break; - } + List<FIN_Payment> creditPayments = new ArrayList<FIN_Payment>(); + for (final FIN_Payment_Credit pc : payment.getFINPaymentCreditList()) { + creditPayments.add(pc.getCreditPaymentUsed()); + } + for (final FIN_Payment creditPayment : creditPayments) { + // Update Description + final String payDesc = creditPayment.getDescription(); + if (payDesc != null) { + final String invoiceDocNoMsg = Utility.messageBD(new DalConnectionProvider(), + "APRM_CreditUsedinInvoice", vars.getLanguage()); + if (invoiceDocNoMsg != null) { + final StringBuffer newDesc = new StringBuffer(); + for (final String line : payDesc.split("\n")) { + boolean include = true; + if (line.startsWith(invoiceDocNoMsg.substring(0, + invoiceDocNoMsg.lastIndexOf("%s")))) { + for (final String docNo : invoiceDocNos) { + if (line.indexOf(docNo) > 0) { + include = false; + break; } } - if (include) { - newDesc.append(line); - if (!"".equals(line)) - newDesc.append("\n"); - } } - // Truncate Description to keep length as 255 - creditPayment.setDescription(newDesc.toString().length() > 255 ? newDesc - .toString().substring(0, 255) : newDesc.toString()); + if (include) { + newDesc.append(line); + if (!"".equals(line)) + newDesc.append("\n"); + } } + // Truncate Description to keep length as 255 + creditPayment.setDescription(newDesc.toString().length() > 255 ? newDesc.toString() + .substring(0, 255) : newDesc.toString()); } } } + payment.getFINPaymentCreditList().clear(); payment.setGeneratedCredit(BigDecimal.ZERO); if (strAction.equals("R")) { diff -r 52f5288bc3dd -r 411bc9e9060e 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 Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 03 16:37:13 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.22292]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.22325]]></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 52f5288bc3dd -r 411bc9e9060e 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 Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 03 16:37:13 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.22292]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.22325]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 52f5288bc3dd -r 411bc9e9060e 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 Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 03 16:37:13 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.22292]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.22325]]></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 52f5288bc3dd -r 411bc9e9060e 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 Mon Mar 03 09:40:29 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 03 16:37:13 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.22292]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.22325]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> ------------------------------------------------------------------------------ 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
