details: https://code.openbravo.com/erp/devel/pi/rev/e66cf6210386 changeset: 15226:e66cf6210386 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jan 25 17:54:00 2012 +0100 summary: CI: update AD_MODULE to version 15193
details: https://code.openbravo.com/erp/devel/pi/rev/a0d6734e4e14 changeset: 15227:a0d6734e4e14 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jan 25 18:03:56 2012 +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.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 19 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 17 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 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.application/src-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml | 2 +- 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.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.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-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 30 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml | 1153 +++------ 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/functions/C_VALIDCOMBINATION_CLONE.xml | 16 +- src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_FORM.xml | 17 +- src-db/database/sourcedata/AD_MENU.xml | 44 +- src-db/database/sourcedata/AD_MESSAGE.xml | 253 ++ src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 82 +- src-db/database/sourcedata/AD_REF_LIST.xml | 8 + src-db/database/sourcedata/AD_TAB.xml | 183 +- src-db/database/sourcedata/AD_WINDOW.xml | 123 +- src/org/openbravo/base/model/Entity.java | 2 +- src/org/openbravo/dal/core/OBContext.java | 7 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 19 +- src/org/openbravo/erpCommon/ad_callouts/SE_CalculateExchangeRate.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_ProcessPlan.java | 9 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 117 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 36 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 29 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 183 +- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 118 +- src/org/openbravo/erpCommon/ad_forms/DocInventory.java | 27 +- src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql | 26 +- src/org/openbravo/service/dataset/DataSetService.java | 18 +- 75 files changed, 1517 insertions(+), 1236 deletions(-) diffs (truncated from 6019 to 300 lines): diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 25 18:03:56 2012 +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.15179]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.15193]]></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 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 25 18:03:56 2012 +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.15179]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.15193]]></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.15179]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.15193]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Wed Jan 25 18:03:56 2012 +0100 @@ -61,6 +61,7 @@ <!--6707D7449A8D45DB851F608BA88329C8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--6707D7449A8D45DB851F608BA88329C8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--6707D7449A8D45DB851F608BA88329C8--> <NAME><![CDATA[Payment Out Details]]></NAME> +<!--6707D7449A8D45DB851F608BA88329C8--> <HELP><![CDATA[Displays the details of the payments (pre-payments or regular payments) made for the order or for the invoice/s of the order.]]></HELP> <!--6707D7449A8D45DB851F608BA88329C8--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--6707D7449A8D45DB851F608BA88329C8--> <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID> <!--6707D7449A8D45DB851F608BA88329C8--> <SEQNO><![CDATA[36]]></SEQNO> @@ -141,7 +142,7 @@ <!--A94442B27F664A41BF64735DFA76FB4D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A94442B27F664A41BF64735DFA76FB4D--> <NAME><![CDATA[Payment Out Plan]]></NAME> <!--A94442B27F664A41BF64735DFA76FB4D--> <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION> -<!--A94442B27F664A41BF64735DFA76FB4D--> <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP> +<!--A94442B27F664A41BF64735DFA76FB4D--> <HELP><![CDATA[List of the scheduled payments expected against the invoice.]]></HELP> <!--A94442B27F664A41BF64735DFA76FB4D--> <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID> <!--A94442B27F664A41BF64735DFA76FB4D--> <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID> <!--A94442B27F664A41BF64735DFA76FB4D--> <SEQNO><![CDATA[32]]></SEQNO> @@ -167,6 +168,7 @@ <!--B82C02920AA84E8DB57D553185BD2F06--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--B82C02920AA84E8DB57D553185BD2F06--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B82C02920AA84E8DB57D553185BD2F06--> <NAME><![CDATA[Payment In Details]]></NAME> +<!--B82C02920AA84E8DB57D553185BD2F06--> <HELP><![CDATA[Displays the details of the payments (pre-payments or regular payments) received for the order or for the invoice/s of the order.]]></HELP> <!--B82C02920AA84E8DB57D553185BD2F06--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--B82C02920AA84E8DB57D553185BD2F06--> <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID> <!--B82C02920AA84E8DB57D553185BD2F06--> <SEQNO><![CDATA[46]]></SEQNO> @@ -220,7 +222,7 @@ <!--EB0466B2A22343F28773B356D292BC7E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--EB0466B2A22343F28773B356D292BC7E--> <NAME><![CDATA[Payment In Plan]]></NAME> <!--EB0466B2A22343F28773B356D292BC7E--> <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION> -<!--EB0466B2A22343F28773B356D292BC7E--> <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP> +<!--EB0466B2A22343F28773B356D292BC7E--> <HELP><![CDATA[List of the scheduled payments expected against the invoice.]]></HELP> <!--EB0466B2A22343F28773B356D292BC7E--> <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID> <!--EB0466B2A22343F28773B356D292BC7E--> <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID> <!--EB0466B2A22343F28773B356D292BC7E--> <SEQNO><![CDATA[50]]></SEQNO> @@ -246,6 +248,7 @@ <!--EB0E0C5A58344F7FA345097E7365CD22--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--EB0E0C5A58344F7FA345097E7365CD22--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--EB0E0C5A58344F7FA345097E7365CD22--> <NAME><![CDATA[Payment In Plan]]></NAME> +<!--EB0E0C5A58344F7FA345097E7365CD22--> <HELP><![CDATA[Shows the total amount expected to be collected upon order booking as well as the amount/s pre-paid or paid against the invoice/s for the order.]]></HELP> <!--EB0E0C5A58344F7FA345097E7365CD22--> <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID> <!--EB0E0C5A58344F7FA345097E7365CD22--> <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID> <!--EB0E0C5A58344F7FA345097E7365CD22--> <SEQNO><![CDATA[45]]></SEQNO> @@ -272,7 +275,7 @@ <!--F9751D712A804D57B97A36803843F2D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--F9751D712A804D57B97A36803843F2D7--> <NAME><![CDATA[Payment Out Details]]></NAME> <!--F9751D712A804D57B97A36803843F2D7--> <DESCRIPTION><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></DESCRIPTION> -<!--F9751D712A804D57B97A36803843F2D7--> <HELP><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></HELP> +<!--F9751D712A804D57B97A36803843F2D7--> <HELP><![CDATA[Display the details of the payments made against the invoice.]]></HELP> <!--F9751D712A804D57B97A36803843F2D7--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--F9751D712A804D57B97A36803843F2D7--> <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID> <!--F9751D712A804D57B97A36803843F2D7--> <SEQNO><![CDATA[33]]></SEQNO> @@ -298,6 +301,7 @@ <!--FA57D75B1BBB4583B4A777008A29BF54--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FA57D75B1BBB4583B4A777008A29BF54--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FA57D75B1BBB4583B4A777008A29BF54--> <NAME><![CDATA[Payment Out Plan]]></NAME> +<!--FA57D75B1BBB4583B4A777008A29BF54--> <HELP><![CDATA[Shows the total amount expected to be paid upon order booking as well as the amount/s pre-paid or paid against the invoice/s for the order.]]></HELP> <!--FA57D75B1BBB4583B4A777008A29BF54--> <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID> <!--FA57D75B1BBB4583B4A777008A29BF54--> <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID> <!--FA57D75B1BBB4583B4A777008A29BF54--> <SEQNO><![CDATA[35]]></SEQNO> @@ -324,7 +328,7 @@ <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <NAME><![CDATA[Payment In Details]]></NAME> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <DESCRIPTION><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></DESCRIPTION> -<!--FD40D9C2F1F14943933DEFEF4A8458E4--> <HELP><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></HELP> +<!--FD40D9C2F1F14943933DEFEF4A8458E4--> <HELP><![CDATA[Display the details of the payments received against the invoice.]]></HELP> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <SEQNO><![CDATA[51]]></SEQNO> diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Wed Jan 25 18:03:56 2012 +0100 @@ -292,8 +292,10 @@ if (payment.getBusinessPartner() != null) { xmlDocument.setParameter("businessPartner", payment.getBusinessPartner().getIdentifier()); xmlDocument.setParameter("businessPartnerId", payment.getBusinessPartner().getId()); - xmlDocument.setParameter("credit", - dao.getCustomerCredit(payment.getBusinessPartner(), payment.isReceipt()).toString()); + xmlDocument.setParameter( + "credit", + dao.getCustomerCredit(payment.getBusinessPartner(), payment.isReceipt(), + payment.getOrganization()).toString()); xmlDocument.setParameter("customerBalance", payment.getBusinessPartner().getCreditUsed() != null ? payment.getBusinessPartner() .getCreditUsed().toString() : BigDecimal.ZERO.toString()); diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Wed Jan 25 18:03:56 2012 +0100 @@ -298,7 +298,16 @@ xmlDocument.setParameter("orgId", strOrgId); xmlDocument.setParameter("invoiceId", strInvoiceId); xmlDocument.setParameter("isReceipt", (isReceipt ? "Y" : "N")); - xmlDocument.setParameter("credit", dao.getCustomerCredit(bp, isReceipt).toString()); + + try { + OBContext.setAdminMode(true); + xmlDocument.setParameter( + "credit", + dao.getCustomerCredit(bp, isReceipt, + OBDal.getInstance().get(Organization.class, strOrgId)).toString()); + } finally { + OBContext.restorePreviousMode(); + } // get DocumentNo final List<Object> parameters = new ArrayList<Object>(); @@ -339,10 +348,10 @@ } xmlDocument.setParameter("sectionDetailFinancialAccount", finAccountComboHtml); - if (account != null){ - if (!financialAccounts.contains(account)){ - strFinancialAccountId = financialAccounts.get(0).getId(); - } + if (account != null) { + if (!financialAccounts.contains(account)) { + strFinancialAccountId = financialAccounts.get(0).getId(); + } } // Currency xmlDocument.setParameter("CurrencyId", strCurrencyId); diff -r 7246b6950ddd -r a0d6734e4e14 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 Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java Wed Jan 25 18:03:56 2012 +0100 @@ -128,8 +128,16 @@ } else if (vars.commandIn("LOADCREDIT")) { final String strBusinessPartnerId = vars.getRequiredStringParameter("inpcBpartnerId"); final boolean isReceipt = "Y".equals(vars.getRequiredStringParameter("isReceipt")); - BigDecimal customerCredit = dao.getCustomerCredit( - OBDal.getInstance().get(BusinessPartner.class, strBusinessPartnerId), isReceipt); + final String strOrgId = vars.getRequiredStringParameter("inpadOrgId"); + BigDecimal customerCredit; + try { + OBContext.setAdminMode(true); + customerCredit = dao.getCustomerCredit( + OBDal.getInstance().get(BusinessPartner.class, strBusinessPartnerId), isReceipt, OBDal + .getInstance().get(Organization.class, strOrgId)); + } finally { + OBContext.restorePreviousMode(); + } response.setContentType("text/html; charset=UTF-8"); response.setHeader("Cache-Control", "no-cache"); PrintWriter out = response.getWriter(); diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Wed Jan 25 18:03:56 2012 +0100 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Set; import org.apache.commons.lang.StringUtils; import org.hibernate.criterion.Criterion; @@ -1407,6 +1408,7 @@ return ppfiCriteria.list(); } + @Deprecated public BigDecimal getCustomerCredit(BusinessPartner bp, boolean isReceipt) { BigDecimal creditAmount = BigDecimal.ZERO; for (FIN_Payment payment : getCustomerPaymentsWithCredit(bp, isReceipt)) @@ -1415,6 +1417,15 @@ return creditAmount; } + public BigDecimal getCustomerCredit(BusinessPartner bp, boolean isReceipt, Organization Org) { + BigDecimal creditAmount = BigDecimal.ZERO; + for (FIN_Payment payment : getCustomerPaymentsWithCredit(Org, bp, isReceipt)) + creditAmount = creditAmount.add(payment.getGeneratedCredit()).subtract( + payment.getUsedCredit()); + return creditAmount; + } + + @Deprecated public List<FIN_Payment> getCustomerPaymentsWithCredit(BusinessPartner bp, boolean isReceipt) { OBCriteria<FIN_Payment> obcPayment = OBDal.getInstance().createCriteria(FIN_Payment.class); obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_BUSINESSPARTNER, bp)); @@ -1451,8 +1462,10 @@ obcPayment.add(Restrictions.neProperty(FIN_Payment.PROPERTY_GENERATEDCREDIT, FIN_Payment.PROPERTY_USEDCREDIT)); final Organization legalEntity = FIN_Utility.getLegalEntityOrg(org); - obcPayment.add(Restrictions.in("organization.id", OBContext.getOBContext() - .getOrganizationStructureProvider().getNaturalTree(legalEntity.getId()))); + Set<String> orgIds = OBContext.getOBContext().getOrganizationStructureProvider() + .getChildOrg(legalEntity.getId()); + orgIds.add(legalEntity.getId()); + obcPayment.add(Restrictions.in("organization.id", orgIds)); obcPayment.addOrderBy(FIN_Payment.PROPERTY_PAYMENTDATE, true); obcPayment.addOrderBy(FIN_Payment.PROPERTY_DOCUMENTNO, true); return obcPayment.list(); diff -r 7246b6950ddd -r a0d6734e4e14 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 Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Wed Jan 25 18:03:56 2012 +0100 @@ -41,6 +41,7 @@ import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.businesspartner.BusinessPartner; import org.openbravo.model.common.currency.ConversionRateDoc; +import org.openbravo.model.common.enterprise.Organization; import org.openbravo.model.common.invoice.Invoice; import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction; import org.openbravo.model.financialmgmt.payment.FIN_Payment; @@ -733,8 +734,9 @@ final BigDecimal usedAmount = newPayment.getUsedCredit(); final BusinessPartner bp = newPayment.getBusinessPartner(); final boolean isReceipt = newPayment.isReceipt(); + final Organization Org = newPayment.getOrganization(); - List<FIN_Payment> creditPayments = dao.getCustomerPaymentsWithCredit(bp, isReceipt); + List<FIN_Payment> creditPayments = dao.getCustomerPaymentsWithCredit(Org, bp, isReceipt); BigDecimal pendingToAllocateAmount = usedAmount; for (FIN_Payment creditPayment : creditPayments) { BigDecimal availableAmount = creditPayment.getGeneratedCredit().subtract( diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 25 18:03:56 2012 +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.15179]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.15193]]></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 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 25 18:03:56 2012 +0100 @@ -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.15179]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.15193]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 25 18:03:56 2012 +0100 @@ -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.15179]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.15193]]></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 7246b6950ddd -r a0d6734e4e14 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 19 10:42:26 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 25 18:03:56 2012 +0100 @@ -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.15179]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.15193]]></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> ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
