Anand Doshi dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log ...

Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js

2012-06-05 18:37:17 +05:30

..

campaign

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

communication_log

rename dt second cut

2012-03-30 18:18:36 +05:30

customer

Merge branch 'master' of github.com:webnotes/erpnext into comm_log

2012-06-05 18:37:17 +05:30

industry_type

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

installation_note

cleaned up imports, doc

2012-05-11 15:53:37 +05:30

installation_note_item

rename dt first cut

2012-03-30 12:29:06 +05:30

lead

Merge branch 'master' of github.com:webnotes/erpnext into comm_log

2012-06-05 18:37:17 +05:30

opportunity

new doctype: communication

2012-05-31 14:53:55 +05:30

opportunity_item

rename dt first cut

2012-03-30 12:29:06 +05:30

plot_control

cleaned up imports, doc

2012-05-11 15:53:37 +05:30

quotation

new doctype: communication

2012-05-31 14:53:55 +05:30

quotation_item

moved uom next to qty in quotation item

2012-05-18 18:21:29 +05:30

sales_and_purchase_return_item

rename dt first cut

2012-03-30 12:29:06 +05:30

sales_common

Link to Sales/accounts browser fixed

2012-05-31 11:43:14 +05:30

sales_order

expected delivery date mandatory only if order type is sales

2012-06-01 10:11:14 +05:30

sales_order_item

fixes in sales order item widths

2012-05-01 18:31:40 +05:30

sales_team

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

shipping_address

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

sms_center

fixed conflict

2012-05-23 11:33:28 +05:30

__init__.py

first cut for lazy loading framework

2011-09-05 18:43:09 +05:30