details: https://code.openbravo.com/erp/devel/pi/rev/01a9a7114bf5
changeset: 25763:01a9a7114bf5
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Tue Jan 27 13:16:28 2015 +0100
summary: Fixed bug 28755 It is impossible leaving credit when adding a
payment in match statement
Properly default value in actual payment field when add payment popup
runs from match statement.
Disabled "+" button and "magnifying glass" when line record is
linked to a transaction.
diffstat:
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
| 9 +++++++--
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
| 6 ++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diffs (73 lines):
diff -r e41b94ecad5b -r 01a9a7114bf5
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
Tue Jan 27 20:10:56 2015 +0100
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Tue Jan 27 13:16:28 2015 +0100
@@ -116,6 +116,7 @@
}));
view.theForm.hideItem('bankStatementLineId');
}
+
OB.APRM.AddPayment.paymentMethodMulticurrency(view, view.theForm, !payment);
OB.APRM.AddPayment.reloadLabels(form);
glitemGrid.fetchData();
@@ -296,7 +297,6 @@
var issotrx = this.view.theForm.getItem('issotrx').getValue(),
payment = this.view.theForm.getItem('fin_payment_id').getValue();
grid.isReady = true;
-
if ((issotrx || !payment) && (grid.selectedIds.length === 0)) {
OB.APRM.AddPayment.distributeAmount(this.view, this.view.theForm, false);
} else {
@@ -597,6 +597,7 @@
generateCredit = new
BigDecimal(String(form.getItem('generateCredit').getValue() || 0)),
glitemtotal = new
BigDecimal(String(form.getItem('amount_gl_items').getValue() || 0)),
credit = new BigDecimal(String(form.getItem('used_credit').getValue() ||
0)),
+ bslamount = new BigDecimal(String(form.getItem('bslamount').getValue()
|| 0)),
selectedRecords = orderInvoice.selectedIds,
actpayment, i;
for (i = 0; i < selectedRecords.length; i++) {
@@ -609,7 +610,11 @@
expectedPayment.setValue(Number('0'));
}
if (!issotrx) {
- actpayment = totalAmount.add(glitemtotal).add(generateCredit);
+ if ((bslamount.compareTo(BigDecimal.prototype.ZERO) !== 0) &&
(totalAmount.compareTo(BigDecimal.prototype.ZERO) === 0)) {
+ actpayment =
totalAmount.add(glitemtotal).add(generateCredit).add(bslamount.abs());
+ } else {
+ actpayment = totalAmount.add(glitemtotal).add(generateCredit);
+ }
actualPayment.setValue(Number(actpayment));
if (credit.compareTo(BigDecimal.prototype.ZERO) > 0) {
if (credit.compareTo(actpayment) > 0) {
diff -r e41b94ecad5b -r 01a9a7114bf5
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
Tue Jan 27 20:10:56 2015 +0100
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
Tue Jan 27 13:16:28 2015 +0100
@@ -87,6 +87,7 @@
searchButton = isc.OBGridToolStripIcon.create({
buttonType: 'search',
+ showDisabled: true,
originalPrompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_SEARCH_BUTTON'),
prompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_SEARCH_BUTTON'),
action: function () {
@@ -122,9 +123,12 @@
}, {}, callback);
}
});
+ // Disable searchButton button if record is linked to a transaction
+ searchButton.setDisabled(me.record.cleared);
addButton = isc.OBGridToolStripIcon.create({
buttonType: 'add',
+ showDisabled: true,
originalPrompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_ADD_BUTTON'),
prompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_ADD_BUTTON'),
action: function () {
@@ -159,6 +163,8 @@
}, {}, callback);
}
});
+ // Disable addButton button if record is linked to a transaction
+ addButton.setDisabled(me.record.cleared);
clearButton = isc.OBGridToolStripIcon.create({
buttonType: 'clearRight',
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
