From e4409143279f58bf02bc2fcbce52e9d3b4825150 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 26 May 2015 17:37:05 -0400 Subject: [PATCH 1/4] [fix] allow slashes in variables of website route rules --- erpnext/hooks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 54e2d0332f..c471007e7b 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -34,13 +34,13 @@ website_context = { website_route_rules = [ {"from_route": "/orders", "to_route": "Sales Order"}, - {"from_route": "/orders/", "to_route": "print", "defaults": {"doctype": "Sales Order"}}, + {"from_route": "/orders/", "to_route": "print", "defaults": {"doctype": "Sales Order"}}, {"from_route": "/invoices", "to_route": "Sales Invoice"}, - {"from_route": "/invoices/", "to_route": "print", "defaults": {"doctype": "Sales Invoice"}}, + {"from_route": "/invoices/", "to_route": "print", "defaults": {"doctype": "Sales Invoice"}}, {"from_route": "/shipments", "to_route": "Delivery Note"}, - {"from_route": "/shipments/", "to_route": "print", "defaults": {"doctype": "Delivery Note"}}, + {"from_route": "/shipments/", "to_route": "print", "defaults": {"doctype": "Delivery Note"}}, {"from_route": "/issues", "to_route": "Issue"}, - {"from_route": "/issues/", "to_route": "print", "defaults": {"doctype": "Issue"}}, + {"from_route": "/issues/", "to_route": "print", "defaults": {"doctype": "Issue"}}, {"from_route": "/addresses", "to_route": "Address"}, ] From 438b67e8b0652400f332d4d094c7c4d529a1483c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 26 May 2015 17:37:39 -0400 Subject: [PATCH 2/4] [fix] shopping cart - get price list for default territory if no price list is selected --- .../doctype/shopping_cart_settings/shopping_cart_settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py index 1ad344a2a9..5fba1ff22f 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py @@ -130,6 +130,9 @@ class ShoppingCartSettings(Document): def get_price_list(self, billing_territory): price_list = self.get_name_from_territory(billing_territory, "price_lists", "selling_price_list") + if not (price_list and price_list[0]): + price_list = self.get_name_from_territory(self.default_territory, "price_lists", "selling_price_list") + return price_list and price_list[0] or None def get_tax_master(self, billing_territory): From ff8a854b820c399abd379d77f4cb9041b1d75440 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 26 May 2015 18:06:09 -0400 Subject: [PATCH 3/4] Fixes #3349. Thanks @abelbm for reporting. --- erpnext/controllers/selling_controller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 2dde68504c..9a2da9620c 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -85,9 +85,9 @@ class SellingController(StockController): existing_shipping_charge = self.get("taxes", filters=shipping_charge) if existing_shipping_charge: # take the last record found - existing_shipping_charge[-1].rate = shipping_amount + existing_shipping_charge[-1].tax_amount = shipping_amount else: - shipping_charge["rate"] = shipping_amount + shipping_charge["tax_amount"] = shipping_amount shipping_charge["description"] = shipping_rule.label self.append("taxes", shipping_charge) From fb4e496b549457ee3b20e1cc965190f44d10111c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 26 May 2015 18:15:55 -0400 Subject: [PATCH 4/4] [fix] target variance sql --- .../sales_person_target_variance_item_group_wise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py index 5bac1c593a..f7aa70fa31 100644 --- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py @@ -72,7 +72,7 @@ def get_target_distribution_details(filters): target_details = {} for d in frappe.db.sql("""select md.name, mdp.month, mdp.percentage_allocation - from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` mdp + from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md where mdp.parent=md.name and md.fiscal_year=%s""", (filters["fiscal_year"]), as_dict=1): target_details.setdefault(d.name, {}).setdefault(d.month, flt(d.percentage_allocation))