From d65a03d437f2eafecce61eaa833bcfe15de7cd6d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 12 Nov 2015 20:35:05 +0530 Subject: [PATCH 1/2] [fix] material request type in reorder --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 4 +++- erpnext/stock/reorder_item.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 8a1f8c7f69..398a7c67da 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 @@ class TestStockEntry(unittest.TestCase): 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 @@ class TestStockEntry(unittest.TestCase): # 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 bf06396c34..ff943d23d7 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -114,7 +114,7 @@ def create_material_request(material_requests): 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: From d4b05fbd51c39b9386b75ef9cfcd6eb6354bc6eb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 12 Nov 2015 21:07:12 +0600 Subject: [PATCH 2/2] bumped to version 6.8.4 --- 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 080d73175f..f2ac3756b1 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 a1c9400fa6..3b33e65c8c 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -29,7 +29,7 @@ blogs. """ 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/setup.py b/setup.py index e1eb26ece3..51dd9e4ea9 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()