From 2f7b192ff90cae7fef23633e4e6d952caf53bd4d Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 6 Apr 2022 18:46:00 +0530 Subject: [PATCH 1/9] chore: version bump and change log for v13.25.0 --- erpnext/__init__.py | 2 +- erpnext/change_log/v13/v13_25_0.md | 47 ++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 erpnext/change_log/v13/v13_25_0.md diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a36eba4583c..fcd35dcedb9 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = '13.24.0' +__version__ = '13.25.0' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/change_log/v13/v13_25_0.md b/erpnext/change_log/v13/v13_25_0.md new file mode 100644 index 00000000000..6c21a839870 --- /dev/null +++ b/erpnext/change_log/v13/v13_25_0.md @@ -0,0 +1,47 @@ +## Version 13.25.0 Release Notes + +### Features & Enhancements + +- feat: minor, pick list item reference on delivery note item table ([#30527](https://github.com/frappe/erpnext/pull/30527)) +- feat: configurable Contract naming ([#30450](https://github.com/frappe/erpnext/pull/30450)) + +### Fixes + +- fix: Account currency validation ([#30486](https://github.com/frappe/erpnext/pull/30486)) +- fix(india): minor e-invoicing fixes ([#30553](https://github.com/frappe/erpnext/pull/30553)) +- feat: Redisearch with consent (bp) ([#30539](https://github.com/frappe/erpnext/pull/30539)) +- fix: maintain FIFO queue even if outgoing_rate is not found ([#30563](https://github.com/frappe/erpnext/pull/30563)) +- fix(lead): reload address and contact before updating their links ([#29968](https://github.com/frappe/erpnext/pull/29968)) +- fix(lead): reload contact before updating links ([#29966](https://github.com/frappe/erpnext/pull/29966)) +- fix: Add non-existent Item check and cleanup in `validate_for_items` ([#30509](https://github.com/frappe/erpnext/pull/30509)) +- fix: incorrect payable amount for loan closure ([#30191](https://github.com/frappe/erpnext/pull/30191)) +- fix: Do not apply shipping rule for POS transactions ([#30575](https://github.com/frappe/erpnext/pull/30575)) +- perf: index barcode for faster scans ([#30543](https://github.com/frappe/erpnext/pull/30543)) +- fix: don't check for failed repost while freezing ([#30472](https://github.com/frappe/erpnext/pull/30472)) +- fix: if accepted warehouse not selected during rejection then stock ledger not created ([#30564](https://github.com/frappe/erpnext/pull/30564)) +- fix: hide pending qty only if original item is assigned ([#30599](https://github.com/frappe/erpnext/pull/30599)) +- fix(ux): refresh update to zero val checkbox ([#30567](https://github.com/frappe/erpnext/pull/30567)) +- refactor: Add exception handling in background job within BOM Update Tool ([#30146](https://github.com/frappe/erpnext/pull/30146)) +- fix: bom valuation - handle lack of LPP ([#30454](https://github.com/frappe/erpnext/pull/30454)) +- fix: total leaves allocated not validated and recalculated on updates post submission ([#30569](https://github.com/frappe/erpnext/pull/30569)) +- fix: convert dates to datetime before comparing in leave days calculation and fix half day edge case ([#30538](https://github.com/frappe/erpnext/pull/30538)) +- fix: Ignore user perm for party account company ([#30555](https://github.com/frappe/erpnext/pull/30555)) +- fix(asset): do not validate warehouse on asset purchase ([#30461](https://github.com/frappe/erpnext/pull/30461)) +- fix: credit limit validation in delivery note ([#30470](https://github.com/frappe/erpnext/pull/30470)) +- fix: enable row deletion in reference table ([#30453](https://github.com/frappe/erpnext/pull/30453)) +- fix: use `name` for links not `item_code` ([#30462](https://github.com/frappe/erpnext/pull/30462)) +- fix: multiple pos issues (copy #30324) ([#30515](https://github.com/frappe/erpnext/pull/30515)) +- fix: fetch from fields not working in eway bill dialog ([#30579](https://github.com/frappe/erpnext/pull/30579)) +- fix(pos): do not reset search input on item selection ([#30537](https://github.com/frappe/erpnext/pull/30537)) +- fix: explicitly check if additional salary is recurring while fetching components for payroll ([#30489](https://github.com/frappe/erpnext/pull/30489)) +- fix(India): Tax fetching based on tax category ([#30500](https://github.com/frappe/erpnext/pull/30500)) +- fix: submit Work Order when “Make Serial No / Batch from Work Order” is enabled ([#30468](https://github.com/frappe/erpnext/pull/30468)) +- fix: Dont set `idx` while adding WO items to Stock Entry ([#30377](https://github.com/frappe/erpnext/pull/30377)) +- fix(India): Auto tax fetching based on GSTIN ([#30385](https://github.com/frappe/erpnext/pull/30385)) +- fix: validate 0 transfer qty in stock entry (copy #30476) ([#30479](https://github.com/frappe/erpnext/pull/30479)) +- fix: Issues on loan repayment ([#30557](https://github.com/frappe/erpnext/pull/30557)) +- fix: Added validation for single_threshold in Tax With Holding Category ([#30382](https://github.com/frappe/erpnext/pull/30382)) +- fix: Remove trailing slashes "/" from route ([#30531](https://github.com/frappe/erpnext/pull/30531)) +- fix: validate 0 transfer qty in stock entry ([#30476](https://github.com/frappe/erpnext/pull/30476)) +- fix: Taxes getting overriden from mapped to target doc ([#30510](https://github.com/frappe/erpnext/pull/30510)) +- fix: move item tax to item tax template patch ([#30419](https://github.com/frappe/erpnext/pull/30419)) From 23a7ab15b5d8c94b8d63cd16f05ee4bc5ca789ad Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 6 Apr 2022 22:31:50 +0530 Subject: [PATCH 2/9] fix(pos): reload doc before set value (#30612) --- .../v13_0/set_return_against_in_pos_invoice_references.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/patches/v13_0/set_return_against_in_pos_invoice_references.py b/erpnext/patches/v13_0/set_return_against_in_pos_invoice_references.py index 6af9617bcee..fe9eb8b2cc1 100644 --- a/erpnext/patches/v13_0/set_return_against_in_pos_invoice_references.py +++ b/erpnext/patches/v13_0/set_return_against_in_pos_invoice_references.py @@ -19,6 +19,8 @@ def execute(): if not open_pos_closing_entries: return + frappe.reload_doc("Accounts", "doctype", "pos_invoice_reference") + POSInvoiceReference = frappe.qb.DocType("POS Invoice Reference") POSInvoice = frappe.qb.DocType("POS Invoice") pos_invoice_references = ( From da7a2bb3a6c3a35ae78978f54fb729e470d176c3 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Wed, 6 Apr 2022 22:37:47 +0530 Subject: [PATCH 3/9] chore: version bump --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 56beaca4bef..d089ec42ae9 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = '13.25.0' +__version__ = '13.25.1' def get_default_company(user=None): """Get default company for user""" From 81812b608f13a9d9b27b32118661f09be9970e77 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Sat, 9 Apr 2022 16:14:26 +0530 Subject: [PATCH 4/9] fix(pos): cannot change paid amount in pos payments (#30659) --- erpnext/selling/page/point_of_sale/pos_controller.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js index 6974bed4f1f..65e0cbb7a5c 100644 --- a/erpnext/selling/page/point_of_sale/pos_controller.js +++ b/erpnext/selling/page/point_of_sale/pos_controller.js @@ -721,11 +721,14 @@ erpnext.PointOfSale.Controller = class { async save_and_checkout() { if (this.frm.is_dirty()) { + let save_error = false; + await this.frm.save(null, null, null, () => save_error = true); // only move to payment section if save is successful - frappe.route_hooks.after_save = () => this.payment.checkout(); - return this.frm.save( - null, null, null, () => this.cart.toggle_checkout_btn(true) // show checkout button on error - ); + !save_error && this.payment.checkout(); + // show checkout button on error + save_error && setTimeout(() => { + this.cart.toggle_checkout_btn(true); + }, 300); // wait for save to finish } else { this.payment.checkout(); } From 71f72458bfb3371b30ca240efa10e3b4602c6f62 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 9 Apr 2022 16:22:22 +0530 Subject: [PATCH 5/9] chore: version bump --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index d089ec42ae9..b19f1cecaaa 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = '13.25.1' +__version__ = '13.25.2' def get_default_company(user=None): """Get default company for user""" From 147499bc9c2b570e50c9ab0ffad077d4ec1d25ac Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 12 Apr 2022 23:01:09 +0530 Subject: [PATCH 6/9] chore: change log and version bump --- erpnext/__init__.py | 2 +- erpnext/change_log/v13/v13_26_0.md | 31 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 erpnext/change_log/v13/v13_26_0.md diff --git a/erpnext/__init__.py b/erpnext/__init__.py index b19f1cecaaa..b34176ed34a 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = '13.25.2' +__version__ = "13.26.0" def get_default_company(user=None): """Get default company for user""" diff --git a/erpnext/change_log/v13/v13_26_0.md b/erpnext/change_log/v13/v13_26_0.md new file mode 100644 index 00000000000..67450983dfb --- /dev/null +++ b/erpnext/change_log/v13/v13_26_0.md @@ -0,0 +1,31 @@ +## Version 13.25.0 Release Notes + +### Features & Enhancements + +- feat: Receivable/Payable Account column and filter in AR/AP report ([#30620](https://github.com/frappe/erpnext/pull/30620)) +- feat(india): e-invoicing for intra-state union territory transactions ([#30626](https://github.com/frappe/erpnext/pull/30626)) +- feat: Ignore permlevel for specific fields ([#30686](https://github.com/frappe/erpnext/pull/30686)) +- feat: 'customer' column and more filter to Payment terms status report ([#30499](https://github.com/frappe/erpnext/pull/30499)) + +### Fixes + +- fix: fallback to item_name if description is not found ([#30619](https://github.com/frappe/erpnext/pull/30619)) +- fix: Deferred Revenue/Expense Account validation ([#30602](https://github.com/frappe/erpnext/pull/30602)) +- fix(pos): reload doc before set value ([#30610](https://github.com/frappe/erpnext/pull/30610)) +- fix: Exchange gain and loss button in Payment Entry ([#30606](https://github.com/frappe/erpnext/pull/30606)) +- fix(pos): cannot change paid amount in pos payments ([#30657](https://github.com/frappe/erpnext/pull/30657)) +- fix: hide pending qty only if original item is assigned ([#30599](https://github.com/frappe/erpnext/pull/30599)) +- fix(pos): reload doc before set value ([#30611](https://github.com/frappe/erpnext/pull/30611)) +- fix: Handle multiple item transfer in separate SEs against WO ([#30674](https://github.com/frappe/erpnext/pull/30674)) +- fix(patch): check null values in is_cancelled patch ([#30594](https://github.com/frappe/erpnext/pull/30594)) +- fix: Download JSON for GSTR-1 report ([#30651](https://github.com/frappe/erpnext/pull/30651)) +- fix: remove bad defaults from BOM operation ([#30644](https://github.com/frappe/erpnext/pull/30644)) +- fix: update translation ([#30474](https://github.com/frappe/erpnext/pull/30474)) +- fix: dont reassign mutable (list) to a different field ([#30634](https://github.com/frappe/erpnext/pull/30634)) +- fix: update translation ([#30654](https://github.com/frappe/erpnext/pull/30654)) +- fix: ignore item-less maintenance visit for sr no ([#30684](https://github.com/frappe/erpnext/pull/30684)) +- fix: removed unused courses template ([#30596](https://github.com/frappe/erpnext/pull/30596)) +- fix: Implicit ignore pricing rule check on returns ([#30662](https://github.com/frappe/erpnext/pull/30662)) +- fix: warehouse naming when suffix is present ([#30621](https://github.com/frappe/erpnext/pull/30621)) +- fix: Ignore disabled tax categories ([#30542](https://github.com/frappe/erpnext/pull/30542)) + From 512b480f6a9d8b9b2ed31c3c593c2e059363b7c6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 12 Apr 2022 23:31:47 +0530 Subject: [PATCH 7/9] chore: version bump --- erpnext/change_log/v13/v13_26_0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/change_log/v13/v13_26_0.md b/erpnext/change_log/v13/v13_26_0.md index 67450983dfb..b29d018039e 100644 --- a/erpnext/change_log/v13/v13_26_0.md +++ b/erpnext/change_log/v13/v13_26_0.md @@ -1,4 +1,4 @@ -## Version 13.25.0 Release Notes +## Version 13.26.0 Release Notes ### Features & Enhancements From f266d765fdf1183cb7b1b126105cce838a83ddbe Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 19 Apr 2022 15:58:49 +0530 Subject: [PATCH 8/9] chore: add GH token --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32ea02b1d71..9a021ce5c63 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,5 +21,6 @@ jobs: npm install @semantic-release/git @semantic-release/exec --no-save - name: Create Release env: + GH_TOKEN: ${{ secrets.RELEASE_TOKEN }} GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} - run: npx semantic-release \ No newline at end of file + run: npx semantic-release From 4389100fa1ec134eb121de275d88d0f1c9d1ec59 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 19 Apr 2022 10:46:00 +0000 Subject: [PATCH 9/9] chore(release): Bumped to Version 13.27.0 # [13.27.0](https://github.com/frappe/erpnext/compare/v13.26.0...v13.27.0) (2022-04-19) ### Bug Fixes * Depreciation Amount calculation for first row when Monthly Depreciation is allowed ([#30692](https://github.com/frappe/erpnext/issues/30692)) ([9cf790d](https://github.com/frappe/erpnext/commit/9cf790db9d81e809e34fd2c6ec8c3f63b29e3de2)) * Do not show disabled dimensions in reports ([46d773d](https://github.com/frappe/erpnext/commit/46d773df5dc6547319a162f78917566d4c4e39ce)) * Exchange gain and loss on advance jv allocation ([9c5f841](https://github.com/frappe/erpnext/commit/9c5f8415bf1bd29bf34d32f49ad4c0b84ed68a6e)) * Map correct company to PO made via Prod Plan (subcontract) ([44be67e](https://github.com/frappe/erpnext/commit/44be67e6ddf7556b6b929b6381675b7919d1c074)) * Map Production Plan company in subassembly WO created from it ([f604101](https://github.com/frappe/erpnext/commit/f604101feabaeb1766bcb3d0376d22352f124c64)) * **patch:** check if column is present while fixing reverse linking (backport [#30737](https://github.com/frappe/erpnext/issues/30737)) ([#30739](https://github.com/frappe/erpnext/issues/30739)) ([38002e3](https://github.com/frappe/erpnext/commit/38002e3fe265c91664c31a9dc4ab8fac9cb01631)) * Payment reco query with max invocie and payment amount limit ([4008c95](https://github.com/frappe/erpnext/commit/4008c95ac6afc3b06a0a602e3f469db61e1f0453)) * Price changing on creating Sales retrun from Delivery Note ([93fe840](https://github.com/frappe/erpnext/commit/93fe840844081c60ce88d8fc1621fe260463657a)) * process statement to_date override ([378d15d](https://github.com/frappe/erpnext/commit/378d15d388ae9cac7a5f897af83c99605403503a)) * Remove "Values Out of Sync" validation (backport [#30707](https://github.com/frappe/erpnext/issues/30707)) ([#30718](https://github.com/frappe/erpnext/issues/30718)) ([fb9d640](https://github.com/frappe/erpnext/commit/fb9d640d8b161ccdee091f1ce9838a32b30ea23e)) * Update token to allow updates on protected branch ([2a29aef](https://github.com/frappe/erpnext/commit/2a29aefb1935f33aa16273a2924fc38a553f7f84)) * update translation ([#30716](https://github.com/frappe/erpnext/issues/30716)) ([fb127da](https://github.com/frappe/erpnext/commit/fb127da489786658d68ee5f3be888623d2f5c38b)) ### Features * Item-wise provisional accounting for service items ([5776881](https://github.com/frappe/erpnext/commit/5776881f34d8cc44dae6f05cdb87a010843dcf96)) --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index b34176ed34a..42fdb0df5df 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = "13.26.0" +__version__ = "13.27.0" def get_default_company(user=None): """Get default company for user"""