diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a81cc856255..e61c0d13f6f 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.59' +__version__ = '10.1.60' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index 4573a427c1b..2284fcd69e0 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -189,15 +189,15 @@ {% } %}
{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
\ No newline at end of file +{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index b2c3e75b8f1..0eab9826c32 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -368,7 +368,8 @@ class BOM(WebsiteGenerator): bom_list = self.traverse_tree(bom_list) for bom in bom_list: bom_obj = frappe.get_doc("BOM", bom) - bom_obj.on_update() + bom_obj.check_recursion() + bom_obj.update_exploded_items() return bom_list diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py index 3f6cb44c490..59861ceba3a 100644 --- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py @@ -62,7 +62,7 @@ class BOMUpdateTool(Document): bom_list.append(d[0]) self.get_parent_boms(d[0], bom_list) - return bom_list + return list(set(bom_list)) @frappe.whitelist() def enqueue_replace_bom(args): diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index daa8318fda5..9620b313ed2 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -272,7 +272,6 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){ var dn_item_fields = frappe.meta.docfield_map['Delivery Note Item']; var dn_fields_copy = dn_fields; var dn_item_fields_copy = dn_item_fields; - if (doc.print_without_amount) { dn_fields['currency'].print_hide = 1; dn_item_fields['rate'].print_hide = 1; @@ -289,7 +288,7 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){ if (dn_item_fields_copy['amount'].print_hide != 1) dn_item_fields['amount'].print_hide = 0; if (dn_item_fields_copy['discount_amount'].print_hide != 1) - dn_item_fields['discount_amount'].print_hide = 0 + dn_item_fields['discount_amount'].print_hide = 0; if (dn_fields_copy['taxes'].print_hide != 1) dn_fields['taxes'].print_hide = 0; }