details: https://code.openbravo.com/erp/devel/pi/rev/e7aee54e4fb2 changeset: 23020:e7aee54e4fb2 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon May 12 17:45:19 2014 +0200 summary: Fixed issue 26193 Error while computing auxiliary input showAddPayment
details: https://code.openbravo.com/erp/devel/pi/rev/786cd7cf325a changeset: 23021:786cd7cf325a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue May 13 09:54:28 2014 +0200 summary: Fixed issue 26513 Return to Vendor P&E is not working properly diffstat: src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 16 +++++----- src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java | 3 +- 2 files changed, 10 insertions(+), 9 deletions(-) diffs (46 lines): diff -r 71ac85d89457 -r 786cd7cf325a src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue May 13 15:00:15 2014 +0200 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue May 13 09:54:28 2014 +0200 @@ -2505,10 +2505,10 @@ <!--9E5EF28335254D948E30BAF9BF41B3A7--> <NAME><![CDATA[showAddPayment]]></NAME> <!--9E5EF28335254D948E30BAF9BF41B3A7--> <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=ci.GrandTotal then 'N' else 'Y' end from fin_payment_scheduledetail fpsd - left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id - left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id - left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice - left join c_invoice ci on ci.c_invoice_id=ps.c_invoice_id + join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id + join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id + join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice + join c_invoice ci on ci.c_invoice_id=ps.c_invoice_id WHERE ps.c_invoice_id =@c_invoice_id@ and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40 group by ci.GrandTotal]]></CODE> @@ -3918,10 +3918,10 @@ <!--FFA925AAC4BB49D5A67C05DAD16EFA32--> <NAME><![CDATA[showAddPayment]]></NAME> <!--FFA925AAC4BB49D5A67C05DAD16EFA32--> <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=ci.GrandTotal then 'N' else 'Y' end from fin_payment_scheduledetail fpsd - left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id - left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id - left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice - left join c_invoice ci on ci.c_invoice_id=ps.c_invoice_id + join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id + join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id + join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice + join c_invoice ci on ci.c_invoice_id=ps.c_invoice_id WHERE ps.c_invoice_id =@c_invoice_id@ and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40 group by ci.GrandTotal]]></CODE> diff -r 71ac85d89457 -r 786cd7cf325a src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java --- a/src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java Tue May 13 15:00:15 2014 +0200 +++ b/src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java Tue May 13 09:54:28 2014 +0200 @@ -581,7 +581,8 @@ BigDecimal returnedInOthers = getReturnedQty(inOutLine); myMap.put("returnQtyOtherRM", returnedInOthers); - myMap.put("returned", orderLine == null ? BigDecimal.ZERO : orderLine.getOrderedQuantity()); + myMap.put("returned", orderLine == null ? BigDecimal.ZERO : orderLine.getOrderedQuantity() + .negate()); if (orderLine != null && orderLine.getReturnReason() != null) { myMap.put("returnReason", orderLine.getReturnReason().getId()); ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
