openerp-dev-web team mailing list archive

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

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

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)


1)Remove Domain in project_planning for bug:

https://bugs.launchpad.net/openobject-addons/+bug/669868

2)Changed demo data in Project_planning_demo.xml file.


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/atp-dev-addons1/+merge/39967
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/atp-dev-addons1.

=== modified file 'project_planning/project_planning_demo.xml'
--- project_planning/project_planning_demo.xml	2010-09-17 09:47:57 +0000
+++ project_planning/project_planning_demo.xml	2010-11-03 14:07:51 +0000
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="hr.dep_administration" model="hr.department">
-            <field name="name">Administration</field>
-            <field name="parent_id" ref="hr.dep_management"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-            <field name="member_ids" eval="[(6,0,[ref('base.user_demo')])]"/>
-        </record>
+    
+        <!-- Project Planning  -->
+                
         <record id="project_plannning_1" model="report_account_analytic.planning">
-        	<field name="name">Project_Planning</field>
+            <field name="name">Project_Planning</field>
             <field name="business_days">20</field>
             <field name="date_from">2010-01-01'</field>
             <field name="date_to">2010-12-31</field>
             <field name="state">draft</field>
-            <field name="member_ids" ref="base.user_demo"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
         </record>
+        
+        
+        <record id="project_plannning_line1" model="report_account_analytic.planning.line">
+            <field name="account_id" ref="account.analytic_project_1"/>
+            <field name="amount">10.0</field>
+            <field name="amount_unit" ref="product.uom_hour"/>
+            <field name="planning_id" ref="project_plannning_1"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="task_ids" eval="[(6,0,[ref('project.project_task_8')])]"/>
+        </record>        
+
+        
     </data>
 </openerp>

=== modified file 'project_planning/project_planning_view.xml'
--- project_planning/project_planning_view.xml	2010-10-17 20:31:19 +0000
+++ project_planning/project_planning_view.xml	2010-11-03 14:07:51 +0000
@@ -74,10 +74,9 @@
                                     <field name="task_ids" />
                                     <field name="note" />
                                     <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-
                                 </tree>
                                 <form string="Planning Lines">
-                                    <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+                                    <field name="user_id"/>
                                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />