[IMP] better form views, new guidelines

bzr revid: fp@tinyerp.com-20120609155935-ngp2di1h04uan90j

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 31af9a9..df68139 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,7 +18,7 @@
             <field name="model">project.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project" layout="manual">
+                <form string="Project" layout="manual" version="7.0">
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
@@ -30,56 +30,65 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="analytic_account_id" invisible="1" required="0"/>
-                        <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                        <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'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                    <field name="analytic_account_id" invisible="1" required="0"/>
+                    <label for="name" class="oe_form_readonly_hidden" string="Project Name"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <label for="parent_id" class="oe_form_readonly_hidden" string="Parent Project"/>
+                    <h2>
+                        <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        <group></group>
+                            <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'])]}"/>
+                            <field name="progress_rate" widget="progressbar"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
-                        <page string="Administration">
-                            <group col="2" colspan="2" name="kanban">
-                                <separator colspan="2" string="Project Management"/>
-                                    <field name="use_tasks"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Performance"/>
-                                <field name="planned_hours" widget="float_time"/>
-                                <field name="effective_hours" widget="float_time" />
-                                <field name="resource_calendar_id"/>
-                            </group>
-                            <newline/>
-                            <group col="2" colspan="2" name="misc">
-                                <separator colspan="4" string="Miscellaneous"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="warn_manager"/>
-                                <field name="priority"/>
-                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                            </group>
-                        </page>
                         <page string="Members">
-                            <field colspan="4" name="members" nolabel="1">
+                            <field name="members">
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
                                 </tree>
                             </field>
                         </page>
+                        <page string="Administration">
+                            <group>
+                                <group name="kanban" string="Project Management">
+                                    <field name="use_tasks"/>
+                                </group>
+                                <group string="Performance">
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time" />
+                                    <field name="resource_calendar_id"/>
+                                </group>
+                                <newline/>
+                                <group name="misc" string="Miscellaneous">
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="warn_manager"/>
+                                    <field name="priority"/>
+                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                </group>
+                            </group>
+                        </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
-                            <field name="warn_customer"/>
-                            <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
-                            <newline/>
-                            <group colspan="4" col="4">
+                            <group col="4">
+                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/>
+                                <field name="warn_customer"/>
+                                <field name="currency_id" groups="base.group_multi_company" required="1"/>
+                            </group>
+                            <group col="4">
                                 <separator colspan="2" string="Mail Header"/>
                                 <separator colspan="2" string="Mail Footer"/>
                                 <field name="warn_header" nolabel="1" colspan="2"/>
                                 <field name="warn_footer" nolabel="1" colspan="2"/>
                             </group>
-                            <group col="3" colspan="4">
+                            <group col="3">
                                 <separator string="Automatic variables for headers and footer. Use exactly the same notation." colspan="4"/>
                                 <label string="Task: %%(name)s"/>
                                 <label string="User: %%(user_id)s"/>
@@ -90,17 +99,16 @@
                             </group>
                         </page>
                         <page string="Tasks Stages">
-                           <field nolabel="1" name="type_ids" colspan="4"/>
+                             <field name="type_ids"/>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="description" nolabel="1"/>
+                            <field name="description"/>
                         </page>
                     </notebook>
-                    <newline/>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -269,12 +277,14 @@
             <field name="model">project.task.work</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Task Work">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="hours" select="1" widget="float_time"/>
-                    <field name="date" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                <form string="Task Work" version="7.0">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <field name="hours" widget="float_time"/>
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -300,7 +310,7 @@
             <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Project" layout="manual">
+                <form string="Project" version="7.0">
                     <header>
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
@@ -322,35 +332,44 @@
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         <field name="stage_id" widget="statusbar"/>
                     </header>
-                    <sheet string="Task edition" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" select="1"  on_change="onchange_project(project_id)"/>
-                        <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"/>
-                        <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                        <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                        <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
+                    <sheet string="Task">
+                    <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)"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="partner_id" />
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
+                                groups="project.group_time_work_estimation_tasks"
+                                on_change="onchange_planned(planned_hours, effective_hours)"/>
+
+                            <field name="effective_hours"
+                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
+                            <label for="remaining_hours" string="+ Remaining"/>
+                            <div>
+                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
+                            </div>
+                            <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"
+                                string="= Total"/>
+
+                            <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Information">
-                            <group col="2" colspan="2">
-                                <field
-                                    name="planned_hours"
-                                    widget="float_time"
-                                    attrs="{'readonly':[('state','!=','draft')]}"
-                                    groups="project.group_time_work_estimation_tasks"                                                                  
-                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field
-                                    name="effective_hours"
-                                    widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
-                            </group>
-                            <group col="3" colspan="2">
-                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2" groups="project.group_time_work_estimation_tasks"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
-                            </group>
-
-                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
-                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
+                            <field name="description" attrs="{'readonly':[('state','=','done')]}"/>
+                            <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
@@ -360,10 +379,10 @@
                             </field>
                         </page>
                         <page string="Delegations History">
