[OpenbravoERP-commits] devel/pi: Fixed bug 26917: It is not possible to generate credit...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/4d20bc9176a9
changeset: 23872:4d20bc9176a9
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Tue Jun 24 16:59:15 2014 +0200
summary:   Fixed bug 26917: It is not possible to generate credit with payment 
out

diffstat:

 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
 |  22 +++++-----
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (89 lines):

diff -r 512af3124e23 -r 4d20bc9176a9 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
--- 
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
    Sat Jun 21 14:46:46 2014 +0530
+++ 
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
    Tue Jun 24 16:59:15 2014 +0200
@@ -250,22 +250,22 @@
       creditGrid = form.getItem('credit_to_use').canvas.viewGrid;
 
   if (orderInvoiceGrid.isReady && glitemGrid.isReady && creditGrid.isReady) {
-    OB.APRM.AddPayment.updateActualExpected(form, true);
+    OB.APRM.AddPayment.updateActualExpected(form);
   }
 };
 
 OB.APRM.AddPayment.orderInvoiceAmountOnChange = function (item, view, form, 
grid) {
-  OB.APRM.AddPayment.updateActualExpected(form, false);
+  OB.APRM.AddPayment.updateActualExpected(form);
   OB.APRM.AddPayment.updateInvOrderTotal(form, grid);
 };
 
 OB.APRM.AddPayment.orderInvoiceTotalAmountOnChange = function (item, view, 
form, grid) {
-  OB.APRM.AddPayment.updateActualExpected(form, false);
+  OB.APRM.AddPayment.updateActualExpected(form);
   OB.APRM.AddPayment.updateTotal(form);
 };
 
 OB.APRM.AddPayment.glItemTotalAmountOnChange = function (item, view, form, 
grid) {
-  OB.APRM.AddPayment.updateActualExpected(form, false);
+  OB.APRM.AddPayment.updateActualExpected(form);
   OB.APRM.AddPayment.updateTotal(form);
 };
 
@@ -354,7 +354,7 @@
       delete orderInvoice.preventDistributingOnSelectionChanged;
     }
   }
-  OB.APRM.AddPayment.updateActualExpected(form, false);
+  OB.APRM.AddPayment.updateActualExpected(form);
   OB.APRM.AddPayment.updateInvOrderTotal(form, orderInvoice);
 };
 
@@ -482,11 +482,11 @@
     }
   }
   OB.APRM.AddPayment.updateInvOrderTotal(view.theForm, orderInvoice);
-  OB.APRM.AddPayment.updateActualExpected(view.theForm, false);
+  OB.APRM.AddPayment.updateActualExpected(view.theForm);
   OB.APRM.AddPayment.updateDifference(view.theForm);
 };
 
-OB.APRM.AddPayment.updateActualExpected = function (form, onload) {
+OB.APRM.AddPayment.updateActualExpected = function (form) {
   var orderInvoice = form.getItem('order_invoice').canvas.viewGrid,
       issotrx = form.getItem('issotrx').getValue(),
       totalAmountoutstanding = BigDecimal.prototype.ZERO,
@@ -507,7 +507,7 @@
   } else {
     expectedPayment.setValue(Number('0'));
   }
-  if (!issotrx && !onload) {
+  if (!issotrx) {
     actpayment = totalAmount.add(glitemtotal).add(generateCredit);
     actualPayment.setValue(Number(actpayment));
     if (credit.compareTo(BigDecimal.prototype.ZERO) > 0) {
@@ -580,7 +580,7 @@
   }
 
   OB.APRM.AddPayment.updateGLItemsTotal(form, item.rowNum, false);
-  OB.APRM.AddPayment.updateActualExpected(form, false);
+  OB.APRM.AddPayment.updateActualExpected(form);
   OB.APRM.AddPayment.updateDifference(form);
   return true;
 };
@@ -610,7 +610,7 @@
     OB.APRM.AddPayment.distributeAmount(view, form, true);
   }
   OB.APRM.AddPayment.updateDifference(form);
-  OB.APRM.AddPayment.updateActualExpected(form, false);
+  OB.APRM.AddPayment.updateActualExpected(form);
   return true;
 };
 
@@ -669,7 +669,7 @@
 
 OB.APRM.AddPayment.doSelectionChangedCredit = function (record, state, view) {
   OB.APRM.AddPayment.updateCreditTotal(view.theForm);
-  OB.APRM.AddPayment.updateActualExpected(view.theForm, false);
+  OB.APRM.AddPayment.updateActualExpected(view.theForm);
 };
 
 OB.APRM.AddPayment.conversionRateOnChange = function (item, view, form, grid) {

------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits