[IMP] sale: add field in reporting and set default in search view

bzr revid: sbh@tinyerp.com-20100208065526-j30p0d711o1yuouo

diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
index 6bb33ad..1dc69f6 100644 (file)
--- a/addons/sale/report_sale_view.xml
+++ b/addons/sale/report_sale_view.xml
@@ -7,33 +7,34 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sale Orders">
-                       <field name="partner_id"/>
+                       <field name="partner_id" invisible="True"/>
                     <field name="date_order"/>
                     <field name="invoiced_rate"/>
                     <field name="picked_rate"/>
                     <field name="amount_untaxed"/>
                     <field name="amount_tax"/>
-                    <field name="amount_total"/>
+                    <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_sale_order_report_all" model="ir.actions.act_window">
-            <field name="name">Sale Orders By Month </field>
+            <field name="name">Sale Orders By Customer </field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="context">{'report':True}</field>
+            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
         </record>        
-           <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim01">
+           <record model="ir.actions.act_window.view" id="action_sale_order_01">
                <field name="sequence" eval="1"/>
                <field name="view_mode">tree</field>
                <field name="view_id" ref="sale.view_sale_order_report_tree"/>
                <field name="act_window_id" ref="action_sale_order_report_all"/>
            </record>        
-               <record model="ir.actions.act_window.view" id="action_order_product02">
+               <record model="ir.actions.act_window.view" id="action_sale_order_02">
                <field name="sequence" eval="1"/>
                <field name="view_mode">graph</field>
                <field name="view_id" ref="sale.view_sale_order_graph"/>
@@ -51,10 +52,11 @@
                     <field name="name"/>
                     <field name="order_id" invisible="True"/>
                     <field name="product_uom_qty" />
-                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
                     <field name="product_id"/>
                     <field name="price_unit" />
-                    <field name="discount"/>
+                    <field name="price_net"/>
                     <field name="price_subtotal" sum="Total"/>
                     <field name="state"/>
                 </tree>
@@ -77,7 +79,7 @@
                <field name="act_window_id" ref="action_order_report_tree_all"/>
            </record>   
            <record model="ir.actions.act_window.view" id="action_order_product02">
-               <field name="sequence" eval="1"/>
+               <field name="sequence" eval="2"/>
                <field name="view_mode">graph</field>
                <field name="view_id" ref="sale.view_order_line_graph"/>
                <field name="act_window_id" ref="action_order_report_tree_all"/>
@@ -86,7 +88,7 @@
        <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="base.next_id_64" sequence="3"/>
     
-    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="3"/>
+    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="4"/>
      
       </data>
     </openerp>    
\ No newline at end of file

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ec7d9d0..9eee62b 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
                                        </group>
                                        <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                                               <filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                                               <filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
                                        </group>                        
@@ -412,7 +412,7 @@
                             <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                         </field>
                                        <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                                               <filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+                                               <filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                                        </group>