details: https://code.openbravo.com/erp/devel/main/rev/a244bb57d196 changeset: 19610:a244bb57d196 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Feb 07 00:11:30 2013 +0100 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/dd9599b2531b changeset: 19611:dd9599b2531b user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Feb 07 11:39:59 2013 +0100 summary: Fixes bug 22808 details: https://code.openbravo.com/erp/devel/main/rev/edd6af02e18c changeset: 19612:edd6af02e18c user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Feb 07 12:35:57 2013 +0100 summary: Fixes Issue 23005: Applied Code Review Changes for Doubtful Debt development. details: https://code.openbravo.com/erp/devel/main/rev/8dd69f4f8042 changeset: 19613:8dd69f4f8042 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Feb 07 13:51:43 2013 +0100 summary: Fixes Issue 23007. Fixes problem that happens when posting a Document through Accounting Background Process. details: https://code.openbravo.com/erp/devel/main/rev/e10d0cd7676b changeset: 19614:e10d0cd7676b user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Feb 07 20:18:31 2013 +0100 summary: Fixes bug 23013 details: https://code.openbravo.com/erp/devel/main/rev/818ea56e7552 changeset: 19615:818ea56e7552 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Feb 07 20:21:03 2013 +0100 summary: Fixes bug 22716 details: https://code.openbravo.com/erp/devel/main/rev/0aeb43d0ff8d changeset: 19616:0aeb43d0ff8d user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Feb 08 06:13:31 2013 +0100 summary: CI: update AD_MODULE to version 19615 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 13 ++- 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/actionHandler/DoubtFulDebtPickEditLines.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 36 +++--- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtProcess.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtRunProcess.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 2 + 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/prescript-Oracle.sql | 2 + src-db/database/model/tables/FIN_DOUBTFUL_DEBT.xml | 1 + src-db/database/model/tables/FIN_DOUBTFUL_DEBT_RUN.xml | 3 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_TAB.xml | 24 ++-- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 21 ++- src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebt.java | 18 ++- src/org/openbravo/erpCommon/businessUtility/AccountTree.java | 53 +++++---- 55 files changed, 198 insertions(+), 164 deletions(-) diffs (truncated from 1479 to 300 lines): diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Feb 08 06:13:31 2013 +0100 @@ -326,7 +326,7 @@ <!--58BED27A9BE64676A4965BC726890E09--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--58BED27A9BE64676A4965BC726890E09--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--58BED27A9BE64676A4965BC726890E09--> <VALUE><![CDATA[APRM_DoubtfulDebtMoreAmountThanOutstanding]]></VALUE> -<!--58BED27A9BE64676A4965BC726890E09--> <MSGTEXT><![CDATA[It is not possible to recognize more doubtful debt than the outstanding.]]></MSGTEXT> +<!--58BED27A9BE64676A4965BC726890E09--> <MSGTEXT><![CDATA[It is not possible to recognize more doubtful debt than the outstanding.]]></MSGTEXT> <!--58BED27A9BE64676A4965BC726890E09--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--58BED27A9BE64676A4965BC726890E09--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--58BED27A9BE64676A4965BC726890E09--></AD_MESSAGE> @@ -881,6 +881,17 @@ <!--CCA38D3048F04C1FA6F05AD56CF81B5D--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--CCA38D3048F04C1FA6F05AD56CF81B5D--></AD_MESSAGE> +<!--D2585EEAC94945C7B3CF79C209FD7650--><AD_MESSAGE> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <AD_MESSAGE_ID><![CDATA[D2585EEAC94945C7B3CF79C209FD7650]]></AD_MESSAGE_ID> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <VALUE><![CDATA[APRM_DoubtfulDebtNoDocument]]></VALUE> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <MSGTEXT><![CDATA[Document Type not defined for Doubtful Debts.]]></MSGTEXT> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--D2585EEAC94945C7B3CF79C209FD7650--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--D2585EEAC94945C7B3CF79C209FD7650--></AD_MESSAGE> + <!--D304C035EC724B6A874E574BE59BC7BF--><AD_MESSAGE> <!--D304C035EC724B6A874E574BE59BC7BF--> <AD_MESSAGE_ID><![CDATA[D304C035EC724B6A874E574BE59BC7BF]]></AD_MESSAGE_ID> <!--D304C035EC724B6A874E574BE59BC7BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 08 06:13:31 2013 +0100 @@ -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.19608]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19615]]></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 47073b14c368 -r 0aeb43d0ff8d 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 Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Feb 08 06:13:31 2013 +0100 @@ -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.19608]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19615]]></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.19608]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19615]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java Fri Feb 08 06:13:31 2013 +0100 @@ -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) 2012 Openbravo SLU + * All portions are Copyright (C) 2012-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -29,6 +29,7 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.openbravo.advpaymentmngt.utility.FIN_Utility; +import org.openbravo.base.exception.OBException; import org.openbravo.base.provider.OBProvider; import org.openbravo.client.application.process.BaseProcessActionHandler; import org.openbravo.dal.core.OBContext; @@ -46,7 +47,7 @@ import org.openbravo.service.db.DbUtility; public class DoubtFulDebtPickEditLines extends BaseProcessActionHandler { - private static Logger log = Logger.getLogger(DoubtFulDebtPickEditLines.class); + private static final Logger log = Logger.getLogger(DoubtFulDebtPickEditLines.class); @Override protected JSONObject doExecute(Map<String, Object> parameters, String content) { @@ -86,7 +87,7 @@ errorMessage.put("text", message); jsonRequest.put("message", errorMessage); } catch (JSONException ignore) { - ignore.printStackTrace(); + log.error("DoubtFulDebtPickeditLines error: " + ignore.getMessage(), ignore); } } finally { @@ -183,7 +184,9 @@ parameters.add("DDB"); String strDocTypeId = (String) CallStoredProcedure.getInstance().call("AD_GET_DOCTYPE", parameters, null); - // TODO: manage no document type: throw exception + if (strDocTypeId == null || "".equals(strDocTypeId)) { + throw new OBException("@APRM_DoubtfulDebtNoDocument@"); + } return OBDal.getInstance().get(DocumentType.class, strDocTypeId); } } diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java Fri Feb 08 06:13:31 2013 +0100 @@ -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): Enterprise Intelligence Systems (http://www.eintel.com.au). ************************************************************************* @@ -855,7 +855,6 @@ } boolean displayDoubtfulDebtAmount(boolean isReceipt) { - // TODO: Apply preference logic if (!isReceipt) { return false; } @@ -865,7 +864,6 @@ .getCurrentClient())); obCriteria.add(Restrictions.in(Preference.PROPERTY_ORGANIZATION + ".id", OBContext .getOBContext().getReadableOrganizations())); - // obCriteria.add(Restrictions.eq(Preference.property_, obCriteria)) Preference preference = (Preference) obCriteria.uniqueResult(); return "Y".equals(preference.getSearchKey()); diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Fri Feb 08 06:13:31 2013 +0100 @@ -504,13 +504,13 @@ final String COLOR_WEAK = "#99CC66"; final String COLOR_WHITE = "white"; boolean alreadyMatched = false; + FIN_BankStatementLine line = OBDal.getInstance().get(FIN_BankStatementLine.class, + FIN_BankStatementLines[i].getId()); - String matchingType = FIN_BankStatementLines[i].getMatchingtype(); - FIN_FinaccTransaction transaction = FIN_BankStatementLines[i] - .getFinancialAccountTransaction(); + String matchingType = line.getMatchingtype(); + FIN_FinaccTransaction transaction = line.getFinancialAccountTransaction(); if (transaction == null && executeMatching) { - FIN_MatchedTransaction matched = matchingTransaction.match(FIN_BankStatementLines[i], - excluded); + FIN_MatchedTransaction matched = matchingTransaction.match(line, excluded); // When hide flag checked then exclude matchings for transactions out of date range if ("Y".equals(strHideDate) && matched.getTransaction() != null @@ -520,7 +520,7 @@ } transaction = matched.getTransaction(); if (transaction != null && FIN_MatchedTransaction.STRONG.equals(matched.getMatchLevel())) { - FIN_BankStatementLine bsl = FIN_BankStatementLines[i]; + FIN_BankStatementLine bsl = line; if (bsl.getFinancialAccountTransaction() != null) { // Unmatch Transaction FIN_FinaccTransaction oldTransaction = bsl.getFinancialAccountTransaction(); @@ -562,21 +562,19 @@ "bankLineTransactionDate", Utility.formatDate(FIN_BankStatementLines[i].getTransactionDate(), vars.getJavaDateFormat())); - FieldProviderFactory.setField(data[i], "bankLineBusinessPartner", FIN_BankStatementLines[i] - .getBusinessPartner() != null ? FIN_BankStatementLines[i].getBusinessPartner() - .getIdentifier() : FIN_BankStatementLines[i].getBpartnername()); - FieldProviderFactory.setField(data[i], "textcolor", - FIN_BankStatementLines[i].getBusinessPartner() != null ? "bold" : "normal"); - FieldProviderFactory.setField(data[i], "bankLineReferenceNo", - FIN_BankStatementLines[i].getReferenceNo()); - // CREDIT - DEBIT - FieldProviderFactory.setField(data[i], "bankLineAmount", FIN_BankStatementLines[i] - .getCramount().subtract(FIN_BankStatementLines[i].getDramount()).toString()); FieldProviderFactory.setField( data[i], - "bankLineDescription", - FIN_BankStatementLines[i].getDescription() + " " - + FIN_BankStatementLines[i].getBpartnername()); + "bankLineBusinessPartner", + line.getBusinessPartner() != null ? line.getBusinessPartner().getIdentifier() : line + .getBpartnername()); + FieldProviderFactory.setField(data[i], "textcolor", + line.getBusinessPartner() != null ? "bold" : "normal"); + FieldProviderFactory.setField(data[i], "bankLineReferenceNo", line.getReferenceNo()); + // CREDIT - DEBIT + FieldProviderFactory.setField(data[i], "bankLineAmount", + line.getCramount().subtract(line.getDramount()).toString()); + FieldProviderFactory.setField(data[i], "bankLineDescription", line.getDescription() + " " + + line.getBpartnername()); FieldProviderFactory .setField( data[i], diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtProcess.java Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtProcess.java Fri Feb 08 06:13:31 2013 +0100 @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; import org.openbravo.base.secureApp.VariablesSecureApp; @@ -38,6 +39,7 @@ public class FIN_DoubtfulDebtProcess implements org.openbravo.scheduling.Process { private static AdvPaymentMngtDao dao; + private static final Logger log4j = Logger.getLogger(FIN_DoubtfulDebtProcess.class); public void execute(ProcessBundle bundle) throws Exception { dao = new AdvPaymentMngtDao(); @@ -46,7 +48,7 @@ msg.setTitle(Utility.messageBD(bundle.getConnection(), "Success", bundle.getContext() .getLanguage())); - OBContext.setAdminMode(); + OBContext.setAdminMode(false); try { // retrieve custom params final String strAction = (String) bundle.getParams().get("action"); @@ -117,7 +119,7 @@ bundle.setResult(msg); } catch (final Exception e) { OBDal.getInstance().rollbackAndClose(); - e.printStackTrace(System.err); + log4j.error("FIN_DoubtfulDebtProcess error: " + e.getMessage(), e); msg.setType("Error"); msg.setTitle(Utility.messageBD(bundle.getConnection(), "Error", bundle.getContext() .getLanguage())); diff -r 47073b14c368 -r 0aeb43d0ff8d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtRunProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtRunProcess.java Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtRunProcess.java Fri Feb 08 06:13:31 2013 +0100 @@ -20,6 +20,7 @@ import java.util.HashMap; +import org.apache.log4j.Logger; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; import org.openbravo.base.secureApp.VariablesSecureApp; @@ -34,6 +35,7 @@ public class FIN_DoubtfulDebtRunProcess implements org.openbravo.scheduling.Process { private static AdvPaymentMngtDao dao; + private static final Logger log4j = Logger.getLogger(FIN_DoubtfulDebtRunProcess.class); public void execute(ProcessBundle bundle) throws Exception { dao = new AdvPaymentMngtDao(); @@ -42,7 +44,7 @@ msg.setTitle(Utility.messageBD(bundle.getConnection(), "Success", bundle.getContext() .getLanguage())); - OBContext.setAdminMode(); + OBContext.setAdminMode(false); try { // retrieve custom params final String strAction = (String) bundle.getParams().get("action"); @@ -100,7 +102,7 @@ bundle.setResult(msg); } catch (final Exception e) { OBDal.getInstance().rollbackAndClose(); - e.printStackTrace(System.err); + log4j.error("FIN_DoubtfulDebtRunProcess error: " + e.getMessage(), e); msg.setType("Error"); msg.setTitle(Utility.messageBD(bundle.getConnection(), "Error", bundle.getContext() .getLanguage())); diff -r 47073b14c368 -r 0aeb43d0ff8d 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 Wed Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Feb 08 06:13:31 2013 +0100 @@ -1235,6 +1235,8 @@ OBQuery<FIN_PaymentDetail> query = OBDal.getInstance().createQuery(FIN_PaymentDetail.class, whereClause.toString()); + query.setFilterOnReadableClients(false); + query.setFilterOnReadableOrganization(false); pdList = query.list(); } finally { diff -r 47073b14c368 -r 0aeb43d0ff8d 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 Feb 06 23:54:05 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 08 06:13:31 2013 +0100 @@ -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.19608]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19615]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
