[FIX] sale,purchase,stock
[odoo/odoo.git] / addons / sale / report / sale_report_view.xml
index fe88fa3..eb18f97 100644 (file)
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+
     <record id="view_order_product_tree" model="ir.ui.view">
         <field name="name">sale.report.tree</field>
         <field name="model">sale.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Sales Orders Statistics">
+            <tree string="Sales Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="shop_id" invisible="1"/>
-                <field name="company_id" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="product_qty" invisible="1"/>
-                <field name="delay" avg="Days to Close"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
+                <field name="product_uom_qty" sum="# of Qty"/>
+                <field name="shipped_qty_1"/>
+                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
+                <field name="delay" avg="Commitment Delay"/>
                 <field name="state" invisible="1"/>
-                <field name="fiscal_position" invisible="1"/>
-                <field name="payment_term" invisible="1"/>
-                <field name="partner_invoice_id" invisible="1"/>
-                <field name="partner_order_id" invisible="1"/>
-                <field name="partner_shipping_id" invisible="1"/>
-                <field name="pricelist_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1"/>
-                <field name="date_confirm" invisible="1"/>
             </tree>
         </field>
     </record>
          <field name="model">sale.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Sales Orders Statistics" type="bar">
+             <graph string="Sales Analysis" type="bar">
                  <field name="product_id"/>
                  <field name="price_total"/>
+                 <field name="state" group="True"/>
              </graph>
          </field>
     </record>
         <field name="model">sale.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Sale Orders">
+            <search string="Sales Analysis">
                <group>
-                   <filter icon="terp-sale" string="This Year"
-                                   domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                   help="Tasks performed in this year"/>
-                       <filter icon="terp-sale" string="This Month"
-                                       name="month"
-                                       domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                       help="Tasks performed in this month"/>
-                       <filter icon="gtk-media-rewind"
-                               string="    7 Days    "
-                               separator="1"
-                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                               help="Tasks during last 7 days"/>
+                   <filter icon="terp-go-year" string="  365 Days  "
+                           domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                           help="Tasks performed in last 365 days"/>
+                       <filter icon="terp-go-month" string="   30 Days   "
+                               name="month"
+                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                               help="Tasks performed in last 30 days"/>
+                       <filter icon="terp-go-week"
+                            string="    7 Days    "
+                            separator="1"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Tasks during last 7 days"/>
+                       <separator orientation="vertical"/>
+                       <filter icon="terp-document-new"
+                           string="Quotations"
+                           domain="[('state','=','draft')]"/>
+                       <filter icon="terp-dolar"
+                               string="Sales"
+                               domain="[('state','not in',('draft','done','cancel'))]"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-sale"
-                               string="Quotations"
-                               domain="[('state','=','draft')]"/>
-                       <filter icon="terp-sale"
-                                       string="Waiting Schedule"
-                                       domain="[('state','=','waiting_date')]"/>
-                       <filter icon="terp-sale"
-                                       string="In progress"
-                                       domain="[('state','=','progress')]"/>
-
+                           string="Picked"
+                           domain="[('shipped','=',True)]"/>
                        <separator orientation="vertical"/>
+                       <field name="partner_id"/>
+                    <field name="product_id"/>
                        <field name="user_id" widget="selection">
-                           <filter icon="terp-sale"
-                                       string="sale Non User"
-                                       help="sale Non User"
-                                       domain="[('user_id','=',False)]"/>
+                           <filter icon="terp-personal"
+                            string="My Sales"
+                            help="My Sales"
+                            domain="[('user_id','=',uid)]"/>
                        </field>
-                       <field name="partner_id"/>
-                       <field name="product_id"/>
                                </group>
                                <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
-                    <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <field name="shop_id" widget="selection"/>
-                    <field name="payment_term" widget="selection"/>
-                    <field name="fiscal_position" widget="selection"/>
-                    <newline/>
-                    <filter icon="terp-sale" string="Manual In Progress" domain="[('state','=','manual')]"/>
-                    <filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/>
-                    <filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
+                    <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
                     <separator orientation="vertical"/>
-                    <field name="partner_invoice_id"/>
-                    <field name="partner_order_id"/>
-                    <field name="partner_shipping_id"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <field name="pricelist_id" widget="selection"/>
-                    <field name="analytic_account_id"/>
-                    <newline/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                </group>
+                               <newline/>
+                <group expand="0" string="Extended options..." groups="base.group_extended">
                     <field name="date"/>
                     <field name="date_confirm"/>
-                </group>
-                <newline/>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
-                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
-                    <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
-                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
-                    <newline/>
-                    <filter string="Invoice Address Name" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
-                    <filter string="Ordering Contact Name" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
-                    <filter string="Shipping Address Name" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
                     <separator orientation="vertical"/>
-                                       <filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                    <field name="shop_id" widget="selection"/>
+                    <field name="categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_order_report_all" model="ir.actions.act_window">
-        <field name="name">Sales Orders</field>
+        <field name="name">Sales Analysis</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
 
- <!-- This views used in board_sale module -->
-     <record id="view_sale_order_by_clients_tree" model="ir.ui.view">
+    <record id="action_stock_move_report_so" model="ir.actions.act_window">
+        <field name="name">Shipments Analysis</field>
+        <field name="res_model">report.stock.move</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
+    </record>
+    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="8"/>
+
+
+    <!--This views used in board_sale module -->
+    <record id="view_sale_order_by_clients_tree" model="ir.ui.view">
         <field name="name">sale.order.by.clients.tree</field>
         <field name="model">sale.order.by.clients</field>
         <field name="type">tree</field>
         <field name="view_id" ref="view_uninvoiced_lines_per_month_tree"/>
     </record>
 
-       <record id="view_product_bought_by_sale_order_tree" model="ir.ui.view">
+    <record id="view_product_bought_by_sale_order_tree" model="ir.ui.view">
         <field name="name">product.bought.by.sale.order.tree</field>
         <field name="model">product.bought.by.sale.order</field>
         <field name="type">tree</field>
         <field name="view_mode">tree,graph</field>
         <field name="view_id" ref="view_sales_by_regions_tree"/>
     </record>
+
 </data>
 </openerp>