From 47b89756d9a09b8c7f139dad497963da80bbee8d Mon Sep 17 00:00:00 2001 From: Valmik Jangla Date: Mon, 28 Mar 2016 12:18:10 +0530 Subject: [PATCH 1/3] Fix for Holiday List in Maintenance Schedule --- .../doctype/maintenance_schedule/maintenance_schedule.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py index 0469972935..5fab1ace72 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -94,7 +94,11 @@ class MaintenanceSchedule(TransactionBase): validated = False employee = frappe.db.get_value("Sales Person", sales_person, "employee") - holiday_list = get_holiday_list_for_employee(employee) + if employee: + holiday_list = get_holiday_list_for_employee(employee) + else: + holiday_list = frappe.db.get_value("Company", self.company, "default_holiday_list") + holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list) if not validated and holidays: From b176dea74ef231ca27b455cc0e98913e55bed0e8 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 28 Mar 2016 13:23:47 +0530 Subject: [PATCH 2/3] Fixed issues in Pricing Rule if multiple pricing rules existed with same priority --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index cd6bcf450b..736d03c800 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -242,6 +242,8 @@ def filter_pricing_rules(args, pricing_rules): for p in pricing_rules: if p.item_code and args.variant_of: p.variant_of = args.variant_of + else: + p.variant_of = None # find pricing rule with highest priority if pricing_rules: @@ -251,7 +253,7 @@ def filter_pricing_rules(args, pricing_rules): # apply internal priority all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory", - "supplier", "supplier_type", "campaign", "sales_partner"] + "supplier", "supplier_type", "campaign", "sales_partner", "variant_of"] if len(pricing_rules) > 1: for field_set in [["item_code", "variant_of", "item_group", "brand"], From 8573aee8b8c28d3a3437e1899fd2974379600394 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 29 Mar 2016 11:19:46 +0600 Subject: [PATCH 3/3] bumped to version 6.27.5 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 96bd1375d6..9ebc832a59 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.27.4' +__version__ = '6.27.5' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 8291afdeec..fd54dd7284 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.27.4" +app_version = "6.27.5" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 018f767490..581e065565 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.27.4" +version = "6.27.5" requirements = parse_requirements("requirements.txt", session="") setup(