Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Sider and Linter

Browse Source
This commit is contained in:
marination 2022-01-21 14:49:10 +05:30
parent 4f7ec25bbe
commit 606f23b667
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/e_commerce/shopping_cart/test_shopping_cart.py
View File

@ -9,8 +9,13 @@ from frappe.utils import add_months, nowdate
from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule
from erpnext.e_commerce.doctype.website_item.website_item import make_website_item from erpnext.e_commerce.doctype.website_item.website_item import make_website_item
from erpnext.e_commerce.shopping_cart.cart import _get_cart_quotation, get_cart_quotation, get_party, update_cart from erpnext.e_commerce.shopping_cart.cart import (
from erpnext.tests.utils import create_test_contact_and_address, change_settings _get_cart_quotation,
get_cart_quotation,
get_party,
update_cart,
)
from erpnext.tests.utils import change_settings, create_test_contact_and_address
# test_dependencies = ['Payment Terms Template'] # test_dependencies = ['Payment Terms Template']
@ -136,8 +141,7 @@ class TestShoppingCart(unittest.TestCase):
"default_customer_group": "_Test Customer Group", "default_customer_group": "_Test Customer Group",
"price_list": "_Test Price List India", "price_list": "_Test Price List India",
"show_price": 1 "show_price": 1
} })
)
def test_add_item_variant_without_web_item_to_cart(self): def test_add_item_variant_without_web_item_to_cart(self):
"Test adding Variants having no Website Items in cart via Template Web Item." "Test adding Variants having no Website Items in cart via Template Web Item."
from erpnext.controllers.item_variant import create_variant from erpnext.controllers.item_variant import create_variant

7
erpnext/e_commerce/variant_selector/test_variant_selector.py
View File

@ -93,15 +93,12 @@ class TestVariantSelector(ERPNextTestCase):
"default_customer_group": "_Test Customer Group", "default_customer_group": "_Test Customer Group",
"price_list": "_Test Price List India", "price_list": "_Test Price List India",
"show_price": 1 "show_price": 1
} })
)
def test_exact_match_with_price(self): def test_exact_match_with_price(self):
""" """
Test price fetching and matching of variant without Website Item Test price fetching and matching of variant without Website Item
""" """
from erpnext.e_commerce.doctype.website_item.test_website_item import ( from erpnext.e_commerce.doctype.website_item.test_website_item import make_web_item_price
make_web_item_price,
)
make_web_item_price(item_code="Test-Tshirt-Temp-S-R", price_list_rate=100) make_web_item_price(item_code="Test-Tshirt-Temp-S-R", price_list_rate=100)
next_values = get_next_attribute_and_values( next_values = get_next_attribute_and_values(

2
erpnext/e_commerce/variant_selector/utils.py
View File

@ -2,7 +2,7 @@ import frappe
from frappe.utils import cint from frappe.utils import cint
from erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings import ( from erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings import (
get_shopping_cart_settings get_shopping_cart_settings,
) )
from erpnext.e_commerce.shopping_cart.cart import _set_price_list from erpnext.e_commerce.shopping_cart.cart import _set_price_list
from erpnext.e_commerce.variant_selector.item_variants_cache import ItemVariantsCacheManager from erpnext.e_commerce.variant_selector.item_variants_cache import ItemVariantsCacheManager