Anand Doshi daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext ... Conflicts: setup/doctype/setup_control/setup_control.py stock/doctype/stock_entry/stock_entry.py utilities/demo/demo_docs/Price_List.csv		2013-11-04 13:14:39 +05:30
..
applicable_territory	[cleanup] [minor] replaced for territory to applicable territory	2013-10-31 19:50:51 +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	[minor] fixes after merge with master	2013-10-10 18:44:26 +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 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n	2013-10-24 11:40:32 +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	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
email_digest	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
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
global_defaults	[fix] [minor] ignore permission on setting values in control panel	2013-10-24 15:33:55 +05:30
item_group	Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n	2013-10-24 11:40:32 +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	[fix] [minor] naming series patch	2013-10-21 16:29:10 +05:30
notification_control	mass replace sql with webnotes.conn.sql	2013-09-18 12:20:53 +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	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
sales_person	Fix translate sales_person.js	2013-10-04 17:41:33 -03:00
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	Fix translate supplier_type.js	2013-10-15 18:15:29 -03:00
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	Fix translate setup/doctype/territory/territory.js	2013-10-15 18:14:50 -03:00
uom	[minor] fixes to form layouts	2013-10-10 15:30:12 +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