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

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9d9285a..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,53 +52,56 @@
             <field name="model">project.issue</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issue Tracker Form">
-                    <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">
+                <form version="7.0">
+                <header>
+                    <button name="case_open" string="Open" type="object"
+                            states="draft,pending"/>
+                    <button name="case_close" string="Done" type="object"
+                            states="draft,open,pending"/>
+                    <button name="case_pending" string="Pending" type="object"
+                            states="draft,open"/>
+                    <button name="case_escalate" string="Escalate" type="object"
+                            states="draft,open,pending"/>
+                    <button name="case_reset" string="Reset to New" type="object"
+                            states="cancelled,done"/>
+                    <button name="stage_previous" string="Previous Stage" type="object"
+                            states="open,pending" icon="gtk-go-back"
+                            attrs="{'invisible': [('stage_id','=', False)]}"/>
+                    <button name="stage_next" string="Next Stage" type="object"
+                            states="open,pending" icon="gtk-go-forward"
+                            attrs="{'invisible': [('stage_id','=', False)]}"/>
+                    <button name="case_cancel" string="Cancel" type="object"
+                            states="draft,open,pending"/>
+                    <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"/>
-                        </group>
-                        <field name="user_id"/>
-                        <field name="version_id" colspan="2" widget="selection"/>
-                        <group colspan="2" col="4">
-                            <field name="type_id" string="Stages" />
-                            <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                            <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
+                            <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>
                     </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"/>
-                            <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' groups="base.group_no_one"/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" groups="base.group_no_one"/>
-                            <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close" groups="base.group_no_one"/>
-                            <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" groups="base.group_no_one"/>
-                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                            <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert" groups="base.group_no_one"/>
-                            </group>
-                        </page>
-                        <page string="Extra Info" groups="base.group_extended">
+                    <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"/>
                                 <field name="day_open"/>
@@ -113,7 +118,10 @@
                             </group>
                         </page>
                     </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -128,22 +136,14 @@
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
-                    <field name="partner_id" groups="base.group_extended"/>
+                    <field name="partner_id"/>
                     <field name="project_id" />
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1" string="Stages" />
-                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                    <field name="state"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to" groups="base.group_no_one"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do" groups="base.group_no_one"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" groups="base.group_no_one"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert" groups="base.group_no_one"/>
+                    <field name="stage_id" widget="selection" readonly="1"/>
+                    <field name="state" groups="base.group_no_one"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -169,7 +169,7 @@
                         <field name="id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..."  groups="base.group_extended">
+                    <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
@@ -185,9 +185,9 @@
                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
                             context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'type_id'}" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}"/>
+                            context="{'group_by':'stage_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
+                            context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
@@ -217,9 +217,9 @@
         <field name="model">project.issue</field>
         <field name="type">kanban</field>
         <field name="arch" type="xml">
-            <kanban default_group_by="type_id">
+            <kanban default_group_by="stage_id">
                 <field name="color"/>
-                <field name="state"/>
+                <field name="state" groups="base.group_no_one"/>
                 <field name="priority"/>
                 <field name="user_email"/>
                 <field name="user_id"/>
@@ -263,9 +263,8 @@
                                         <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
                                     <div class="oe_kanban_right">
-                                        <a name="case_open" string="Open" states="draft,pending" type="object" icon="kanban-apply" groups="base.group_no_one"/>
-                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" groups="base.group_no_one"/>
-                                        <a name="case_close" string="Close" states="open,draft,pending" type="object" icon="kanban-stop" groups="base.group_no_one"/>
+                                        <a name="case_open" string="Open" states="draft,pending" type="object" icon="kanban-apply"/>
+                                        <a name="case_close" string="Close" states="open,draft,pending" type="object" icon="kanban-stop"/>
                                     </div>
                                     <div class="oe_kanban_clear"/>
                                 </div>
@@ -295,20 +294,12 @@
                     <field name="id"/>
                     <field name="needaction_pending" invisible="1"/>
                     <field name="name" string="Feature description"/>
-                    <field name="partner_id" groups="base.group_extended"/>
+                    <field name="partner_id"/>
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1"/>
-                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
                     <field name="user_id"/>
-                    <field name="state"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to" groups="base.group_no_one"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" groups="base.group_no_one"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" groups="base.group_no_one"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert" groups="base.group_no_one"/>
+                    <field name="stage_id" widget="selection" readonly="1"/>
+                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -325,7 +316,7 @@
                     <group>
                         <field name="name" string="Feature description"/>
                         <field name="user_id"/>
-                        <field name="state">
+                        <field name="state" groups="base.group_no_one">
                         <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                         <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
@@ -334,6 +325,14 @@
                 </search>
             </field>
         </record>
+        
+        <act_window id="act_project_project_2_project_issue_all"
+            name="Issues"
+            src_model="project.project"
+            res_model="project.issue"
+            view_type="form"
+            view_mode="kanban,tree,form,calendar,graph"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
 
     # ------------------------------------------------------
     # Project
@@ -345,12 +344,61 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+            	<xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <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 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">
                     <field name="project_escalation_id"/>
                     <field name="reply_to"/>
                 </field>
+                <xpath expr='//page[@name="team"]' position='replace'>
+                    <page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0),('use_issues','=', 0)]}">
+                        <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
+                            <tree string="Members">
+                                <field name="name"/>
+                                <field name="user_email"/>
+                            </tree>
+                        </field>
+                    </page>
+                </xpath>
             </field>
        </record>
-
+        
+        <record id="view_project_kanban_inherited" model="ir.ui.view">
+            <field name="name">project.project.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="arch" type="xml">
+                <field name="use_tasks" position="after">
+                    <field name="use_issues"/>
+                    <field name="issue_count" invisible="1"/>
+                </field>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                    <a t-if="record.use_issues.raw_value"
+                        name="%(act_project_project_2_project_issue_all)d" type="action">
+                        Issues(<field name="issue_count"/>)</a>
+                </xpath>
+            </field>
+        </record>
+      <record id="analytic_account_inherited_issue_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.issue.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="2" string="Project" name="project_sep"/>
+                </xpath>
+            	<group name="project" position="inside">
+            	    <field name="use_issues"/>
+            	</group>
+            </field>
+        </record>
     </data>
 </openerp>