nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

In Time Log

Browse Source 
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log

In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
This commit is contained in:
Neil Trini Lasrado
2015-03-24 16:47:30 +05:30
parent a3eec1603a
commit bccec29415
13 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,6 @@ def install(country=None):
{'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
{'doctype': 'Activity Type', 'activity_type': _('Execution')},
{'doctype': 'Activity Type', 'activity_type': _('Communication')},
{'doctype': 'Activity Type', 'activity_type': 'Manufacturing'},
{'doctype': "Item Attribute", "attribute_name": _("Size"), "item_attribute_values": [
{"attribute_value": _("Extra Small"), "abbr": "XS"},
@@ -158,7 +157,7 @@ def install(country=None):
{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"}
]
from erpnext.setup.page.setup_wizard.fixtures import industry_type, operations
from erpnext.setup.page.setup_wizard.fixtures import industry_type
records += [{"doctype":"Industry Type", "industry": d} for d in industry_type.items]
# records += [{"doctype":"Operation", "operation": d} for d in operations.items]