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

minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2015-02-24 09:42:24 +05:30
parent 6dfbc2465b
commit 7b19b9ed02
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/taxes_and_totals.py
View File

@ -356,8 +356,8 @@ class calculate_taxes_and_totals(object):
return flt(self.doc.grand_total - sum(actual_taxes_dict.values()), self.doc.precision("grand_total"))
def calculate_total_advance(self, parenttype, advance_parentfield):
if self.docstatus < 2:
def calculate_total_advance(self):
if self.doc.docstatus < 2:
total_allocated_amount = sum([flt(adv.allocated_amount, adv.precision("allocated_amount"))
for adv in self.doc.get("advances")])

4
erpnext/selling/sales_common.js
View File

@ -17,10 +17,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.toggle_editable_price_list_rate();
},
onload_post_render: function() {
cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
},
setup_queries: function() {
var me = this;

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -330,7 +330,7 @@ class PurchaseReceipt(BuyingController):
}))
# divisional loss adjustment
if not self.get("other_charges"):
if not self.get("taxes"):
sle_valuation_amount = flt(flt(d.valuation_rate, val_rate_db_precision) * flt(d.qty) * flt(d.conversion_factor),
self.precision("base_net_amount", d))