nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
chore: release v14
This commit is contained in:
ruthra kumar
2025-03-12 19:41:47 +05:30
committed by GitHub
parent b404f00ece f311a0fc1c
commit 2546589b4c
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/release.yml vendored Normal file
View File

@@ -0,0 +1,4 @@
changelog:
exclude:
labels:
- skip-release-notes

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

@@ -421,7 +421,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
"name", "name",
) )
if old_name: if old_name and not from_descendant:
# same account in parent company exists # same account in parent company exists
allow_child_account_creation = _("Allow Account Creation Against Child Company") allow_child_account_creation = _("Allow Account Creation Against Child Company")

2
erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
View File

@@ -98,7 +98,7 @@
"Office Maintenance Expenses": {}, "Office Maintenance Expenses": {},
"Office Rent": {}, "Office Rent": {},
"Postal Expenses": {}, "Postal Expenses": {},
"Print and Stationary": {}, "Print and Stationery": {},
"Rounded Off": { "Rounded Off": {
"account_type": "Round Off" "account_type": "Round Off"
}, },

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -498,7 +498,7 @@ class ReceivablePayableReport:
ps.description, ps.paid_amount, ps.discounted_amount ps.description, ps.paid_amount, ps.discounted_amount
from `tab{row.voucher_type}` si, `tabPayment Schedule` ps from `tab{row.voucher_type}` si, `tabPayment Schedule` ps
where where
si.name = ps.parent and si.name = ps.parent and ps.parenttype = '{row.voucher_type}' and
si.name = %s and si.name = %s and
si.is_return = 0 si.is_return = 0
order by ps.paid_amount desc, due_date order by ps.paid_amount desc, due_date

2
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@@ -92,7 +92,7 @@ class WorkOrder(Document):
if self.source_warehouse: if self.source_warehouse:
self.set_warehouses() self.set_warehouses()
validate_uom_is_integer(self, "stock_uom", ["qty", "produced_qty"]) validate_uom_is_integer(self, "stock_uom", ["required_qty"])
self.set_required_items(reset_only_qty=len(self.get("required_items"))) self.set_required_items(reset_only_qty=len(self.get("required_items")))