[MERGE] trunk-search_views or instead of and in groups

[odoo/odoo.git] / addons / stock / stock_view.xml

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5a55700..280743b 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1486,10 +1486,10 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                       <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-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"/>
+                        <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"/>