From 31c0d43b9505c6386f6dbb168952c2d59ff1f866 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 20 May 2016 15:30:00 +0530 Subject: [PATCH 1/4] [fix] update setup wizard access --- erpnext/setup/setup_wizard/setup_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index 32559423df..bd7009ebd2 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -20,7 +20,7 @@ def setup_complete(args=None): 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) From 04f3286c043b7da12670f675f2e6f0c233640e69 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 20 May 2016 15:47:56 +0530 Subject: [PATCH 2/4] Update company.py --- erpnext/setup/doctype/company/company.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 6689d66748..e114aaeb25 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -103,9 +103,9 @@ class Company(Document): 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") From 62dbbfba0da24d459d680e6cd19729e4a5f6318c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 20 May 2016 16:48:51 +0530 Subject: [PATCH 3/4] [Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item --- erpnext/selling/doctype/sales_order/sales_order.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 529c17cebe..158c7265ee 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -339,8 +339,6 @@ def make_material_request(source_name, target_doc=None): 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 @@ def make_material_request(source_name, target_doc=None): "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) From c5d186c497869ed1696c06e5cb4b69e294351442 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 26 May 2016 16:15:34 +0600 Subject: [PATCH 4/4] bumped to version 6.27.20 --- 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 a62f0b362d..2536e8f4de 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 7db26976bb..e1db8be403 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." 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/setup.py b/setup.py index 0185f02794..3211bff585 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(