Odoo Server (MOVED TO GITHUB)

Merge lp://staging/~openerp-dev/openobject-server/trunk-imp-user-form-psa into lp://staging/openobject-server

trunk-imp-user-form-psa
Merge into trunk

Proposed by Paramjit Singh Sahota(OpenERP) on 2014-04-01

Status:	Work in progress
Proposed branch:	lp://staging/~openerp-dev/openobject-server/trunk-imp-user-form-psa
Merge into:	lp://staging/openobject-server
Diff against target:	292 lines (+76/-54) 7 files modified openerp/addons/base/base_data.xml (+20/-0) openerp/addons/base/module/module_data.xml (+37/-37) openerp/addons/base/res/res_partner_demo.xml (+1/-1) openerp/addons/base/res/res_security.xml (+0/-4) openerp/addons/base/res/res_users.py (+2/-2) openerp/addons/base/res/res_users_view.xml (+14/-10) openerp/addons/base/security/base_security.xml (+2/-0)
To merge this branch:	bzr merge lp://staging/~openerp-dev/openobject-server/trunk-imp-user-form-psa
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
OpenERP Core Team		2014-04-01	Pending
Review via email: mp+213603@code.staging.launchpad.net

lp://staging/~openerp-dev/openobject-server/trunk-imp-user-form-psa updated on 2014-05-15

5160. By Paramjit Singh Sahota(OpenERP) on 2014-04-01: [IMP]Rename 'Marketing' into 'Lead Acquisition'
5161. By Paramjit Singh Sahota(OpenERP) on 2014-04-02: [IMP] Improved
>Move that right to technical feature group
>>Contact Creation (keep true)
>>Share Documents (keep false)
>>Portal -> automatic
>>Public -> automatic
>>Blog Subscriber (post comments in blog)-> automatic
5162. By Paramjit Singh Sahota(OpenERP) on 2014-04-03: [MERGE] Merged lp:openobject-server
5163. By Paramjit Singh Sahota(OpenERP) on 2014-04-04: [MERGE]Merged lp:openobject-server.
5164. By Paramjit Singh Sahota(OpenERP) on 2014-04-04: [IMP] Reorder the contact creation and other group.
Keep the Contact Creation true by default.
5165. By Paramjit Singh Sahota(OpenERP) on 2014-04-04: Revert the widget from the active field
Applied category_id in user.
5166. By Paramjit Singh Sahota(OpenERP) on 2014-04-07: [ADD] Added a new widget to the active field.
5167. By Paramjit Singh Sahota(OpenERP) on 2014-04-07: [REM] Removed the 'Extra Tools' category bcz its giving the rights for the survey and subscriptions. So, better to shift survey and subscriptions to 'Survey' category rather than 'Extra tools'.
5168. By Paramjit Singh Sahota(OpenERP) on 2014-04-07: [REM] Missed to remove the related field from the pot.
5169. By Paramjit Singh Sahota(OpenERP) on 2014-04-09: [MERGE] MergeD lp:openobject-server.
5170. By Paramjit Singh Sahota(OpenERP) on 2014-04-11: [REVERT] Reverted the code till rev no. 5166 but not of 5166
5171. By Paramjit Singh Sahota(OpenERP) on 2014-04-11: [IMP] As per discussion with APR, rather than removing the Extra Tools which gives rights for Survey and Subscription it is better to rename it as 'Marketing & Communication'.
5172. By Paramjit Singh Sahota(OpenERP) on 2014-04-11: [MERGE] Merged lp:openobject-server.
5173. By Pariket Trivedi(OpenERP) on 2014-04-14: [IMP]: set appliction setting for install module wise.
5174. By Pariket Trivedi(OpenERP) on 2014-04-16: [IMP] Rename 'Lead Acquisition' to 'Lead Automation'
Renamed extra tools to marketing.
5175. By Mehul Mehta(OpenERP) on 2014-05-06: [MERGE] Merged lp:openobject-server.
5176. By Mehul Mehta(OpenERP) on 2014-05-06: Unwanted changes done during merge with latest trunk
so removed that to make same as latest trunk.
5177. By Paramjit Singh Sahota(OpenERP) on 2014-05-06: [REVERT] Reverted the changes done during merging trunk.
5178. By Mehul Mehta(OpenERP) on 2014-05-06: [IMP] improved a typo
5179. By Paramjit Singh Sahota(OpenERP) on 2014-05-12: [MERGE] Merged lp:openobject-server.
5180. By Paramjit Singh Sahota(OpenERP) on 2014-05-12: [ADD] Added deactived filter for users.
5181. By Paramjit Singh Sahota(OpenERP) on 2014-05-13: [IMP] Reorder the sequence of menus.
5182. By Gaurav Panchal (OpenERP) on 2014-05-15: [IMP]Improve the sequense of the menu and rename the id module_category_tools => module_category_marketing and rename module_category_marketing => module_category_lead_automation
5183. By Gaurav Panchal (OpenERP) on 2014-05-15: [MERGE] Merged lp:openobject-server

Unmerged revisions

5183. By Gaurav Panchal (OpenERP) on 2014-05-15: [MERGE] Merged lp:openobject-server
5182. By Gaurav Panchal (OpenERP) on 2014-05-15: [IMP]Improve the sequense of the menu and rename the id module_category_tools => module_category_marketing and rename module_category_marketing => module_category_lead_automation
5181. By Paramjit Singh Sahota(OpenERP) on 2014-05-13: [IMP] Reorder the sequence of menus.
5180. By Paramjit Singh Sahota(OpenERP) on 2014-05-12: [ADD] Added deactived filter for users.
5179. By Paramjit Singh Sahota(OpenERP) on 2014-05-12: [MERGE] Merged lp:openobject-server.
5178. By Mehul Mehta(OpenERP) on 2014-05-06: [IMP] improved a typo
5177. By Paramjit Singh Sahota(OpenERP) on 2014-05-06: [REVERT] Reverted the changes done during merging trunk.
5176. By Mehul Mehta(OpenERP) on 2014-05-06: Unwanted changes done during merge with latest trunk
so removed that to make same as latest trunk.
5175. By Mehul Mehta(OpenERP) on 2014-05-06: [MERGE] Merged lp:openobject-server.
5174. By Pariket Trivedi(OpenERP) on 2014-04-16: [IMP] Rename 'Lead Acquisition' to 'Lead Automation'
Renamed extra tools to marketing.