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

Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency

Browse Source
This commit is contained in:
Nabin Hait 2015-09-07 10:41:01 +05:30
commit 3607737b5e
4 changed files with 221 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v5_7/item_template_attributes.py
View File

@ -40,8 +40,8 @@ def rename_and_reload_doctypes():
frappe.reload_doctype("Item") frappe.reload_doctype("Item")
frappe.reload_doc("Stock", "DocType", "Item Variant Attribute") frappe.reload_doc("Stock", "DocType", "Item Variant Attribute")
frappe.reload_doctype("Item Attribute Value") frappe.reload_doc("Stock", "DocType", "Item Attribute Value")
frappe.reload_doctype("Item Attribute") frappe.reload_doc("Stock", "DocType", "Item Attribute")
def migrate_manage_variants(): def migrate_manage_variants():
item_attribute = {} item_attribute = {}

6
erpnext/setup/page/setup_wizard/fixtures/industry_type.py
View File

@ -1,6 +1,7 @@
from frappe import _ from frappe import _
items = [ def get_industry_types():
return [
_('Accounting'), _('Accounting'),
_('Advertising'), _('Advertising'),
_('Aerospace'), _('Aerospace'),
@ -51,4 +52,5 @@ _('Technology'),
_('Telecommunications'), _('Telecommunications'),
_('Television'), _('Television'),
_('Transportation'), _('Transportation'),
_('Venture Capital')] _('Venture Capital')
]

6
erpnext/setup/page/setup_wizard/fixtures/operations.py
View File

@ -3,7 +3,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from frappe import _ from frappe import _
items = [ def get_operations():
return [
_("Centrifugal casting"), _("Centrifugal casting"),
_("Continuous casting"), _("Continuous casting"),
_("Die casting"), _("Die casting"),
@ -162,4 +163,5 @@ _("Woodworking"),
_("Lapping"), _("Lapping"),
_("Morticing"), _("Morticing"),
_("Crushing"), _("Crushing"),
_("Packaging and labeling")] _("Packaging and labeling")
]

6
erpnext/setup/page/setup_wizard/install_fixtures.py
View File

@ -177,9 +177,9 @@ def install(country=None):
{'doctype': "Print Heading", 'print_heading': _("Debit Note")} {'doctype': "Print Heading", 'print_heading': _("Debit Note")}
] ]
from erpnext.setup.page.setup_wizard.fixtures import industry_type from erpnext.setup.page.setup_wizard.fixtures.industry_type import get_industry_types
records += [{"doctype":"Industry Type", "industry": d} for d in industry_type.items] records += [{"doctype":"Industry Type", "industry": d} for d in get_industry_types()]
# records += [{"doctype":"Operation", "operation": d} for d in operations.items] # records += [{"doctype":"Operation", "operation": d} for d in get_operations()]
from frappe.modules import scrub from frappe.modules import scrub
for r in records: for r in records: