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

Merge pull request #1263 from nabinhait/hotfix

Browse Source 
Hotfix
This commit is contained in:
Nabin Hait 2014-01-02 22:44:24 -08:00
commit c95b9f9221
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,7 +350,6 @@ class DocType(BuyingController):
# item gl entries
stock_item_and_auto_accounting_for_stock = False
stock_items = self.get_stock_items()
# rounding_diff = 0.0
for item in self.doclist.get({"parentfield": "entries"}):
if auto_accounting_for_stock and item.item_code in stock_items:
if flt(item.valuation_rate):
@ -361,11 +360,6 @@ class DocType(BuyingController):
valuation_amt = item.amount + item.item_tax_amount + item.rm_supp_cost
# rounding_diff += (flt(item.amount, self.precision("amount", item)) +
# flt(item.item_tax_amount, self.precision("item_tax_amount", item)) +
# flt(item.rm_supp_cost, self.precision("rm_supp_cost", item)) -
# valuation_amt)
gl_entries.append(
self.get_gl_dict({
"account": item.expense_head,
@ -392,12 +386,6 @@ class DocType(BuyingController):
# this will balance out valuation amount included in cost of goods sold
expenses_included_in_valuation = \
self.get_company_default("expenses_included_in_valuation")
# if rounding_diff:
# import operator
# cost_center_with_max_value = max(valuation_tax.iteritems(),
# key=operator.itemgetter(1))[0]
# valuation_tax[cost_center_with_max_value] -= flt(rounding_diff)
for cost_center, amount in valuation_tax.items():
gl_entries.append(

2
accounts/utils.py
View File

@ -31,6 +31,8 @@ def get_fiscal_years(date=None, fiscal_year=None, label="Date", verbose=1):
if not fy:
error_msg = """%s %s not in any Fiscal Year""" % (label, formatdate(date))
error_msg = """{msg}: {date}""".format(msg=_("Fiscal Year does not exist for date"),
date=formatdate(date))
if verbose: webnotes.msgprint(error_msg)
raise FiscalYearError, error_msg

15
controllers/buying_controller.py
View File

@ -174,9 +174,11 @@ class BuyingController(StockController):
"""
stock_items = self.get_stock_items()
stock_items_amount = sum([flt(d.amount) for d in
self.doclist.get({"parentfield": parentfield})
if d.item_code and d.item_code in stock_items])
stock_items_qty, stock_items_amount = 0, 0
for d in self.doclist.get({"parentfield": parentfield}):
if d.item_code and d.item_code in stock_items:
stock_items_qty += flt(d.qty)
stock_items_amount += flt(d.amount)
total_valuation_amount = sum([flt(d.tax_amount) for d in
self.doclist.get({"parentfield": "purchase_tax_details"})
@ -185,8 +187,11 @@ class BuyingController(StockController):
for item in self.doclist.get({"parentfield": parentfield}):
if item.item_code and item.qty and item.item_code in stock_items:
item.item_tax_amount = flt(flt(item.amount) * total_valuation_amount \
/ stock_items_amount, self.precision("item_tax_amount", item))
item_proportion = flt(item.amount) / stock_items_amount if stock_items_amount \
else flt(item.qty) / stock_items_qty
item.item_tax_amount = flt(item_proportion * total_valuation_amount,
self.precision("item_tax_amount", item))
self.round_floats_in(item)