Rushabh Mehta af596344ba merged conflict in gl_control.py

2011-07-13 14:37:17 +05:30

..

authorization_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

authorization_rule

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

brand

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

company

feed fix

2011-07-06 14:50:30 +05:30

contact_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

country

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

currency

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

customer_group

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

email_settings

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

import_data_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

item_group

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

manage_account

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

market_segment

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

naming_series

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

naming_series_options

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

notification_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

order_lost_reason

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

other_charges

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

period

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

period_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

permission_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

personalize

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

price_list

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

print_heading

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

role

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

sales_browser_control

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

sales_partner

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

sales_person

fixed conflict while merging with webnotes repo

2011-07-06 09:23:02 +05:30

series_detail

restored series detail

2011-07-08 13:26:40 +05:30

setup_control

merged conflict in gl_control.py

2011-07-13 14:37:17 +05:30

setup_wizard_control

Removed Tips Common from each js file

2011-07-05 10:54:05 +05:30

sms_settings

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

state

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

static_parameter_detail

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

supplier_type

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

support_email_settings

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

target_detail

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

term

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

territory

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

uom

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

update_series

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

warehouse_type

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

workflow_action_detail

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

workflow_engine

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

workflow_rule

removed get_tips() from js file

2011-07-05 14:41:36 +05:30

workflow_rule_detail

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

__init__.py

Sourced wnframework-modules from Google Code as erpnext

2011-06-08 14:37:15 +05:30