-                            <separator string="Parent Tasks" colspan="4"/>
-                            <field colspan="4" height="150" name="parent_ids" nolabel="1"/>
-                            <separator string="Delegated tasks" colspan="4"/>
-                            <field colspan="4" height="150" name="child_ids" nolabel="1">
+                            <separator string="Parent Tasks"/>
+                            <field name="parent_ids"/>
+                            <separator string="Delegated tasks"/>
+                            <field name="child_ids">
                                 <tree string="Delegated tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
@@ -376,27 +395,20 @@
                                 </tree>
                             </field>
                         </page>
-
                         <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
-                            <group colspan="2" col="2">
-                                <separator string="Planning" colspan="2"/>
+                            <group col="4">
                                 <field name="priority"/>
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
-
-                            <separator string="Miscellaneous" colspan="4"/>
-                            <field name="partner_id" />
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            <field name="state" groups="base.group_no_one"/>
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="notes" nolabel="1"/>
+                            <separator string="Notes"/>
+                            <field name="notes"/>
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -668,18 +680,20 @@
             <field name="model">project.task.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Task Stage">
-                    <group colspan="2" col="2">
-                        <field name="name"/>
-                        <field name="state"/>
-                    </group>
-                    <group colspan="2" col="4">
-                        <field name="case_default"/>
-                        <field name="sequence"/>
-                        <field name="fold"/>
+                <form string="Task Stage" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="state"/>
+                        </group>
+                        <group>
+                            <field name="case_default"/>
+                            <field name="sequence"/>
+                            <field name="fold"/>
+                        </group>
                     </group>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4914ff2..cf371a3 100644 (file)
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,26 +7,28 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project" layout="manual">
+                <form string="Configure Project" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Project" colspan="4"/>
-                        <field name="module_project_mrp"/>
-                        <field name="module_project_timesheet"/>
-                        <field name="module_pad"/>
-                        <field name="group_tasks_work_on_tasks"/>
-                        <field name="group_time_work_estimation_tasks"/>
+                    <sheet>
+                        <group col="4">
+                            <separator string="Project" colspan="4"/>
+                            <field name="module_project_mrp"/>
+                            <field name="module_project_timesheet"/>
+                            <field name="module_pad"/>
+                            <field name="group_tasks_work_on_tasks"/>
+                            <field name="group_time_work_estimation_tasks"/>
 
-                        <separator string="Planning" colspan="4"/>
-                        <field name="module_project_long_term"/>
+                            <separator string="Planning" colspan="4"/>
+                            <field name="module_project_long_term"/>
 
-                        <separator string="Helpdesk and Support" colspan="4"/>
-                        <field name="module_project_issue"/>
-                        <field name="module_project_issue_sheet"/>
-                        <group name="support" colspan="4"/>
+                            <separator string="Helpdesk and Support" colspan="4"/>
+                            <field name="module_project_issue"/>
+                            <field name="module_project_issue_sheet"/>
+                            <group name="support" colspan="4"/>
+                        </group>
                     </sheet>
                 </form>
             </field>

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 2b8ad64..e5cfda8 100644 (file)
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -7,28 +7,27 @@
             <field name="model">project.task.delegate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Task Delegate">
-                    <field name="project_id" on_change="onchange_project_id(project_id)"/>
-                    <field name="user_id"/>
-                    <group colspan="2" col="2">
-                        <separator string="Delegated Task" colspan="2"/>
-                        <field name="name"/>
-                        <field name="planned_hours"/>
-                        <separator string="New Task Description" colspan="2"/>
-                        <field name="new_task_description" colspan="2" nolabel="1"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Validation Task" colspan="2"/>
-                        <field name="prefix" string="Validation Task Title"/>
-                        <field name="planned_hours_me"/>
-                        <field name="state"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                    </group>
-                    <group colspan="2" col="2">
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                <form string="Project Task Delegate" version="7.0">
+                    <header>
                         <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    <header>
