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

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-server

OpenERP Core Team: Pending requested 2014-04-01

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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.