From 49af8754d558c4acf867775391528b96cc75bbad Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 11 Jun 2013 12:40:46 +0530 Subject: [PATCH 1/2] [auto inventory accounting] [general ledger entry] calculate valuation amount without rounding --- accounts/doctype/purchase_invoice/purchase_invoice.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index 95b56dc4ff..32a46cf58f 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -466,9 +466,8 @@ class DocType(BuyingController): # expense will be booked in sales invoice stock_item_and_auto_inventory_accounting = True - valuation_amt = (flt(item.amount, self.precision.item.amount) + - flt(item.item_tax_amount, self.precision.item.item_tax_amount) + - flt(item.rm_supp_cost, self.precision.item.rm_supp_cost)) + valuation_amt = (flt(item.amount) + flt(item.item_tax_amount) + + flt(item.rm_supp_cost)) gl_entries.append( self.get_gl_dict({ From 433047b2e284a707165fc1ae623d402f44a4cd64 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 11 Jun 2013 14:28:42 +0530 Subject: [PATCH 2/2] [customer] [permlevel] changed fields/perms with permlevel 2 to permlevel 1 --- selling/doctype/customer/customer.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index a221daa599..d7cecdd1bf 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-23 19:57:18", + "creation": "2013-06-11 14:26:44", "docstatus": 0, - "modified": "2013-01-29 16:28:03", + "modified": "2013-06-11 14:27:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -270,7 +270,7 @@ "label": "Credit Days", "oldfieldname": "credit_days", "oldfieldtype": "Int", - "permlevel": 2 + "permlevel": 1 }, { "doctype": "DocField", @@ -280,7 +280,7 @@ "oldfieldname": "credit_limit", "oldfieldtype": "Currency", "options": "Company:company:default_currency", - "permlevel": 2 + "permlevel": 1 }, { "doctype": "DocField", @@ -339,7 +339,7 @@ }, { "doctype": "DocPerm", - "permlevel": 2, + "permlevel": 1, "role": "Sales User" }, { @@ -355,7 +355,7 @@ }, { "doctype": "DocPerm", - "permlevel": 2, + "permlevel": 1, "role": "Sales Master Manager", "write": 1 }