From d5166861ded4ec2cb6dcbaab9f9bf41f044174b8 Mon Sep 17 00:00:00 2001 From: Pranav Nachnekar Date: Wed, 23 Oct 2019 07:46:00 +0000 Subject: [PATCH 1/6] fix:setting incorrect field for party bank account Previously ![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif) Corrected ![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif) --- erpnext/accounts/doctype/payment_entry/payment_entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 172d5372a61..1e0b1bcbf16 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -308,7 +308,7 @@ frappe.ui.form.on('Payment Entry', { () => { frm.set_party_account_based_on_party = false; if (r.message.bank_account) { - frm.set_value("bank_account", r.message.bank_account); + frm.set_value("party_bank_account", r.message.bank_account); } } ]); From 7bdc6120132c23af4e7e334f6a96aeaae06c8ee7 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 24 Oct 2019 18:01:58 +0530 Subject: [PATCH 2/6] chore: Update module name (#19404) --- erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py index 5c18985f7ff..3d1a88e800c 100644 --- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py +++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py @@ -4,7 +4,7 @@ from frappe.model.utils.rename_field import rename_field def execute(): - frappe.reload_doc('desk', 'doctype', 'auto_repeat') + frappe.reload_doc('automation', 'doctype', 'auto_repeat') doctypes_to_rename = { 'accounts': ['Journal Entry', 'Payment Entry', 'Purchase Invoice', 'Sales Invoice'], @@ -41,4 +41,4 @@ def drop_columns_from_subscription(): if field in frappe.db.get_table_columns("Subscription"): fields_to_drop['Subscription'].append(field) - frappe.model.delete_fields(fields_to_drop, delete=1) \ No newline at end of file + frappe.model.delete_fields(fields_to_drop, delete=1) From e1f95c0529f0109f7cc70674b4bab75971436550 Mon Sep 17 00:00:00 2001 From: Ashish Shah Date: Fri, 25 Oct 2019 12:16:11 +0530 Subject: [PATCH 3/6] fix: allow_items_not_in_stock should be evaluated (#19398) --- erpnext/shopping_cart/cart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index f850bc17079..a4c10cfb7d6 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -66,7 +66,7 @@ def place_order(): from erpnext.selling.doctype.quotation.quotation import _make_sales_order sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True)) - if not cart_settings.allow_items_not_in_stock: + if not cint(cart_settings.allow_items_not_in_stock): for item in sales_order.get("items"): item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item", item.item_code, ["website_warehouse", "is_stock_item"]) From 8f67ef8a750a0fac04b85935e6a2d5b937666fca Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 25 Oct 2019 18:55:57 +0530 Subject: [PATCH 4/6] fix: Add patch to replace accounting with accounts in home_settings --- erpnext/patches.txt | 1 + .../replace_accounting_with_accounts_in_home_settings.py | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 9f98099257d..ee6bdff6612 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -640,3 +640,4 @@ erpnext.patches.v12_0.create_default_energy_point_rules erpnext.patches.v12_0.set_produced_qty_field_in_sales_order_for_work_order erpnext.patches.v12_0.generate_leave_ledger_entries erpnext.patches.v12_0.set_default_shopify_app_type +erpnext.patches.v12_0.replace_accounting_with_accounts_in_home_settings diff --git a/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py b/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py new file mode 100644 index 00000000000..09fc4c1b04e --- /dev/null +++ b/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py @@ -0,0 +1,5 @@ +import frappe + +def execute(): + frappe.db.sql("""UPDATE `tabUser` SET `home_settings` = REPLACE(`home_settings`, 'Accounting', 'Accounts')""") + frappe.cache().delete_key('home_settings') \ No newline at end of file From ce5200d70045f02345e84634b1ca3f3d9dc7a7f6 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Thu, 24 Oct 2019 17:50:19 +0550 Subject: [PATCH 5/6] bumped to version 12.1.7 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 686d5492ca0..a06e3db9aef 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.1.6' +__version__ = '12.1.7' def get_default_company(user=None): '''Get default company for user''' From e6f86c934dc8100980ac009b1d6e39a51d711d0b Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Sat, 26 Oct 2019 20:22:19 +0550 Subject: [PATCH 6/6] bumped to version 12.1.8 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a06e3db9aef..d031bc5bb17 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.1.7' +__version__ = '12.1.8' def get_default_company(user=None): '''Get default company for user'''