Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi 2015-11-12 20:37:12 +05:30
commit 2c93d67463
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.8.3'
__version__ = '6.8.4'

2
erpnext/hooks.py
View File

@ -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"

4
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@ -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

2
erpnext/stock/reorder_item.py
View File

@ -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:

2
setup.py
View File

@ -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()