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

test: fix for Item Tax Template v12

Browse Source
This commit is contained in:
Saif Ur Rehman 2019-01-11 03:53:43 +05:00
parent fc5c9b8ab8
commit 5085673030
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/tax_rule/tax_rule.py
View File

@ -145,7 +145,7 @@ def get_tax_template(posting_date, args):
conditions = ["""(from_date is null or from_date <= '{0}') conditions = ["""(from_date is null or from_date <= '{0}')
and (to_date is null or to_date >= '{0}')""".format(posting_date)] and (to_date is null or to_date >= '{0}')""".format(posting_date)]
conditions.append("ifnull(tax_category, '') = '{0}'".format(frappe.db.escape(cstr(args.get("tax_category"))))) conditions.append("ifnull(tax_category, '') = {0}".format(frappe.db.escape(cstr(args.get("tax_category")))))
if 'tax_category' in args.keys(): if 'tax_category' in args.keys():
del args['tax_category'] del args['tax_category']

16
erpnext/controllers/tests/test_qty_based_taxes.py
View File

@ -27,6 +27,16 @@ class TestTaxes(unittest.TestCase):
'item_group_name': uuid4(), 'item_group_name': uuid4(),
'parent_item_group': 'All Item Groups', 'parent_item_group': 'All Item Groups',
}).insert() }).insert()
self.item_tax_template = frappe.get_doc({
'doctype': 'Item Tax Template',
'title': uuid4(),
'taxes': [
{
'tax_type': self.account.name,
'tax_rate': 2,
}
]
}).insert()
self.item = frappe.get_doc({ self.item = frappe.get_doc({
'doctype': 'Item', 'doctype': 'Item',
'item_code': uuid4(), 'item_code': uuid4(),
@ -34,8 +44,8 @@ class TestTaxes(unittest.TestCase):
'is_stock_item': 0, 'is_stock_item': 0,
'taxes': [ 'taxes': [
{ {
'tax_type': self.account.name, 'item_tax_template': self.item_tax_template.name,
'tax_rate': 2, 'tax_category': '',
} }
], ],
}).insert() }).insert()
@ -58,6 +68,7 @@ class TestTaxes(unittest.TestCase):
'doctype': dt, 'doctype': dt,
'company': self.company.name, 'company': self.company.name,
'supplier': self.supplier.name, 'supplier': self.supplier.name,
'currency': "USD",
'schedule_date': frappe.utils.nowdate(), 'schedule_date': frappe.utils.nowdate(),
'delivery_date': frappe.utils.nowdate(), 'delivery_date': frappe.utils.nowdate(),
'customer': self.customer.name, 'customer': self.customer.name,
@ -90,5 +101,6 @@ class TestTaxes(unittest.TestCase):
doc.delete() doc.delete()
self.item.delete() self.item.delete()
self.item_group.delete() self.item_group.delete()
self.item_tax_template.delete()
self.account.delete() self.account.delete()
self.company.delete() self.company.delete()