From f3be8e0da616618f26d7d206abc5829d66f33293 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Wed, 7 Jun 2017 15:29:33 +0100 Subject: [PATCH 1/5] removes check for condition - `status == "Submitted"` (#9176) --- erpnext/stock/doctype/material_request/material_request.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 58c16e1964..5c3bbc9dff 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -61,11 +61,11 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten if(doc.docstatus == 1 && doc.status != 'Stopped') { if(flt(doc.per_ordered, 2) < 100) { // make - if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted") + if(doc.material_request_type === "Material Transfer") cur_frm.add_custom_button(__("Transfer Material"), this.make_stock_entry, __("Make")); - if(doc.material_request_type === "Material Issue" && doc.status === "Submitted") + if(doc.material_request_type === "Material Issue") cur_frm.add_custom_button(__("Issue Material"), this.make_stock_entry, __("Make")); @@ -81,7 +81,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten cur_frm.add_custom_button(__("Supplier Quotation"), this.make_supplier_quotation, __("Make")); - if(doc.material_request_type === "Manufacture" && doc.status === "Submitted") + if(doc.material_request_type === "Manufacture") cur_frm.add_custom_button(__("Production Order"), function() { me.raise_production_orders() }, __("Make")); From 98f8da1294c0c81aefadf7ff3370ae62894a83a2 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Wed, 7 Jun 2017 15:31:51 +0100 Subject: [PATCH 2/5] hides `payments` field when `is_pos` is checked (#9174) --- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 0de23e593e..d08716fddd 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2664,6 +2664,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "depends_on": "eval:doc.is_pos===1", "fieldname": "payments", "fieldtype": "Table", "hidden": 0, @@ -4564,7 +4565,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-05-17 10:34:44.412147", + "modified": "2017-06-07 11:00:01.903429", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", From 6b95210c190359ce6d275750dca4b0aa52bdb559 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 7 Jun 2017 20:03:37 +0530 Subject: [PATCH 3/5] [Fix] User not able to view projects from the portal (#9173) --- erpnext/templates/includes/projects/project_tasks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html index c978576ecd..94c692cdd2 100644 --- a/erpnext/templates/includes/projects/project_tasks.html +++ b/erpnext/templates/includes/projects/project_tasks.html @@ -6,7 +6,7 @@ {{ task.subject }}
- {{ __("modified") }} {{ frappe.utils.pretty_date(task.modified) }} + {{ _("modified") }} {{ frappe.utils.pretty_date(task.modified) }}
{% if task.todo %} From 1607125815de54ce5696a1526d381170fadfd090 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 7 Jun 2017 20:06:58 +0530 Subject: [PATCH 4/5] [minor] POS customer creation was disabled in offline mode (#9169) --- erpnext/accounts/page/pos/pos.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 44941102f1..1b670d113d 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -833,7 +833,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ update_customer: function (new_customer) { var me = this; - if (!this.connection_status) return; this.customer_doc = new frappe.ui.Dialog({ 'title': 'Customer', From 72f7a1a7487377a46e41d9966023c45479d83413 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 8 Jun 2017 11:04:44 +0600 Subject: [PATCH 5/5] bumped to version 8.0.46 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 7ce777213f..eea2e47ebb 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '8.0.45' +__version__ = '8.0.46' def get_default_company(user=None):