[MERGE]:resolved conflicts and merged with trunk

bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541

3 files changed, 62 insertions, 60 deletions

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index cba3ead23c5..a81650b596b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -37,8 +37,8 @@
             <field name="model">project.user.allocation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project User Allocation">
-                    <group colspan="4" col="6">
+                <form string="Project User Allocation" version="7.0">
+                    <group col="4">
                         <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
@@ -143,7 +143,7 @@
             <field name="model">project.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft"/>
                     <button string="Done" name="set_done" states="pending,open"/>
@@ -152,34 +152,44 @@
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-                <sheet string="Project Phase" layout="auto">
-                    <group colspan="6" col="6">
-                        <group colspan="6" col="7" >
-                            <field name="name" colspan="4"/>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                <sheet>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                    </h2>
+                    <group>
+                        <group>
                             <field name="date_start"/>
                             <field name="date_end"/>
-                            <field name="duration"/>
-                            <field name="product_uom" nolabel="1"/>
+                        </group><group>
+                            <label for="duration"/>
+                            <div>
+                                <field name="duration" class="oe_form_inline"/>
+                                <field name="product_uom"/>
+                            </div>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Planning of Users">
-                            <field colspan="4" name="user_ids" nolabel="1">
+                            <field name="user_ids">
                                  <tree editable="bottom" string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
+                                      <field name="user_id"/>
+                                      <field name="date_start"/>
+                                      <field name="date_end"/>
                                   </tree>
-                                  <form string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start" />
-                                    <field name="date_end"/>
+                                  <form string="Project Users" version="7.0">
+                                      <group col="4">
+                                          <field name="user_id"/>
+                                          <field name="date_start" />
+                                          <field name="date_end"/>
+                                      </group>
                                   </form>
                              </field>
                         </page>
                         <page string="Tasks Details">
-                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                            <field name="task_ids" readonly="1" context="{'default_project_id' :project_id}">
                                  <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
@@ -195,24 +205,23 @@
                              </field>
                         </page>
                         <page string="Constraints">
-                           <group colspan="2" col="2">
-                                <separator string="Constraints" colspan="2"/>
-                                <field name="constraint_date_start"/>
-                                <field name="constraint_date_end"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Displaying Settings" colspan="2"/>
-                                <field name="sequence"/>
+                           <group>
+                               <group>
+                                    <field name="constraint_date_start"/>
+                                    <field name="constraint_date_end"/>
+                                </group>
+                                <group>
+                                    <field name="sequence"/>
+                                </group>
                             </group>
-                           <separator colspan="4" string="Force Assigned Users"/>
-                           <field colspan="4" name="user_force_ids" nolabel="1"/>
-                           <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
-                           <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                           <separator string="Force Assigned Users"/>
+                           <field name="user_force_ids"/>
+                           <separator string="Previous Phases"/>
+                           <field name="previous_phase_ids"/>
+                           <separator string="Next Phases"/>
+                           <field name="next_phase_ids"/>
                         </page>
                     </notebook>
-                    <newline/>
                 </sheet>
                 </form>
             </field>
@@ -330,7 +339,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
-                    <field name="phase_id" select="1"/>
+                    <field name="phase_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index b6afc26276b..bf2c51e41e6 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -7,19 +7,15 @@
             <field name="model">project.compute.phases</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                  <form string="Schedule Phases">
-                    <group colspan="4" col="4">
-                        <separator colspan="4" string="Schedule Phases" />
-                        <field name="target_project" colspan="4"/>
-                        <field name="project_id" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
-                        <separator colspan="4"/>
-                        <group colspan="2" col="2">
-                        </group>
-                        <group colspan="2" col="2"> <!-- Improve me -->
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                            <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                        </group>
-                    </group>
+                  <form string="Schedule Phases" version="7.0">
+                      <header>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
+                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                      </header>
+                      <group string="Schedule Phases">
+                          <field name="target_project"/>
+                          <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
+                      </group>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index bf27e7e7286..ac30a3aa6d9 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -7,17 +7,14 @@
             <field name="model">project.compute.tasks</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                 <form string="Schedule Tasks">
-                    <group colspan="4">
-                        <field name="project_id" colspan="4"/>
-                        <separator colspan="4"/>
-                        <group colspan="2" col="2">
-                        </group>
-                        <group colspan="2" col="2">
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                            <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                      </group>
-                    </group>
+                 <form string="Schedule Tasks" version="7.0">
+                     <header>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
+                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                     </header>
+                     <group>
+                         <field name="project_id"/>
+                     </group>
                   </form>
             </field>
         </record>