From 32ba8c7d6d438bf65e3732b941a1fd039d2efbdb Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 20 Jul 2022 15:21:11 +0000 Subject: [PATCH 1/3] chore(release): Bumped to Version 13.36.0 # [13.36.0](https://github.com/frappe/erpnext/compare/v13.35.3...v13.36.0) (2022-07-20) ### Bug Fixes * (india) (e-invoice) allow generation for UIN Holders ([82539fc](https://github.com/frappe/erpnext/commit/82539fc18a07425c8b6135f0a2c842acdfb85cdf)) * (india) (e-invoice) CN / DN with 0 qty ([84f260e](https://github.com/frappe/erpnext/commit/84f260e1d8ca943a1b1afbed1391734bed157b41)) * (india) (e-invoice) discount calculation ([1f4d434](https://github.com/frappe/erpnext/commit/1f4d4346752424c4b344cfebfe6042485c03da65)) * (india) (e-invoice) discount in CN/DN ([6e6b55e](https://github.com/frappe/erpnext/commit/6e6b55ece02c695203018a74cdd980bbe5c2ea4a)) * (india) (e-invoice) qty should not be changed to 1 ([b0efb98](https://github.com/frappe/erpnext/commit/b0efb98237ecad71bb37c92eb579e790219be049)) * (india)(einvoice) discount for CN DN ([844758a](https://github.com/frappe/erpnext/commit/844758a27cb5436e30ef07d6e2ceee88fad8b6c2)) * added Section translation in German for Salary Slip (backport [#31608](https://github.com/frappe/erpnext/issues/31608)) ([#31616](https://github.com/frappe/erpnext/issues/31616)) ([12d3d6a](https://github.com/frappe/erpnext/commit/12d3d6ab4925228702ae5cdb98f1d510ef5ad5d4)) * Allow multi currency invoice against single party account ([9ac9c46](https://github.com/frappe/erpnext/commit/9ac9c46dab24126381d868fb71c0215a133005db)) * **India:** Inward supplies from Composition Supplier in 3B report ([b147ce4](https://github.com/frappe/erpnext/commit/b147ce42063fdd2cdd267f30260d1a53a14b6597)) * LCV updates wrong future qty/Bin qty ([f0ecdbe](https://github.com/frappe/erpnext/commit/f0ecdbef5a9aeb3b962da61c9ba8cd12a0a9ec10)) * linter ([9a3c846](https://github.com/frappe/erpnext/commit/9a3c84663fdbbfdad8a4a256f50211a23e8f896a)) * move auto attendance job to long queue ([8eb9aaa](https://github.com/frappe/erpnext/commit/8eb9aaafe9850913b05e3983e9ae5361f049f00c)) * on cancel for loan refund ([8237d94](https://github.com/frappe/erpnext/commit/8237d94b11758938dbf6f4fff630189d7200c1cd)) * Opening Invoice Creation Tool msgprint ([cb80bcd](https://github.com/frappe/erpnext/commit/cb80bcd0ee4cedd34e72053d7d442577bd4cb5c2)) * Patch to make accounting dimension in orders ([55399f2](https://github.com/frappe/erpnext/commit/55399f2e5837b424a5489823fd73e376e9cfbad6)) * Remove unnecessary list comprehensions ([711501b](https://github.com/frappe/erpnext/commit/711501be5e1f6b2fe39529d8287d912f0ccea9f2)) * Removed 'Allow Monthly Depreciation' checkbox and fixed wdv depreciation rate ([616e3c6](https://github.com/frappe/erpnext/commit/616e3c66b9f8da898fd4e3559e0b2a9ec4aaf910)) * Renamed status field to gle_processing_status ([1180135](https://github.com/frappe/erpnext/commit/118013506775ab6546c4720674217fb22f9dafc5)) * Set Amount in Supplied Item table ([72e8c02](https://github.com/frappe/erpnext/commit/72e8c02ae0970bd24acbde4fc0759afa371d8a3b)) * set default_bom for item ([def622c](https://github.com/frappe/erpnext/commit/def622c13e5afab174a3dd2c2e976472b33e1ceb)) * set status on submit/cancel ([04b077a](https://github.com/frappe/erpnext/commit/04b077a89ff0c447343726e2a3d045991a136b08)) * slow stock reposting ([a5dae92](https://github.com/frappe/erpnext/commit/a5dae9264db5456531491cb7e2394919860b5ad3)) * Supplier details in TDS monthly report ([#31599](https://github.com/frappe/erpnext/issues/31599)) ([431d79f](https://github.com/frappe/erpnext/commit/431d79f5161868ebd1fe80f924c3ed3a02b70f89)) * Tax amount not considered in Expense Claim Journal Entry ([90c751f](https://github.com/frappe/erpnext/commit/90c751f64884ed49ec94e22fbf72d7ac18968d55)) * test ([9631ffd](https://github.com/frappe/erpnext/commit/9631ffd215de8a23bbeb8e25ce8ba8e7262f2877)) ### Features * add adjustment amount to loan ([d5ce780](https://github.com/frappe/erpnext/commit/d5ce780e8704b6e7bc1067c1beae257d1c811892)) ### Performance Improvements * index shift type and employee in checkins and assignment to avoid full table scans ([6938025](https://github.com/frappe/erpnext/commit/6938025952d5d702c2e28b5086f18c7c9cb3b41a)) * Optimization of gl entry processing logic in period closing voucher ([903e42f](https://github.com/frappe/erpnext/commit/903e42fbddd6d9dab5a63f95051309156823356b)) * Replace `db.get_all` with `db.exists` in `is_holiday` ([85c554e](https://github.com/frappe/erpnext/commit/85c554eab560a1e958935dbccdb534a8079f6722)) * Replace `get_doc` with `db.get_value` in `get_shift_details` ([abb7ac5](https://github.com/frappe/erpnext/commit/abb7ac5a0be7a8e48e63186dc8fb02d5656bc1aa)) * Use `get_cached_value` and `get_cached_doc` ([8c9035d](https://github.com/frappe/erpnext/commit/8c9035d914406e3134e9516b7194d4c50662f37d)) --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 69fc7cbcdaa..514dd40467a 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = "13.35.3" +__version__ = "13.36.0" def get_default_company(user=None): From 2ae3bd9fedbde89496e2e438b94e68da80c4db86 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 13:54:40 +0530 Subject: [PATCH 2/3] fix: ensure defaults removed in bad frappe patch get set again (backport #31659) fix: ensure defaults removed in bad frappe patch get set again (#31659) (cherry picked from commit bf2833b8ee094497dd7d20bd3b2577c7fedb37c9) (cherry picked from commit 9071018e4ea195a24898ec29491337f91060cd13) Co-authored-by: Sagar Vora --- erpnext/patches.txt | 1 + .../patches/v13_0/reset_corrupt_defaults.py | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 erpnext/patches/v13_0/reset_corrupt_defaults.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 8e8e2b25299..15f50a791c7 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -370,3 +370,4 @@ erpnext.patches.v13_0.job_card_status_on_hold erpnext.patches.v13_0.add_cost_center_in_loans erpnext.patches.v13_0.show_india_localisation_deprecation_warning erpnext.patches.v13_0.fix_number_and_frequency_for_monthly_depreciation +erpnext.patches.v13_0.reset_corrupt_defaults diff --git a/erpnext/patches/v13_0/reset_corrupt_defaults.py b/erpnext/patches/v13_0/reset_corrupt_defaults.py new file mode 100644 index 00000000000..7a6d50f19d6 --- /dev/null +++ b/erpnext/patches/v13_0/reset_corrupt_defaults.py @@ -0,0 +1,29 @@ +import frappe + + +def execute(): + """ + This patch is needed to fix parent incorrectly set as `__2fa` because of + https://github.com/frappe/frappe/commit/a822092211533ff17ff9b92dd86f6f868ed63e2e + """ + + for doctype in ( + "Accounts Settings", + "Stock Settings", + "Selling Settings", + "Buying Settings", + "CRM Settings", + "Global Defaults", + "Healthcare Settings", + "Education Settings", + ): + try: + frappe.get_single(doctype).save() + except Exception: + pass + + try: + pos_profile = frappe.get_last_doc("POS Profile") + pos_profile.set_defaults() + except Exception: + pass From 69087b8790d0b17f17c8755ec2d31d57374813ae Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Thu, 21 Jul 2022 08:26:20 +0000 Subject: [PATCH 3/3] chore(release): Bumped to Version 13.36.1 ## [13.36.1](https://github.com/frappe/erpnext/compare/v13.36.0...v13.36.1) (2022-07-21) ### Bug Fixes * ensure defaults removed in bad frappe patch get set again (backport [#31659](https://github.com/frappe/erpnext/issues/31659)) ([2ae3bd9](https://github.com/frappe/erpnext/commit/2ae3bd9fedbde89496e2e438b94e68da80c4db86)) --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 514dd40467a..2c928b288de 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = "13.36.0" +__version__ = "13.36.1" def get_default_company(user=None):