← Back to team overview

eficent team mailing list archive

lp:~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management into lp:eficent-openerp-project-management

 

Cristian Sebastian Rocha has proposed merging lp:~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management into lp:eficent-openerp-project-management.

Requested reviews:
  Eficent (eficent)
Related bugs:
  Bug #1083594 in Eficent OpenERP Project Management: "Cant install project_time_schedule in 7.0 by error in project_time_schedule_view.xml "
  https://bugs.launchpad.net/eficent-openerp-project-management/+bug/1083594
  Bug #1083604 in Eficent OpenERP Project Management: "Cant install some modules because they look for view id project.menu_definitions"
  https://bugs.launchpad.net/eficent-openerp-project-management/+bug/1083604
  Bug #1083608 in Eficent OpenERP Project Management: "Cant install project_(category|scope_wbs) because "Administration" page not exists."
  https://bugs.launchpad.net/eficent-openerp-project-management/+bug/1083608
  Bug #1083630 in Eficent OpenERP Project Management: "Cant install modules because v7.0 change view_account_analytic_account_form from account to analytics"
  https://bugs.launchpad.net/eficent-openerp-project-management/+bug/1083630

For more details, see:
https://code.launchpad.net/~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management/+merge/136444

This merge make it be installable in OpenERP v7.0. Add dependencies and solve this bugs:

#1083594 #1083604 #1083608 #1083630
-- 
https://code.launchpad.net/~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management/+merge/136444
Your team Eficent is requested to review the proposed merge of lp:~cristian-rocha/eficent-openerp-project-management/eficent-openerp-project-management into lp:eficent-openerp-project-management.
=== modified file 'account_analytic_lob/project_view.xml'
--- account_analytic_lob/project_view.xml	2012-10-02 23:10:39 +0000
+++ account_analytic_lob/project_view.xml	2012-11-27 15:18:41 +0000
@@ -30,7 +30,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
 				<xpath expr="//page[@string='Account Data']/field[@name='partner_id']" position="after">	
             		<field name="lob"/>          				            		

=== modified file 'project_category/__openerp__.py'
--- project_category/__openerp__.py	2012-10-18 23:30:50 +0000
+++ project_category/__openerp__.py	2012-11-27 15:18:41 +0000
@@ -28,6 +28,8 @@
     "category": "Generic Modules/Projects & Services",
     "depends": [
                 "base",
+                "account",                       
+                "analytic",                       
                 "project",                       
                 ],
     "description": """ This module intrododuces the possibility to associate categories to analytic accounts and projects.

=== modified file 'project_category/analytic_account_category.xml'
--- project_category/analytic_account_category.xml	2012-10-18 23:30:50 +0000
+++ project_category/analytic_account_category.xml	2012-11-27 15:18:41 +0000
@@ -73,7 +73,7 @@
         </record>
 
         <menuitem action="action_analytic_account_category_form" id="menu_analytic_account_category_form" name="Analytic Account Categories" sequence="4" parent="account.menu_analytic_accounting"/>
-        <menuitem action="action_analytic_account_category_form" id="menu_project_category_form" name="Project Categories" sequence="4" parent="project.menu_definitions"/>
+        <menuitem action="action_analytic_account_category_form" id="menu_project_category_form" name="Project Categories" sequence="4" parent="base.menu_definitions"/>
 
 
     </data>

=== modified file 'project_category/analytic_account_view.xml'
--- project_category/analytic_account_view.xml	2012-10-18 23:30:50 +0000
+++ project_category/analytic_account_view.xml	2012-11-27 15:18:41 +0000
@@ -48,7 +48,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
             	 <page string="Account Data" position="after">
 	                <page string="Categories">	                        

=== modified file 'project_category/project_view.xml'
--- project_category/project_view.xml	2012-10-18 23:30:50 +0000
+++ project_category/project_view.xml	2012-11-27 15:18:41 +0000
@@ -41,7 +41,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-            	<page string="Administration" position="after">	
+            	<page string="Other Info" position="after">	
 	                <page string="Categories">	                        
 	                	<field  colspan="4" name="category_id" nolabel="1"/>
 	                </page>       		            				            	

=== modified file 'project_communications_meetings/project_view.xml'
--- project_communications_meetings/project_view.xml	2012-10-02 23:10:39 +0000
+++ project_communications_meetings/project_view.xml	2012-11-27 15:18:41 +0000
@@ -24,7 +24,7 @@
             
 
     <menuitem id="menu_project_meeting_categories_def_act"
-            name="Meeting Categories" parent="project.menu_definitions"
+            name="Meeting Categories" parent="base.menu_definitions"
             sequence="10" action="crm.crm_meeting_categ_action"
             groups="project.group_project_manager" />
 

=== modified file 'project_cost/account_analytic_account_view.xml'
--- project_cost/account_analytic_account_view.xml	2012-10-02 23:10:39 +0000
+++ project_cost/account_analytic_account_view.xml	2012-11-27 15:18:41 +0000
@@ -47,7 +47,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
             	<page string='Description' position="after">
 	            	<page string="Costs">
@@ -147,4 +147,4 @@
 </openerp>
         	
         	
-                 	
\ No newline at end of file
+                 	

=== modified file 'project_hr_stakeholder/project_hr_responsibility.xml'
--- project_hr_stakeholder/project_hr_responsibility.xml	2012-10-02 23:10:39 +0000
+++ project_hr_stakeholder/project_hr_responsibility.xml	2012-11-27 15:18:41 +0000
@@ -51,7 +51,7 @@
             <field name="help">Define the responsibilities for stakeholders in projects.</field>
         </record>
 
-        <menuitem id="menu_responsibilities_config" name="Responsibilities" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_responsibilities_config" name="Responsibilities" parent="base.menu_definitions" sequence="1"/>
         <menuitem action="action_project_hr_responsibility_tree" id="menu_project_hr_responsibility_view" parent="menu_responsibilities_config" sequence="1"/>                  	                    
     </data>
 </openerp>

=== modified file 'project_hr_stakeholder/project_hr_role.xml'
--- project_hr_stakeholder/project_hr_role.xml	2012-10-02 23:10:39 +0000
+++ project_hr_stakeholder/project_hr_role.xml	2012-11-27 15:18:41 +0000
@@ -51,7 +51,7 @@
             <field name="help">Define the roles for stakeholders in projects.</field>
         </record>
 
-        <menuitem id="menu_roles_config" name="Roles" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_roles_config" name="Roles" parent="base.menu_definitions" sequence="1"/>
         <menuitem action="action_project_hr_role_tree" id="menu_project_hr_role_view" parent="menu_roles_config" sequence="1"/>                  	                    
     </data>
 </openerp>

=== modified file 'project_hr_stakeholder/project_view.xml'
--- project_hr_stakeholder/project_view.xml	2012-10-02 23:10:39 +0000
+++ project_hr_stakeholder/project_view.xml	2012-11-27 15:18:41 +0000
@@ -13,7 +13,7 @@
 		
 		<menuitem id="project_hr_stakeholder_menu_project_config_address_book" 
 			name="Stakeholders" 
-			parent="project.menu_definitions" 
+			parent="base.menu_definitions" 
 			sequence="2"
             groups="project.group_project_manager"/>
 

=== modified file 'project_scope_wbs/__openerp__.py'
--- project_scope_wbs/__openerp__.py	2012-10-02 23:10:39 +0000
+++ project_scope_wbs/__openerp__.py	2012-11-27 15:18:41 +0000
@@ -26,7 +26,7 @@
     "author": "Jordi Ballester (Eficent)",
     "website": "http://www.eficent.com";,
     "category": "Generic Modules/Projects & Services",
-    "depends": ["project","analytic"],
+    "depends": ["account","project","analytic"],
     "description": """Eficent Project Management. Project Scope  
     - The hierarchy of a project is considered the WBS (Work Breakdown Structure)
     - The analytic accounts in the project hierarchies are considered WBS components 

