Merge lp:~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management into lp:eficent-openerp-project-management
- eficent-openerp-project-management
- Merge into trunk
Status: | Needs review |
---|---|
Proposed branch: | lp:~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management |
Merge into: | lp:eficent-openerp-project-management |
Diff against target: |
622 lines (+66/-63) 26 files modified
account_analytic_lob/project_view.xml (+1/-1) project_category/__openerp__.py (+2/-0) project_category/analytic_account_category.xml (+2/-2) project_category/analytic_account_view.xml (+1/-1) project_category/project_view.xml (+1/-1) project_communications_meetings/project_view.xml (+1/-1) project_cost/account_analytic_account_view.xml (+4/-4) project_cost/account_analytic_line_plan_view.xml (+2/-2) project_cost/project_view.xml (+2/-2) project_cost_plan_purchase/project_purchase_line_plan_view.xml (+6/-6) project_cost_plan_sale/project_sale_line_plan_view.xml (+6/-6) project_cost_plan_time/project_time_line_plan_view.xml (+3/-3) project_hr_stakeholder/project_hr_responsibility.xml (+1/-1) project_hr_stakeholder/project_hr_role.xml (+1/-1) project_hr_stakeholder/project_view.xml (+2/-2) project_integration/project_integration_view.xml (+2/-2) project_sale/account_invoice_view.xml (+10/-10) project_sale/sale_order_view.xml (+1/-1) project_scope_wbs/__openerp__.py (+1/-1) project_scope_wbs/project_lifecycle_view.xml (+1/-1) project_scope_wbs/project_scope_wbs.py (+2/-1) project_scope_wbs/project_scope_wbs_view.xml (+2/-2) project_time_easy_scheduling/project_task_view.xml (+4/-4) project_time_milestone/project_time_milestone_view.xml (+2/-2) project_time_schedule/project_time_schedule_view.xml (+3/-3) project_time_sequence/project_time_sequence_view.xml (+3/-3) |
To merge this branch: | bzr merge lp:~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eficent | Pending | ||
Review via email: mp+136444@code.launchpad.net |
Commit message
Description of the change
This merge make it be installable in OpenERP v7.0. Add dependencies and solve this bugs:
#1083594 #1083604 #1083608 #1083630
- 9. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] Creo un proyecto, voy a proyectos y veo los kanban de los proyectos, hago click en uno proyecto (me llevarÃa a las tareas del proyecto). Da error
- 10. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] view project_
time_schedule_ view use the unexists group res.group_extended in openerp v7.0. - 11. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] "Delegations" page change to "Delegation" in openerp v7.0
- 12. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] reasing group from base.group_extended to base.group_
erp_manager
Unmerged revisions
- 12. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] reasing group from base.group_extended to base.group_
erp_manager - 11. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] "Delegations" page change to "Delegation" in openerp v7.0
- 10. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] view project_
time_schedule_ view use the unexists group res.group_extended in openerp v7.0. - 9. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] Creo un proyecto, voy a proyectos y veo los kanban de los proyectos, hago click en uno proyecto (me llevarÃa a las tareas del proyecto). Da error
- 8. By Cristian Sebastian Rocha <email address hidden>
-
[FIX] Fix multiple bugs to make it installable in 7.0
Preview Diff
1 | === modified file 'account_analytic_lob/project_view.xml' |
2 | --- account_analytic_lob/project_view.xml 2012-10-02 23:10:39 +0000 |
3 | +++ account_analytic_lob/project_view.xml 2012-11-27 21:00:27 +0000 |
4 | @@ -30,7 +30,7 @@ |
5 | <field name="name">account.analytic.account.form</field> |
6 | <field name="model">account.analytic.account</field> |
7 | <field name="type">form</field> |
8 | - <field name="inherit_id" ref="account.view_account_analytic_account_form"/> |
9 | + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> |
10 | <field name="arch" type="xml"> |
11 | <xpath expr="//page[@string='Account Data']/field[@name='partner_id']" position="after"> |
12 | <field name="lob"/> |
13 | |
14 | === modified file 'project_category/__openerp__.py' |
15 | --- project_category/__openerp__.py 2012-10-18 23:30:50 +0000 |
16 | +++ project_category/__openerp__.py 2012-11-27 21:00:27 +0000 |
17 | @@ -28,6 +28,8 @@ |
18 | "category": "Generic Modules/Projects & Services", |
19 | "depends": [ |
20 | "base", |
21 | + "account", |
22 | + "analytic", |
23 | "project", |
24 | ], |
25 | "description": """ This module intrododuces the possibility to associate categories to analytic accounts and projects. |
26 | |
27 | === modified file 'project_category/analytic_account_category.xml' |
28 | --- project_category/analytic_account_category.xml 2012-10-18 23:30:50 +0000 |
29 | +++ project_category/analytic_account_category.xml 2012-11-27 21:00:27 +0000 |
30 | @@ -14,7 +14,7 @@ |
31 | <field name="arch" type="xml"> |
32 | <form string="Analytic Account Category"> |
33 | <field name="name" select="1"/> |
34 | - <field name="active" groups="base.group_extended"/> |
35 | + <field name="active" groups="base.group_erp_manager"/> |
36 | <field name="parent_id"/> |
37 | <separator colspan="4" string="Analytic Accounts"/> |
38 | <field colspan="4" name="account_ids" nolabel="1"/> |
39 | @@ -73,7 +73,7 @@ |
40 | </record> |
41 | |
42 | <menuitem action="action_analytic_account_category_form" id="menu_analytic_account_category_form" name="Analytic Account Categories" sequence="4" parent="account.menu_analytic_accounting"/> |
43 | - <menuitem action="action_analytic_account_category_form" id="menu_project_category_form" name="Project Categories" sequence="4" parent="project.menu_definitions"/> |
44 | + <menuitem action="action_analytic_account_category_form" id="menu_project_category_form" name="Project Categories" sequence="4" parent="base.menu_definitions"/> |
45 | |
46 | |
47 | </data> |
48 | |
49 | === modified file 'project_category/analytic_account_view.xml' |
50 | --- project_category/analytic_account_view.xml 2012-10-18 23:30:50 +0000 |
51 | +++ project_category/analytic_account_view.xml 2012-11-27 21:00:27 +0000 |
52 | @@ -48,7 +48,7 @@ |
53 | <field name="name">account.analytic.account.form</field> |
54 | <field name="model">account.analytic.account</field> |
55 | <field name="type">form</field> |
56 | - <field name="inherit_id" ref="account.view_account_analytic_account_form"/> |
57 | + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> |
58 | <field name="arch" type="xml"> |
59 | <page string="Account Data" position="after"> |
60 | <page string="Categories"> |
61 | |
62 | === modified file 'project_category/project_view.xml' |
63 | --- project_category/project_view.xml 2012-10-18 23:30:50 +0000 |
64 | +++ project_category/project_view.xml 2012-11-27 21:00:27 +0000 |
65 | @@ -41,7 +41,7 @@ |
66 | <field name="type">form</field> |
67 | <field name="inherit_id" ref="project.edit_project"/> |
68 | <field name="arch" type="xml"> |
69 | - <page string="Administration" position="after"> |
70 | + <page string="Other Info" position="after"> |
71 | <page string="Categories"> |
72 | <field colspan="4" name="category_id" nolabel="1"/> |
73 | </page> |
74 | |
75 | === modified file 'project_communications_meetings/project_view.xml' |
76 | --- project_communications_meetings/project_view.xml 2012-10-02 23:10:39 +0000 |
77 | +++ project_communications_meetings/project_view.xml 2012-11-27 21:00:27 +0000 |
78 | @@ -24,7 +24,7 @@ |
79 | |
80 | |
81 | <menuitem id="menu_project_meeting_categories_def_act" |
82 | - name="Meeting Categories" parent="project.menu_definitions" |
83 | + name="Meeting Categories" parent="base.menu_definitions" |
84 | sequence="10" action="crm.crm_meeting_categ_action" |
85 | groups="project.group_project_manager" /> |
86 | |
87 | |
88 | === modified file 'project_cost/account_analytic_account_view.xml' |
89 | --- project_cost/account_analytic_account_view.xml 2012-10-02 23:10:39 +0000 |
90 | +++ project_cost/account_analytic_account_view.xml 2012-11-27 21:00:27 +0000 |
91 | @@ -47,7 +47,7 @@ |
92 | <field name="name">account.analytic.account.form</field> |
93 | <field name="model">account.analytic.account</field> |
94 | <field name="type">form</field> |
95 | - <field name="inherit_id" ref="account.view_account_analytic_account_form"/> |
96 | + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> |
97 | <field name="arch" type="xml"> |
98 | <page string='Description' position="after"> |
99 | <page string="Costs"> |
100 | @@ -88,7 +88,7 @@ |
101 | <field name="unit_amount" colspan="2" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> |
102 | <field name="product_uom_id" colspan="2" nolabel="1" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> |
103 | </group> |
104 | - <group colspan="2" col="2" groups="base.group_extended"> |
105 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
106 | <separator string="General Accounting" colspan="2"/> |
107 | <field name="general_account_id"/> |
108 | <field name="move_id" readonly="1"/> |
109 | @@ -131,7 +131,7 @@ |
110 | <field name="unit_amount" colspan="2" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> |
111 | <field name="product_uom_id" colspan="2" nolabel="1" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> |
112 | </group> |
113 | - <group colspan="2" col="2" groups="base.group_extended"> |
114 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
115 | <separator string="General Accounting" colspan="2"/> |
116 | <field name="general_account_id"/> |
117 | <field name="move_id" readonly="1"/> |
118 | @@ -147,4 +147,4 @@ |
119 | </openerp> |
120 | |
121 | |
122 | - |
123 | \ No newline at end of file |
124 | + |
125 | |
126 | === modified file 'project_cost/account_analytic_line_plan_view.xml' |
127 | --- project_cost/account_analytic_line_plan_view.xml 2012-10-02 23:10:39 +0000 |
128 | +++ project_cost/account_analytic_line_plan_view.xml 2012-11-27 21:00:27 +0000 |
129 | @@ -34,7 +34,7 @@ |
130 | <field name="product_uom_id" colspan="2" nolabel="1"/> |
131 | <field name="user_id" colspan="2"/> |
132 | </group> |
133 | - <group colspan="2" col="2" groups="base.group_extended"> |
134 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
135 | <separator string="General Accounting" colspan="2"/> |
136 | <field name="general_account_id"/> |
137 | <field name="move_id" readonly="1"/> |
138 | @@ -72,7 +72,7 @@ |
139 | <filter name="edit" |
140 | string="Edit" context="{'set_editable':True,'seq_visible': True}" |
141 | icon="gtk-execute" |
142 | - groups="base.group_extended"/> |
143 | + groups="base.group_erp_manager"/> |
144 | <field name="date"/> |
145 | <field name="name"/> |
146 | <field name="account_id"/> |
147 | |
148 | === modified file 'project_cost/project_view.xml' |
149 | --- project_cost/project_view.xml 2012-10-02 23:10:39 +0000 |
150 | +++ project_cost/project_view.xml 2012-11-27 21:00:27 +0000 |
151 | @@ -57,7 +57,7 @@ |
152 | <field name="product_uom_id" colspan="2" nolabel="1" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> |
153 | <field name="user_id" colspan="2"/> |
154 | </group> |
155 | - <group colspan="2" col="2" groups="base.group_extended"> |
156 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
157 | <separator string="General Accounting" colspan="2"/> |
158 | <field name="general_account_id" invisible="True"/> |
159 | <field name="move_id" readonly="1" invisible="True"/> |
160 | @@ -101,7 +101,7 @@ |
161 | <field name="product_uom_id" colspan="2" nolabel="1" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> |
162 | <field name="user_id" colspan="2"/> |
163 | </group> |
164 | - <group colspan="2" col="2" groups="base.group_extended"> |
165 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
166 | <separator string="General Accounting" colspan="2"/> |
167 | <field name="general_account_id" invisible="True"/> |
168 | <field name="move_id" readonly="1" invisible="True"/> |
169 | |
170 | === modified file 'project_cost_plan_purchase/project_purchase_line_plan_view.xml' |
171 | --- project_cost_plan_purchase/project_purchase_line_plan_view.xml 2012-10-02 23:10:39 +0000 |
172 | +++ project_cost_plan_purchase/project_purchase_line_plan_view.xml 2012-11-27 21:00:27 +0000 |
173 | @@ -14,7 +14,7 @@ |
174 | <group colspan="4" col="6"> |
175 | <field name="account_id"/> |
176 | <field name="supplier_id" on_change="onchange_supplier_id(supplier_id)" context="{'search_default_supplier':1}"/> |
177 | - <field name="pricelist_id" domain="[('type','=','purchase')]" groups="base.group_extended"/> |
178 | + <field name="pricelist_id" domain="[('type','=','purchase')]" groups="base.group_erp_manager"/> |
179 | <!--<field name="account_id"/>--> |
180 | </group> |
181 | <group colspan="2" col="4"> |
182 | @@ -27,16 +27,16 @@ |
183 | |
184 | |
185 | </group> |
186 | - <group colspan="2" col="2" groups="base.group_extended"> |
187 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
188 | <separator string="Purchase Order Information" colspan="2"/> |
189 | <field name="purchase_order_id"/> |
190 | <field name="purchase_line_id"/> |
191 | </group> |
192 | - <group colspan="2" col="2" groups="base.group_extended"> |
193 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
194 | <separator string="Notes" colspan="2"/> |
195 | <field name="notes" nolabel="1"/> |
196 | </group> |
197 | - <group colspan="2" col="2" groups="base.group_extended"> |
198 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
199 | <separator string="Analytic Information" colspan="2"/> |
200 | <field name="journal_id"/> |
201 | <field name="date"/> |
202 | @@ -80,11 +80,11 @@ |
203 | <filter name="edit" |
204 | string="Edit" context="{'set_editable':True,'seq_visible': True}" |
205 | icon="gtk-execute" |
206 | - groups="base.group_extended"/> |
207 | + groups="base.group_erp_manager"/> |
208 | <filter name="no_po" |
209 | string="Non-ordered" domain="[('purchase_line_id','=','')]" |
210 | icon="gtk-execute" |
211 | - groups="base.group_extended"/> |
212 | + groups="base.group_erp_manager"/> |
213 | <field name="account_id"/> |
214 | <field name="product_id"/> |
215 | <field name="supplier_id" on_change="onchange_partner_id(supplier_id)" context="{'search_default_supplier':1}"/> |
216 | |
217 | === modified file 'project_cost_plan_sale/project_sale_line_plan_view.xml' |
218 | --- project_cost_plan_sale/project_sale_line_plan_view.xml 2012-10-02 23:10:39 +0000 |
219 | +++ project_cost_plan_sale/project_sale_line_plan_view.xml 2012-11-27 21:00:27 +0000 |
220 | @@ -14,7 +14,7 @@ |
221 | <group colspan="4" col="6"> |
222 | <field name="account_id"/> |
223 | <field name="customer_id" on_change="onchange_customer_id(customer_id)" context="{'search_default_supplier':1}"/> |
224 | - <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended"/> |
225 | + <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_erp_manager"/> |
226 | <!--<field name="account_id"/>--> |
227 | </group> |
228 | <group colspan="2" col="4"> |
229 | @@ -27,16 +27,16 @@ |
230 | |
231 | |
232 | </group> |
233 | - <group colspan="2" col="2" groups="base.group_extended"> |
234 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
235 | <separator string="Sale Order Information" colspan="2"/> |
236 | <field name="sale_order_id"/> |
237 | <field name="sale_line_id"/> |
238 | </group> |
239 | - <group colspan="2" col="2" groups="base.group_extended"> |
240 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
241 | <separator string="Notes" colspan="2"/> |
242 | <field name="notes" nolabel="1"/> |
243 | </group> |
244 | - <group colspan="2" col="2" groups="base.group_extended"> |
245 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
246 | <separator string="Analytic Information" colspan="2"/> |
247 | <field name="journal_id"/> |
248 | <field name="date"/> |
249 | @@ -80,11 +80,11 @@ |
250 | <filter name="edit" |
251 | string="Edit" context="{'seq_visible': True, 'set_editable':True}" |
252 | icon="gtk-execute" |
253 | - groups="base.group_extended"/> |
254 | + groups="base.group_erp_manager"/> |
255 | <filter name="no_po" |
256 | string="Non-ordered" domain="[('sale_line_id','=','')]" |
257 | icon="gtk-execute" |
258 | - groups="base.group_extended"/> |
259 | + groups="base.group_erp_manager"/> |
260 | <field name="account_id"/> |
261 | <field name="product_id"/> |
262 | <field name="customer_id" on_change="onchange_partner_id(customer_id)" context="{'search_default_supplier':1}"/> |
263 | |
264 | === modified file 'project_cost_plan_time/project_time_line_plan_view.xml' |
265 | --- project_cost_plan_time/project_time_line_plan_view.xml 2012-10-02 23:10:39 +0000 |
266 | +++ project_cost_plan_time/project_time_line_plan_view.xml 2012-11-27 21:00:27 +0000 |
267 | @@ -23,11 +23,11 @@ |
268 | <field name="time_amount" colspan="2" on_change="on_change_time_amount(unit_amount)" sum="Total"/> |
269 | </group> |
270 | <newline/> |
271 | - <group colspan="2" col="2" groups="base.group_extended"> |
272 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
273 | <separator string="Notes" colspan="2"/> |
274 | <field name="notes" nolabel="1"/> |
275 | </group> |
276 | - <group colspan="2" col="2" groups="base.group_extended"> |
277 | + <group colspan="2" col="2" groups="base.group_erp_manager"> |
278 | <separator string="Analytic Information" colspan="2"/> |
279 | <field name="journal_id" ref="project_cost.analytic_journal_plan_time"/> |
280 | <field name="date"/> |
281 | @@ -69,7 +69,7 @@ |
282 | <filter name="edit" |
283 | string="Edit" context="{'set_editable':True,'seq_visible': True}" |
284 | icon="gtk-execute" |
285 | - groups="base.group_extended"/> |
286 | + groups="base.group_erp_manager"/> |
287 | <field name="account_id"/> |
288 | <field name="product_id"/> |
289 | <field name="employee_id" on_change="onchange_employee_id(employee_id)"/> |
290 | |
291 | === modified file 'project_hr_stakeholder/project_hr_responsibility.xml' |
292 | --- project_hr_stakeholder/project_hr_responsibility.xml 2012-10-02 23:10:39 +0000 |
293 | +++ project_hr_stakeholder/project_hr_responsibility.xml 2012-11-27 21:00:27 +0000 |
294 | @@ -51,7 +51,7 @@ |
295 | <field name="help">Define the responsibilities for stakeholders in projects.</field> |
296 | </record> |
297 | |
298 | - <menuitem id="menu_responsibilities_config" name="Responsibilities" parent="project.menu_definitions" sequence="1"/> |
299 | + <menuitem id="menu_responsibilities_config" name="Responsibilities" parent="base.menu_definitions" sequence="1"/> |
300 | <menuitem action="action_project_hr_responsibility_tree" id="menu_project_hr_responsibility_view" parent="menu_responsibilities_config" sequence="1"/> |
301 | </data> |
302 | </openerp> |
303 | |
304 | === modified file 'project_hr_stakeholder/project_hr_role.xml' |
305 | --- project_hr_stakeholder/project_hr_role.xml 2012-10-02 23:10:39 +0000 |
306 | +++ project_hr_stakeholder/project_hr_role.xml 2012-11-27 21:00:27 +0000 |
307 | @@ -51,7 +51,7 @@ |
308 | <field name="help">Define the roles for stakeholders in projects.</field> |
309 | </record> |
310 | |
311 | - <menuitem id="menu_roles_config" name="Roles" parent="project.menu_definitions" sequence="1"/> |
312 | + <menuitem id="menu_roles_config" name="Roles" parent="base.menu_definitions" sequence="1"/> |
313 | <menuitem action="action_project_hr_role_tree" id="menu_project_hr_role_view" parent="menu_roles_config" sequence="1"/> |
314 | </data> |
315 | </openerp> |
316 | |
317 | === modified file 'project_hr_stakeholder/project_view.xml' |
318 | --- project_hr_stakeholder/project_view.xml 2012-10-02 23:10:39 +0000 |
319 | +++ project_hr_stakeholder/project_view.xml 2012-11-27 21:00:27 +0000 |
320 | @@ -13,7 +13,7 @@ |
321 | |
322 | <menuitem id="project_hr_stakeholder_menu_project_config_address_book" |
323 | name="Stakeholders" |
324 | - parent="project.menu_definitions" |
325 | + parent="base.menu_definitions" |
326 | sequence="2" |
327 | groups="project.group_project_manager"/> |
328 | |
329 | @@ -49,7 +49,7 @@ |
330 | <field name="inherit_id" ref="project.edit_project"/> |
331 | <field name="arch" type="xml"> |
332 | <page string='Administration' position="after"> |
333 | - <page groups="base.group_extended" string="Stakeholders"> |
334 | + <page groups="base.group_erp_manager" string="Stakeholders"> |
335 | <field name="stakeholder_ids" nolabel="1" context="{'default_project_id': active_id}"> |
336 | <tree string="Stakeholders"> |
337 | <field name="partner_id"/> |
338 | |
339 | === modified file 'project_integration/project_integration_view.xml' |
340 | --- project_integration/project_integration_view.xml 2012-10-02 23:10:39 +0000 |
341 | +++ project_integration/project_integration_view.xml 2012-11-27 21:00:27 +0000 |
342 | @@ -31,7 +31,7 @@ |
343 | <field name="inherit_id" ref="project.edit_project"/> |
344 | <field name="arch" type="xml"> |
345 | <page string='Administration' position="after"> |
346 | - <page groups="base.group_extended" string="Relationships"> |
347 | + <page groups="base.group_erp_manager" string="Relationships"> |
348 | <separator string="Predecessor Projects" colspan="4"/> |
349 | <field colspan="4" height="150" name="predecessor_ids" nolabel="1"/> |
350 | <separator string="Successor Projects" colspan="4"/> |
351 | @@ -52,7 +52,7 @@ |
352 | <button name="do_open" states="ready,pending" string="Start Task" type="object" icon="gtk-execute"/> |
353 | <button name="%(project.action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" /> |
354 | <button name="do_pending" states="ready, open" string="Pending" type="object" icon="gtk-media-pause"/> |
355 | - <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> |
356 | + <button groups="base.group_erp_manager" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> |
357 | <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/> |
358 | </tree> |
359 | </field> |
360 | |
361 | === modified file 'project_sale/account_invoice_view.xml' |
362 | --- project_sale/account_invoice_view.xml 2012-10-02 23:10:39 +0000 |
363 | +++ project_sale/account_invoice_view.xml 2012-11-27 21:00:27 +0000 |
364 | @@ -34,7 +34,7 @@ |
365 | <newline/> |
366 | <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/> |
367 | <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> |
368 | - <field name="fiscal_position" groups="base.group_extended" widget="selection"/> |
369 | + <field name="fiscal_position" groups="base.group_erp_manager" widget="selection"/> |
370 | <newline/> |
371 | <field name="date_invoice"/> |
372 | <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/> |
373 | @@ -103,24 +103,24 @@ |
374 | <field name="payment_term" widget="selection"/> |
375 | <field name="name"/> |
376 | <newline/> |
377 | - <field name="origin" groups="base.group_extended"/> |
378 | - <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/> |
379 | + <field name="origin" groups="base.group_erp_manager"/> |
380 | + <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_erp_manager"/> |
381 | <field name="user_id"/> |
382 | <field name="move_id" groups="account.group_account_user"/> |
383 | <separator colspan="4" string="Additional Information"/> |
384 | <field colspan="4" name="comment" nolabel="1"/> |
385 | </page> |
386 | - <page string="Payments" groups="base.group_extended"> |
387 | + <page string="Payments" groups="base.group_erp_manager"> |
388 | <field name="payment_ids" colspan="4" nolabel="1" > |
389 | <tree string="Payments"> |
390 | <field name="date" string="Payment Date"/> |
391 | <field name="ref"/> |
392 | - <field name="name" groups="base.group_extended"/> |
393 | + <field name="name" groups="base.group_erp_manager"/> |
394 | <field name="journal_id"/> |
395 | <field name="debit"/> |
396 | <field name="credit"/> |
397 | - <field name="amount_currency" groups="base.group_extended"/> |
398 | - <field name="currency_id" groups="base.group_extended"/> |
399 | + <field name="amount_currency" groups="base.group_erp_manager"/> |
400 | + <field name="currency_id" groups="base.group_erp_manager"/> |
401 | </tree> |
402 | </field> |
403 | </page> |
404 | @@ -144,7 +144,7 @@ |
405 | <newline/> |
406 | <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}"/> |
407 | <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> |
408 | - <field name="fiscal_position" groups="base.group_extended" widget="selection"/> |
409 | + <field name="fiscal_position" groups="base.group_erp_manager" widget="selection"/> |
410 | <newline/> |
411 | <field name="date_invoice"/> |
412 | <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/> |
413 | @@ -200,10 +200,10 @@ |
414 | <field name="user_id"/> |
415 | <newline/> |
416 | <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" |
417 | - groups="base.group_extended"/> |
418 | + groups="base.group_erp_manager"/> |
419 | <field name="origin"/> |
420 | <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" |
421 | - groups="base.group_extended"/> |
422 | + groups="base.group_erp_manager"/> |
423 | <field name="move_id" groups="account.group_account_user"/> |
424 | <separator colspan="4" string="Additional Information"/> |
425 | <field colspan="4" name="comment" nolabel="1"/> |
426 | |
427 | === modified file 'project_sale/sale_order_view.xml' |
428 | --- project_sale/sale_order_view.xml 2012-10-02 23:10:39 +0000 |
429 | +++ project_sale/sale_order_view.xml 2012-11-27 21:00:27 +0000 |
430 | @@ -33,7 +33,7 @@ |
431 | <field name="product_uom_qty" readonly="1"/> |
432 | <field name="product_uom"/> |
433 | |
434 | - <field colspan="4" name="name" groups="base.group_extended"/> |
435 | + <field colspan="4" name="name" groups="base.group_erp_manager"/> |
436 | <field name="company_id" groups="base.group_multi_company" readonly="1"/> |
437 | </group> |
438 | <separator colspan="4" string="Price"/> |
439 | |
440 | === modified file 'project_scope_wbs/__openerp__.py' |
441 | --- project_scope_wbs/__openerp__.py 2012-10-02 23:10:39 +0000 |
442 | +++ project_scope_wbs/__openerp__.py 2012-11-27 21:00:27 +0000 |
443 | @@ -26,7 +26,7 @@ |
444 | "author": "Jordi Ballester (Eficent)", |
445 | "website": "http://www.eficent.com", |
446 | "category": "Generic Modules/Projects & Services", |
447 | - "depends": ["project","analytic"], |
448 | + "depends": ["account","project","analytic"], |
449 | "description": """Eficent Project Management. Project Scope |
450 | - The hierarchy of a project is considered the WBS (Work Breakdown Structure) |
451 | - The analytic accounts in the project hierarchies are considered WBS components |
452 | |
453 | === modified file 'project_scope_wbs/project_lifecycle_view.xml' |
454 | --- project_scope_wbs/project_lifecycle_view.xml 2012-10-02 23:10:39 +0000 |
455 | +++ project_scope_wbs/project_lifecycle_view.xml 2012-11-27 21:00:27 +0000 |
456 | @@ -48,7 +48,7 @@ |
457 | <field name="help">Define the project lifecycle stages.</field> |
458 | </record> |
459 | |
460 | - <menuitem id="menu_project_lifecycle_config" name="Lifecycle" parent="project.menu_definitions" sequence="1"/> |
461 | + <menuitem id="menu_project_lifecycle_config" name="Lifecycle" parent="base.menu_definitions" sequence="1"/> |
462 | <menuitem action="action_project_lifecycle_tree" id="menu_project_lifecycle_view" parent="menu_project_lifecycle_config" sequence="1"/> |
463 | </data> |
464 | </openerp> |
465 | |
466 | === modified file 'project_scope_wbs/project_scope_wbs.py' |
467 | --- project_scope_wbs/project_scope_wbs.py 2012-10-04 22:11:07 +0000 |
468 | +++ project_scope_wbs/project_scope_wbs.py 2012-11-27 21:00:27 +0000 |
469 | @@ -237,6 +237,7 @@ |
470 | def name_get(self, cr, uid, ids, context=None): |
471 | if not ids: |
472 | return [] |
473 | + if type(ids) is int: ids = [ids] |
474 | res = [] |
475 | for project in self.browse(cr, uid, ids, context=context): |
476 | data = [] |
477 | @@ -328,4 +329,4 @@ |
478 | |
479 | project() |
480 | |
481 | - |
482 | \ No newline at end of file |
483 | + |
484 | |
485 | === modified file 'project_scope_wbs/project_scope_wbs_view.xml' |
486 | --- project_scope_wbs/project_scope_wbs_view.xml 2012-10-02 23:10:39 +0000 |
487 | +++ project_scope_wbs/project_scope_wbs_view.xml 2012-11-27 21:00:27 +0000 |
488 | @@ -53,7 +53,7 @@ |
489 | <field name="code" string="Code"/> |
490 | <field name="complete_wbs_code" string="WBS Path code" readonly="1"/> |
491 | </field> |
492 | - <page string="Administration" position="after"> |
493 | + <page string="Other Info" position="after"> |
494 | <page string="WBS Components"> |
495 | <field colspan="4" name="project_child_complete_ids" nolabel="1" |
496 | context="{'form_view_ref':'view_project','tree_view_ref':'edit_project'}"> |
497 | @@ -120,7 +120,7 @@ |
498 | <field name="name">account.analytic.account.form</field> |
499 | <field name="model">account.analytic.account</field> |
500 | <field name="type">form</field> |
501 | - <field name="inherit_id" ref="account.view_account_analytic_account_form"/> |
502 | + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> |
503 | <field name="arch" type="xml"> |
504 | <field name="name" position="after"> |
505 | <field name="class" string="Class"/> |
506 | |
507 | === modified file 'project_time_easy_scheduling/project_task_view.xml' |
508 | --- project_time_easy_scheduling/project_task_view.xml 2012-10-02 23:10:39 +0000 |
509 | +++ project_time_easy_scheduling/project_task_view.xml 2012-11-27 21:00:27 +0000 |
510 | @@ -17,7 +17,7 @@ |
511 | <filter name="edit" |
512 | string="Edit" context="{'set_editable':True,'seq_visible': True}" |
513 | icon="gtk-execute" |
514 | - groups="base.group_extended"/> |
515 | + groups="base.group_erp_manager"/> |
516 | <separator orientation="vertical"/> |
517 | <field name="id" select="1"/> |
518 | <field name="name" select="1"/> |
519 | @@ -62,7 +62,7 @@ |
520 | <field name="project_complete_wbs_name" string="WBS Path name" /> |
521 | --> |
522 | |
523 | - <button groups="base.group_extended" name="%(project_time_sequence.action_project_task_link_predecessors_str)d" states="pending,open,draft,ready" string="Link" type="action" icon="gtk-sort-descending" help="For linking to a predecessor task"/> |
524 | + <button groups="base.group_erp_manager" name="%(project_time_sequence.action_project_task_link_predecessors_str)d" states="pending,open,draft,ready" string="Link" type="action" icon="gtk-sort-descending" help="For linking to a predecessor task"/> |
525 | |
526 | <field name="predecessor_ids_str" readonly ="1"/> |
527 | <field name="predecessor_names_str" readonly ="1"/> |
528 | @@ -117,7 +117,7 @@ |
529 | <filter name="edit" |
530 | string="Edit" context="{'set_editable':True,'seq_visible': True}" |
531 | icon="gtk-execute" |
532 | - groups="base.group_extended"/> |
533 | + groups="base.group_erp_manager"/> |
534 | <separator orientation="vertical"/> |
535 | <field name="id" select="1"/> |
536 | <field name="name" select="1"/> |
537 | @@ -157,7 +157,7 @@ |
538 | <field name="date_latest_finish"/> |
539 | <field name="predecessor_ids_str" readonly ="1"/> |
540 | <field name="predecessor_names_str" readonly ="1"/> |
541 | - <button groups="base.group_extended" name="%(project_time_sequence.action_project_task_link_predecessors_str)d" states="pending,open,draft,ready" string="Link" type="action" icon="gtk-sort-descending" help="For linking to a predecessor task"/> |
542 | + <button groups="base.group_erp_manager" name="%(project_time_sequence.action_project_task_link_predecessors_str)d" states="pending,open,draft,ready" string="Link" type="action" icon="gtk-sort-descending" help="For linking to a predecessor task"/> |
543 | <field name="milestone"/> |
544 | <button name="do_cancel" states="draft,ready,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/> |
545 | <button name="do_open" states="pending,draft,ready,done,cancelled" string="Start Activity" type="object" icon="gtk-new" help="For changing to open state" invisible="context.get('set_visible',False)"/> |
546 | |
547 | === modified file 'project_time_milestone/project_time_milestone_view.xml' |
548 | --- project_time_milestone/project_time_milestone_view.xml 2012-10-02 23:10:39 +0000 |
549 | +++ project_time_milestone/project_time_milestone_view.xml 2012-11-27 21:00:27 +0000 |
550 | @@ -17,7 +17,7 @@ |
551 | </field> |
552 | |
553 | <page string='Extra Info' position="after"> |
554 | - <page groups="base.group_extended" string="Milestone" attrs="{'readonly':[('milestone','=',False)]}"> |
555 | + <page groups="base.group_erp_manager" string="Milestone" attrs="{'readonly':[('milestone','=',False)]}"> |
556 | <group colspan="3" col="3"> |
557 | <field name="public_milestone"/> |
558 | <field name="project_poc"/> |
559 | @@ -72,7 +72,7 @@ |
560 | <button name="do_open" states="ready,pending" string="Start Task" type="object" icon="gtk-execute"/> |
561 | <button name="%(project.action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" /> |
562 | <button name="do_pending" states="ready, open" string="Pending" type="object" icon="gtk-media-pause"/> |
563 | - <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> |
564 | + <button groups="base.group_erp_manager" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> |
565 | <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/> |
566 | </tree> |
567 | </field> |
568 | |
569 | === modified file 'project_time_schedule/project_time_schedule_view.xml' |
570 | --- project_time_schedule/project_time_schedule_view.xml 2012-10-02 23:10:39 +0000 |
571 | +++ project_time_schedule/project_time_schedule_view.xml 2012-11-27 21:00:27 +0000 |
572 | @@ -9,7 +9,7 @@ |
573 | #--------------------------------------------------------------------------------------------------------- |
574 | |
575 | |
576 | - <record id="view_task_form2_inh" model="ir.ui.view"> |
577 | + <!--record id="view_task_form2_inh" model="ir.ui.view"> |
578 | <field name="name">project.task.form</field> |
579 | <field name="model">project.task</field> |
580 | <field name="type">form</field> |
581 | @@ -24,7 +24,7 @@ |
582 | <xpath expr="//field[@name='remaining_hours']" position="replace"/> |
583 | <xpath expr="//field[@name='effective_hours']" position="replace"/> |
584 | </field> |
585 | - </record> |
586 | + </record--> |
587 | |
588 | <!-- Task --> |
589 | <record id="view_task_form2" model="ir.ui.view"> |
590 | @@ -37,7 +37,7 @@ |
591 | |
592 | <page string='Extra Info' position="after"> |
593 | |
594 | - <page groups="base.group_extended" string="Scheduling" attrs="{'readonly':[('state','=','done')]}"> |
595 | + <page groups="base.group_erp_manager" string="Scheduling" attrs="{'readonly':[('state','=','done')]}"> |
596 | <group colspan="2" col="2"> |
597 | <separator string="Limitations" colspan="2"/> |
598 | <field name="date_earliest_start"/> |
599 | |
600 | === modified file 'project_time_sequence/project_time_sequence_view.xml' |
601 | --- project_time_sequence/project_time_sequence_view.xml 2012-10-02 23:10:39 +0000 |
602 | +++ project_time_sequence/project_time_sequence_view.xml 2012-11-27 21:00:27 +0000 |
603 | @@ -16,7 +16,7 @@ |
604 | <field name="arch" type="xml"> |
605 | <field name="name" position="after"> |
606 | <field name="predecessor_ids_str"/> |
607 | - <button groups="base.group_extended" name="%(action_project_task_link_predecessors)d" states="pending,open,draft" string="Link" type="action" icon="gtk-sort-descending" help="For linking to a predecessor task"/> |
608 | + <button groups="base.group_erp_manager" name="%(action_project_task_link_predecessors)d" states="pending,open,draft" string="Link" type="action" icon="gtk-sort-descending" help="For linking to a predecessor task"/> |
609 | </field> |
610 | </field> |
611 | </record> |
612 | @@ -28,8 +28,8 @@ |
613 | <field eval="2" name="priority"/> |
614 | <field name="inherit_id" ref="project.view_task_form2"/> |
615 | <field name="arch" type="xml"> |
616 | - <xpath expr="//page[@string='Delegations']" position="replace"> |
617 | - <page groups="base.group_extended" string="Relationships"> |
618 | + <xpath expr="//page[@string='Delegation']" position="replace"> |
619 | + <page groups="base.group_erp_manager" string="Relationships"> |
620 | <separator string="Predecessor Activities" colspan="4"/> |
621 | <field colspan="4" height="150" name="parent_ids" nolabel="1"/> |
622 | <separator string="Successor Activities" colspan="4"/> |