Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 7ce7772..eea2e47 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):
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 0de23e5..d08716fd 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",
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 4494110..1b670d1 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -833,7 +833,6 @@
update_customer: function (new_customer) {
var me = this;
- if (!this.connection_status) return;
this.customer_doc = new frappe.ui.Dialog({
'title': 'Customer',
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 58c16e1..5c3bbc9 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -61,11 +61,11 @@
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 @@
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"));
diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html
index c978576..94c692c 100644
--- a/erpnext/templates/includes/projects/project_tasks.html
+++ b/erpnext/templates/includes/projects/project_tasks.html
@@ -6,7 +6,7 @@
<span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgrey" }}" title="{{ task.status }}" > {{ task.subject }}</span>
<div class="small text-muted item-timestamp"
title="{{ frappe.utils.pretty_date(task.modified) }}">
- {{ __("modified") }} {{ frappe.utils.pretty_date(task.modified) }}
+ {{ _("modified") }} {{ frappe.utils.pretty_date(task.modified) }}
</div>
</div>
<div class='col-xs-1'>{% if task.todo %}