[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130626111029-e6szwugpewn3cd2g

1 files changed, 25 insertions, 32 deletions

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 46caba0021e..da3034c72f5 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -283,22 +283,6 @@
             </field>
         </record>
 
-        <record id="view_project_feature_filter" model="ir.ui.view">
-            <field name="name">Project Issue - Feature Tracker Search</field>
-            <field name="model">project.issue</field>
-            <field name="arch" type="xml">
-                <search string="Feature Tracker Search">
-                    <field name="name" string="Feature description"/>
-                    <field name="date"/>
-                    <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 name="user_id"/>
-                    <field name="project_id" string="Project"/>
-                </search>
-            </field>
-        </record>
-
         <record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
@@ -325,7 +309,8 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//div[@name="options_active"]' position='inside'>
-                    <field name="use_issues" class="oe_inline"/>
+                    <field name="use_issues" class="oe_inline"
+                            on_change="on_change_use_tasks_or_issues(use_tasks, use_issues)"/>
                     <label for="use_issues"/>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
@@ -334,21 +319,12 @@
                 <xpath expr='//page[@name="project_stages"]' position="attributes">
                     <attribute name="attrs">{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}</attribute>
                 </xpath>
+                <xpath expr='//field[@name="use_tasks"]' position="attributes">
+                    <attribute name="attrs">{'on_change': 'on_change_use_tasks_or_issues(use_tasks, use_issues)'}</attribute>
+                </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                 </field>
-                <xpath expr='//span[@name="edit_alias"]' position='replace'>
-                    <span class="oe_edit_only" name="edit_alias">
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>
-                        @
-                        <field class="oe_inline" name="alias_domain"/>
-                        <span class="oe_inline"
-                                attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
-                            <label for="alias_model" string="creates"/>
-                            <field name="alias_model" class="oe_inline"/>
-                        </span>
-                    </span>
-                </xpath>
             </field>
        </record>
 
@@ -384,16 +360,33 @@
             </field>
         </record>
 
+        <record id="action_view_issues" model="ir.actions.act_window">
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="name">Issues</field>
+            <field name="view_mode">kanban,tree,form,calendar,graph</field>
+            <field name="help" type="html">
+                <p>
+                    The OpenERP issues tacker allows you to efficiantly manage things
+                    like internal requests, software development bugs, customer
+                    complaints, project troubles, material breakdowns, etc.
+                </p>
+            </field>
+        </record>
+
         <!-- res.partner -->
         <record model="ir.ui.view" id="res_partner_issues_button_view">
             <field name="name">res.partner.issues.button.view</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="10"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button type="action" string="Issues" attrs="{'invisible': [('customer', '=', False)]}"
-                        name="%(act_project_project_2_project_issue_all)d" context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}" groups="project.group_project_user"/>
+                    <button class="oe_inline" type="action" string="Issues"
+                        attrs="{'invisible': [('customer', '=', False)]}"
+                        name="%(action_view_issues)d"
+                        context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
+                        groups="project.group_project_user"/>
                 </xpath>
             </field>
         </record>