Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template
[fix] Show Item Name in re-order email. Fixes #4381
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index b5408d2..9c5fffa 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.10.2'
+__version__ = '6.11.0'
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index a4a7202..9b47e58 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -77,11 +77,6 @@
"type": "doctype",
"name": "Landed Cost Voucher",
"description": _("Update additional costs to calculate landed cost of items"),
- },
- {
- "type": "doctype",
- "name": "Stock UOM Replace Utility",
- "description": _("Change UOM for an Item."),
}
]
},
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ae726f6..8ca6aca 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.10.2"
+app_version = "6.11.0"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
@@ -64,7 +64,7 @@
{"from_route": "/shipments", "to_route": "Delivery Note"},
{"from_route": "/shipments/<path:name>", "to_route": "order",
"defaults": {
- "doctype": "Delivery Notes",
+ "doctype": "Delivery Note",
"parents": [{"title": _("Shipments"), "name": "shipments"}]
}
}
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 1cbb33d..b11603e 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -662,7 +662,5 @@
frappe.db.sql("""update tabBin set stock_uom=%s where item_code=%s""", (stock_uom, item))
if not matched:
- frappe.throw(_("Default Unit of Measure for Item {0} cannot be changed directly because \
- you have already made some transaction(s) with another UOM. To change default UOM, \
- use 'UOM Replace Utility' tool under Stock module.").format(item))
+ frappe.throw(_("Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.").format(item))
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 046e6f6..45f6af0 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -46,15 +46,14 @@
</div>
<div class="col-sm-2 col-xs-3 text-right">
{{ d.qty }}
- {% if d.delivered_qty != None %}
+ {% if d.delivered_qty is defined and d.delivered_qty != None %}
<p class="text-muted small">{{
_("Delivered: {0}").format(d.delivered_qty) }}</p>
{% endif %}
</div>
<div class="col-sm-2 col-xs-3 text-right">
{{ d.get_formatted("amount") }}
- <!-- output of get_formatted("rate") is unicode, to replace unicode use
- _("text {0}").decode("utf8").format(val) -->
+ {# output of get_formatted("rate") is unicode, to replace unicode use _("text {0}").decode("utf8").format(val) #}
<p class="text-muted small">{{
_("Rate: {0}").decode("utf8").format(d.get_formatted("rate")) }}</p>
</div>
diff --git a/setup.py b/setup.py
index 4ef7050..72b69b6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "6.10.2"
+version = "6.11.0"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()