IMP modulerecorder to record workflow actions for yml generation

[odoo/odoo.git] / addons / sale / sale_view.xml

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9e8fe82..7fa6110 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -30,9 +30,9 @@
             <field name="arch" type="xml">
                 <tree string="Sale Shop">
                     <field name="name"/>
+                    <field name="warehouse_id"/>
                     <field name="pricelist_id"/>
                     <field name="project_id"/>
-                    <field name="warehouse_id"/>
                 </tree>
             </field>
         </record>
@@ -80,6 +80,7 @@
                     <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="partner_shipping_id"/>
+                    <field name="user_id" />
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
@@ -224,7 +225,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
+                                <field name="create_date" widget="datetime"/>
                                 <field name="date_confirm"/>
                             </group>
                             <separator colspan="4" string="Notes"/>
@@ -257,7 +258,7 @@
                     </field>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
+                    <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
@@ -428,14 +429,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <field name="order_id" select="1"/>
+                    <filter icon="terp-purchase" string="Shipped"
+                        domain="[('state','=','done')]"
+                        separator="1" />
+                    <filter icon="terp-purchase" string="Uninvoiced"
+                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
+                        separator="1" />
+                    <separator orientation="vertical"/>
                     <field name="product_id" select="1"/>
+                    <field name="order_id" select="1"/>
+                    <field name="order_partner_id" select="1"/>
+                    <field name="state" select="1"/>
                     <newline />
                     <group expand="1" string="Group By..." colspan="9" col="8">
-                        <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
-                        <!--
-                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'order_partner_id'}"/>
-                        -->
+                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+<!--                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'order_partner_id'}"/>-->
+                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                     </group>
                 </search>
             </field>
@@ -447,7 +456,6 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>