[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/0aeb43d0ff8d changeset: 19616:0aeb43d0ff8d user: RM packaging bot openbravo.com> date: Fri Feb 08 06:13:31 2013 +0100 summary: CI: update AD_MODULE to version 19615 details: https://code.openbravo.com/erp/devel/pi/rev/8c10a0b86855 changeset: 19617:8c10a0b86855 user: RM packaging bot openbravo.com> date: Fri Feb 08 06:30:17 2013 +0100 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.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/sou
[OpenbravoERP-commits] devel/main: 7 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/a244bb57d196 changeset: 19610:a244bb57d196 user: RM packaging bot 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 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 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 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 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 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 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
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/e10d0cd7676b changeset: 19614:e10d0cd7676b user: Eduardo Argal Guibert openbravo.com> date: Thu Feb 07 20:18:31 2013 +0100 summary: Fixes bug 23013 details: https://code.openbravo.com/erp/devel/pi/rev/818ea56e7552 changeset: 19615:818ea56e7552 user: Eduardo Argal Guibert openbravo.com> date: Thu Feb 07 20:21:03 2013 +0100 summary: Fixes bug 22716 diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 36 +++--- src/org/openbravo/erpCommon/businessUtility/AccountTree.java | 53 + 2 files changed, 47 insertions(+), 42 deletions(-) diffs (180 lines): diff -r 8dd69f4f8042 -r 818ea56e7552 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 Thu Feb 07 13:51:43 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Thu Feb 07 20:21:03 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 8dd69f4f8042 -r 818ea56e7552 src/org/openbravo/erpCommon/businessUtility/AccountTree.java --- a/src/org/openbravo/erpCommon/businessUtility/AccountTree.java Thu Feb 07 13:51:43 2013 +0100 +++ b/src/org/openbravo/
[OpenbravoERP-commits] devel/pi: Fixes Issue 23007. Fixes problem that happens when pos...
details: https://code.openbravo.com/erp/devel/pi/rev/8dd69f4f8042 changeset: 19613:8dd69f4f8042 user: David Miguelez 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. diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r edd6af02e18c -r 8dd69f4f8042 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 07 12:35:57 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Feb 07 13:51:43 2013 +0100 @@ -1235,6 +1235,8 @@ OBQuery query = OBDal.getInstance().createQuery(FIN_PaymentDetail.class, whereClause.toString()); + query.setFilterOnReadableClients(false); + query.setFilterOnReadableOrganization(false); pdList = query.list(); } finally { -- 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
[OpenbravoERP-commits] devel/pi: Fixes Issue 23005: Applied Code Review Changes for Dou...
details: https://code.openbravo.com/erp/devel/pi/rev/edd6af02e18c changeset: 19612:edd6af02e18c user: David Miguelez openbravo.com> date: Thu Feb 07 12:35:57 2013 +0100 summary: Fixes Issue 23005: Applied Code Review Changes for Doubtful Debt development. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 13 +- 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/process/FIN_DoubtfulDebtProcess.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_DoubtfulDebtRunProcess.java | 6 +- 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/org/openbravo/erpCommon/ad_forms/AcctServer.java | 21 + src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebt.java | 18 +--- 10 files changed, 56 insertions(+), 29 deletions(-) diffs (truncated from 324 to 300 lines): diff -r dd9599b2531b -r edd6af02e18c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Feb 07 11:39:59 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Feb 07 12:35:57 2013 +0100 @@ -326,7 +326,7 @@ - + @@ -881,6 +881,17 @@ + + + + + + + + + + + diff -r dd9599b2531b -r edd6af02e18c modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java Thu Feb 07 11:39:59 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java Thu Feb 07 12:35:57 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 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 dd9599b2531b -r edd6af02e18c 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 Thu Feb 07 11:39:59 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionb
[OpenbravoERP-commits] devel/pi: Fixes bug 22808
details: https://code.openbravo.com/erp/devel/pi/rev/dd9599b2531b changeset: 19611:dd9599b2531b user: Eduardo Argal Guibert openbravo.com> date: Thu Feb 07 11:39:59 2013 +0100 summary: Fixes bug 22808 diffstat: src-db/database/sourcedata/AD_TAB.xml | 24 1 files changed, 12 insertions(+), 12 deletions(-) diffs (111 lines): diff -r a244bb57d196 -r dd9599b2531b src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Thu Feb 07 00:11:30 2013 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Thu Feb 07 11:39:59 2013 +0100 @@ -12141,7 +12141,7 @@ - + @@ -12153,7 +12153,7 @@ - + @@ -12211,7 +12211,7 @@ - + @@ -12620,7 +12620,7 @@ - + @@ -13562,7 +13562,7 @@ - + @@ -13652,7 +13652,7 @@ - + @@ -14094,7 +14094,7 @@ - + @@ -14242,7 +14242,7 @@ - + @@ -14379,7 +14379,7 @@ - + @@ -14907,7 +14907,7 @@ - + @@ -15113,7 +15113,7 @@ - + @@ -15432,7 +15432,7 @@ - + -- 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