Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] Calculate paid amount when is pos is enabled

Browse Source
This commit is contained in:
Rohit Waghchaure 2017-01-17 12:11:57 +05:30
parent 2bbf784fd8
commit f58cad6b13
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -2385,7 +2385,7 @@
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Sales Invoice Payment", "label": "Sales Invoice Payment",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 1,
"options": "Sales Invoice Payment", "options": "Sales Invoice Payment",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -3188,6 +3188,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Status", "label": "Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -4182,7 +4183,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2016-11-09 14:18:24.760263", "modified": "2017-01-17 11:07:25.814402",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

10
erpnext/controllers/taxes_and_totals.py
View File

@ -455,10 +455,12 @@ class calculate_taxes_and_totals(object):
def calculate_paid_amount(self): def calculate_paid_amount(self):
paid_amount = base_paid_amount = 0.0 paid_amount = base_paid_amount = 0.0
for payment in self.doc.get('payments'):
payment.base_amount = flt(payment.amount * self.doc.conversion_rate) if self.doc.is_pos:
paid_amount += payment.amount for payment in self.doc.get('payments'):
base_paid_amount += payment.base_amount payment.base_amount = flt(payment.amount * self.doc.conversion_rate)
paid_amount += payment.amount
base_paid_amount += payment.base_amount
self.doc.paid_amount = flt(paid_amount, self.doc.precision("paid_amount")) self.doc.paid_amount = flt(paid_amount, self.doc.precision("paid_amount"))
self.doc.base_paid_amount = flt(base_paid_amount, self.doc.precision("base_paid_amount")) self.doc.base_paid_amount = flt(base_paid_amount, self.doc.precision("base_paid_amount"))

12
erpnext/public/js/controllers/taxes_and_totals.js
View File

@ -588,11 +588,13 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
calculate_paid_amount: function(){ calculate_paid_amount: function(){
var me = this; var me = this;
var paid_amount = base_paid_amount = 0.0; var paid_amount = base_paid_amount = 0.0;
$.each(this.frm.doc['payments'] || [], function(index, data){ if(this.frm.doc.is_pos) {
data.base_amount = flt(data.amount * me.frm.doc.conversion_rate, precision("base_amount")); $.each(this.frm.doc['payments'] || [], function(index, data){
paid_amount += data.amount; data.base_amount = flt(data.amount * me.frm.doc.conversion_rate, precision("base_amount"));
base_paid_amount += data.base_amount; paid_amount += data.amount;
}) base_paid_amount += data.base_amount;
})
}
this.frm.doc.paid_amount = flt(paid_amount, precision("paid_amount")); this.frm.doc.paid_amount = flt(paid_amount, precision("paid_amount"));
this.frm.doc.base_paid_amount = flt(base_paid_amount, precision("base_paid_amount")); this.frm.doc.base_paid_amount = flt(base_paid_amount, precision("base_paid_amount"));