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

Revert "sets tax category to "Total" if all items are non-stock items (#9295)" (#9320)

Browse Source 
This reverts commit 476c4fec1d2943ded83faeb7bb07045c27ae2e35.
This commit is contained in:
Rushabh Mehta 2017-06-16 11:18:23 +05:30 committed by GitHub
parent 476c4fec1d
commit c8a0de5e59
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/buying_controller.py
View File

@ -73,14 +73,10 @@ class BuyingController(StockController):
def validate_stock_or_nonstock_items(self): def validate_stock_or_nonstock_items(self):
if self.meta.get_field("taxes") and not self.get_stock_items(): if self.meta.get_field("taxes") and not self.get_stock_items():
tax_for_valuation = [d for d in self.get("taxes") tax_for_valuation = [d.account_head for d in self.get("taxes")
if d.category in ["Valuation", "Valuation and Total"]] if d.category in ["Valuation", "Valuation and Total"]]
if tax_for_valuation: if tax_for_valuation:
for d in tax_for_valuation: frappe.throw(_("Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items"))
d.db_set("category", 'Total')
msgprint("Tax Category has been changed to \"Total\" because all Items in the Purchase Order "
"are non-stock items")
def set_landed_cost_voucher_amount(self): def set_landed_cost_voucher_amount(self):
for d in self.get("items"): for d in self.get("items"):