[MERGE] stock_*: search view update

bzr revid: psi@tinyerp.com-20120618125235-f0u7n76q0kg0qc8p

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index d6ab3c4..d40f6db 100644 (file)
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -67,22 +67,21 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter string="Done"
-                    name="done"
-                    icon="terp-dialog-close"
-                    domain="[('state','=','done')]"
-                    help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                    icon="terp-gtk-go-back-rtl"
-                    domain="[('state','in',('assigned','waiting','confirmed'))]"
-                    help = "Future Stock-Moves"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                <separator orientation="vertical"/>
-                <field name="product_id" default_focus="1"/>
-                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <filter string="Done"
+                        name="done"
+                        icon="terp-dialog-close"
+                        domain="[('state','=','done')]"
+                        help = "Completed Stock-Moves"/>
+                    <filter string="Todo"
+                        icon="terp-gtk-go-back-rtl"
+                        domain="[('state','in',('assigned','waiting','confirmed'))]"
+                        help = "Future Stock-Moves"/>
+                    <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                    <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                    <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -180,13 +179,10 @@
                         icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
-
                     <filter string="Future"
                         icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
-
-                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id" default_focus="1"/>

diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 51236e4..69a7829 100644 (file)
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -34,16 +34,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consu')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
-                    <field name="date"/>
                 </search>
             </field>
         </record>

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 458af2b..baa446b 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,8 +78,10 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Inventory Reference" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
@@ -283,8 +285,8 @@
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" />
-                        <field name="serial" />
+                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date" />
                         <field name="active"/>
                     </group>
@@ -390,13 +392,13 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
+                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="product_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -552,6 +554,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
+                    <field name="name" string="Stock Locations" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
                     <filter icon="terp-personal" name="customer"
@@ -559,7 +563,6 @@
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
@@ -872,12 +875,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
+                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike', self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
@@ -937,6 +940,7 @@
                     <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="min_date"/>
+                    <field name="date"/>
                     <field name="backorder_id"/>
                     <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
@@ -984,16 +988,14 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
+                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1098,15 +1100,13 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike',self),('origin','ilike',self)]"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="product_id"/>
                     </group>
@@ -1288,17 +1288,18 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date" groups="base.group_no_one"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
@@ -1474,13 +1475,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1505,13 +1506,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1700,7 +1701,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name"/>
+                    <field name="name" string="Stock Journal" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 0ae33ce..c13e056 100644 (file)
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,12 +50,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
-                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
+                    <field name="name" string="Stock Periods" filter_domain="[('name','ilike',self)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
+                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
                 </search>
             </field>
         </record>
@@ -198,6 +199,7 @@
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
@@ -304,6 +306,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>