Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 080d731..f2ac375 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.8.3'
+__version__ = '6.8.4'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index a1c9400..3b33e65 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@
"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.8.3"
+app_version = "6.8.4"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 8a1f8c7..398a7c6 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -74,11 +74,12 @@
from erpnext.stock.doctype.item.test_item import make_item_variant
make_item_variant()
self._test_auto_material_request("_Test Item")
+ self._test_auto_material_request("_Test Item", material_request_type="Transfer")
def test_auto_material_request_for_variant(self):
self._test_auto_material_request("_Test Variant Item-S")
- def _test_auto_material_request(self, item_code):
+ def _test_auto_material_request(self, item_code, material_request_type="Purchase"):
item = frappe.get_doc("Item", item_code)
if item.variant_of:
@@ -101,6 +102,7 @@
# update re-level qty so that it is more than projected_qty
if projected_qty >= template.reorder_levels[0].warehouse_reorder_level:
template.reorder_levels[0].warehouse_reorder_level += projected_qty
+ template.reorder_levels[0].material_request_type = material_request_type
template.save()
from erpnext.stock.reorder_item import reorder_item
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index bf06396..ff943d2 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -114,7 +114,7 @@
mr.update({
"company": company,
"transaction_date": nowdate(),
- "material_request_type": request_type
+ "material_request_type": "Material Transfer" if request_type=="Transfer" else request_type
})
for d in items:
diff --git a/setup.py b/setup.py
index e1eb26e..51dd9e4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "6.8.3"
+version = "6.8.4"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()