brotherton-erpnext/erpnext/setup/doctype
Anand Doshi 7ff696fb12 Merge branch 'renamedt' into shf_rename
Conflicts:
	erpnext/patches/patch_list.py
2012-03-29 15:31:17 +05:30
..
authorization_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
authorization_rule merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
brand merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
company merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
contact_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
country merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
currency merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
customer_group merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
email_digest merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
email_settings merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
features_setup merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
import_data_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
item_group merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
manage_account merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
market_segment merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
naming_series merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
naming_series_options merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
notification_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
order_lost_reason merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
other_charges Merge branch 'renamedt' into shf_rename 2012-03-29 15:31:17 +05:30
period merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
period_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
permission_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
personalize merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
price_list merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
print_heading merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
sales_browser_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
sales_partner merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
sales_person merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
series_detail merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
setup_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
setup_wizard_control merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
sms_settings merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
state merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
static_parameter_detail merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
supplier_type merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
target_detail merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
term merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
territory merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
uom merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
warehouse_type merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
workflow_action_detail merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
workflow_engine merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
workflow_rule merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
workflow_rule_detail merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
__init__.py first cut for lazy loading framework 2011-09-05 18:43:09 +05:30