nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into version-12-hotfix

Browse Source
This commit is contained in:
Tunde Akinyanmi
2020-10-09 07:24:23 +01:00
parent 78a98030ef 7c760f62c3
commit 65a716dd08
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -97,7 +97,7 @@
"default": "1", "default": "1",
"fieldname": "unlink_advance_payment_on_cancelation_of_order", "fieldname": "unlink_advance_payment_on_cancelation_of_order",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Unlink Advance Payment on Cancelation of Order" "label": "Unlink Advance Payment on Cancellation of Order"
}, },
{ {
"default": "1", "default": "1",
@@ -179,7 +179,7 @@
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2020-03-11 13:09:26.235848", "modified": "2020-10-08 09:40:12.121145",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

3
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -207,6 +207,8 @@ class PurchaseReceipt(BuyingController):
from erpnext.accounts.general_ledger import process_gl_map from erpnext.accounts.general_ledger import process_gl_map
stock_rbnb = self.get_company_default("stock_received_but_not_billed") stock_rbnb = self.get_company_default("stock_received_but_not_billed")
stock_rbnb_currency = get_account_currency(stock_rbnb)
cogs_account = self.get_company_default("default_expense_account")
landed_cost_entries = get_item_account_wise_additional_cost(self.name) landed_cost_entries = get_item_account_wise_additional_cost(self.name)
expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation") expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
@@ -242,7 +244,6 @@ class PurchaseReceipt(BuyingController):
# stock received but not billed # stock received but not billed
if d.base_net_amount: if d.base_net_amount:
stock_rbnb_currency = get_account_currency(stock_rbnb)
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
"account": stock_rbnb, "account": stock_rbnb,
"against": warehouse_account[d.warehouse]["account"], "against": warehouse_account[d.warehouse]["account"],