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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2016-05-26 16:55:34 +05:30
commit fd5d0db6e2
4 changed files with 4 additions and 6 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 from __future__ import unicode_literals
__version__ = '6.27.20' __version__ = '6.27.21'

2
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.27.20" app_version = "6.27.21"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

4
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -337,8 +337,6 @@ def make_material_request(source_name, target_doc=None):
def postprocess(source, doc): def postprocess(source, doc):
doc.material_request_type = "Purchase" doc.material_request_type = "Purchase"
so = frappe.get_doc("Sales Order", source_name)
doc = get_mapped_doc("Sales Order", source_name, { doc = get_mapped_doc("Sales Order", source_name, {
"Sales Order": { "Sales Order": {
"doctype": "Material Request", "doctype": "Material Request",
@ -352,7 +350,7 @@ def make_material_request(source_name, target_doc=None):
"parent": "sales_order", "parent": "sales_order",
"stock_uom": "uom" "stock_uom": "uom"
} }
}. },
"Sales Order Item": { "Sales Order Item": {
"doctype": "Material Request Item", "doctype": "Material Request Item",
"field_map": { "field_map": {

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.27.20" version = "6.27.21"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(