X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fproject_issue%2Fproject_issue_view.xml;h=caa5c1923bc7132beec19a30578a913320254439;hb=618aacc5a707c1c7ad952f1e4ba10f14d8274a85;hp=d580607e027e37e7158c8b24fba328b816741019;hpb=4a864e1ff1d454fed2204c0af2dacd4be1b3a231;p=odoo%2Fodoo.git

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d580607..caa5c19 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/>
+        <menuitem  id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
@@ -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,8 +52,8 @@
             <field name="model">project.issue</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
-                <div class="oe_form_topbar">
+                <form version="7.0">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Done" type="object"
@@ -70,44 +72,35 @@
                             attrs="{'invisible': [('stage_id','=', False)]}"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
-                <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">
+                    <field name="stage_id" widget="statusbar"/>
+                </header>
+                <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"/>
@@ -126,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>
@@ -355,7 +348,7 @@
                     <tr name="use_issues_row">
                         <th style="border-right:1px solid #DDD;" width="140px">Issues Tracking</th>
                         <td><field name="use_issues" nolabel="1"/></td>
-                        <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                        <td style="text-align:right;" width="110px"><button icon="terp-stock_symbol-selection" class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
                     </tr>
                 </xpath>
                 <field name="priority" position="before">
@@ -405,9 +398,6 @@
             	<group name="project" position="inside">
             	    <field name="use_issues"/>
             	</group>
-            	<xpath expr='//field[@name="members"]' position='replace'>
-                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1),('use_issues','!=',1)]}"/>
-                </xpath>
             </field>
         </record>
     </data>