mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-23 21:22:42 +01:00
fix: set company based expense account
This commit is contained in:
@@ -1259,6 +1259,7 @@ def make_landed_cost_voucher(**args):
|
||||
lcv = frappe.new_doc("Landed Cost Voucher")
|
||||
lcv.company = args.company or "_Test Company"
|
||||
lcv.distribute_charges_based_on = args.distribute_charges_based_on or "Amount"
|
||||
expense_account = get_expense_account(args.company or "_Test Company")
|
||||
|
||||
lcv.set(
|
||||
"purchase_receipts",
|
||||
@@ -1279,7 +1280,7 @@ def make_landed_cost_voucher(**args):
|
||||
[
|
||||
{
|
||||
"description": "Shipping Charges",
|
||||
"expense_account": args.expense_account or "Expenses Included In Valuation - TCP1",
|
||||
"expense_account": args.expense_account or expense_account,
|
||||
"amount": args.charges,
|
||||
}
|
||||
],
|
||||
@@ -1299,6 +1300,7 @@ def create_landed_cost_voucher(receipt_document_type, receipt_document, company,
|
||||
lcv = frappe.new_doc("Landed Cost Voucher")
|
||||
lcv.company = company
|
||||
lcv.distribute_charges_based_on = "Amount"
|
||||
expense_account = get_expense_account(company)
|
||||
|
||||
lcv.set(
|
||||
"purchase_receipts",
|
||||
@@ -1318,7 +1320,7 @@ def create_landed_cost_voucher(receipt_document_type, receipt_document, company,
|
||||
[
|
||||
{
|
||||
"description": "Insurance Charges",
|
||||
"expense_account": "Expenses Included In Valuation - TCP1",
|
||||
"expense_account": expense_account,
|
||||
"amount": charges,
|
||||
}
|
||||
],
|
||||
@@ -1333,6 +1335,11 @@ def create_landed_cost_voucher(receipt_document_type, receipt_document, company,
|
||||
return lcv
|
||||
|
||||
|
||||
def get_expense_account(company):
|
||||
company_abbr = frappe.get_cached_value("Company", company, "abbr")
|
||||
return f"Expenses Included In Valuation - {company_abbr}"
|
||||
|
||||
|
||||
def distribute_landed_cost_on_items(lcv):
|
||||
based_on = lcv.distribute_charges_based_on.lower()
|
||||
total = sum(flt(d.get(based_on)) for d in lcv.get("items"))
|
||||
|
||||
Reference in New Issue
Block a user