+                    <group>
+                            <group colspan="2" col="2">
+                        <field name="project_id" on_change="onchange_project_id(project_id)"/>
+                            <separator string="Delegated Task" colspan="2"/>
+                            <field name="name"/>
+                            <field name="planned_hours"/>
+                            <separator string="New Task Description" colspan="2"/>
+                            <field name="new_task_description" colspan="2" nolabel="1"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <field name="user_id"/>
+                            <separator string="Validation Task" colspan="2"/>
+                            <field name="prefix" string="Validation Task Title"/>
+                            <field name="planned_hours_me"/>
+                            <field name="state"/>
+                        </group>
                     </group>
                 </form>
             </field>

diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index f015863..ae5f912 100644 (file)
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -7,15 +7,14 @@
             <field name="model">project.task.reevaluate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reevaluate Task">
-                    <separator colspan="4" string="Reevaluation Task"/>
-                    <field name="remaining_hours" widget="float_time"/>
-                    <separator string="" colspan="4"/>
-                    <group col="2" colspan="2">
-                    </group>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                <form string="Reevaluate Task" version="7.0">
+                    <header>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    <header>
+                    <separator string="Reevaluation Task"/>
+                    <group>
+                        <field name="remaining_hours" widget="float_time"/>
                     </group>
                 </form>
             </field>

diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 9dfcb8d..c8e8709 100644 (file)
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -8,7 +8,7 @@
         <field name="arch" type="xml">
             <tree string="Context">
                 <field name="sequence" invisible="1"/>
-                <field name="name" select="1"/>
+                <field name="name"/>
             </tree>
         </field>
     </record>
@@ -18,9 +18,11 @@
         <field name="model">project.gtd.context</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Context">
-                <field name="name" select="1"/>
-                <field name="sequence"/>
+            <form string="Context" version="7.0">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                </group>
             </form>
         </field>
     </record>
@@ -52,11 +54,12 @@
         <field name="model">project.gtd.timebox</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Timeboxes">
-                <separator string="Timebox Definition" colspan="4"/>
-                <field name="name" select="1"/>
-                <field name="sequence"/>
-                <field name="icon"/>
+            <form string="Timeboxes" version="7.0">
+                <group col="4" string="Timebox Definition">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="icon"/>
+                </group>
             </form>
         </field>
     </record>
@@ -96,7 +99,7 @@
         <field name="arch" type="xml">
             <field name="progress" position="after">
                 <field name="context_id" widget="selection"/>
-                <field name="timebox_id" widget="selection" select="1"/>
+                <field name="timebox_id" widget="selection"/>
             </field>
         </field>
     </record>

diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index e66161b..9beb118 100644 (file)
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -2,34 +2,32 @@
 <openerp>
     <data>
 
-       <record id="view_project_gtd_empty" model="ir.ui.view">
+        <record id="view_project_gtd_empty" model="ir.ui.view">
             <field name="name">Empty Timebox</field>
             <field name="model">project.timebox.empty</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Empty Timebox">
-                       <group width="345" height="70">
-                               <label string="Timebox Empty Process Completed Successfully." />
-                                   <newline/>
-                                   <separator colspan="4"/>
-                                       <button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
-                               </group>
-                               </form>
+                <form string="Empty Timebox" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
+                    </header>
+                    <label string="Timebox Empty Process Completed Successfully." />
+                </form>
             </field>
-               </record>
+        </record>
 
-               <record id="action_project_gtd_empty" model="ir.actions.act_window">
-                  <field name="name">Empty Timebox</field>
-                  <field name="type">ir.actions.act_window</field>
-                  <field name="res_model">project.timebox.empty</field>
-                  <field name="view_type">form</field>
-                  <field name="view_mode">form</field>
-                  <field name="view_id" ref="view_project_gtd_empty"/>
-                      <field name="context">{'record_id' : active_id}</field>
-                  <field name="target">new</field>
-       </record>
+        <record id="action_project_gtd_empty" model="ir.actions.act_window">
+               <field name="name">Empty Timebox</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">project.timebox.empty</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_project_gtd_empty"/>
+               <field name="context">{'record_id' : active_id}</field>
+               <field name="target">new</field>
+        </record>
 
-       <record model="ir.values" id="project_gtd_empty_values">
+        <record model="ir.values" id="project_gtd_empty_values">
             <field name="model_id" ref="model_project_gtd_timebox" />
             <field name="name">Empty Timebox</field>
             <field name="key2">client_action_multi</field>

diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 9f9e080..31fc832 100644 (file)
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -2,36 +2,37 @@
 <openerp>
     <data>
 
