Akhilesh Darjee e0a1039756 merge conflict fixed

2014-01-30 14:44:35 +05:30

..

campaign

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

customer

changed fieldname from charge to taxes

2014-01-28 19:16:05 +05:30

customer_discount

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

industry_type

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

installation_note

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

installation_note_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

lead

merge conflict fixed

2014-01-27 15:42:02 +05:30

opportunity

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

opportunity_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

quotation

merge conflict fixed

2014-01-30 14:44:35 +05:30

quotation_item

Fliend rearrangemet in tables

2014-01-01 10:45:42 +05:30

sales_bom

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

sales_bom_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

sales_order

changed fieldname from charge to taxes

2014-01-28 19:16:05 +05:30

sales_order_item

Fliend rearrangemet in tables

2014-01-01 10:45:42 +05:30

sales_team

Fliend rearrangemet in tables

2014-01-01 10:45:42 +05:30

selling_settings

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

sms_center

minor changes

2014-01-24 19:57:52 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30