nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 23:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14' into version-14-hotfix

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-16 17:59:35 +05:30
committed by GitHub
parent 9404dea97e 7a6c0e5283
commit ebf5f13447
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -3,7 +3,7 @@ import inspect
import frappe
__version__ = "14.63.3"
__version__ = "14.67.1"
def get_default_company(user=None):

8
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
View File

@@ -329,9 +329,7 @@ class SubcontractingReceipt(SubcontractingController):
)
accepted_warehouse_account = warehouse_account[item.warehouse]["account"]
supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get(
"account"
)
supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get("account")
remarks = self.get("remarks") or _("Accounting Entry for Stock")
# Accepted Warehouse Account (Debit)
@@ -403,9 +401,7 @@ class SubcontractingReceipt(SubcontractingController):
)
if divisional_loss := flt(item.amount - stock_value_diff, item.precision("amount")):
loss_account = self.get_company_default(
"stock_adjustment_account", ignore_validation=True
)
loss_account = self.get_company_default("stock_adjustment_account", ignore_validation=True)
# Loss Account (Credit)
self.add_gl_entry(