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

fix: Test Cases

Browse Source
This commit is contained in:
Deepesh Garg 2020-12-26 11:37:51 +05:30
parent 5269f02919
commit 4f8da4c313
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@ -149,7 +149,7 @@ class GLEntry(Document):
account_currency = get_account_currency(self.account) account_currency = get_account_currency(self.account)
if not self.account_currency: if not self.account_currency:
self.account_currency = company_currency self.account_currency = account_currency or company_currency
if account_currency != self.account_currency: if account_currency != self.account_currency:
frappe.throw(_("{0} {1}: Accounting Entry for {2} can only be made in currency: {3}") frappe.throw(_("{0} {1}: Accounting Entry for {2} can only be made in currency: {3}")

11
erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
View File

@ -41,16 +41,14 @@
"in_list_view": 1, "in_list_view": 1,
"label": "Expense Account", "label": "Expense Account",
"mandatory_depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))", "mandatory_depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
"options": "Account", "options": "Account"
"reqd": 1
}, },
{ {
"fieldname": "account_currency", "fieldname": "account_currency",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Account Currency", "label": "Account Currency",
"options": "Currency", "options": "Currency",
"read_only": 1, "read_only": 1
"reqd": 1
}, },
{ {
"fieldname": "exchange_rate", "fieldname": "exchange_rate",
@ -63,14 +61,13 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Base Amount", "label": "Base Amount",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"read_only": 1, "read_only": 1
"reqd": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-12-04 00:22:14.373312", "modified": "2020-12-26 01:07:23.233604",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Landed Cost Taxes and Charges", "name": "Landed Cost Taxes and Charges",