From 22a4b82bd26a19a23cbc55a4065c8fa8f4cc049b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Jan 2015 13:11:34 +0530 Subject: [PATCH 1/4] Minor fixes --- erpnext/selling/doctype/sales_order/sales_order.py | 4 ++-- .../support/doctype/maintenance_visit/maintenance_visit.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 604ac111a6..5b0f7e9708 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -51,12 +51,12 @@ class SalesOrder(SellingController): frappe.throw(_("Reserved warehouse required for stock item {0}").format(d.item_code)) if e in check_list: - frappe.throw(_("Item {0} has been entered twice").format(d.item_code)) + frappe.msgprint(_("Item {0} has been entered twice").format(d.item_code)) else: check_list.append(e) else: if f in chk_dupl_itm: - frappe.throw(_("Item {0} has been entered twice").format(d.item_code)) + frappe.msgprint(_("Item {0} has been entered twice").format(d.item_code)) else: chk_dupl_itm.append(f) diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.py b/erpnext/support/doctype/maintenance_visit/maintenance_visit.py index e16017df1d..11ecd29d61 100644 --- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.py @@ -27,6 +27,7 @@ class MaintenanceVisit(TransactionBase): mntc_date = self.mntc_date service_person = d.service_person work_done = d.work_done + status = "Open" if self.completion_status == 'Fully Completed': status = 'Closed' elif self.completion_status == 'Partially Completed': From 238fd68803f8e9a5dce4e0cf881d7479cc200a35 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Jan 2015 14:30:03 +0530 Subject: [PATCH 2/4] Minor fix --- erpnext/stock/doctype/stock_entry/stock_entry.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 96dee3da4f..a2c670e324 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -231,8 +231,8 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse; }, - source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return"], - target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return"], + source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract"], + target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract"], from_warehouse: function(doc) { var me = this; @@ -462,4 +462,4 @@ cur_frm.fields_dict.supplier.get_query = function(doc, cdt, cdn) { return { query: "erpnext.controllers.queries.supplier_query" } } cur_frm.add_fetch('production_order', 'total_fixed_cost', 'total_fixed_cost'); -cur_frm.add_fetch('bom_no', 'total_fixed_cost', 'total_fixed_cost'); \ No newline at end of file +cur_frm.add_fetch('bom_no', 'total_fixed_cost', 'total_fixed_cost'); From f6f2fc4079c7d7f62891b4285b96a0d24dd5d2fd Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Jan 2015 16:44:54 +0530 Subject: [PATCH 3/4] Print format: show item table header as per meta label --- .../templates/print_formats/includes/item_grid.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html index 1d09f73fec..7e1d1a62cf 100644 --- a/erpnext/templates/print_formats/includes/item_grid.html +++ b/erpnext/templates/print_formats/includes/item_grid.html @@ -9,9 +9,13 @@ {{ _("Sr") }} {{ _("Item") }} - {{ _("Qty") }} - {% if not hide_rate -%}{{ _("Rate") }}{%- endif %} - {% if not hide_amount -%}{{ _("Amount") }}{%- endif %} + {{ _(data[0].meta.get_label("qty")) }} + {% if not hide_rate -%} + {{ _(data[0].meta.get_label("rate")) }} + {%- endif %} + {% if not hide_amount -%} + {{ _(data[0].meta.get_label("amount")) }} + {%- endif %} {%- for row in data -%} From 276053b35f166cb87e10a6162f1c7b4d94d77fba Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 28 Jan 2015 17:31:56 +0600 Subject: [PATCH 4/4] bumped to version 4.20.2 --- 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 884d464b52..7ef99604d5 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1 +1 @@ -__version__ = '4.20.1' +__version__ = '4.20.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 6f906755bd..13b33035f9 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "4.20.1" +app_version = "4.20.2" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index f093f55176..4e650c8311 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.20.1" +version = "4.20.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()