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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Rushabh Mehta 2017-09-29 16:22:02 +05:30
commit 912ae24ca2
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '9.0.3' __version__ = '9.0.4'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

8
erpnext/accounts/party.py
View File

@ -320,11 +320,15 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup
from erpnext.accounts.doctype.tax_rule.tax_rule import get_tax_template, get_party_details from erpnext.accounts.doctype.tax_rule.tax_rule import get_tax_template, get_party_details
args = { args = {
party_type.lower(): party, party_type.lower(): party,
"customer_group": customer_group,
"supplier_type": supplier_type,
"company": company "company": company
} }
if customer_group:
args['customer_group'] = customer_group
if supplier_type:
args['supplier_type'] = supplier_type
if billing_address or shipping_address: if billing_address or shipping_address:
args.update(get_party_details(party, party_type, {"billing_address": billing_address, \ args.update(get_party_details(party, party_type, {"billing_address": billing_address, \
"shipping_address": shipping_address })) "shipping_address": shipping_address }))

2
erpnext/controllers/item_variant.py
View File

@ -207,7 +207,7 @@ def copy_attributes_to_variant(item, variant):
if variant.attributes: if variant.attributes:
variant.description += "\n" variant.description += "\n"
for d in variant.attributes: for d in variant.attributes:
variant.description += "<p>" + d.attribute + ": " + cstr(d.attribute_value) + "</p>" variant.description += "<div>" + d.attribute + ": " + cstr(d.attribute_value) + "</div>"
def make_variant_item_code(template_item_code, template_item_name, variant): def make_variant_item_code(template_item_code, template_item_name, variant):
"""Uses template's item code and abbreviations to make variant's item code""" """Uses template's item code and abbreviations to make variant's item code"""

2
erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
View File

@ -36,7 +36,7 @@ def execute(filters=None):
status_map = {"Present": "P", "Absent": "A", "Half Day": "HD", "On Leave": "L", "None": "", "Holiday":"<b>H</b>"} status_map = {"Present": "P", "Absent": "A", "Half Day": "HD", "On Leave": "L", "None": "", "Holiday":"<b>H</b>"}
if status == "None" and holiday_map: if status == "None" and holiday_map:
emp_holiday_list = emp_det.holiday_list if emp_det.holiday_list else default_holiday_list emp_holiday_list = emp_det.holiday_list if emp_det.holiday_list else default_holiday_list
if (day+1) in holiday_map[emp_holiday_list]: if emp_holiday_list in holiday_map and (day+1) in holiday_map[emp_holiday_list]:
status = "Holiday" status = "Holiday"
row.append(status_map[status]) row.append(status_map[status])

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -312,7 +312,7 @@ class BOM(WebsiteGenerator):
li.append("{0} on row {1}".format(i.item_code, i.idx)) li.append("{0} on row {1}".format(i.item_code, i.idx))
duplicate_list = '<br>' + '<br>'.join(li) duplicate_list = '<br>' + '<br>'.join(li)
frappe.throw(_("Same item has been entered multiple times. {list}").format(list=duplicate_list)) frappe.throw(_("Same item has been entered multiple times. {0}").format(duplicate_list))
def check_recursion(self): def check_recursion(self):
""" Check whether recursion occurs in any bom""" """ Check whether recursion occurs in any bom"""