Merge branch 'hotfix'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index a62f0b3..2536e8f 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.27.19'
+__version__ = '6.27.20'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 7db2697..e1db8be 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.27.19"
+app_version = "6.27.20"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 529c17c..158c726 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -339,8 +339,6 @@
so = frappe.get_doc("Sales Order", source_name)
- item_table = "Packed Item" if so.packed_items else "Sales Order Item"
-
doc = get_mapped_doc("Sales Order", source_name, {
"Sales Order": {
"doctype": "Material Request",
@@ -348,12 +346,20 @@
"docstatus": ["=", 1]
}
},
- item_table: {
+ "Packed Item": {
"doctype": "Material Request Item",
"field_map": {
"parent": "sales_order",
"stock_uom": "uom"
}
+ }.
+ "Sales Order Item": {
+ "doctype": "Material Request Item",
+ "field_map": {
+ "parent": "sales_order",
+ "stock_uom": "uom"
+ },
+ "condition": lambda doc: not frappe.db.exists('Product Bundle', doc.item_code)
}
}, target_doc, postprocess)
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 6689d66..e114aae 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -103,9 +103,9 @@
create_charts(self.chart_of_accounts, self.name)
frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",
- {"company": self.name, "account_type": "Receivable"}))
+ {"company": self.name, "account_type": "Receivable", "is_group": 0}))
frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
- {"company": self.name, "account_type": "Payable"}))
+ {"company": self.name, "account_type": "Payable", "is_group": 0}))
def set_default_accounts(self):
self._set_default_account("default_cash_account", "Cash")
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 3255942..bd7009e 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -20,7 +20,7 @@
install_fixtures.install(args.get("country"))
- # update_setup_wizard_access()
+ update_setup_wizard_access()
create_fiscal_year_and_company(args)
create_users(args)
set_defaults(args)
diff --git a/setup.py b/setup.py
index 0185f02..3211bff 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.27.19"
+version = "6.27.20"
requirements = parse_requirements("requirements.txt", session="")
setup(