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

[fix] [minor] Pick cost_center from tax table for expense included in valuation

Browse Source
This commit is contained in:
Nabin Hait 2013-10-09 12:04:41 +05:30
parent 6ec7d9d3f9
commit 3235e787c4
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -335,7 +335,7 @@ class DocType(BuyingController):
) )
# tax table gl entries # tax table gl entries
valuation_tax = 0 valuation_tax = {}
for tax in self.doclist.get({"parentfield": "purchase_tax_details"}): for tax in self.doclist.get({"parentfield": "purchase_tax_details"}):
if tax.category in ("Total", "Valuation and Total") and flt(tax.tax_amount): if tax.category in ("Total", "Valuation and Total") and flt(tax.tax_amount):
gl_entries.append( gl_entries.append(
@ -350,8 +350,11 @@ class DocType(BuyingController):
) )
# accumulate valuation tax # accumulate valuation tax
if tax.category in ("Valuation", "Valuation and Total") and flt(tax.tax_amount): if tax.category in ("Valuation", "Valuation and Total") and flt(tax.tax_amount) \
valuation_tax += (tax.add_deduct_tax == "Add" and 1 or -1) * flt(tax.tax_amount) and tax.cost_center:
valuation_tax.setdefault(tax.cost_center, 0)
valuation_tax[tax.cost_center] += \
(tax.add_deduct_tax == "Add" and 1 or -1) * flt(tax.tax_amount)
# item gl entries # item gl entries
stock_item_and_auto_accounting_for_stock = False stock_item_and_auto_accounting_for_stock = False
@ -392,12 +395,16 @@ class DocType(BuyingController):
if stock_item_and_auto_accounting_for_stock and valuation_tax: if stock_item_and_auto_accounting_for_stock and valuation_tax:
# credit valuation tax amount in "Expenses Included In Valuation" # credit valuation tax amount in "Expenses Included In Valuation"
# this will balance out valuation amount included in cost of goods sold # this will balance out valuation amount included in cost of goods sold
expenses_included_in_valuation = \
self.get_company_default("expenses_included_in_valuation")
for cost_center, amount in valuation_tax.items():
gl_entries.append( gl_entries.append(
self.get_gl_dict({ self.get_gl_dict({
"account": self.get_company_default("expenses_included_in_valuation"), "account": expenses_included_in_valuation,
"cost_center": self.get_company_default("cost_center"), "cost_center": cost_center,
"against": self.doc.credit_to, "against": self.doc.credit_to,
"credit": valuation_tax, "credit": amount,
"remarks": self.doc.remarks or "Accounting Entry for Stock" "remarks": self.doc.remarks or "Accounting Entry for Stock"
}) })
) )