From 6ca1f9bc73ecf38380bf3cf5efa3439b682e9c16 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 10 Mar 2025 12:46:45 +0530 Subject: [PATCH 1/5] fix: not able to save work order with alternative item --- erpnext/manufacturing/doctype/work_order/work_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 5971587da56..f657967c0c5 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -92,7 +92,7 @@ class WorkOrder(Document): if self.source_warehouse: 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"))) From 1f54c272ac983bba48f21c66ffbf724b62eea9a4 Mon Sep 17 00:00:00 2001 From: venkat102 Date: Thu, 6 Mar 2025 18:33:53 +0530 Subject: [PATCH 2/5] fix(account): update account number from parent company (cherry picked from commit 4a4894bc01c132ca46572591da6cd8db31e9ec30) --- erpnext/accounts/doctype/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py index e41d1b0f768..3f41ce98624 100644 --- a/erpnext/accounts/doctype/account/account.py +++ b/erpnext/accounts/doctype/account/account.py @@ -421,7 +421,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda "name", ) - if old_name: + if old_name and not from_descendant: # same account in parent company exists allow_child_account_creation = _("Allow Account Creation Against Child Company") From 247a006b5a9c575d784dcab23a2eca94b06afd5c Mon Sep 17 00:00:00 2001 From: chethank1407 Date: Sat, 8 Mar 2025 13:04:50 +0530 Subject: [PATCH 3/5] chore: rename print and stationery account (cherry picked from commit 615997b77496fe207867a543c2d9d46a5e8db12c) --- .../verified/in_standard_chart_of_accounts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json index 2ec0b7f70c8..787207ef2c4 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json @@ -98,7 +98,7 @@ "Office Maintenance Expenses": {}, "Office Rent": {}, "Postal Expenses": {}, - "Print and Stationary": {}, + "Print and Stationery": {}, "Rounded Off": { "account_type": "Round Off" }, From a1585b3c53d04fa320fa42d385ededc479fced39 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 10:33:07 +0530 Subject: [PATCH 4/5] ci: ignore PRs labeled with "skip-release-notes" when generating release notes (backport #46453) (#46456) ci: ignore PRs labeled with "skip-release-notes" when generating release notes (cherry picked from commit 57007bf937d93ce0c9be2821c7cd90e873828e21) Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> --- .github/release.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000000..c043f44b6fe --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,4 @@ +changelog: + exclude: + labels: + - skip-release-notes From f311a0fc1ca80be3bda349175d1cb36f3009bb12 Mon Sep 17 00:00:00 2001 From: Shanuka Hewage <89955436+Shanuka-98@users.noreply.github.com> Date: Wed, 12 Mar 2025 16:07:07 +0530 Subject: [PATCH 5/5] Fix: add parenttype condition to payment schedule query in accounts receivable report (#46370) fix: add parenttype condition to payment schedule query in accounts receivable report --- .../accounts/report/accounts_receivable/accounts_receivable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index eeff456291a..b082d45c520 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -498,7 +498,7 @@ class ReceivablePayableReport: ps.description, ps.paid_amount, ps.discounted_amount from `tab{row.voucher_type}` si, `tabPayment Schedule` ps where - si.name = ps.parent and + si.name = ps.parent and ps.parenttype = '{row.voucher_type}' and si.name = %s and si.is_return = 0 order by ps.paid_amount desc, due_date