[MERGE] Merge psi branch : lp:~psi-tinyerp/openobject-addons/trunk-mode3-yaml:

 -Improve resource calendar leave form view
 -put selection box for working time
 -search View : set user_id from project phase by deafult
 -date_deadline should not use to compute effectivity. should use date_end

bzr revid: mra@tinyerp.com-20100514095039-5fsaxmmftl64wmk9

8 files changed, 27 insertions, 29 deletions

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2dbb268776d..9a3a8921a70 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -349,7 +349,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
             <field name="arch" type="xml">
-            	<field name="resource_id"  on_change="onchange_resource(resource_id)" position="after">
+            	<field name="date_to" position="after">
             		<field name="holiday_id"/>
             	</field>
             </field>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 8e67bc23766..a925aeeb7aa 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -85,8 +85,8 @@ class project_phase(osv.osv):
 
     _columns = {
         'name': fields.char("Phase Name", size=64, required=True),
-        'date_start': fields.datetime('Starting Date'),
-        'date_end': fields.datetime('End Date'),
+        'date_start': fields.datetime('Starting Date', help="Start date of the phase"),
+        'date_end': fields.datetime('End Date', help="End date of the phase"),
         'constraint_date_start': fields.datetime('Start Date', help='force the phase to start after this date'),
         'constraint_date_end': fields.datetime('End Date', help='force the phase to finish before this date'),
         'project_id': fields.many2one('project.project', 'Project', required=True),
@@ -104,8 +104,8 @@ class project_phase(osv.osv):
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
-        'state': lambda *a: 'draft',
-        'sequence': lambda *a: 10,
+        'state': 'draft',
+        'sequence': 10,
     }
     _order = "name"
     _constraints = [
@@ -237,7 +237,7 @@ class project_resource_allocation(osv.osv):
         'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"),
     }
     _defaults = {
-        'useability': lambda *a: 100,
+        'useability': 100,
     }
 
 project_resource_allocation()
@@ -261,7 +261,7 @@ class task(osv.osv):
         'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
     }
     _defaults = {
-         'occupation_rate':lambda *a: '1'
+         'occupation_rate': '1'
     }
 
     def onchange_planned(self, cr, uid, ids, project, user_id=False, planned=0.0, effective=0.0, date_start=None, occupation_rate=0.0):
@@ -368,4 +368,4 @@ class task(osv.osv):
         return super(task, self).write(cr, uid, ids, vals, context=context)
 
 task()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ae06ebb3b71..fafc2a14aa4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -204,9 +204,7 @@
                         <field name="project_id" widget="selection">
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
-                        <field name="responsible_id" widget="selection">
-                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" default="1"/>
-                        </field>
+                        <field name="responsible_id" widget="selection"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -225,6 +223,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt</field>
+ 			<field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index ddf8ba315c0..5353db25be6 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -48,7 +48,6 @@ class project_compute_phases(osv.osv_memory):
         return self.compute_date(cr, uid, ids, context=context)
 
     def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context=None):
-
        """Schedule phase with the start date till all the next phases are completed.
 
        Arguements: start_dsate -- start date for the phase
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 90d2b428580..b86f9d862c9 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -132,7 +132,7 @@ class project_compute_tasks(osv.osv_memory):
                     ctx.update({'scheduler': True})
                     user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)])
                     task_pool.write(cr, uid, [tasks[loop_no-1].id], {'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                                         'date_deadline': e_date.strftime('%Y-%m-%d %H:%M:%S'),
+                                                                         'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
                                                                          'user_id': user_id[0]},
                                                                          context=ctx)
                 loop_no +=1
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 2d0071547be..8ec2d4c16e0 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -65,7 +65,7 @@ class project_schedule_task(osv.osv_memory):
                                          {'__doc__': res.user_id.name,
                                           '__name__': res.user_id.name,
                                           'vacation': tuple(leaves),
-                                          'efficiency': resource_eff
+                                          'efficiency': resource_eff,
                                           }))
         return resource_objs
 
@@ -149,7 +149,7 @@ class project_schedule_task(osv.osv_memory):
                     ctx.update({'scheduler': True})
                     user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)])
                     task_obj.write(cr, uid, [tasks[loop_no-1].id], {'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                                    'date_deadline': e_date.strftime('%Y-%m-%d %H:%M:%S'),
+                                                                    'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
                                                                     'user_id': user_id[0]},
                                                                     context=ctx)
                 loop_no +=1
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 4632931bcd1..998102555c6 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -30,7 +30,7 @@ class resource_calendar(osv.osv):
     _description = "Resource Calendar"
     _columns = {
         'name' : fields.char("Name", size=64, required=True),
-        'company_id' : fields.many2one('res.company', 'Company', required=True),
+        'company_id' : fields.many2one('res.company', 'Company', required=False),
         'week_id' : fields.one2many('resource.calendar.week', 'calendar_id', 'Working Time'),
         'manager' : fields.many2one('res.users', 'Workgroup manager'),
     }
@@ -148,20 +148,20 @@ class resource_resource(osv.osv):
     _name = "resource.resource"
     _description = "Resource Detail"
     _columns = {
-        'name' : fields.char("Name", size=64, required=True ),
+        'name' : fields.char("Name", size=64, required=True),
         'code': fields.char('Code', size=16),
         'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the resource record without removing it."),
-        'company_id' : fields.many2one('res.company', 'Company', required=False),
+        'company_id' : fields.many2one('res.company', 'Company'),
         'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
         'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
         'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
         'calendar_id' : fields.many2one("resource.calendar", "Working time", help="Define the schedule of resource"),
     }
     _defaults = {
-        'resource_type' : lambda *a: 'user',
-        'time_efficiency' : lambda *a: 1,
-        'active' : lambda *a: True,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', c)
+        'resource_type' : 'user',
+        'time_efficiency' : 1,
+        'active' : True,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', c)
     }
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f7bfbf9f00f..6c6349cddae 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -165,7 +165,7 @@
                     <field name="name" />
                     <field name="active"/>
                     <field name="company_id" widget="selection"/>
-                    <field name="calendar_id" />
+                    <field name="calendar_id" widget="selection"/>
                     <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
                     <field name="time_efficiency" />
@@ -200,13 +200,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail">
-                    <field name="name" />
+                    <field name="name"/>
                     <field name="company_id"  widget="selection"/>
-                    <field name="calendar_id" />
-                    <newline/>
-                    <field name="date_from" />
-                    <field name="date_to" />
+                    <field name="calendar_id"/>
                     <field name="resource_id"  on_change="onchange_resource(resource_id)"/>
+                    <newline/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
                 </form>
             </field>
         </record>
@@ -217,7 +217,7 @@
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
                     <field name="name" />
-                    <field name="company_id" />
+                    <field name="company_id"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />