From 5c6d3e043c75b9bd9b5688c34eafbe01bcf0737b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 15:33:58 +0530 Subject: [PATCH 1/6] test: Replace usage of render with get_response --- erpnext/portal/doctype/homepage/test_homepage.py | 4 ++-- .../doctype/homepage_section/test_homepage_section.py | 6 +++--- .../product_configurator/test_product_configurator.py | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/erpnext/portal/doctype/homepage/test_homepage.py b/erpnext/portal/doctype/homepage/test_homepage.py index b717491a821..e646775ab32 100644 --- a/erpnext/portal/doctype/homepage/test_homepage.py +++ b/erpnext/portal/doctype/homepage/test_homepage.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals import frappe import unittest from frappe.utils import set_request -from frappe.website.render import render +from frappe.website.serve import get_response class TestHomepage(unittest.TestCase): def test_homepage_load(self): set_request(method='GET', path='home') - response = render() + response = get_response() self.assertEqual(response.status_code, 200) diff --git a/erpnext/portal/doctype/homepage_section/test_homepage_section.py b/erpnext/portal/doctype/homepage_section/test_homepage_section.py index f0aa554858a..5bb9682bc56 100644 --- a/erpnext/portal/doctype/homepage_section/test_homepage_section.py +++ b/erpnext/portal/doctype/homepage_section/test_homepage_section.py @@ -7,7 +7,7 @@ import frappe import unittest from bs4 import BeautifulSoup from frappe.utils import set_request -from frappe.website.render import render +from frappe.website.serve import get_response class TestHomepageSection(unittest.TestCase): def test_homepage_section_card(self): @@ -26,7 +26,7 @@ class TestHomepageSection(unittest.TestCase): pass set_request(method='GET', path='home') - response = render() + response = get_response() self.assertEqual(response.status_code, 200) @@ -59,7 +59,7 @@ class TestHomepageSection(unittest.TestCase): }).insert() set_request(method='GET', path='home') - response = render() + response = get_response() self.assertEqual(response.status_code, 200) diff --git a/erpnext/portal/product_configurator/test_product_configurator.py b/erpnext/portal/product_configurator/test_product_configurator.py index 3521e7e8bf0..0a5ebef5236 100644 --- a/erpnext/portal/product_configurator/test_product_configurator.py +++ b/erpnext/portal/product_configurator/test_product_configurator.py @@ -2,10 +2,8 @@ from __future__ import unicode_literals from bs4 import BeautifulSoup import frappe, unittest -from frappe.utils import set_request, get_html_for_route -from frappe.website.render import render +from frappe.utils import get_html_for_route from erpnext.portal.product_configurator.utils import get_products_for_website -from erpnext.stock.doctype.item.test_item import make_item_variant test_dependencies = ["Item"] From 2f8a742aa874d37fd24ca1f21db50492fc3a927f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 10:28:32 +0530 Subject: [PATCH 2/6] refactor: Replace render imports --- erpnext/patches/v6_5/show_in_website_for_template_item.py | 4 ++-- erpnext/setup/doctype/item_group/item_group.py | 2 +- erpnext/stock/doctype/item/item.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/patches/v6_5/show_in_website_for_template_item.py b/erpnext/patches/v6_5/show_in_website_for_template_item.py index af6e8304d67..3a5cac84d67 100644 --- a/erpnext/patches/v6_5/show_in_website_for_template_item.py +++ b/erpnext/patches/v6_5/show_in_website_for_template_item.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals import frappe -import frappe.website.render +from frappe.website.utils import clear_cache def execute(): for item_code in frappe.db.sql_list("""select distinct variant_of from `tabItem` @@ -12,4 +12,4 @@ def execute(): item.make_route() item.db_set("route", item.route, update_modified=False) - frappe.website.render.clear_cache() + clear_cache() diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py index bff806d5472..a3208c95848 100644 --- a/erpnext/setup/doctype/item_group/item_group.py +++ b/erpnext/setup/doctype/item_group/item_group.py @@ -8,7 +8,7 @@ from frappe import _ from frappe.utils import nowdate, cint, cstr from frappe.utils.nestedset import NestedSet from frappe.website.website_generator import WebsiteGenerator -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow from erpnext.shopping_cart.product_info import set_product_info_for_website from erpnext.utilities.product import get_qty_in_stock diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index dbac79465ee..483635cc3b1 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -18,7 +18,7 @@ from frappe.utils.html_utils import clean_html from frappe.website.doctype.website_slideshow.website_slideshow import \ get_slideshow -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe.website.website_generator import WebsiteGenerator from six import iteritems From d3b9edd2c4468e7319d7b143104332a6ac7a8fbc Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 12:52:26 +0530 Subject: [PATCH 3/6] fix: Remove unnecessary import --- erpnext/templates/pages/partners.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/templates/pages/partners.py b/erpnext/templates/pages/partners.py index 6725a3e2948..a7e60e26168 100644 --- a/erpnext/templates/pages/partners.py +++ b/erpnext/templates/pages/partners.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import frappe -import frappe.website.render page_title = "Partners" From 7f2ae23dbfed3fe418ea44a072cd898381718db8 Mon Sep 17 00:00:00 2001 From: Eben van Deventer Date: Mon, 31 May 2021 12:24:29 +0200 Subject: [PATCH 4/6] Correct South Africa VAT Rate On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation. This was already done with a commit to version-13 branch under #25894, this proposed change is to ensure that the update is pulled through to future versions. --- erpnext/setup/setup_wizard/data/country_wise_tax.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json index 58764880330..512f8ace4a8 100644 --- a/erpnext/setup/setup_wizard/data/country_wise_tax.json +++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json @@ -1519,7 +1519,7 @@ "South Africa": { "South Africa Tax": { "account_name": "VAT", - "tax_rate": 14.00 + "tax_rate": 15.00 } }, From c03a947e986644db19c5dabfe3d2f23c9fc2ac30 Mon Sep 17 00:00:00 2001 From: Subin Tom Date: Wed, 16 Jun 2021 19:47:55 +0530 Subject: [PATCH 5/6] fix: removed extra space from label rate --- .../doctype/purchase_invoice_item/purchase_invoice_item.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index 10e1c73ea90..29f72470b32 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -272,7 +272,7 @@ "fieldname": "rate", "fieldtype": "Currency", "in_list_view": 1, - "label": "Rate ", + "label": "Rate", "oldfieldname": "import_rate", "oldfieldtype": "Currency", "options": "currency", @@ -854,7 +854,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2021-03-30 09:02:39.256602", + "modified": "2021-06-16 19:33:51.099386", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", From e8e4841e5e778ebf35fd5548a530837d9d746a3d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Jun 2021 20:23:18 +0530 Subject: [PATCH 6/6] ci: Build frappe assets - Build frappe assets since it is used for print views --- .github/helper/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 7b0f944c669..f7a71223436 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -44,3 +44,4 @@ sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile bench get-app erpnext "${GITHUB_WORKSPACE}" bench start & bench --site test_site reinstall --yes +bench build --app frappe