mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-18 17:08:42 +00:00
fix(stock): set stock received but not billed account for purchase (#55149)
(cherry picked from commit c4d28a2612)
This commit is contained in:
@@ -12,6 +12,7 @@ from frappe.model.utils import get_fetch_values
|
|||||||
from frappe.query_builder.functions import IfNull, Sum
|
from frappe.query_builder.functions import IfNull, Sum
|
||||||
from frappe.utils import add_days, add_months, cint, cstr, flt, get_link_to_form, getdate, parse_json
|
from frappe.utils import add_days, add_months, cint, cstr, flt, get_link_to_form, getdate, parse_json
|
||||||
|
|
||||||
|
import erpnext
|
||||||
from erpnext import get_company_currency
|
from erpnext import get_company_currency
|
||||||
from erpnext.accounts.doctype.pricing_rule.pricing_rule import (
|
from erpnext.accounts.doctype.pricing_rule.pricing_rule import (
|
||||||
get_pricing_rule_for_item,
|
get_pricing_rule_for_item,
|
||||||
@@ -518,10 +519,21 @@ def get_basic_details(args, item, overwrite_warehouse=True):
|
|||||||
args.name, args.conversion_rate, item.name, out.conversion_factor
|
args.name, args.conversion_rate, item.name, out.conversion_factor
|
||||||
)
|
)
|
||||||
|
|
||||||
|
expense_account_field = "default_expense_account"
|
||||||
|
if (
|
||||||
|
item.is_stock_item
|
||||||
|
and erpnext.is_perpetual_inventory_enabled(args.company)
|
||||||
|
and (
|
||||||
|
args.doctype == "Purchase Receipt"
|
||||||
|
or (args.doctype == "Purchase Invoice" and args.get("update_stock"))
|
||||||
|
)
|
||||||
|
):
|
||||||
|
expense_account_field = "stock_received_but_not_billed"
|
||||||
|
|
||||||
# if default specified in item is for another company, fetch from company
|
# if default specified in item is for another company, fetch from company
|
||||||
for d in [
|
for d in [
|
||||||
["Account", "income_account", "default_income_account"],
|
["Account", "income_account", "default_income_account"],
|
||||||
["Account", "expense_account", "default_expense_account"],
|
["Account", "expense_account", expense_account_field],
|
||||||
["Cost Center", "cost_center", "cost_center"],
|
["Cost Center", "cost_center", "cost_center"],
|
||||||
["Warehouse", "warehouse", ""],
|
["Warehouse", "warehouse", ""],
|
||||||
]:
|
]:
|
||||||
|
|||||||
Reference in New Issue
Block a user