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

Merge pull request #22158 from pipech/v12-hotfix-pricing_rule-missing_income_account

Browse Source 
fix(pricing_rule): missing income account when getting free product
This commit is contained in:
rohitwaghchaure
2020-06-12 17:00:13 +05:30
committed by GitHub
parent 18ccd6b253 dfd410ded2
commit 9ea539d335
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/pricing_rule/utils.py
View File

@@ -13,7 +13,10 @@ from six import string_types
import frappe import frappe
from erpnext.setup.doctype.item_group.item_group import get_child_item_groups from erpnext.setup.doctype.item_group.item_group import get_child_item_groups
from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
from erpnext.stock.get_item_details import get_conversion_factor from erpnext.stock.get_item_details import get_conversion_factor, get_default_income_account
from erpnext.stock.doctype.item.item import get_item_defaults
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
from erpnext.setup.doctype.brand.brand import get_brand_defaults
from frappe import _, throw from frappe import _, throw
from frappe.utils import cint, flt, get_datetime, get_link_to_form, getdate, today from frappe.utils import cint, flt, get_datetime, get_link_to_form, getdate, today
@@ -480,6 +483,14 @@ def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
if item_details.get("parenttype") == 'Sales Order': if item_details.get("parenttype") == 'Sales Order':
item_details.free_item_data['delivery_date'] = doc.delivery_date if doc else today() item_details.free_item_data['delivery_date'] = doc.delivery_date if doc else today()
company = args.get('company') or doc.company
item_details.free_item_data['income_account'] = get_default_income_account(
args=args,
item=get_item_defaults(free_item, company),
item_group=get_item_group_defaults(free_item, company),
brand=get_brand_defaults(free_item, company),
)
def apply_pricing_rule_for_free_items(doc, pricing_rule_args, set_missing_values=False): def apply_pricing_rule_for_free_items(doc, pricing_rule_args, set_missing_values=False):
if pricing_rule_args.get('item_code'): if pricing_rule_args.get('item_code'):
items = [d.item_code for d in doc.items items = [d.item_code for d in doc.items