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

fix: Test

Browse Source
This commit is contained in:
Deepesh Garg 2020-07-11 13:58:53 +05:30
parent 87eb2827ef
commit f15ff5fbfa
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/stock/doctype/item/test_records.json
View File

@ -92,8 +92,7 @@
{ {
"doctype": "Item Tax", "doctype": "Item Tax",
"parentfield": "taxes", "parentfield": "taxes",
"item_tax_template": "_Test Account Excise Duty @ 10", "item_tax_template": "_Test Account Excise Duty @ 10"
"tax_category": ""
} }
], ],
"stock_uom": "_Test UOM 1" "stock_uom": "_Test UOM 1"
@ -371,8 +370,7 @@
{ {
"doctype": "Item Tax", "doctype": "Item Tax",
"parentfield": "taxes", "parentfield": "taxes",
"item_tax_template": "_Test Account Excise Duty @ 10", "item_tax_template": "_Test Account Excise Duty @ 10"
"tax_category": ""
}, },
{ {
"doctype": "Item Tax", "doctype": "Item Tax",
@ -451,14 +449,12 @@
{ {
"doctype": "Item Tax", "doctype": "Item Tax",
"parentfield": "taxes", "parentfield": "taxes",
"item_tax_template": "_Test Account Excise Duty @ 20", "item_tax_template": "_Test Account Excise Duty @ 20"
"tax_category": ""
}, },
{ {
"doctype": "Item Tax", "doctype": "Item Tax",
"parentfield": "taxes", "parentfield": "taxes",
"item_tax_template": "_Test Item Tax Template 1", "item_tax_template": "_Test Item Tax Template 1"
"tax_category": "_Test Tax Category 1"
} }
] ]
} }

2
erpnext/stock/get_item_details.py
View File

@ -636,7 +636,7 @@ def get_item_price(args, item_code, ignore_party=False):
if args.get('transaction_date'): if args.get('transaction_date'):
conditions += """ and %(transaction_date)s between conditions += """ and %(transaction_date)s between
ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31')""" ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31')"""
if args.get('posting_date'): if args.get('posting_date'):
conditions += """ and %(posting_date)s between conditions += """ and %(posting_date)s between
ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31')""" ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31')"""