nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings

Browse Source
This commit is contained in:
Anand Doshi
2013-08-13 13:01:12 +05:30
parent c4dde9bd99
commit 47e14a9de4
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/doctype/shopping_cart_settings/shopping_cart_settings.py
View File

@@ -43,7 +43,7 @@ class DocType(DocListController):
def validate_price_lists(self):
territory_name_map = self.validate_overlapping_territories("price_lists",
"price_list")
"selling_price_list")
# validate that a Shopping Cart Price List exists for the root territory
# as a catch all!
@@ -92,9 +92,9 @@ class DocType(DocListController):
raise_exception=ShoppingCartSetupError)
price_list_currency_map = webnotes.conn.get_values("Price List",
[d.price_list for d in self.doclist.get({"parentfield": "price_lists"})],
[d.selling_price_list for d in self.doclist.get({"parentfield": "price_lists"})],
"currency")
expected_to_exist = [currency + "-" + company_currency
for currency in price_list_currency_map.values()
if currency != company_currency]
@@ -126,7 +126,7 @@ class DocType(DocListController):
return name
def get_price_list(self, billing_territory):
price_list = self.get_name_from_territory(billing_territory, "price_lists", "price_list")
price_list = self.get_name_from_territory(billing_territory, "price_lists", "selling_price_list")
return price_list and price_list[0] or None
def get_tax_master(self, billing_territory):

6
website/doctype/shopping_cart_settings/test_shopping_cart_settings.py
View File

@@ -26,7 +26,7 @@ class TestShoppingCartSettings(unittest.TestCase):
cart_settings.doclist.append({
"doctype": "Shopping Cart Price List",
"parentfield": "price_lists",
"price_list": price_list
"selling_price_list": price_list
})
for price_list in ("_Test Price List Rest of the World", "_Test Price List India",
@@ -34,13 +34,13 @@ class TestShoppingCartSettings(unittest.TestCase):
_add_price_list(price_list)
controller = cart_settings.make_controller()
controller.validate_overlapping_territories("price_lists", "price_list")
controller.validate_overlapping_territories("price_lists", "selling_price_list")
_add_price_list("_Test Price List 2")
controller = cart_settings.make_controller()
self.assertRaises(ShoppingCartSetupError, controller.validate_overlapping_territories,
"price_lists", "price_list")
"price_lists", "selling_price_list")
return cart_settings