[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-project-view-improvement-bde

bzr revid: atp@tinyerp.com-20120626062015-3ouunhuvfncggyvv

diff --cc addons/hr_holidays/hr_holidays.py
index f5e8ba6,f5e8ba6..9967bb6
--- 1/addons/hr_holidays/hr_holidays.py
--- 2/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@@ -422,7 -422,7 +422,7 @@@ class resource_calendar_leaves(osv.osv)
      _inherit = "resource.calendar.leaves"
      _description = "Leave Detail"
      _columns = {
--        'holiday_id': fields.many2one("hr.holidays", "Holiday"),
++        'holiday_id': fields.many2one("hr.holidays", "Leave Request"),
      }
  
  resource_calendar_leaves()

diff --cc addons/hr_holidays/hr_holidays_view.xml
index 7db5a41,31d30fc..e0cc7e0
--- 1/addons/hr_holidays/hr_holidays_view.xml
--- 2/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@@ -446,8 -449,8 +446,8 @@@
              <field name="type">form</field>
              <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
              <field name="arch" type="xml">
-                 <field name="date_to" position="after">
+                 <field name="name" position="after">
 -                    <field name="holiday_id" string="Leave Request"/>
 +                    <field name="holiday_id"/>
                  </field>
              </field>
          </record>

diff --cc addons/project/project.py
index 429672d,429672d..ef096a3
--- 1/addons/project/project.py
--- 2/addons/project/project.py
+++ b/addons/project/project.py
@@@ -712,7 -712,7 +712,7 @@@ class task(base_stage, osv.osv)
                  'project.task.work': (_get_task, ['hours'], 10),
              }),
          'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
--        'total_hours': fields.function(_hours_get, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
++        'total_hours': fields.function(_hours_get, string='Total', multi='hours', help="Computed as: Time Spent + Remaining Time.",
              store = {
                  'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                  'project.task.work': (_get_task, ['hours'], 10),

diff --cc addons/project/project_view.xml
index 9521969,f6c7265..aaaa9ec
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -382,14 -384,14 +382,16 @@@
                                      <field name="hours" widget="float_time" sum="Spent Hours"/>
                                  </tree>
                              </field>
--                            <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
++                            <group>
++                             <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
++                             <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                  <field name="effective_hours" widget="float_time"/>
                                  <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                  <div>
                                      <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
                                  </div>
                                  <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
++                             </group>
                              </group>
                              <div class="oe_clear"/>
                          </page>

diff --cc addons/project_issue/project_issue_view.xml
Simple merge

diff --cc addons/project_long_term/project_long_term_view.xml
index b527d51,8750c98..f7e9f11
--- 1/addons/project_long_term/project_long_term_view.xml
--- 2/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@@ -207,13 -207,13 +207,12 @@@
                                 <group>
                                      <field name="constraint_date_start"/>
                                      <field name="constraint_date_end"/>
++                                     <field name="user_force_ids" widget="many2many_tags"/>
                                  </group>
                                  <group>
                                      <field name="sequence"/>
                                  </group>
                              </group>
-                            <separator string="Force Assigned Users"/>
-                            <field name="user_force_ids" widget="many2many_tags" />
 -                           <h2><label string="Force Assigned Users"/></h2> 
 -                           <field name="user_force_ids" widget="many2many_tags" />
                             <separator string="Previous Phases"/>
                             <field name="previous_phase_ids"/>
                             <separator string="Next Phases"/>

diff --cc addons/resource/resource_view.xml
index 20c1251,003bbd8..f6e0eca
--- 1/addons/resource/resource_view.xml
--- 2/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@@ -135,11 -132,16 +135,16 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Working Time" version="7.0">
-                     <field colspan="4" name="name"/>
-                     <field name="date_from"/>
-                     <field name="dayofweek"/>
-                     <field name="hour_from" widget="float_time"/>
-                     <field name="hour_to" widget="float_time"/>
 -                    <group colspan="4"> 
++                    <group> 
+                         <field name="name"/>
+                         <field name="date_from"/>
+                         <field name="dayofweek"/>
+                         <label for="hour_from" string="Hours"/>
+                         <div>
 -                            <field name="hour_from" widget="float_time"/>-
++                            <field name="hour_from" widget="float_time"/> - 
+                             <field name="hour_to" widget="float_time"/>
+                         </div>
+                     </group>
                  </form>
              </field>
          </record>
@@@ -179,16 -181,16 +184,18 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Resource" version="7.0">
--                   <group col="4">
--                       <field name="name" colspan="4"/>
--                       <field name="active"/>
--                       <newline/>
--                       <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
--                       <field name="resource_type" />
--                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
--                       <newline/>
--                       <field name="calendar_id" string="Working Period"/>
--                       <field name="time_efficiency"/>
++                   <group>
++                      <group>
++                        <field name="name"/>
++                        <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
++                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
++                        <field name="active"/>
++                       </group>
++                       <group>
++                        <field name="resource_type" />
++                        <field name="calendar_id"/>
++                        <field name="time_efficiency"/>
++                       </group>
                      </group>
                  </form>
              </field>
@@@ -225,21 -227,24 +232,22 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Leave Detail" version="7.0">
--                      <sheet>
++                   <sheet>
                      <group>
                         <group>
                             <field name="resource_id" on_change="onchange_resource(resource_id)"/>
                             <field name="name" string="Reason"/>
 -                       </group>
 -                       <group>
 -                           <field name="calendar_id" string="Working Period"/>
 -                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 -                       </group>
 -                       <group col="2" colspan="4">
+                            <label for="date_from" string="Duration"/> 
+                            <div>
+                                <field name="date_from" nolabel="1"/> - 
+                                <field name="date_to" nolabel="1"/>
+                            </div>
                         </group>
 -                   </group>
 +                       <group>
-                            <field name="date_from"/>
 +                           <field name="calendar_id" string="Working Period"/>
 +                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 +                       </group>
-                        <group>
-                            <field name="date_to"/>
-                        </group>
-                    </group>
++                    </group>
                     </sheet>
                  </form>
              </field>