brotherton-erpnext/setup/doctype
Anand Doshi fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
2013-10-02 16:52:52 +05:30
..
authorization_control mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
authorization_rule mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
backup_manager Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-02 16:52:52 +05:30
brand [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
company Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-02 16:52:52 +05:30
contact_control [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
country [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
currency [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
currency_exchange [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
customer_group mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
email_digest Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-09-25 19:55:41 +05:30
email_settings remove sql = 2013-09-18 11:10:59 +05:30
features_setup [pos] pos view first commit 2013-08-22 17:26:43 +05:30
for_territory [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
global_defaults [fix] default float precision = 3, changed description of float precision in global defaults [issue] webnotes/erpnext#712 2013-08-06 13:33:42 +05:30
item_group [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
item_price [fix] [pos] hide custom buttons in pos view 2013-09-13 17:37:23 +05:30
jobs_email_settings [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
naming_series mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
notification_control mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
price_list [minor] [fix] price list table 2013-10-02 16:14:30 +05:30
print_heading remove sql = 2013-09-18 11:10:59 +05:30
quotation_lost_reason [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
sales_email_settings [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
sales_partner mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
sales_person [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
setup_control [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
sms_parameter [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
sms_settings [minor] label changed in sms settings 2013-09-10 17:20:42 +05:30
supplier_type [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
target_detail [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
terms_and_conditions [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
territory [nested set] [minor] Added validation to test loop in hierarchy 2013-08-05 18:14:39 +05:30
uom [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
website_item_group [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
__init__.py moved directory structure 2012-09-24 19:13:42 +05:30