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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Rushabh Mehta 2016-03-29 10:49:46 +05:30
commit 4ccf692f7c
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.27.4' __version__ = '6.27.5'

4
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -242,6 +242,8 @@ def filter_pricing_rules(args, pricing_rules):
for p in pricing_rules: for p in pricing_rules:
if p.item_code and args.variant_of: if p.item_code and args.variant_of:
p.variant_of = args.variant_of p.variant_of = args.variant_of
else:
p.variant_of = None
# find pricing rule with highest priority # find pricing rule with highest priority
if pricing_rules: if pricing_rules:
@ -251,7 +253,7 @@ def filter_pricing_rules(args, pricing_rules):
# apply internal priority # apply internal priority
all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory", 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: if len(pricing_rules) > 1:
for field_set in [["item_code", "variant_of", "item_group", "brand"], for field_set in [["item_code", "variant_of", "item_group", "brand"],

2
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.27.4" app_version = "6.27.5"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

4
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
View File

@ -94,7 +94,11 @@ class MaintenanceSchedule(TransactionBase):
validated = False validated = False
employee = frappe.db.get_value("Sales Person", sales_person, "employee") employee = frappe.db.get_value("Sales Person", sales_person, "employee")
if employee:
holiday_list = get_holiday_list_for_employee(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) holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list)
if not validated and holidays: if not validated and holidays:

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.27.4" version = "6.27.5"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(