nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into cleanup

Browse Source
This commit is contained in:
Rushabh Mehta
2013-10-31 15:16:05 +05:30
parent 069672e197 f64dfa1d46
commit bed14d7fa4
12 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accounts/doctype/pos_setting/test_pos_setting.py
View File

@@ -6,7 +6,6 @@ test_records = [
"doctype": "POS Setting",
"name": "_Test POS Setting",
"currency": "INR",
"conversion_rate": 1.0,
"selling_price_list": "_Test Price List",
"company": "_Test Company",
"warehouse": "_Test Warehouse - _TC",

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

@@ -338,11 +338,14 @@ class DocType(BuyingController):
)
# accumulate valuation tax
if tax.category in ("Valuation", "Valuation and Total") and 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)
if tax.category in ("Valuation", "Valuation and Total") and flt(tax.tax_amount):
if auto_accounting_for_stock and not tax.cost_center:
webnotes.throw(_("Row %(row)s: Cost Center is mandatory \
if tax/charges category is Valuation or Valuation and Total" %
{"row": tax.idx}))
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
stock_item_and_auto_accounting_for_stock = False