[IMP] sale_crm: improved link towards invoice in kanban view links 'Invoices'. Now...

bzr revid: tde@openerp.com-20130404134448-7f1rzav02fmxumzn

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8c0854b..c2f21c0 100644 (file)
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -453,10 +453,11 @@
                     <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                     <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
-                    <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
                     <field name="partner_id"/>
                     <field name="user_id" string="Salesperson"/>
                     <field name="period_id" string="Period"/>
+                    <separator/>
+                    <filter domain="[('user_id','=',uid)]" help="My Invoices"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 06ced38..e278136 100644 (file)
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -53,18 +53,22 @@
             <field name="inherit_id" ref="account.invoice_tree"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='date_invoice']" position="after">
-                        <field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                     </xpath>
                 </data>
             </field>
         </record>
 
+        <!-- Update account invoice search view!-->
         <record id="account_invoice_groupby_inherit" model="ir.ui.view">
             <field name="name">account.invoice.groupby</field>
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="section_id"/>
+                </xpath>
                 <xpath expr="//group/filter[@string='Due Date']" position="after">
                     <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}"/>
                 </xpath>
@@ -124,9 +128,11 @@
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
             <field name="context">{
-                'search_default_section_id': [active_id], 'default_section_id': active_id,
-                'search_default_my_sale_orders_filter': 1
-            }</field>
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                    'search_default_my_sale_orders_filter': 1,
+                }
+            </field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create a quotation that can be converted into a sales
@@ -146,9 +152,11 @@
             <field name="view_id" ref="sale.view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{
-                'search_default_section_id': [active_id], 'default_section_id': active_id, 'show_address': 1,
-                'search_default_my_sale_orders_filter': 1
-            }</field>
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id, 'show_address': 1,
+                    'search_default_my_sale_orders_filter': 1
+                }
+            </field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="help" type="html">
@@ -172,11 +180,33 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="view_id" ref="account.invoice_tree"/>
-            <field name="domain">[('state','not in',['draft','cancel'])]</field>
-            <field name="context">{'search_default_section_id': [active_id], 'default_section_id': active_id}</field>
+            <field name="domain">[
+                ('state', 'not in', ['draft', 'cancel']),
+                ('type', '=', 'out_invoice')]</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id},
+                    'default_type':'out_invoice',
+                    'type':'out_invoice',
+                    'journal_type': 'sale',
+                }
+            </field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
         </record>
 
+        <record id="action_invoice_salesteams_view_tree" model="ir.actions.act_window.view">
+            <field name="sequence">1</field>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
+        </record>
+
+        <record id="action_invoice_salesteams_view_form" model="ir.actions.act_window.view">
+            <field name="sequence">2</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account.invoice_form"/>
+            <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
+        </record>
+
         <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>