Nabin Hait 5c18bd9b61 Fixed merge conflict

2016-12-06 16:16:58 +05:30

..

campaign

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

customer

Fixed merge conflict

2016-12-06 16:16:58 +05:30

industry_type

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

installation_note

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

installation_note_item

[fix] make grids editable

2016-07-11 13:01:58 +05:30

lead_source

[enhance] added Lead Source master, fixes #6231

2016-09-16 11:44:49 +05:30

product_bundle

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

product_bundle_item

[fix] make grids editable

2016-07-11 13:01:58 +05:30

quotation

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

quotation_item

change fieldtype from float to currency

2016-11-01 16:32:33 +05:30

sales_order

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

sales_order_item

change fieldtype from float to currency

2016-11-01 16:32:33 +05:30

sales_team

[fix] make grids editable

2016-07-11 13:01:58 +05:30

selling_settings

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

sms_center

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

__init__.py

…