openerp-dev-web team mailing list archive

["uco \(OpenERP\)" <uco@xxxxxxxxxxx>]

uco (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #697443 Bug in the tree view of the projects, when grouping by parent
  https://bugs.launchpad.net/bugs/697443

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/45234

[FIX] project: parent_id problem. (lp:697443)
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/45234
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'project/project.py'
--- project/project.py	2010-12-20 09:04:17 +0000
+++ project/project.py	2011-01-05 13:14:58 +0000
@@ -129,7 +129,6 @@
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {

=== modified file 'project/project_data.xml'
--- project/project_data.xml	2010-12-16 11:13:48 +0000
+++ project/project_data.xml	2011-01-05 13:14:58 +0000
@@ -17,13 +17,13 @@
         
         <!--
 		Resource: project.project
-		
+		-->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
 	
 		<function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
-        -->
+        
     </data>
 </openerp>

=== modified file 'project/project_demo.xml'
--- project/project_demo.xml	2010-12-16 11:13:48 +0000
+++ project/project_demo.xml	2011-01-05 13:14:58 +0000
@@ -241,10 +241,10 @@
         </record>
 
         <!-- Projects -->
-        <record id="all_projects_account" model="project.project">
+        <!-- <record id="all_projects_account" model="project.project">
             <field name="name">Projects</field>
             <field name="code">3</field>
-        </record>
+        </record> -->
         
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2010-12-30 12:41:28 +0000
+++ project/project_view.xml	2011-01-05 13:14:58 +0000
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" domain="[('id','!=',active_id)]"/>
+                        <field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -143,7 +143,7 @@
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" invisible="1"/>
+                    <field name="parent_id" string="Parent Project" invisible="1"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>