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

Fixed conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-05-26 16:10:02 +05:30
commit 310d64d565
6 changed files with 16 additions and 12 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.19' __version__ = '6.27.20'

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.19" app_version = "6.27.20"
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"

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

@ -345,11 +345,6 @@ def make_material_request(source_name, target_doc=None):
def update_item(source, target, source_parent): def update_item(source, target, source_parent):
target.project = source_parent.project target.project = source_parent.project
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, { doc = get_mapped_doc("Sales Order", source_name, {
"Sales Order": { "Sales Order": {
"doctype": "Material Request", "doctype": "Material Request",
@ -357,13 +352,22 @@ def make_material_request(source_name, target_doc=None):
"docstatus": ["=", 1] "docstatus": ["=", 1]
} }
}, },
item_table: { "Packed Item": {
"doctype": "Material Request Item", "doctype": "Material Request Item",
"field_map": { "field_map": {
"parent": "sales_order", "parent": "sales_order",
"stock_uom": "uom" "stock_uom": "uom"
}, },
"postprocess": update_item "postprocess": update_item
},
"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),
"postprocess": update_item
} }
}, target_doc, postprocess) }, target_doc, postprocess)

4
erpnext/setup/doctype/company/company.py
View File

@ -109,9 +109,9 @@ class Company(Document):
create_charts(self.chart_of_accounts, self.name, self.flags.ignore_permissions) create_charts(self.chart_of_accounts, self.name, self.flags.ignore_permissions)
frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account", 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", 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): def set_default_accounts(self):
self._set_default_account("default_cash_account", "Cash") self._set_default_account("default_cash_account", "Cash")

2
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -20,7 +20,7 @@ def setup_complete(args=None):
install_fixtures.install(args.get("country")) install_fixtures.install(args.get("country"))
# update_setup_wizard_access() update_setup_wizard_access()
create_fiscal_year_and_company(args) create_fiscal_year_and_company(args)
create_users(args) create_users(args)
set_defaults(args) set_defaults(args)

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.19" version = "6.27.20"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(