nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 23:22:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_filter_p_r

Browse Source
This commit is contained in:
Deepesh Garg
2022-04-30 22:11:43 +05:30
parent ab94b73e93 54d16de849
commit c7edc29152
4 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
View File

@@ -114,10 +114,13 @@ class OpeningInvoiceCreationTool(Document):
)
or {}
)
default_currency = frappe.db.get_value(row.party_type, row.party, "default_currency")
if company_details:
invoice.update(
{
"currency": company_details.get("default_currency"),
"currency": default_currency or company_details.get("default_currency"),
"letter_head": company_details.get("default_letter_head"),
}
)
@@ -154,7 +157,6 @@ class OpeningInvoiceCreationTool(Document):
"income_account" if row.party_type == "Customer" else "expense_account"
)
default_uom = frappe.db.get_single_value("Stock Settings", "stock_uom") or _("Nos")
default_currency = frappe.db.get_value(row.party_type, row.party, "default_currency")
rate = flt(row.outstanding_amount) / flt(row.qty)
item_dict = frappe._dict(
@@ -167,7 +169,6 @@ class OpeningInvoiceCreationTool(Document):
"description": row.item_name or "Opening Invoice Item",
income_expense_account_field: row.temporary_opening_account,
"cost_center": cost_center,
"currency": default_currency,
}
)