nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into export-round-off-fix

Browse Source
This commit is contained in:
Saqib
2021-06-18 11:25:21 +05:30
committed by GitHub
parent 2be7e90e78 6894cc2832
commit 5633834ef7
9 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/helper/install.sh vendored
View File

@@ -44,3 +44,4 @@ sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
bench get-app erpnext "${GITHUB_WORKSPACE}" bench get-app erpnext "${GITHUB_WORKSPACE}"
bench start & bench start &
bench --site test_site reinstall --yes bench --site test_site reinstall --yes
bench build --app frappe

2
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@@ -854,7 +854,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-03-30 09:02:39.256602", "modified": "2021-06-16 19:33:51.099386",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

4
erpnext/portal/doctype/homepage/test_homepage.py
View File

@@ -6,12 +6,12 @@ from __future__ import unicode_literals
import frappe import frappe
import unittest import unittest
from frappe.utils import set_request from frappe.utils import set_request
from frappe.website.render import render from frappe.website.serve import get_response
class TestHomepage(unittest.TestCase): class TestHomepage(unittest.TestCase):
def test_homepage_load(self): def test_homepage_load(self):
set_request(method='GET', path='home') set_request(method='GET', path='home')
response = render() response = get_response()
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)

6
erpnext/portal/doctype/homepage_section/test_homepage_section.py
View File

@@ -7,7 +7,7 @@ import frappe
import unittest import unittest
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from frappe.utils import set_request from frappe.utils import set_request
from frappe.website.render import render from frappe.website.serve import get_response
class TestHomepageSection(unittest.TestCase): class TestHomepageSection(unittest.TestCase):
def test_homepage_section_card(self): def test_homepage_section_card(self):
@@ -26,7 +26,7 @@ class TestHomepageSection(unittest.TestCase):
pass pass
set_request(method='GET', path='home') set_request(method='GET', path='home')
response = render() response = get_response()
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@@ -59,7 +59,7 @@ class TestHomepageSection(unittest.TestCase):
}).insert() }).insert()
set_request(method='GET', path='home') set_request(method='GET', path='home')
response = render() response = get_response()
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)

4
erpnext/portal/product_configurator/test_product_configurator.py
View File

@@ -2,10 +2,8 @@ from __future__ import unicode_literals
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
import frappe, unittest import frappe, unittest
from frappe.utils import set_request, get_html_for_route from frappe.utils import get_html_for_route
from frappe.website.render import render
from erpnext.portal.product_configurator.utils import get_products_for_website 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"] test_dependencies = ["Item"]

2
erpnext/setup/doctype/item_group/item_group.py
View File

@@ -8,7 +8,7 @@ from frappe import _
from frappe.utils import nowdate, cint, cstr from frappe.utils import nowdate, cint, cstr
from frappe.utils.nestedset import NestedSet from frappe.utils.nestedset import NestedSet
from frappe.website.website_generator import WebsiteGenerator 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 frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
from erpnext.shopping_cart.product_info import set_product_info_for_website from erpnext.shopping_cart.product_info import set_product_info_for_website
from erpnext.utilities.product import get_qty_in_stock from erpnext.utilities.product import get_qty_in_stock

2
erpnext/setup/setup_wizard/data/country_wise_tax.json
View File

@@ -1867,7 +1867,7 @@
"South Africa": { "South Africa": {
"South Africa Tax": { "South Africa Tax": {
"account_name": "VAT", "account_name": "VAT",
"tax_rate": 14.00 "tax_rate": 15.00
} }
}, },

2
erpnext/stock/doctype/item/item.py
View File

@@ -16,7 +16,7 @@ from frappe.utils.html_utils import clean_html
from frappe.website.doctype.website_slideshow.website_slideshow import \ from frappe.website.doctype.website_slideshow.website_slideshow import \
get_slideshow get_slideshow
from frappe.website.render import clear_cache from frappe.website.utils import clear_cache
from frappe.website.website_generator import WebsiteGenerator from frappe.website.website_generator import WebsiteGenerator

1
erpnext/templates/pages/partners.py
View File

@@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
import frappe.website.render
page_title = "Partners" page_title = "Partners"