=== modified file 'project_scope_wbs/project_lifecycle_view.xml'
--- project_scope_wbs/project_lifecycle_view.xml	2012-10-02 23:10:39 +0000
+++ project_scope_wbs/project_lifecycle_view.xml	2012-11-27 15:18:41 +0000
@@ -48,7 +48,7 @@
             <field name="help">Define the project lifecycle stages.</field>
         </record>
 
-        <menuitem id="menu_project_lifecycle_config" name="Lifecycle" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_project_lifecycle_config" name="Lifecycle" parent="base.menu_definitions" sequence="1"/>
         <menuitem action="action_project_lifecycle_tree" id="menu_project_lifecycle_view" parent="menu_project_lifecycle_config" sequence="1"/>                  	                    
     </data>
 </openerp>

=== modified file 'project_scope_wbs/project_scope_wbs_view.xml'
--- project_scope_wbs/project_scope_wbs_view.xml	2012-10-02 23:10:39 +0000
+++ project_scope_wbs/project_scope_wbs_view.xml	2012-11-27 15:18:41 +0000
@@ -53,7 +53,7 @@
             		<field name="code" string="Code"/>
             		<field name="complete_wbs_code" string="WBS Path code" readonly="1"/>            				            		
             	</field>
-            	<page string="Administration" position="after">
+            	<page string="Other Info" position="after">
 	            	<page string="WBS Components">
 	            		<field colspan="4" name="project_child_complete_ids" nolabel="1" 
 	            			context="{'form_view_ref':'view_project','tree_view_ref':'edit_project'}">
@@ -120,7 +120,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
             	<field name="name" position="after">
             		<field name="class" string="Class"/>            		

=== modified file 'project_time_schedule/project_time_schedule_view.xml'
--- project_time_schedule/project_time_schedule_view.xml	2012-10-02 23:10:39 +0000
+++ project_time_schedule/project_time_schedule_view.xml	2012-11-27 15:18:41 +0000
@@ -9,7 +9,7 @@
 #---------------------------------------------------------------------------------------------------------
 
 
- 		<record id="view_task_form2_inh" model="ir.ui.view">
+ 		<!--record id="view_task_form2_inh" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
             <field name="type">form</field>
@@ -24,7 +24,7 @@
             	<xpath expr="//field[@name='remaining_hours']" position="replace"/>
            		<xpath expr="//field[@name='effective_hours']" position="replace"/>
             </field>
-        </record>
+        </record-->
 
         <!-- Task -->
  		<record id="view_task_form2" model="ir.ui.view">