details: https://code.openbravo.com/erp/devel/main/rev/ec4c6d3b7bde changeset: 16701:ec4c6d3b7bde user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue May 29 09:52:54 2012 +0200 summary: Fixes issue 20253: Total Gross Amount is not updated correctly.
details: https://code.openbravo.com/erp/devel/main/rev/20ba1feb4a41 changeset: 16702:20ba1feb4a41 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue May 29 17:36:06 2012 +0200 summary: Fixes issue 20208: Import bank statement. Bank statement lines with amount zero should not be imported. details: https://code.openbravo.com/erp/devel/main/rev/b002c999253f changeset: 16703:b002c999253f user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Wed May 30 11:27:26 2012 +0200 summary: Fixed issue 20540: Enabling disabled checks when the grid is not reloaded details: https://code.openbravo.com/erp/devel/main/rev/0541f858f6e6 changeset: 16704:0541f858f6e6 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed May 30 10:01:59 2012 +0200 summary: Fixes issue 0020366: Accepts Payments with same date as the filter. details: https://code.openbravo.com/erp/devel/main/rev/8a34161af58b changeset: 16705:8a34161af58b user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Wed May 30 11:33:35 2012 +0200 summary: Related to issue 20540: Var name has been corrected details: https://code.openbravo.com/erp/devel/main/rev/62c8e6a2f223 changeset: 16706:62c8e6a2f223 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu May 24 15:46:38 2012 +0200 summary: Fixed bug 20586 Set currency in demodata details: https://code.openbravo.com/erp/devel/main/rev/3679bfdc36e0 changeset: 16707:3679bfdc36e0 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri May 25 12:41:23 2012 +0200 summary: Fixed bug 20575 Change the UUID of the Spanish regions in demodata Change the UUID of the Spanish regions in demodata because it's impossible to apply Spanish Taxes Module in an instance with demodata details: https://code.openbravo.com/erp/devel/main/rev/8f2d220d1108 changeset: 16708:8f2d220d1108 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed May 30 12:09:54 2012 +0200 summary: Fixes issue 20257: New, more efficient business partner selector The default business partner selector has been changed: - It does not contain location, contact and income fields - It contains business partner category field The previous behaviour can be found in a new Reference called Business Partner With Location and User A callout has been modified so it supports both business partner selectors details: https://code.openbravo.com/erp/devel/main/rev/5c1d94ab89b2 changeset: 16709:5c1d94ab89b2 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon May 28 16:58:51 2012 +0200 summary: fixed bug 20613 change labels and distinguish between in and out details: https://code.openbravo.com/erp/devel/main/rev/97173c37d435 changeset: 16710:97173c37d435 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed May 30 15:35:25 2012 +0200 summary: Fixes issue 20644: Selector with old behaviour is fixed The selector that implements the old behaviour (Business Partner with Location and User) has been fixed. Two fields (locationid and contactid) are not being shown in the grid, and the business partner identifier has been set as value field. details: https://code.openbravo.com/erp/devel/main/rev/9a62a0e2f041 changeset: 16711:9a62a0e2f041 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed May 30 16:22:49 2012 +0200 summary: Fixes issue 20195: Serial Number repeated in Create lines from orders in Goods receipt window details: https://code.openbravo.com/erp/devel/main/rev/e99deb6bf819 changeset: 16712:e99deb6bf819 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed May 30 13:29:23 2012 +0200 summary: Fixes issue 20638: Is imposible to delete lines in Good Receipts. details: https://code.openbravo.com/erp/devel/main/rev/e3c8fe0b168f changeset: 16713:e3c8fe0b168f user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Wed May 30 17:28:29 2012 +0200 summary: fixed bug 20642 Add an auxiliary input to have the same behaviour in selector as it had details: https://code.openbravo.com/erp/devel/main/rev/3ee74d6d79b1 changeset: 16714:3ee74d6d79b1 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed May 30 18:12:16 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/cf3e984e1fae changeset: 16715:cf3e984e1fae user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu May 31 11:28:27 2012 +0200 summary: Related to issue 20257: Callouts updated to select first contact Without this change, no contact is set when selecting a business partner. Then, when sending an email, no email address is set in the "To" field details: https://code.openbravo.com/erp/devel/main/rev/3ac036c08ee6 changeset: 16716:3ac036c08ee6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu May 31 21:27:52 2012 +0200 summary: CI: update AD_MODULE to version 16715 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + 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/ad_actionbutton/MatchTransaction.html | 13 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 41 +- 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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 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 +- referencedata/sampledata/F_B_International_Group.xml | 1308 +++++----- src-db/database/model/triggers/C_INVOICETAX_TRG2.xml | 21 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 10 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_FIELD.xml | 4 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_SEARCH.xml | 10 + src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 10 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 33 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 373 ++- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 61 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 40 +- src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java | 28 +- src/org/openbravo/erpCommon/ad_callouts/SE_Proposal_BPartner.java | 29 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 32 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 7 +- 61 files changed, 1328 insertions(+), 903 deletions(-) diffs (truncated from 4280 to 300 lines): diff -r 25447e74a93f -r 3ac036c08ee6 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 31 21:27:52 2012 +0200 @@ -485,6 +485,17 @@ <!--8A4E2745545245ED81BFBC5324648833--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--8A4E2745545245ED81BFBC5324648833--></AD_MESSAGE> +<!--8E01FDCFBE034863898A47F1AE37BB15--><AD_MESSAGE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_MESSAGE_ID><![CDATA[8E01FDCFBE034863898A47F1AE37BB15]]></AD_MESSAGE_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <VALUE><![CDATA[APRM_ZeroAmountNotInserted]]></VALUE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <MSGTEXT><![CDATA[%s row/s inserted.<br/>%s row/s not inserted because credit and debit amount were 0.]]></MSGTEXT> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <MSGTYPE><![CDATA[S]]></MSGTYPE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--></AD_MESSAGE> + <!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE> <!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID> <!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 25447e74a93f -r 3ac036c08ee6 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu May 31 21:27:52 2012 +0200 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16673]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16715]]></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 25447e74a93f -r 3ac036c08ee6 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 May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 31 21:27:52 2012 +0200 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16673]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16715]]></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.16673]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16715]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 25447e74a93f -r 3ac036c08ee6 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Thu May 31 21:27:52 2012 +0200 @@ -54,6 +54,7 @@ <script language="JavaScript" type="text/javascript"> var APRMMatchStatementIds; var serverWorking=false; +var checksToEnable=[]; function transactionFind(selected) { var depositAmt = returnCalcToFormatted(selected.depositAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); var paymentAmt = returnCalcToFormatted(selected.paymentAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); @@ -103,12 +104,20 @@ bslId: '' }); +function enableChecks(){ + for(var i=0; i<checksToEnable.length; i++){ + document.getElementById(checksToEnable[i]).disabled=false; + } +} + function disableChecks(){ -var items = document.frmMain.getElementsByTagName("input"); + var items = document.frmMain.getElementsByTagName("input"); + checksToEnable = []; for(var i=0; i<items.length; i++){ if(items[i].name === 'inpBankStatementLineId'){ if(items[i].checked){ items[i].disabled=true; + checksToEnable.push(items[i].id); } } } @@ -248,6 +257,8 @@ var data = eval(strText); if (data.forceLoadGrid) { loadGrid(); + }else{ + enableChecks(); } } } catch (e) { diff -r 25447e74a93f -r 3ac036c08ee6 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java Thu May 31 21:27:52 2012 +0200 @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -128,6 +129,7 @@ InputStream file = null; FIN_BankStatement bankStatement; List<FIN_BankStatementLine> bankStatementLines = new ArrayList<FIN_BankStatementLine>(); + int previousNumberofLines = 0; int numberOfLines = 0; try { @@ -153,6 +155,8 @@ return getMyError(); } + previousNumberofLines = bankStatementLines.size(); + try { numberOfLines = saveFINBankStatementLines(bankStatementLines); OBDal.getInstance().refresh(bankStatement); @@ -167,6 +171,16 @@ OBDal.getInstance().rollbackAndClose(); return getMyError(); } else if (getMyError() != null && getMyError().getType().toLowerCase().equals("success")) { + if (numberOfLines < previousNumberofLines) { + OBError msg = new OBError(); + msg.setType("Success"); + msg.setTitle(Utility.messageBD(conn, "Success", vars.getLanguage())); + String message = String.format( + Utility.messageBD(conn, "APRM_ZeroAmountNotInserted", vars.getLanguage()), + String.valueOf(numberOfLines), String.valueOf(previousNumberofLines - numberOfLines)); + msg.setMessage(message); + setMyError(msg); + } return getMyError(); } else { return getOBError(conn, vars, "@APRM_BankStatementNo@ " + bankStatement.getDocumentNo() @@ -185,17 +199,28 @@ private int saveFINBankStatementLines(List<FIN_BankStatementLine> bankStatementLines) { int counter = 0; + BigDecimal crAmount; + BigDecimal drAmount; for (FIN_BankStatementLine bankStatementLine : bankStatementLines) { BusinessPartner businessPartner; - try { - businessPartner = matchBusinessPartner(bankStatementLine.getBpartnername(), - bankStatementLine.getOrganization(), bankStatementLine.getBankStatement().getAccount()); - } catch (Exception e) { - businessPartner = null; + crAmount = bankStatementLine.getCramount(); + drAmount = bankStatementLine.getDramount(); + if (!(crAmount.compareTo(BigDecimal.ZERO) == 0) + || !(drAmount.compareTo(BigDecimal.ZERO) == 0)) { + try { + businessPartner = matchBusinessPartner(bankStatementLine.getBpartnername(), + bankStatementLine.getOrganization(), bankStatementLine.getBankStatement() + .getAccount()); + } catch (Exception e) { + businessPartner = null; + } + bankStatementLine.setBusinessPartner(businessPartner); + bankStatementLine.setLineNo(new Long((counter + 1) * 10)); + OBDal.getInstance().save(bankStatementLine); + counter++; + } else { + OBDal.getInstance().remove(bankStatementLine); } - bankStatementLine.setBusinessPartner(businessPartner); - OBDal.getInstance().save(bankStatementLine); - counter++; } OBDal.getInstance().flush(); return counter; diff -r 25447e74a93f -r 3ac036c08ee6 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 May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu May 31 21:27:52 2012 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16673]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16715]]></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 25447e74a93f -r 3ac036c08ee6 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 May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 31 21:27:52 2012 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16673]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16715]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 25447e74a93f -r 3ac036c08ee6 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 May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu May 31 21:27:52 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16673]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16715]]></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 25447e74a93f -r 3ac036c08ee6 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 May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 31 21:27:52 2012 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16673]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16715]]></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.16673]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.16715]]></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.16673]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.16715]]></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.16673]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.16715]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 25447e74a93f -r 3ac036c08ee6 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 Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Thu May 31 21:27:52 2012 +0200 @@ -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.16673]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16715]]></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 25447e74a93f -r 3ac036c08ee6 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 Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 31 21:27:52 2012 +0200 @@ -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.16673]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.16715]]></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 25447e74a93f -r 3ac036c08ee6 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 Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Thu May 31 21:27:52 2012 +0200 @@ -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.16673]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.16715]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> <!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP> <!--4B828F4D03264080AA1D2057B13F613C--> <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL> diff -r 25447e74a93f -r 3ac036c08ee6 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed May 30 07:36:48 2012 +0200 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 31 21:27:52 2012 +0200 @@ -7,7 +7,7 @@ <!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.16673]]></STARTVERSION> +<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.16715]]></STARTVERSION> <!--26B041893E844A53AFA58BC326C4F0D7--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
