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

Merge pull request #50181 from frappe/version-14-hotfix

Browse Source 
chore: release v14
This commit is contained in:
Diptanil Saha
2025-10-21 18:13:40 +05:30
committed by GitHub
parent e27518b2d4 00a75d4984
commit 70a8c64ea4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -456,9 +456,8 @@ class PurchaseOrder(BuyingController):
if not self.is_against_so(): if not self.is_against_so():
return return
for item in removed_items: for item in removed_items:
prev_ordered_qty = ( prev_ordered_qty = flt(
frappe.get_cached_value("Sales Order Item", item.get("sales_order_item"), "ordered_qty") frappe.get_cached_value("Sales Order Item", item.get("sales_order_item"), "ordered_qty")
or 0.0
) )
frappe.db.set_value( frappe.db.set_value(

4
erpnext/controllers/accounts_controller.py
View File

@@ -2750,9 +2750,7 @@ def set_balance_in_account_currency(
_("Account: {0} with currency: {1} can not be selected").format(gl_dict.account, account_currency) _("Account: {0} with currency: {1} can not be selected").format(gl_dict.account, account_currency)
) )
gl_dict["account_currency"] = ( gl_dict["account_currency"] = account_currency
company_currency if account_currency == company_currency else account_currency
)
# set debit/credit in account currency if not provided # set debit/credit in account currency if not provided
if flt(gl_dict.debit) and not flt(gl_dict.debit_in_account_currency): if flt(gl_dict.debit) and not flt(gl_dict.debit_in_account_currency):

5
erpnext/stock/stock_ledger.py
View File

@@ -496,7 +496,10 @@ class update_entries_after:
elif dependant_sle.voucher_type == "Stock Entry" and is_transfer_stock_entry( elif dependant_sle.voucher_type == "Stock Entry" and is_transfer_stock_entry(
dependant_sle.voucher_no dependant_sle.voucher_no
): ):
print(dependant_sle.voucher_no) if self.distinct_item_warehouses[key].get("transfer_entry_to_repost"):
return
val["transfer_entry_to_repost"] = True
self.distinct_item_warehouses[key] = val self.distinct_item_warehouses[key] = val
self.new_items_found = True self.new_items_found = True