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

feat: Assign Item's Default Discount Account if present

Browse Source
This commit is contained in:
GangaManoj 2021-07-06 16:51:12 +05:30 committed by Deepesh Garg
parent acb9e207ec
commit cdfefa261e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/get_item_details.py
View File

@ -287,6 +287,7 @@ def get_basic_details(args, item, overwrite_warehouse=True):
"warehouse": warehouse, "warehouse": warehouse,
"income_account": get_default_income_account(args, item_defaults, item_group_defaults, brand_defaults), "income_account": get_default_income_account(args, item_defaults, item_group_defaults, brand_defaults),
"expense_account": expense_account or get_default_expense_account(args, item_defaults, item_group_defaults, brand_defaults) , "expense_account": expense_account or get_default_expense_account(args, item_defaults, item_group_defaults, brand_defaults) ,
"discount_account": None or get_default_discount_account(args, item_defaults),
"cost_center": get_default_cost_center(args, item_defaults, item_group_defaults, brand_defaults), "cost_center": get_default_cost_center(args, item_defaults, item_group_defaults, brand_defaults),
'has_serial_no': item.has_serial_no, 'has_serial_no': item.has_serial_no,
'has_batch_no': item.has_batch_no, 'has_batch_no': item.has_batch_no,
@ -589,6 +590,10 @@ def get_default_expense_account(args, item, item_group, brand):
or brand.get("expense_account") or brand.get("expense_account")
or args.expense_account) or args.expense_account)
def get_default_discount_account(args, item_defaults):
return (item_defaults.default_discount_account
or args.discount_account)
def get_default_deferred_account(args, item, fieldname=None): def get_default_deferred_account(args, item, fieldname=None):
if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"): if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"):
return (item.get(fieldname) return (item.get(fieldname)