From 4e6a9ea55c84ce288d810f63b3a4a4cd801e37d8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 Mar 2011 15:08:59 +0100
Subject: [REM] all @col and @colspan attributes on groups in search views:
 search views are not laid out by columns, therefore these attributes do not
 belong

bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
---
 addons/procurement/procurement_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index ed353f996f8..6b5af29cdc1 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -100,7 +100,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Procurement">
-                    <group col='10' colspan='4'>
+                    <group>
                        <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
@@ -116,7 +116,7 @@
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By" groups="base.group_extended">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
                         <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
@@ -181,7 +181,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id"/>
@@ -189,7 +189,7 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Warehouse" icon="terp-go-home" domain="[]"  context="{'group_by':'warehouse_id'}"/>
                         <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
-- 
cgit v1.2.3


From b0a1441722f17ce11cd4109339fee330f4dbd74d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 15:58:35 +0200
Subject: [IMP] remove date widget on datetime fields in search view

bzr revid: xmo@openerp.com-20110824135835-ooqqw87301n6mxja
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index ed353f996f8..329b65ad6c5 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -112,7 +112,7 @@
                        <separator orientation="vertical"/>
                        <field name="origin"/>
                        <field name="product_id" />
-                       <field name="date_planned" widget="date"/>
+                       <field name="date_planned"/>
                        <field name="state" />
                     </group>
                     <newline/>
-- 
cgit v1.2.3


From 178fec5c6410db05dd7b49f362454a49a4dd8b21 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Sun, 11 Sep 2011 15:50:25 +0200
Subject: [FIX] str 'in' str (singletons missing tuple-building comma), in
 @colors attributes. Replace by string equality

bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
---
 addons/procurement/procurement_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 329b65ad6c5..09dd890970a 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -11,7 +11,7 @@
             <field name="model">procurement.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
                     <field name="date_planned" widget="date"/>
                     <field name="origin"/>
                     <field name="product_id"/>
@@ -30,7 +30,7 @@
             <field name="type">tree</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
                     <field name="date_planned" widget="date"/>
                     <field name="origin"/>
                     <field name="product_id"/>
-- 
cgit v1.2.3