-       <record id="view_project_gtd_fill" model="ir.ui.view">
+        <record id="view_project_gtd_fill" model="ir.ui.view">
             <field name="name">Plannify Timebox</field>
             <field name="model">project.timebox.fill.plan</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Plannify Timebox">
-                         <field name="timebox_id" widget="selection"/>
-                         <field name="timebox_to_id" widget="selection"/>
-                         <field colspan="4" name="task_ids" nolabel="1" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
-                         <separator colspan="4"/>
-                             <group colspan="4" col="6">
-                                           <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                                       <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
-                             </group>
-                               </form>
+                <form string="Plannify Timebox" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
+                    <header>
+                      <group col="4">
+                          <field name="timebox_id" widget="selection"/>
+                          <field name="timebox_to_id" widget="selection"/>
+                      </group>
+                      <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+                </form>
             </field>
-               </record>
+        </record>
 
-               <record id="action_project_gtd_fill" model="ir.actions.act_window">
-                  <field name="name">Plannify Timebox</field>
-                  <field name="type">ir.actions.act_window</field>
-                  <field name="res_model">project.timebox.fill.plan</field>
-                  <field name="view_type">form</field>
-                  <field name="view_mode">form</field>
-                  <field name="view_id" ref="view_project_gtd_fill"/>
-                      <field name="context">{'record_id' : active_id}</field>
-                  <field name="target">new</field>
-       </record>
+        <record id="action_project_gtd_fill" model="ir.actions.act_window">
+               <field name="name">Plannify Timebox</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">project.timebox.fill.plan</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_project_gtd_fill"/>
+               <field name="context">{'record_id' : active_id}</field>
+               <field name="target">new</field>
+        </record>
 
-       <record model="ir.values" id="project_gtd_fill_values">
+        <record model="ir.values" id="project_gtd_fill_values">
             <field name="model_id" ref="model_project_gtd_timebox" />
             <field name="name">Plannify Timebox</field>
             <field name="key2">client_action_multi</field>

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index b6e1f8a..4bd3854 100644 (file)
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,7 +56,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issues Dashboard" layout="manual">
+                <form string="Issues Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 895b459..b7089ca 100644 (file)
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -20,9 +20,11 @@
             <field name="model">project.issue.version</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issue Version">
-                    <field name="name"/>
-                    <field name="active"/>
+                <form string="Issue Version" version="7.0">
+                    <group col="2">
+                        <field name="name"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -50,7 +52,7 @@
             <field name="model">project.issue</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
@@ -72,39 +74,33 @@
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar"/>
                 </header>
-                <sheet string="Issue Tracker Form" layout="auto">
-                    <group colspan="4" col="6">
-                        <field name="name"/>
-                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
-                        <group colspan="2" col="3">
+                <sheet string="Issue">
+                    <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" required="True" on_change="on_change_project(project_id)"/></h2>
+                    <group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
+                            <field name="email_from"/>
+                            <label for="task_id"/>
+                            <div>
+                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
+                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
+                                    attrs="{'invisible':[('task_id','!=',False)]}" />
+                            </div>
+                        </group><group>
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action"/>
+                            <field name="version_id" widget="selection"/>
+                            <field name="priority"/>
+                            <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
+                            <field name="state" groups="base.group_no_one"/>
                         </group>
-                        <field name="user_id"/>
-                        <field name="version_id" colspan="2" widget="selection"/>
-                        <field name="state" groups="base.group_no_one"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Contact Information"/>
-                            <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
-                            <field name="email_from"/>
-                            </group>
-                            <group col="3" colspan="2">
-                            <separator colspan="3" string="Status"/>
-                            <field name="priority" colspan="3"/>
-                            <field name="task_id" on_change="onchange_task_id(task_id)"/>
-                            <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
-                                attrs="{'invisible':[('task_id','!=',False)]}" />
-                            <field name="progress" colspan="3" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                            </group>
-                            <separator string= "Description" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="4"/>
-                            <separator colspan="4"/>
-                        </page>
+                    <field name="description"/>
+
+                    <notebook groups="base.group_no_one">
                         <page string="Extra Info">
                             <group col="4" colspan="4">
                                 <separator string="Statistics" colspan="4" col="4"/>
@@ -123,9 +119,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                   <div class="oe_form_sheet_width">
-                       <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                   </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -348,7 +344,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-               <field name="use_tasks" position="after">
+                <field name="use_tasks" position="after">
                     <field name="use_issues"/>
                 </field>
                 <field name="priority" position="before">