Odoo Server (MOVED TO GITHUB)

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

  1. trunk-imp-user-form-psa
  2. Merge into trunk
Proposed by Paramjit Singh Sahota(OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-server/trunk-imp-user-form-psa
Merge into: lp: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:~openerp-dev/openobject-server/trunk-imp-user-form-psa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+213603@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openobject-server/trunk-imp-user-form-psa updated
5160. By Paramjit Singh Sahota(OpenERP)

[IMP]Rename 'Marketing' into 'Lead Acquisition'

5161. By Paramjit Singh Sahota(OpenERP)

[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)

[MERGE] Merged lp:openobject-server

5163. By Paramjit Singh Sahota(OpenERP)

[MERGE]Merged lp:openobject-server.

5164. By Paramjit Singh Sahota(OpenERP)

[IMP] Reorder the contact creation and other group.
Keep the Contact Creation true by default.

5165. By Paramjit Singh Sahota(OpenERP)

Revert the widget from the active field
Applied category_id in user.

5166. By Paramjit Singh Sahota(OpenERP)

[ADD] Added a new widget to the active field.

5167. By Paramjit Singh Sahota(OpenERP)

[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)

[REM] Missed to remove the related field from the pot.

5169. By Paramjit Singh Sahota(OpenERP)

[MERGE] MergeD lp:openobject-server.

5170. By Paramjit Singh Sahota(OpenERP)

[REVERT] Reverted the code till rev no. 5166 but not of 5166

5171. By Paramjit Singh Sahota(OpenERP)

[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)

[MERGE] Merged lp:openobject-server.

5173. By Pariket Trivedi(OpenERP)

[IMP]: set appliction setting for install module wise.

5174. By Pariket Trivedi(OpenERP)

[IMP] Rename 'Lead Acquisition' to 'Lead Automation'
Renamed extra tools to marketing.

5175. By Mehul Mehta(OpenERP)

[MERGE] Merged lp:openobject-server.

5176. By Mehul Mehta(OpenERP)

Unwanted changes done during merge with latest trunk
so removed that to make same as latest trunk.

5177. By Paramjit Singh Sahota(OpenERP)

[REVERT] Reverted the changes done during merging trunk.

5178. By Mehul Mehta(OpenERP)

[IMP] improved a typo

5179. By Paramjit Singh Sahota(OpenERP)

[MERGE] Merged lp:openobject-server.

5180. By Paramjit Singh Sahota(OpenERP)

[ADD] Added deactived filter for users.

5181. By Paramjit Singh Sahota(OpenERP)

[IMP] Reorder the sequence of menus.

5182. By Gaurav Panchal (OpenERP)

[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)

[MERGE] Merged lp:openobject-server

Unmerged revisions

5183. By Gaurav Panchal (OpenERP)

[MERGE] Merged lp:openobject-server

5182. By Gaurav Panchal (OpenERP)

[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)

[IMP] Reorder the sequence of menus.

5180. By Paramjit Singh Sahota(OpenERP)

[ADD] Added deactived filter for users.

5179. By Paramjit Singh Sahota(OpenERP)

[MERGE] Merged lp:openobject-server.

5178. By Mehul Mehta(OpenERP)

[IMP] improved a typo

5177. By Paramjit Singh Sahota(OpenERP)

[REVERT] Reverted the changes done during merging trunk.

5176. By Mehul Mehta(OpenERP)

Unwanted changes done during merge with latest trunk
so removed that to make same as latest trunk.

5175. By Mehul Mehta(OpenERP)

[MERGE] Merged lp:openobject-server.

5174. By Pariket Trivedi(OpenERP)

[IMP] Rename 'Lead Acquisition' to 'Lead Automation'
Renamed extra tools to marketing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/base_data.xml'
2--- openerp/addons/base/base_data.xml 2014-04-14 12:33:21 +0000
3+++ openerp/addons/base/base_data.xml 2014-05-15 14:03:26 +0000
4@@ -47,6 +47,23 @@
5 <field eval="time.strftime('%Y-01-01')" name="name"/>
6 </record>
7
8+ <!--
9+ Other category to display the groups.
10+ -->
11+ <record model="ir.module.category" id="module_category_other">
12+ <field name="name">Other</field>
13+ <field name="sequence">102</field>
14+ <field name="visible" eval="0" />
15+ </record>
16+
17+ <!--
18+ A group dedicated for contact creation.
19+ -->
20+ <record model="res.groups" id="group_partner_manager">
21+ <field name="name">Contact Creation</field>
22+ <field name="category_id" ref="base.module_category_other"/>
23+ </record>
24+
25 <!-- Basic Company -->
26 <record id="main_company" model="res.company">
27 <field name="name">Your Company</field>
28@@ -66,6 +83,7 @@
29 <field name="partner_id" ref="base.partner_root"/>
30 <field name="company_id" ref="main_company"/>
31 <field name="company_ids" eval="[(4, ref('main_company'))]"/>
32+ <field name="groups_id" eval="[(6,0,[ref('base.group_partner_manager')])]"/>
33 <field name="signature">--
34 Administrator</field>
35 </record>
36@@ -87,6 +105,7 @@
37 -->
38 <record id="group_portal" model="res.groups">
39 <field name="name">Portal</field>
40+ <field name="category_id" ref="base.module_category_other"/>
41 <field name="comment">Portal members have specific access rights (such as record rules and restricted menus).
42 They usually do not belong to the usual OpenERP groups.</field>
43 </record>
44@@ -96,6 +115,7 @@
45 -->
46 <record id="group_public" model="res.groups">
47 <field name="name">Public</field>
48+ <field name="category_id" ref="base.module_category_other"/>
49 <field name="comment">Public users have specific access rights (such as record rules and restricted menus).
50 They usually do not belong to the usual OpenERP groups.</field>
51 </record>
52
53=== modified file 'openerp/addons/base/module/module_data.xml'
54--- openerp/addons/base/module/module_data.xml 2014-01-21 07:52:35 +0000
55+++ openerp/addons/base/module/module_data.xml 2014-05-15 14:03:26 +0000
56@@ -31,86 +31,86 @@
57 <field name="sequence">2</field>
58 </record>
59
60+ <record model="ir.module.category" id="module_category_point_of_sale">
61+ <field name="name">Point of Sale</field>
62+ <field name="description">Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
63+ <field name="sequence">3</field>
64+ </record>
65+
66 <record model="ir.module.category" id="module_category_project_management">
67 <field name="name">Project</field>
68 <field name="description">Helps you manage your projects and tasks by tracking them, generating plannings, etc...</field>
69- <field name="sequence">3</field>
70- </record>
71-
72- <record model="ir.module.category" id="module_category_knowledge_management">
73- <field name="name">Knowledge</field>
74- <field name="description">Lets you install addons geared towards sharing knowledge with and between your employees.</field>
75 <field name="sequence">4</field>
76 </record>
77
78- <record model="ir.module.category" id="module_category_warehouse_management">
79- <field name="name">Warehouse</field>
80- <field name="description">Helps you manage your inventory and main stock operations: delivery orders, receptions, etc.</field>
81- <field name="sequence">5</field>
82- </record>
83-
84- <record model="ir.module.category" id="module_category_manufacturing">
85- <field name="name">Manufacturing</field>
86- <field name="description">Helps you manage your manufacturing processes and generate reports on those processes.</field>
87- <field name="sequence">6</field>
88- </record>
89-
90 <record model="ir.module.category" id="module_category_account_voucher">
91 <field name="name">Invoicing &amp; Payments</field>
92 <field name="description">Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants.</field>
93- <field name="sequence">7</field>
94+ <field name="sequence">5</field>
95 </record>
96
97 <record model="ir.module.category" id="module_category_accounting_and_finance">
98 <field name="name">Accounting &amp; Finance</field>
99 <field name="description">Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing.</field>
100- <field name="sequence">8</field>
101+ <field name="sequence">6</field>
102 </record>
103
104 <record model="ir.module.category" id="module_category_purchase_management">
105 <field name="name">Purchases</field>
106 <field name="description">Helps you manage your purchase-related processes such as requests for quotations, supplier invoices, etc...</field>
107+ <field name="sequence">7</field>
108+ </record>
109+
110+ <record model="ir.module.category" id="module_category_warehouse_management">
111+ <field name="name">Warehouse</field>
112+ <field name="description">Helps you manage your inventory and main stock operations: delivery orders, receptions, etc.</field>
113+ <field name="sequence">8</field>
114+ </record>
115+
116+ <record model="ir.module.category" id="module_category_manufacturing">
117+ <field name="name">Manufacturing</field>
118+ <field name="description">Helps you manage your manufacturing processes and generate reports on those processes.</field>
119 <field name="sequence">9</field>
120 </record>
121
122+ <record model="ir.module.category" id="module_category_lead_automation">
123+ <field name="name">Lead Automation</field>
124+ <field name="description">Helps you manage your marketing campaigns step by step.</field>
125+ <field name="sequence">10</field>
126+ </record>
127+
128 <record model="ir.module.category" id="module_category_human_resources">
129 <field name="name">Human Resources</field>
130 <field name="description">Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more.</field>
131- <field name="sequence">10</field>
132- </record>
133-
134- <record model="ir.module.category" id="module_category_tools">
135- <field name="name">Extra Tools</field>
136- <field name="description">Lets you install various interesting but non-essential tools like Survey, Lunch and Ideas box.</field>
137 <field name="sequence">11</field>
138 </record>
139
140+ <record model="ir.module.category" id="module_category_knowledge_management">
141+ <field name="name">Knowledge</field>
142+ <field name="description">Lets you install addons geared towards sharing knowledge with and between your employees.</field>
143+ <field name="sequence">14</field>
144+ </record>
145+
146 <record model="ir.module.category" id="module_category_marketing">
147 <field name="name">Marketing</field>
148- <field name="description">Helps you manage your marketing campaigns step by step.</field>
149- <field name="sequence">12</field>
150- </record>
151-
152- <record model="ir.module.category" id="module_category_point_of_sale">
153- <field name="name">Point of Sale</field>
154- <field name="description">Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
155- <field name="sequence">13</field>
156+ <field name="description">Lets you install various interesting but non-essential tools like Survey, Events and Ideas box.</field>
157+ <field name="sequence">15</field>
158 </record>
159
160 <record model="ir.module.category" id="module_category_report_designer">
161 <field name="name">Advanced Reporting</field>
162 <field name="description">Lets you install various tools to simplify and enhance OpenERP's report creation.</field>
163- <field name="sequence">14</field>
164+ <field name="sequence">16</field>
165 </record>
166
167 <record model="ir.module.category" id="module_category_specific_industry_applications">
168 <field name="name">Specific Industry Applications</field>
169- <field name="sequence">15</field>
170+ <field name="sequence">17</field>
171 </record>
172
173 <record model="ir.module.category" id="module_category_website">
174 <field name="name">Website</field>
175- <field name="sequence">16</field>
176+ <field name="sequence">18</field>
177 </record>
178
179 <record model="ir.module.category" id="module_category_administration">
180
181=== modified file 'openerp/addons/base/res/res_partner_demo.xml'
182--- openerp/addons/base/res/res_partner_demo.xml 2014-04-08 08:16:48 +0000
183+++ openerp/addons/base/res/res_partner_demo.xml 2014-05-15 14:03:26 +0000
184@@ -438,7 +438,7 @@
185 <field model="res.country" name="country_id" search="[('name','=','China')]"/>
186 <field name="country_id" ref="base.cn"/>
187 <field name="street">89 Dong Lu Road</field>
188- <field name="email">ming@yourcompany.example.com</field>
189+ <field name="email">míng@yourcompany.example.com</field>
190 <field name="phone">+86 215 069 5177</field>
191 <field name="website">http://www.míng.com</field>
192 </record>
193
194=== modified file 'openerp/addons/base/res/res_security.xml'
195--- openerp/addons/base/res/res_security.xml 2014-04-25 16:28:28 +0000
196+++ openerp/addons/base/res/res_security.xml 2014-05-15 14:03:26 +0000
197@@ -2,10 +2,6 @@
198 <openerp>
199 <data noupdate="1">
200
201- <record model="res.groups" id="group_partner_manager">
202- <field name="name">Contact Creation</field>
203- </record>
204-
205 <record model="ir.ui.menu" id="menu_config_address_book">
206 <field name="name">Address Book</field>
207 <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
208
209=== modified file 'openerp/addons/base/res/res_users.py'
210--- openerp/addons/base/res/res_users.py 2014-05-12 08:05:23 +0000
211+++ openerp/addons/base/res/res_users.py 2014-05-15 14:03:26 +0000
212@@ -700,7 +700,7 @@
213 xml1.append(E.separator(string=_('Application'), colspan="4"))
214 for app, kind, gs in self.get_groups_by_application(cr, uid, context):
215 # hide groups in category 'Hidden' (except to group_no_one)
216- attrs = {'groups': 'base.group_no_one'} if app and app.xml_id == 'base.module_category_hidden' else {}
217+ attrs = {'groups': 'base.group_no_one'} if app and app.xml_id in ['base.module_category_hidden', 'base.module_category_other'] else {}
218 if kind == 'selection':
219 # application name with a selection field
220 field_name = name_selection_groups(map(int, gs))
221@@ -708,7 +708,7 @@
222 xml1.append(E.newline())
223 else:
224 # application separator with boolean fields
225- app_name = app and app.name or _('Other')
226+ app_name = app and app.name or _('Undefined Category')
227 xml2.append(E.separator(string=app_name, colspan="4", **attrs))
228 for g in gs:
229 field_name = name_boolean_group(g.id)
230
231=== modified file 'openerp/addons/base/res/res_users_view.xml'
232--- openerp/addons/base/res/res_users_view.xml 2014-04-29 13:52:00 +0000
233+++ openerp/addons/base/res/res_users_view.xml 2014-05-15 14:03:26 +0000
234@@ -166,22 +166,24 @@
235 <sheet>
236 <field name="id" invisible="1"/>
237 <div class="oe_right oe_button_box">
238- <button string="Change Password" type="action" name="%(change_password_wizard_action)d"
239+ <field name="active" class="pull-right" widget="active_deactive_button"/>
240+ </div>
241+ <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
242+ <div class="oe_title">
243+ <label for="name" class="oe_edit_only"/>
244+ <h1><field name="name"/></h1>
245+ <field name="email" invisible="1"/>
246+ <label for="login" class="oe_edit_only" string="Email Address"/>
247+ <h2><field name="login" on_change="on_change_login(login)"/></h2>
248+ <div>
249+ <button string="Change Password" type="action" name="%(change_password_wizard_action)d"
250 class="oe_link" help="Change the user password."/>
251- </div>
252- <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
253- <div class="oe_title">
254- <label for="name" class="oe_edit_only"/>
255- <h1><field name="name"/></h1>
256- <field name="email" invisible="1"/>
257- <label for="login" class="oe_edit_only" string="Email Address"/>
258- <h2><field name="login" on_change="on_change_login(login)"/></h2>
259+ </div>
260 <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
261 <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_company"/>
262 <group>
263 <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"
264 attrs="{'invisible': [('id', '=', False)]}"/>
265- <field name="active"/>
266 </group>
267 </div>
268 <notebook colspan="4">
269@@ -232,6 +234,8 @@
270 <search string="Users">
271 <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email','ilike',self)]" string="User"/>
272 <field name="company_ids" string="Company" groups="base.group_multi_company"/>
273+ <filter name="Deactivated" string="Deactivated Users" icon="terp-partner"
274+ domain="[('active','=',False)]"/>
275 </search>
276 </field>
277 </record>
278
279=== modified file 'openerp/addons/base/security/base_security.xml'
280--- openerp/addons/base/security/base_security.xml 2014-05-01 21:45:01 +0000
281+++ openerp/addons/base/security/base_security.xml 2014-05-15 14:03:26 +0000
282@@ -35,9 +35,11 @@
283
284 <record id="group_sale_salesman" model="res.groups">
285 <field name="name">User</field>
286+ <field name="category_id" ref="base.module_category_other"/>
287 </record>
288 <record id="group_sale_manager" model="res.groups">
289 <field name="name">Manager</field>
290+ <field name="category_id" ref="base.module_category_other"/>
291 <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
292 </record>
293