Merge lp:~openerp-dev/openobject-addons/trunk-views-cleanup-xmo into lp:openobject-addons

[Xavier (Open ERP)]

During cleanup and tightening of the RNG schema for the views in the server, found several attributes which either were completely unused (and didn't seem used by anything) or were straight-up copy/paste from other views which did not belong where they were.

Nuked them all.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Commit 4531: filter/@separator attribute which does not seem used by anything anywhere, was introduced as part of a big merge and from there spread (by copy/paste I'm guessing) to a lot of the codebase.

[OpenERP buildbot (openerp-buildbot)]

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove

[OpenERP buildbot (openerp-buildbot)]

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove

[OpenERP buildbot (openerp-buildbot)]

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove

=== modified file 'account/account_installer.xml'
--- account/account_installer.xml	2011-02-10 06:50:57 +0000
+++ account/account_installer.xml	2011-03-15 19:27:05 +0000
@@ -23,7 +23,7 @@
                     <attribute name='rowspan'>23</attribute>
                     <attribute name='string'></attribute>
                 </xpath>
-                <group colspan="8">
+                <group colspan="8" position="inside">
                     <group colspan="4" width="600">
                         <field name="charts"/>
                             <group colspan="4" groups="base.group_extended">
@@ -66,7 +66,7 @@
                     <xpath expr='//separator[@string="vsep"]' position='attributes'>
                         <attribute name='string'></attribute>
                     </xpath>
-                    <group colspan="8">
+                    <group colspan="8" position="inside">
                         <field name="account_voucher"/>
                         <field name="account_followup"/>
                         <field name="account_payment"/>

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2011-01-27 09:49:39 +0000
+++ account/account_invoice_view.xml	2011-03-15 19:27:05 +0000
@@ -356,7 +356,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                   <group col="10" colspan="4">
+                   <group>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
@@ -365,16 +365,16 @@
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" select="1" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
+                        <field name="user_id" widget="selection" string="Salesman">
+                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
                         </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" select='1'/>
-                        <field name="period_id" select='1' string="Period"/>
+                    <group>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id" string="Period"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-03-09 13:03:45 +0000
+++ account/account_view.xml	2011-03-15 19:27:05 +0000
@@ -202,7 +202,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
@@ -387,7 +387,7 @@
             <field name="model">account.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <tree string="Search Account Journal">
+                <search string="Search Account Journal">
                     <group>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
@@ -404,7 +404,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
                     </group>
-                </tree>
+                </search>
             </field>
         </record>
         <record id="view_account_journal_form" model="ir.ui.view">
@@ -482,7 +482,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
@@ -526,7 +526,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
@@ -906,7 +906,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Taxes">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="description"/>
                     </group>
@@ -1174,7 +1174,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
-                    <group col='10' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1186,27 +1186,27 @@
                             domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
-                        <field name="move_id" select="1" string="Number (Move)"/>
-                        <field name="date" select='1'/>
-                        <field name="account_id" select='1'/>
-                        <field name="partner_id" select='1'>
+                        <field name="move_id" string="Number (Move)"/>
+                        <field name="date"/>
+                        <field name="account_id"/>
+                        <field name="partner_id">
                             <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self, 'normal_view':False}"/>
                         <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="ref" select="1" string="Reference"/>
-                        <field name="name" select="1"/>
-                        <field name="narration" select="1"/>
-                        <field name="balance" string="Debit/Credit" select='1'/>
+                        <field name="ref" string="Reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="balance" string="Debit/Credit"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1438,7 +1438,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
@@ -1450,12 +1450,12 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1837,7 +1837,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                         <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                         <separator orientation="vertical"/>
@@ -2283,7 +2283,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>

=== modified file 'account/company_view.xml'
--- account/company_view.xml	2011-01-14 00:11:01 +0000
+++ account/company_view.xml	2011-03-15 19:27:05 +0000
@@ -7,7 +7,7 @@
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <notebook>
+                <notebook position="inside">
                     <page string="Overdue Payments" position="inside">
                         <separator string="Overdue Payments Message" colspan="4"/>
                         <field name="overdue_msg" nolabel="1" colspan ="4"/>

=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2011-03-10 10:16:50 +0000
+++ account/project/project_view.xml	2011-03-15 19:27:05 +0000
@@ -27,15 +27,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                         <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Overdue Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="partner_id" select="1"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="partner_id"/>
                         <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -201,7 +201,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
-                    <group col='6' colspan='4'>
+                    <group>
                         <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                         <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
@@ -217,7 +217,7 @@
                     <group expand="0" string="Extended Filters...">
                         <field name="journal_id" widget="selection"/>
                         <field name="product_id" widget="selection"/>
-                        <field name="amount" select="1"/>
+                        <field name="amount"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
@@ -433,13 +433,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
                            <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                           <field name="month" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="name"/>
+                           <field name="month"/>
+                        <field name="account_id"/>
                     </group>
                 </search>
             </field>

=== modified file 'account/report/account_analytic_entries_report_view.xml'
--- account/report/account_analytic_entries_report_view.xml	2011-01-14 00:11:01 +0000
+++ account/report/account_analytic_entries_report_view.xml	2011-03-15 19:27:05 +0000
@@ -34,7 +34,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-              <group col="10" colspan="12">
+              <group>
                     <filter icon="terp-go-year" string="  365 Days  "
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Entries of last 365 days"/>
@@ -44,7 +44,6 @@
                             help="Analytic Entries of last 30 days"/>
                     <filter icon="terp-go-week"
                             string="    7 Days    "
-                            separator="1"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Entries during last 7 days"/>
                     <separator orientation="vertical"/>

=== modified file 'account/report/account_entries_report_view.xml'
--- account/report/account_entries_report_view.xml	2011-01-14 00:11:01 +0000
+++ account/report/account_entries_report_view.xml	2011-03-15 19:27:05 +0000
@@ -67,7 +67,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Entries Analysis">
-                <group colspan="10" col="12">
+                <group>
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
                             context="{'year':'current_year'}"

=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml	2011-02-22 17:02:26 +0000
+++ account/report/account_invoice_report_view.xml	2011-03-15 19:27:05 +0000
@@ -58,7 +58,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
-              <group col="10" colspan="12">
+              <group>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -79,7 +79,6 @@
                             help="Customer Invoices And Refunds"/>
                     <filter icon="terp-personal"
                             string="Supplier"
-                            separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
                             help="Supplier Invoices And Refunds"/>
                    <separator orientation="vertical"/>
@@ -88,7 +87,6 @@
                             help="Customer And Supplier Invoices"/>
                    <filter icon="terp-dolar_ok!"
                             string="Refund"
-                            separator="1"
                             domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
                             help="Customer And Supplier Refunds"/>
                    <separator orientation="vertical"/>

=== modified file 'account/report/account_report_view.xml'
--- account/report/account_report_view.xml	2011-01-14 00:11:01 +0000
+++ account/report/account_report_view.xml	2011-03-15 19:27:05 +0000
@@ -152,8 +152,8 @@
 					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
 					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
 					<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
+					<field name="name"/>
+					<field name="month"/>
                </search>
             </field>
         </record>
@@ -218,8 +218,8 @@
 					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
 					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
 					<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
+					<field name="name"/>
+					<field name="month"/>
                </search>
             </field>
         </record>

=== modified file 'account_analytic_default/account_analytic_default_view.xml'
--- account_analytic_default/account_analytic_default_view.xml	2011-01-27 09:49:39 +0000
+++ account_analytic_default/account_analytic_default_view.xml	2011-03-15 19:27:05 +0000
@@ -44,7 +44,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group col="10" colspan="4">
+                    <group>
                     <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
                     <separator orientation="vertical"/>
                     <field name="analytic_id" groups="analytic.group_analytic_accounting"/>

=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml	2011-01-27 09:49:39 +0000
+++ account_budget/account_budget_view.xml	2011-03-15 19:27:05 +0000
@@ -170,12 +170,12 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Budget">
-                   <group col="20" colspan="4">
+                   <group>
                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                        <separator orientation="vertical"/>
-                       <field name="name" select="1"/>
-                       <field name="code" select="1" />
+                       <field name="name"/>
+                       <field name="code" />
                        <field name="state"/>
                        <field name="date_from"/>
                        <field name="date_to"/>

=== modified file 'account_coda/account_coda_view.xml'
--- account_coda/account_coda_view.xml	2011-01-14 00:11:01 +0000
+++ account_coda/account_coda_view.xml	2011-03-15 19:27:05 +0000
@@ -45,7 +45,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Coda">
-                   <group col="10" colspan="4">
+                   <group>
                         <field name="journal_id" widget='selection'/>
                         <field name="date"/>
                         <field name="user_id" widget='selection'/>

=== modified file 'account_followup/account_followup_view.xml'
--- account_followup/account_followup_view.xml	2011-01-14 00:11:01 +0000
+++ account_followup/account_followup_view.xml	2011-03-15 19:27:05 +0000
@@ -71,7 +71,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Followup">
-                   <group col="10" colspan="4">
+                   <group>
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>

=== modified file 'account_followup/report/account_followup_report.xml'
--- account_followup/report/account_followup_report.xml	2011-01-14 00:11:01 +0000
+++ account_followup/report/account_followup_report.xml	2011-03-15 19:27:05 +0000
@@ -41,7 +41,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Follow-ups Sent">
-              <group col="10" colspan="12">
+              <group>
               <filter icon="terp-go-year" string="This Fiscal year"
 			              name="fiscalyear"
 			              domain="[('period_id','in','current_year')]"

=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2011-02-24 11:45:37 +0000
+++ account_payment/account_payment_view.xml	2011-03-15 19:27:05 +0000
@@ -46,7 +46,7 @@
             <field name="model">payment.mode</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <form string="Payment Mode">
+                <search string="Payment Mode">
                     <field name="name"/>
                     <field name="journal" widget='selection'/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
@@ -54,7 +54,7 @@
                     <group expand="0" string="Group By...">
                       <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
-                </form>
+                </search>
             </field>
         </record>
 
@@ -199,7 +199,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                         <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>

=== modified file 'account_sequence/account_sequence_installer_view.xml'
--- account_sequence/account_sequence_installer_view.xml	2011-01-14 00:11:01 +0000
+++ account_sequence/account_sequence_installer_view.xml	2011-03-15 19:27:05 +0000
@@ -21,7 +21,7 @@
             <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">You can enhance the Account Sequence Application by installing .</attribute>
             </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="name" colspan="4"/>
             <field name="prefix"/>
             <field name="suffix"/>

=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml	2011-03-10 08:41:20 +0000
+++ account_voucher/account_voucher_view.xml	2011-03-15 19:27:05 +0000
@@ -118,7 +118,7 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -129,19 +129,19 @@
                         <field name="partner_id"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters...">
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>

=== modified file 'account_voucher/report/account_voucher_sales_receipt_view.xml'
--- account_voucher/report/account_voucher_sales_receipt_view.xml	2011-01-14 00:11:01 +0000
+++ account_voucher/report/account_voucher_sales_receipt_view.xml	2011-03-15 19:27:05 +0000
@@ -48,7 +48,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
-              <group col="10" colspan="12">
+              <group>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"

=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml	2011-02-14 12:45:21 +0000
+++ account_voucher/voucher_payment_receipt_view.xml	2011-03-15 19:27:05 +0000
@@ -8,7 +8,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -19,19 +19,19 @@
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters...">
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
@@ -48,7 +48,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -59,19 +59,19 @@
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters...">
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>

=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2011-01-14 00:11:01 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2011-03-15 19:27:05 +0000
@@ -7,7 +7,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -18,19 +18,19 @@
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters...">
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
@@ -46,7 +46,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -57,19 +57,19 @@
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters...">
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>

=== modified file 'auction/auction_view.xml'
--- auction/auction_view.xml	2011-01-27 09:49:39 +0000
+++ auction/auction_view.xml	2011-03-15 19:27:05 +0000
@@ -216,7 +216,7 @@
                 <field name="auction1" string="First Auction Date"/>
                 <field name="auction2" string="Last Auction Date"/>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="16">
+                <group expand="0" string="Group By...">
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical" />
                     <filter string="Auction Date"
@@ -446,7 +446,7 @@
                  <field name="bord_vnd_id"/>
                  <field name="state"/>
                  <newline/>
-                 <group expand="0" string="Group By..." colspan="16">
+                 <group expand="0" string="Group By...">
                      <filter string="Buyer"
                          icon="terp-personal"
                          help="Buyer" domain="[]"
@@ -610,7 +610,7 @@
                  <field name="method"/>
                  <field name="date_dep"/>
                  <newline/>
-                 <group expand="0" string="Group By..." colspan="16">
+                 <group expand="0" string="Group By...">
                      <filter string="Seller"
                          icon="terp-personal"
                          help="Seller" domain="[]"
@@ -743,7 +743,7 @@
                  <field name="partner_id"/>
                  <field name="contact_tel"/>
                  <newline/>
-                 <group expand="0" string="Group By..." colspan="16">
+                 <group expand="0" string="Group By...">
                      <filter string="Buyer"
                          icon="terp-personal"
                          help="Buyer" domain="[]"

=== modified file 'auction/report/report_auction_view.xml'
--- auction/report/report_auction_view.xml	2011-01-14 00:11:01 +0000
+++ auction/report/report_auction_view.xml	2011-03-15 19:27:05 +0000
@@ -46,7 +46,6 @@
                         help="Auction during current month."/>
                     <filter icon="terp-go-week"
                          string="Month -1"
-                         separator="1"
                          domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
                          help="Auction during last month."/>
                     <separator orientation="vertical"/>
@@ -70,7 +69,7 @@
                     <field name="lot_type"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/>
                     <filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/>

=== modified file 'audittrail/audittrail_view.xml'
--- audittrail/audittrail_view.xml	2011-01-14 00:11:01 +0000
+++ audittrail/audittrail_view.xml	2011-03-15 19:27:05 +0000
@@ -56,7 +56,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                   <group col="8" colspan="4">
+                   <group>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
                     <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
                     <separator orientation="vertical"/>
@@ -64,7 +64,7 @@
                     <field name="object_id"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                 </group>
                 </search>
@@ -158,13 +158,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group col="8" colspan="4">
+                 <group>
                     <field name="name"/>
                     <field name="object_id"/>
                     <field name="user_id"  widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
    					<separator orientation="vertical"/>                    
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>

=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml	2011-02-18 11:21:59 +0000
+++ base_calendar/base_calendar_view.xml	2011-03-15 19:27:05 +0000
@@ -110,22 +110,22 @@
                 <search string="Search Invitations">
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
-                       separator="1" help="Invitations To Review" />
+                       help="Invitations To Review" />
                    <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
-                       separator="1" help="Accepted Invitations" />
+                       help="Accepted Invitations" />
                    <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
-                       separator="1" help="Declined Invitations" />
+                       help="Declined Invitations" />
                    <filter icon="gtk-sort-descending" string="Delegated"
                        domain="[('state','=', 'delegated')]"
-                       separator="1" help="Delegated Invitations" />
-                   <separator orientation="vertical"/>
-                   <field name="email" select='1'/>
-                   <field name="user_id" select="1" string="Responsible"/>
-                   <separator orientation="vertical"/>
-                   <field name="cutype" string="Invitation type" select="1"/>
-                   <field name="event_date" select="1"/>
+                       help="Delegated Invitations" />
+                   <separator orientation="vertical"/>
+                   <field name="email"/>
+                   <field name="user_id" string="Responsible"/>
+                   <separator orientation="vertical"/>
+                   <field name="cutype" string="Invitation type"/>
+                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -448,7 +448,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Events">
-                       <group col="12" colspan="4">
+                       <group>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -457,13 +457,13 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" select="1" string="Summary"/>
-                           <field name="location" select="1" string="Location"/>
-                           <separator orientation="vertical"/>
-                           <field name="user_id" select="1"/>
-                           <separator orientation="vertical"/>
-                           <field name="show_as" select="1"/>
-                           <field name="class" select="1" string="Privacy"/>
+                           <field name="name" string="Summary"/>
+                           <field name="location" string="Location"/>
+                           <separator orientation="vertical"/>
+                           <field name="user_id"/>
+                           <separator orientation="vertical"/>
+                           <field name="show_as"/>
+                           <field name="class" string="Privacy"/>
                        </group>
                        <newline/>
                         <group expand="0" string="Group By...">

=== modified file 'base_contact/base_contact_view.xml'
--- base_contact/base_contact_view.xml	2011-01-27 09:49:39 +0000
+++ base_contact/base_contact_view.xml	2011-03-15 19:27:05 +0000
@@ -108,9 +108,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Partner Contact">
-                <field name="name" select="1"/>
-                <field name="first_name" select="1"/>
-                <field name="partner_id" select="1" string="Partner"/>
+                <field name="name"/>
+                <field name="first_name"/>
+                <field name="partner_id" string="Partner"/>
             </search>
         </field>
     </record>
@@ -339,7 +339,7 @@
         <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
         <field name="arch" type="xml">
             <search string="Search Contact">
-                   <field name="job_ids" select='1'/>
+                   <field name="job_ids"/>
             </search>
         </field>
     </record>

=== modified file 'base_setup/base_setup_installer.xml'
--- base_setup/base_setup_installer.xml	2011-01-14 00:11:01 +0000
+++ base_setup/base_setup_installer.xml	2011-03-15 19:27:05 +0000
@@ -24,7 +24,7 @@
             <attribute name="string">Install Applications</attribute>
           </separator>
             
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>

=== modified file 'base_synchro/base_synchro_view.xml'
--- base_synchro/base_synchro_view.xml	2011-01-14 00:11:01 +0000
+++ base_synchro/base_synchro_view.xml	2011-03-15 19:27:05 +0000
@@ -36,12 +36,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Transfered Ids Details">
-                    <group colspan="4" col="10">
+                    <group>
                       <field name="name"/>
                       <field name="obj_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4">
+                    <group expand="0" string="Group By">
                       <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'obj_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'name'}"/>
@@ -118,12 +118,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Synchronized objects">
-                    <group colspan="4" col="10">
+                    <group>
                       <field name="model_id"/>
                       <field name="synchronize_date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4">
+                    <group expand="0" string="Group By">
                       <filter string="Object to synchronize" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Latest synchronization" icon="terp-go-month" domain="[]" context="{'group_by':'synchronize_date'}"/>

=== modified file 'board/board_administration_view.xml'
--- board/board_administration_view.xml	2011-01-14 00:11:01 +0000
+++ board/board_administration_view.xml	2011-03-15 19:27:05 +0000
@@ -37,7 +37,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Log Analysis">
-                    <group col="20" colspan="8">
+                    <group>
                     <filter icon="terp-go-year" string="  Year  "
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Log created in current year"/>
@@ -47,7 +47,6 @@
                         help="Log created in current month"/>
                     <filter icon="terp-go-month"
                          string="    Month-1    "
-                         separator="1"
                          domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Log created in last month"/>
                    </group>

=== modified file 'board/board_view.xml'
--- board/board_view.xml	2011-01-14 00:11:01 +0000
+++ board/board_view.xml	2011-03-15 19:27:05 +0000
@@ -8,13 +8,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Notes">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name" string="Subject"/>
                         <field name="type" string="Note Type"/>
                         <field name="date" string="Date"/>
                     </group>
                     <newline/>
-                    <group expand="0" colspan="4" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                 </search>

=== modified file 'caldav/caldav_view.xml'
--- caldav/caldav_view.xml	2011-01-14 09:34:28 +0000
+++ caldav/caldav_view.xml	2011-03-15 19:27:05 +0000
@@ -157,7 +157,7 @@
                     <field name="user_id" widget="selection">
                         <filter icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)" string="MY"/>
                     </field>
-                    <field name="collection_id" required="1"/>
+                    <field name="collection_id"/>
                 </search>
             </field>
         </record>

=== modified file 'crm/crm_installer_view.xml'
--- crm/crm_installer_view.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_installer_view.xml	2011-03-15 19:27:05 +0000
@@ -25,7 +25,7 @@
           <xpath expr="//button[@string='Install Modules']" position="attributes">
             <attribute name="string">Configure</attribute>
           </xpath>
-            <group colspan="8">
+            <group colspan="8" position="inside">
             <group colspan="4" col="4" groups="base.group_extended" name="other">
                   <field name="crm_claim" />
                   <field name="crm_helpdesk" />

=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2011-02-10 04:58:03 +0000
+++ crm/crm_meeting_view.xml	2011-03-15 19:27:05 +0000
@@ -294,29 +294,29 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
                 <search string="Search Meetings">
-                       <group col="12" colspan="4">
+                       <group>
                            <filter icon="terp-check" name="current" string="Current"
                                 domain="[('state','in',('draft', 'open'))]"
                 groups="base.group_extended"
                                 help="Current Meetings"/>
                            <separator orientation="vertical"/>
-                           <field name="name" select="1" string="Subject"/>
-                           <field name="categ_id" select="1"
+                           <field name="name" string="Subject"/>
+                           <field name="categ_id"
                                string="Meeting Type" widget="selection"
                                domain="[('object_id.model', '=', 'crm.meeting')]" />
                            <separator orientation="vertical"/>
-                           <field name="partner_id" select="1" />
-                           <field name="section_id" select="1" widget="selection">
+                           <field name="partner_id"/>
+                           <field name="section_id" widget="selection">
                                <filter icon="terp-personal+" groups="base.group_extended"
                                    domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
-                           <field name="user_id" select="1"/>
+                           <field name="user_id"/>
                        </group>
                         <newline/>
                         <group expand="0" string="Extended Filters...">
-                           <field name="class" select="1" string="Privacy"/>
-                           <field name="show_as" string="Show time as" select="1"/>
+                           <field name="class" string="Privacy"/>
+                           <field name="show_as" string="Show time as"/>
                         </group>
                        <newline/>
                        <group expand="0" string="Group By...">

=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml	2011-03-04 12:53:34 +0000
+++ crm/crm_opportunity_view.xml	2011-03-15 19:27:05 +0000
@@ -326,7 +326,7 @@
                               <field name="date_closed"/>
                         </group>
                         <newline/>
-                        <group expand="0" string="Group By..." colspan="16">
+                        <group expand="0" string="Group By...">
                             <filter string="Salesman" icon="terp-personal"
                                 domain="[]" context="{'group_by':'user_id'}" />
                             <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2011-01-17 22:22:19 +0000
+++ crm/crm_phonecall_view.xml	2011-03-15 19:27:05 +0000
@@ -274,13 +274,13 @@
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-                   select="1" widget="selection" string="Sales Team">
+                   widget="selection" string="Sales Team">
                    <filter icon="terp-personal+" groups="base.group_extended"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
-               <group expand="0" string="Group By..." colspan="4">
+               <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-personal"

=== modified file 'crm/crm_report_view.xml'
--- crm/crm_report_view.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_report_view.xml	2011-03-15 19:27:05 +0000
@@ -69,7 +69,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group col="10" colspan="4">
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Type for this year" />
@@ -78,10 +78,10 @@
                                help="Cases by Team and Type for this month" />
                            <separator orientation="vertical"/>
                            <field name="section_id"
-                               select="1" widget="selection" />
-                           <field name="category2_id" select="1"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                               widget="selection" />
+                           <field name="category2_id"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
                    </group>
                </search>
             </field>
@@ -161,7 +161,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
-                   <group col="8" colspan="4">
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Stage for this year" />
@@ -169,9 +169,9 @@
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Stage for this month" />
                            <separator orientation="vertical"/>
-                        <field name="section_id" select="1" widget="selection"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
                    </group>
                </search>
             </field>
@@ -236,7 +236,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                   <group col='8' colspan='4'>
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Section, Category and Stage for this year" />
@@ -244,9 +244,9 @@
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Section, Category and Stage for this month" />
                            <separator orientation="vertical"/>
-                        <field name="section_id" select="1" widget="selection"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
 
                    </group>
                </search>
@@ -329,7 +329,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                   <group col='12' colspan='4'>
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by User for this year" />
@@ -337,9 +337,9 @@
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by User for this month" />
                            <separator orientation="vertical"/>
-                        <field name="section_id" select="1" widget="selection"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
                    </group>
                </search>
             </field>

=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml	2011-02-22 17:24:34 +0000
+++ crm/report/crm_lead_report_view.xml	2011-03-15 19:27:05 +0000
@@ -70,7 +70,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group col="20" colspan="8">
+                    <group>
                         <filter icon="terp-personal"
                             string="Lead"
                             domain="[('type','=', 'lead')]"
@@ -86,7 +86,7 @@
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                        <filter icon="terp-go-month" string="    Month-1    " 
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in last month"/>
 

=== modified file 'crm/report/crm_phonecall_report_view.xml'
--- crm/report/crm_phonecall_report_view.xml	2011-01-14 00:11:01 +0000
+++ crm/report/crm_phonecall_report_view.xml	2011-03-15 19:27:05 +0000
@@ -51,7 +51,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
+                  <group>
                            <filter string="  Year  " icon="terp-go-year"
                                domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                                help="Phone calls made in current year"/>
@@ -60,7 +60,7 @@
                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Phone calls made in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " 
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
                         <separator orientation="vertical" />
@@ -84,7 +84,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
                         </field>
-                        <field name="user_id" string="Salesman" select="1">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2011-03-09 13:03:45 +0000
+++ crm_claim/crm_claim_view.xml	2011-03-15 19:27:05 +0000
@@ -255,21 +255,21 @@
                 <search string="Search Claims">
                     <filter icon="terp-check" string="Current" name="current"
                         domain="[('state','in',('draft', 'open'))]"
-                        separator="1" help="Draft and Open Claims" />
+                        help="Draft and Open Claims" />
                     <filter icon="terp-camera_test"
                         string="In Progress"
                         domain="[('state','=','open')]"
-                        separator="1" help="In Progress Claims"
+                        help="In Progress Claims"
                     />
                     <filter icon="terp-gtk-media-pause"
                         string="Pending"
                         domain="[('state','=','pending')]"
-                        separator="1" help="All pending Claims"
+                        help="All pending Claims"
                     />
                     <separator orientation="vertical"/>
-                    <field name="name" select='1'/>
-                    <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection">
                             <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Claims" />

=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml	2011-01-18 11:29:22 +0000
+++ crm_claim/report/crm_claim_report_view.xml	2011-03-15 19:27:05 +0000
@@ -54,7 +54,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
+                  <group>
                        <filter string="  Year  " icon="terp-go-year"
                                domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                                help="Claims created in current year"/>
@@ -63,7 +63,7 @@
                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Claims created in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " 
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Claims created in last month"/>
 
@@ -95,7 +95,7 @@
                                 help="My company"/>
                         </field>
 
-                        <field name="user_id" string="Salesman" select="1">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>

=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml	2011-02-22 14:15:01 +0000
+++ crm_fundraising/crm_fundraising_view.xml	2011-03-15 19:27:05 +0000
@@ -285,16 +285,16 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
-                            <field name="state" select="1" />
-                            <field name="name" select='1'
+                            <field name="state"/>
+                            <field name="name"
                                 string="Fund Description" />
-                            <field name="user_id" select="1"
+                            <field name="user_id"
                                 widget="selection">
                                 <filter icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
                             </field>
-                            <field name="section_id" select="1" widget="selection" string="Sales Team">
+                            <field name="section_id" widget="selection" string="Sales Team">
                                 <filter icon="terp-personal+" groups="base.group_extended"
                                     domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My Sales Team(s)" />

=== modified file 'crm_fundraising/report/crm_fundraising_report_view.xml'
--- crm_fundraising/report/crm_fundraising_report_view.xml	2011-01-14 00:11:01 +0000
+++ crm_fundraising/report/crm_fundraising_report_view.xml	2011-03-15 19:27:05 +0000
@@ -75,7 +75,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
+                  <group>
                    		<filter string="  Year  " icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                    			help="Funds raised in current year"/>
@@ -84,7 +84,7 @@
                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                     	   help="Funds raised in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " 
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Funds raised in last month"/>
                         <separator orientation="vertical" />
@@ -111,7 +111,7 @@
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
                         </field>
-                        <field name="user_id" select="1" string="Salesman">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -123,10 +123,8 @@
                         <filter icon="gtk-cancel"
                             string="Cancel"
                             domain="[('state','=','cancel')]"/>
-                        <group>
-                            <separator orientation="vertical"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                        </group>
+                        <separator orientation="vertical"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">

=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml	2011-02-22 08:55:27 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml	2011-03-15 19:27:05 +0000
@@ -235,20 +235,19 @@
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
                     <filter icon="terp-go-today" string="Today"
-                        separator="1"
                         domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
                         help="Todays's Helpdesk Requests"
                         />
                     <filter icon="terp-go-week"
-                        string="7 Days" separator="1"
+                        string="7 Days" 
                         help="Helpdesk requests during last 7 days"
                         domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         />
                     <separator orientation="vertical"/>
-                    <field name="name" select='1' string="Query"/>
+                    <field name="name" string="Query"/>
                     <field name="partner_id" />
-                    <field name="user_id" select="1" widget="selection"/>
-                    <field name="section_id" select="1" widget="selection" string="Sales Team">
+                    <field name="user_id" widget="selection"/>
+                    <field name="section_id" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+" groups="base.group_extended"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />

=== modified file 'crm_helpdesk/report/crm_helpdesk_report_view.xml'
--- crm_helpdesk/report/crm_helpdesk_report_view.xml	2011-01-14 00:11:01 +0000
+++ crm_helpdesk/report/crm_helpdesk_report_view.xml	2011-03-15 19:27:05 +0000
@@ -53,14 +53,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <group col="16" colspan="9">
+                    <group>
                         <filter string="  Year  " icon="terp-go-year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                        <filter icon="terp-go-month" string="    Month-1    " 
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in last month"/>
                         <separator orientation="vertical" />

=== modified file 'crm_partner_assign/report/crm_lead_report_view.xml'
--- crm_partner_assign/report/crm_lead_report_view.xml	2011-01-14 00:11:01 +0000
+++ crm_partner_assign/report/crm_lead_report_view.xml	2011-03-15 19:27:05 +0000
@@ -9,10 +9,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group col="20" colspan="8">
+                    <group>
                         <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days" separator="1"
+                        <filter icon="terp-go-week" string="7 Days" 
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-check"

=== modified file 'document/report/document_report_view.xml'
--- document/report/document_report_view.xml	2011-01-14 00:11:01 +0000
+++ document/report/document_report_view.xml	2011-03-15 19:27:05 +0000
@@ -41,15 +41,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group col="12" colspan="4">
+                        <group>
                         <separator orientation="vertical"/>
                             <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
                             <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
                             <separator orientation="vertical"/>
-                            <field name="name" select="1"/>
-                            <field name="month" select="1"/>
-                            <field name="user" select="1"/>
-                            <field name="directory" select="1"/>
+                            <field name="name"/>
+                            <field name="month"/>
+                            <field name="user"/>
+                            <field name="directory"/>
                         </group>
                </search>
             </field>

=== modified file 'email_template/email_template_account_view.xml'
--- email_template/email_template_account_view.xml	2011-02-07 11:32:52 +0000
+++ email_template/email_template_account_view.xml	2011-03-15 19:27:05 +0000
@@ -81,11 +81,11 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" string="Company Accounts" domain="[('company','=','yes')]"/>
                     <separator orientation="vertical"/>
-                    <field name="user" select="1">
+                    <field name="user">
                         <filter icon="terp-personal" help="My Accounts" name="my" domain="[('user','=',uid)]"/>
                     </field>
-                    <field name="name" select="1"/>
-                    <field name="email_id" select="1"/>
+                    <field name="name"/>
+                    <field name="email_id"/>
                </search>
            </field>
         </record>

=== modified file 'email_template/email_template_view.xml'
--- email_template/email_template_view.xml	2011-01-14 00:11:01 +0000
+++ email_template/email_template_view.xml	2011-03-15 19:27:05 +0000
@@ -172,17 +172,17 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Templates">
-                    <group col="13" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="object_name" select="1"/>
-                        <field name="def_to" select="1"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="object_name"/>
+                        <field name="def_to"/>
                         <separator orientation="vertical"/>
-                        <field name="lang" select="1"/>
-                        <field name="def_subject" select="1"/>
-                        <field name="file_name" select="1"/>
+                        <field name="lang"/>
+                        <field name="def_subject"/>
+                        <field name="file_name"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group by..." colspan="4" col="10">
+                    <group expand="0" string="Group by...">
                         <filter string="Account" domain="[]" context="{'group_by':'from_account'}" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
                         <filter string="Resource" domain="[]" context="{'group_by':'object_name'}" icon="terp-accessories-archiver"/>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2011-01-27 09:49:39 +0000
+++ event/event_view.xml	2011-03-15 19:27:05 +0000
@@ -227,18 +227,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Events">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="date_begin" select="1"/>
+                        <field name="date_begin"/>
                         <field name="section_id" widget="selection" groups="base.group_extended">
                           <filter icon="terp-personal+"
                                   context="{'invisible_section': False}"
@@ -248,7 +248,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="12">
+                    <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
@@ -476,7 +476,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <group col="12" colspan="4">
+                    <group>
                         <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
@@ -488,7 +488,7 @@
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="state" select="1"/>
+                        <field name="state"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml	2011-01-14 00:11:01 +0000
+++ event/report/report_event_registration_view.xml	2011-03-15 19:27:05 +0000
@@ -52,7 +52,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
-                    <group col="8" colspan="4">
+                    <group>
                     <filter icon="terp-go-year" string="Last 365 Days" name="365day"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                         help="Events with beginning date in last 365 days"/>
@@ -62,7 +62,6 @@
                         help="Events with beginning date in last 30 days"/>
                     <filter icon="terp-go-week"
                          string="Last 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="Events with beginning date in last 7 days"/>
                     <separator orientation="vertical"/>
@@ -94,7 +93,7 @@
                     </group>
                     <newline/>
 
-                    <group expand="1" string="Group By..." colspan="4" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
                         <filter string="Sale Team"  icon="terp-personal" context="{'group_by': 'section_id'}"/>

=== modified file 'hr/hr_installer.xml'
--- hr/hr_installer.xml	2011-01-14 00:11:01 +0000
+++ hr/hr_installer.xml	2011-03-15 19:27:05 +0000
@@ -21,7 +21,7 @@
             <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">You can enhance the base HR Application by installing few HR-related functionalities.</attribute>
             </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="hr_holidays"/>
             <field name="hr_expense"/>
             <field name="hr_recruitment"/>

=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml	2011-01-27 09:49:39 +0000
+++ hr_contract/hr_contract_view.xml	2011-03-15 19:27:05 +0000
@@ -36,12 +36,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Wage Type">
-                   <group col='15' colspan='4'>
+                   <group>
                    <field name="name"/>
                    <field name="type"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                    <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                    </group>
                </search>
@@ -78,7 +78,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Wage Period">
-                   <group col='15' colspan='4'>
+                   <group>
                     <field name="name"/>
                    </group>
                </search>
@@ -131,7 +131,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
-                   <group col='15' colspan='4'>
+                   <group>
                    <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> 
                    <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>   
                    <separator orientation="vertical"/>                  
@@ -142,7 +142,7 @@
                    <field name="date_end"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> 
                    <separator orientation="vertical"/> 
                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
@@ -251,7 +251,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
-                   <group col='15' colspan='4'>
+                   <group>
                     <field name="name"/>
                    </group>
                </search>

=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml	2011-03-09 13:03:45 +0000
+++ hr_evaluation/hr_evaluation_view.xml	2011-03-15 19:27:05 +0000
@@ -8,7 +8,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Evaluation Plan">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -251,7 +251,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
-                   <group col='10' colspan='4'>
+                   <group>
                     <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
@@ -340,7 +340,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
-                   <group col='10' colspan='4'>
+                   <group>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>

=== modified file 'hr_evaluation/report/hr_evaluation_report_view.xml'
--- hr_evaluation/report/hr_evaluation_report_view.xml	2011-01-14 00:11:01 +0000
+++ hr_evaluation/report/hr_evaluation_report_view.xml	2011-03-15 19:27:05 +0000
@@ -52,7 +52,7 @@
                     <filter icon="terp-go-month" string=" Month " name="month" 
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Evaluation done in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
+	                <filter icon="terp-go-month" string="    Month-1    " 
                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Evaluation done in last month"/>
                     <separator orientation="vertical"/>

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2011-02-18 13:27:42 +0000
+++ hr_expense/hr_expense_view.xml	2011-03-15 19:27:05 +0000
@@ -146,13 +146,13 @@
                       <filter icon="terp-go-month" string="This Month" name="this"
                               domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
-                      <field name="employee_id" select='1'/>
-                      <field name="date" select='1'/>
+                      <field name="employee_id"/>
+                      <field name="date"/>
                       <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
                    <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
                     </field>
-                      <field name="name" select='1'/>
-                      <field name="user_id"  string="User" invisible="True">
+                      <field name="name"/>
+                      <field name="user_id"  string="User">
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>

=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml	2011-01-14 00:11:01 +0000
+++ hr_expense/report/hr_expense_report_view.xml	2011-03-15 19:27:05 +0000
@@ -60,7 +60,7 @@
                       name="month"
                       domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                       help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                <filter icon="terp-go-month" string="    Month-1    " 
                       domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                       help="Expenses during last month"/>
                   <separator orientation="vertical"/>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-03-11 11:32:04 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-03-15 19:27:05 +0000
@@ -8,7 +8,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>

=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml	2011-01-27 09:49:39 +0000
+++ hr_payroll/hr_payroll_view.xml	2011-03-15 19:27:05 +0000
@@ -58,14 +58,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Passport">
-                    <group col="8" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="employee_id"/>
                         <field name="country_id"/>
                         <field name="address_id"/>
                     </group>
                     <newline/>
-                    <group col="8" colspan="4" expand="0" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/>
                         <filter string="Country" name="country_id" icon="terp-go-home" context="{'group_by':'country_id'}"/>
                         <filter string="Expire" name="date_expire" icon="terp-go-month" context="{'group_by':'date_expire'}"/>
@@ -487,7 +487,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslips">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Slip"/>
                         <separator orientation="vertical"/>
@@ -499,7 +499,7 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group col="8" colspan="4" expand="0" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'group_by':'register_id'}"/>
@@ -612,11 +612,11 @@
                     <filter icon="terp-document-new" string="Allowance" domain="[('type','=','allowance')]"/>
                     <filter icon="terp-check" string="Deduction" domain="[('type','=','deduction')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                     <field name="code" select="1"/>
+                    <field name="name"/>
+                     <field name="code"/>
                     <field name="type"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Based" icon="terp-go-month" domain="[]" context="{'group_by':'base'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -703,7 +703,7 @@
             <field name="type">search</field>
              <field name="arch" type="xml">
                 <search string="Search Company Contribution">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-document-new" string="Fixed Amount" domain="[('amount_type','=','fix')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Function Calculation" domain="[('amount_type','=','func')]" help="Posted Slip"/>
                         <separator orientation="vertical"/>
@@ -713,7 +713,7 @@
                         <field name="register_id"/>
                     </group>
                     <newline/>
-                    <group col="8" colspan="4" expand="0" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" name="amount_type" context="{'group_by':'amount_type'}"/>
                         <filter string="Category" name="category_id" icon="terp-stock_symbol-selection"  context="{'group_by':'category_id'}"/>
                     </group>

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2011-03-11 17:29:52 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2011-03-15 19:27:05 +0000
@@ -244,7 +244,7 @@
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
                <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" separator="1"/>
+                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
                    <filter icon="terp-personal+" context="{'invisible_department': False}"
@@ -252,7 +252,7 @@
                        help="My Department"/>
                </field>
                <newline/>
-                <group expand="0" string="Group By..." colspan="11" col="20">
+                <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>

=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml	2011-01-14 00:11:01 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml	2011-03-15 19:27:05 +0000
@@ -59,7 +59,6 @@
                         help="Recruitment performed in current month"/>
                     <filter icon="terp-go-month"
                         string="    Month-1    "
-                        separator="1"
                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Recruitment during last month"/>
                     <separator orientation="vertical"/>

=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml	2011-03-11 12:23:45 +0000
+++ hr_timesheet/hr_timesheet_view.xml	2011-03-15 19:27:05 +0000
@@ -62,7 +62,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>

=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml	2011-01-14 00:11:01 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml	2011-03-15 19:27:05 +0000
@@ -46,7 +46,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group col="10" colspan="4">
+                    <group>
                       <filter icon="terp-go-year" 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="Timesheet lines in this year"/>
@@ -56,7 +56,6 @@
                           help="Timesheet lines in this month"/>
                     <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="Timesheet lines during last 7 days"/>
                       <separator orientation="vertical"/>
@@ -70,7 +69,7 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="10" col="12">
+                    <group expand="0" string="Extended Filters...">
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <field name="invoice_id" widget="selection"/>
@@ -162,14 +161,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group col="10" colspan="4">
+                    <group>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
                         <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="user_id" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
@@ -218,9 +217,9 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
                     <separator orientation="vertical"/>
-                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="manager_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="manager_id"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -299,15 +298,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                    <group col="10" colspan="4">
+                    <group>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
                         <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
@@ -371,18 +370,18 @@
             <field name="model">report_timesheet.account</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by account">
-                    <group col="10" colspan="4">
+                <search string="Timesheet by account">
+                    <group>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
                         <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
-                </form>
+                </search>
             </field>
         </record>
 

=== modified file 'hr_timesheet_invoice/report/report_analytic_view.xml'
--- hr_timesheet_invoice/report/report_analytic_view.xml	2011-01-27 09:49:39 +0000
+++ hr_timesheet_invoice/report/report_analytic_view.xml	2011-03-15 19:27:05 +0000
@@ -113,14 +113,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
-                   <group col="12" colspan="4">
+                   <group>
                         <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
                         <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="product_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
                    </group>
                </search>
             </field>

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2011-03-11 10:10:16 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2011-03-15 19:27:05 +0000
@@ -33,7 +33,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="sheet_id" />
                         <field name="name" groups="analytic.group_analytic_accounting"/>
                         <field name="invoice_rate"/>
@@ -159,11 +159,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id" select="1"/>
+                        <field name="employee_id"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+"

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2011-03-15 19:27:05 +0000
@@ -40,7 +40,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col="10" colspan="12">
+                    <group>
                         <filter icon="terp-go-year" string=" Year "
                             name="year"
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"

=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml	2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml	2011-03-15 19:27:05 +0000
@@ -48,7 +48,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col="10" colspan="12">
+                    <group>
                         <filter icon="terp-go-year" string=" Year "
                                 domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                                 help="Timesheet in current year"/>

=== modified file 'idea/idea_view.xml'
--- idea/idea_view.xml	2011-01-14 00:11:01 +0000
+++ idea/idea_view.xml	2011-03-15 19:27:05 +0000
@@ -8,12 +8,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
-                <group col="10" colspan="4">
+                <group>
                     <field name="name" string="Category"/>
                     <field name="parent_id" widget="selection"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="0" string="Group By...">
                     <filter string="Parent Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
                 </group>
             </search>
@@ -169,12 +169,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas vote">
-                <group col="10" colspan="4">
+                <group>
                     <field name="idea_id" widget="selection"/>
                     <field name="user_id" string="User"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="0" string="Group By...">
                     <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
@@ -288,17 +288,17 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas">
-                <group col="10" colspan="4">
+                <group>
                     <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/>
                     <filter icon="terp-camera_test" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="category_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="12" col="10">
+                <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>

=== modified file 'idea/report/report_vote_view.xml'
--- idea/report/report_vote_view.xml	2011-01-14 00:11:01 +0000
+++ idea/report/report_vote_view.xml	2011-03-15 19:27:05 +0000
@@ -37,14 +37,12 @@
                             help="Idea Vote created in current month"/>
                         <filter icon="terp-go-month"
                              string="    Month-1    "
-                             separator="1"
                              domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created last month"/>
                          <separator orientation="vertical"/>
                          <filter icon="terp-go-today"
                              string="    Today    "
                              name="today"
-                             separator="1"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created by today"/>
                         <separator orientation="vertical"/>
@@ -64,7 +62,7 @@
                         <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>

=== modified file 'lunch/lunch_view.xml'
--- lunch/lunch_view.xml	2011-01-14 00:11:01 +0000
+++ lunch/lunch_view.xml	2011-03-15 19:27:05 +0000
@@ -83,7 +83,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
                 </search>
@@ -191,7 +191,7 @@
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
@@ -372,16 +372,15 @@
                                 help="Box amount in current month"/>
                         <filter icon="terp-go-month"
                          string="    Month-1    "
-                         separator="1"
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Box amount in last month"/>
                     <separator orientation="vertical"/>
-                        <field name="user_id" select="1"/>
-                        <field name="box" select="1"/>
-                        <field name="amount" select="1"/>
+                        <field name="user_id"/>
+                        <field name="box"/>
+                        <field name="amount"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
                     </group>
                 </search>

=== modified file 'lunch/report/report_lunch_order_view.xml'
--- lunch/report/report_lunch_order_view.xml	2011-01-14 00:11:01 +0000
+++ lunch/report/report_lunch_order_view.xml	2011-03-15 19:27:05 +0000
@@ -35,12 +35,11 @@
                         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"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
                     <separator orientation="vertical"/>
@@ -66,4 +65,4 @@
 <!--              id="menu_lunch_order_analysis" action="action_report_lunch_order_all"  sequence="1" />-->
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'marketing/marketing_view.xml'
--- marketing/marketing_view.xml	2011-01-14 00:11:01 +0000
+++ marketing/marketing_view.xml	2011-03-15 19:27:05 +0000
@@ -36,7 +36,7 @@
                   <xpath expr="//button[@string='Install Modules']" position="attributes">
                             <attribute name="string">Configure</attribute>
                   </xpath>
-                  <group colspan="8">
+                  <group colspan="8" position="inside">
                         <field name="marketing_campaign" />
                         <field name="email_template" />
                         <field name="crm_profiling" />

=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml	2011-01-27 09:49:39 +0000
+++ marketing_campaign/marketing_campaign_view.xml	2011-03-15 19:27:05 +0000
@@ -94,10 +94,10 @@
                <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
                <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
                <separator orientation="vertical"/>
-               <field name="name" select="1"/>
-               <field name="object_id" select="1" string="Resource"/>
+               <field name="name"/>
+               <field name="object_id" string="Resource"/>
                <newline/>
-               <group expand="0" string="Group By..." colspan="10" col="12">
+               <group expand="0" string="Group By...">
                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
                    <separator orientation="vertical"/>
                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
@@ -199,12 +199,12 @@
                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
                <separator orientation="vertical"/>
-               <field name="name" select="1"/>
-               <field name="campaign_id" select="1"/>
-               <field name="object_id" select="1"/>
-               <field name="date_run" select="1"/>
+               <field name="name"/>
+               <field name="campaign_id"/>
+               <field name="object_id"/>
+               <field name="date_run"/>
                <newline/>
-               <group expand="0" string="Group By..." colspan="10" col="12">
+               <group expand="0" string="Group By...">
                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <separator orientation="vertical"/>
                    <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
@@ -396,7 +396,7 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Marketing Campaign Activities">
-               <group colspan="4" col="10">
+               <group>
                 <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
                 <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
                 <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
@@ -411,7 +411,7 @@
                 <field name="partner_id"/>
                </group>
                <newline/>
-               <group expand="0" string="Group By..." colspan="10" col="12">
+               <group expand="0" string="Group By...">
                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />

=== modified file 'marketing_campaign/report/campaign_analysis_view.xml'
--- marketing_campaign/report/campaign_analysis_view.xml	2011-01-14 00:11:01 +0000
+++ marketing_campaign/report/campaign_analysis_view.xml	2011-03-15 19:27:05 +0000
@@ -59,7 +59,7 @@
                     <field name="country_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                     <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />

=== modified file 'membership/report/report_membership_view.xml'
--- membership/report/report_membership_view.xml	2011-01-14 00:11:01 +0000
+++ membership/report/report_membership_view.xml	2011-03-15 19:27:05 +0000
@@ -35,7 +35,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Last 365 Days" icon="terp-go-year"
                             domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
                         <filter string="Last 30 Days" icon="terp-go-month" name="month"
@@ -49,7 +49,7 @@
                         <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"

=== modified file 'mrp/mrp_installer.xml'
--- mrp/mrp_installer.xml	2011-01-14 00:11:01 +0000
+++ mrp/mrp_installer.xml	2011-03-15 19:27:05 +0000
@@ -24,7 +24,7 @@
             <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
           </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="stock_location"/>
             <field name="mrp_jit"/>
             <field name="mrp_operations"/>

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2011-03-11 15:18:19 +0000
+++ mrp/mrp_view.xml	2011-03-15 19:27:05 +0000
@@ -79,13 +79,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name"/>
                        <field name="composition"/>
                        <field name="group_id"  widget="selection" />
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                         <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
                </search>
@@ -183,7 +183,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
-                   <group col='15' colspan='4'>
+                   <group>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
@@ -191,7 +191,7 @@
                         <field name="resource_type"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                   <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -289,7 +289,7 @@
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <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="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
                 </search>
@@ -420,14 +420,14 @@
            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
-                    <group col='4' colspan='4'>
+                    <group>
                          <field name="name"/>
                          <field name="code" string="Reference"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
                     </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='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
                         <separator orientation="vertical"/>
@@ -796,7 +796,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Production">
-                   <group col='9' colspan='4'>
+                   <group>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"
                            help="Manufacturing Orders which are waiting for raw materials."/>
@@ -817,7 +817,7 @@
                        <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="10" 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'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>

=== modified file 'mrp/report/mrp_production_order_view.xml'
--- mrp/report/mrp_production_order_view.xml	2011-01-14 00:11:01 +0000
+++ mrp/report/mrp_production_order_view.xml	2011-03-15 19:27:05 +0000
@@ -47,7 +47,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="6">
+                  <group>
 	                    <filter icon="terp-go-year" string="Year"
 	                    	    domain="[('year','=',time.strftime('%%Y'))]"
 	                    	    help="Production performed during current year"/>
@@ -57,7 +57,6 @@
 	                    		help="Production performed during current month"/>
 		                <filter icon="terp-go-week"
 	                            string="Month -1"
-	                            separator="1"
 	                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Production during last month"/>
                       <separator orientation="vertical"/>

=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml	2011-02-18 08:58:56 +0000
+++ mrp_operations/mrp_operations_view.xml	2011-03-15 19:27:05 +0000
@@ -131,7 +131,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <search string="Search Work Orders">
-                        <group col='9' colspan='4'>
+                        <group>
 	                       <filter icon="terp-document-new" string="Draft"
 	                           domain="[('state','=','draft')]"/>
 	                       <filter icon="terp-check" string="In Progress" name="Current"
@@ -150,7 +150,7 @@
 	                		<field name="date_planned" widget="date"/>
 	                	</group>
                 	<newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
                         <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
                         <separator orientation="vertical"/>

=== modified file 'mrp_operations/report/mrp_workorder_analysis_view.xml'
--- mrp_operations/report/mrp_workorder_analysis_view.xml	2011-02-18 08:58:56 +0000
+++ mrp_operations/report/mrp_workorder_analysis_view.xml	2011-03-15 19:27:05 +0000
@@ -46,7 +46,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="6">
+                  <group>
                         <filter icon="terp-go-year" string="Year"
                                 domain="[('year','=',time.strftime('%%Y'))]"
                                 help="Work orders made during current year"/>
@@ -56,7 +56,6 @@
                                 help="Work orders made during current month"/>
                         <filter icon="terp-go-week"
                                 string="Month -1"
-                                separator="1"
                                 domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
                                 help="Work orders during last month"/>
                       <separator orientation="vertical"/>

=== modified file 'mrp_repair/mrp_repair_view.xml'
--- mrp_repair/mrp_repair_view.xml	2011-02-28 14:22:32 +0000
+++ mrp_repair/mrp_repair_view.xml	2011-03-15 19:27:05 +0000
@@ -179,7 +179,7 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
-                  <group col='4' colspan='4'>
+                  <group>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
@@ -192,7 +192,7 @@
                        <field name="state" />
                   </group>
                   <newline/>
-                  <group expand="0" string="Group By..." colspan="10" col="8">
+                  <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>

=== modified file 'mrp_subproduct/mrp_subproduct_view.xml'
--- mrp_subproduct/mrp_subproduct_view.xml	2011-01-14 00:11:01 +0000
+++ mrp_subproduct/mrp_subproduct_view.xml	2011-03-15 19:27:05 +0000
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <notebook>
+             <notebook position="inside">
                  <page string="Sub Products" position="inside">
                      <field colspan="4" name="sub_products" nolabel="1" widget="one2many_list">
                          <tree string="sub products"  editable="top">

=== modified file 'multi_company/res_company_view.xml'
--- multi_company/res_company_view.xml	2011-01-14 00:11:01 +0000
+++ multi_company/res_company_view.xml	2011-03-15 19:27:05 +0000
@@ -49,10 +49,10 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="company_dest_id" select="1" widget="selection"/>
-                    <field name="object_id" select="1"/>
+                    <field name="name"/>
+                    <field name="company_id" widget="selection"/>
+                    <field name="company_dest_id" widget="selection"/>
+                    <field name="object_id"/>
                 </search>
             </field>
         </record>

=== modified file 'point_of_sale/account_statement_view.xml'
--- point_of_sale/account_statement_view.xml	2011-02-10 16:56:48 +0000
+++ point_of_sale/account_statement_view.xml	2011-03-15 19:27:05 +0000
@@ -39,7 +39,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
@@ -64,7 +64,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2011-02-04 11:32:47 +0000
+++ point_of_sale/point_of_sale_view.xml	2011-03-15 19:27:05 +0000
@@ -140,7 +140,7 @@
                     <field name="user_id"/>
                     <field name="date_order" string="Order date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator string="" orientation="vertical"/>

=== modified file 'point_of_sale/report/pos_order_report_view.xml'
--- point_of_sale/report/pos_order_report_view.xml	2011-01-14 00:11:01 +0000
+++ point_of_sale/report/pos_order_report_view.xml	2011-03-15 19:27:05 +0000
@@ -46,14 +46,12 @@
 	                        help="POS ordered created during current month"/>
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
-	                         separator="1"
 	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                         help="POS ordered created last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
                              string="Today"
                              name="today"
-                             separator="1"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
                              help="POS ordered created by today"/>
 	                    <separator orientation="vertical"/>
@@ -78,7 +76,7 @@
                         <field name="date_payment"/>
                     </group>
 	                <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
+	                <group expand="1" string="Group By...">
 	                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
 	                    <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
 	                    <separator orientation="vertical"/>

=== modified file 'point_of_sale/report/report_cash_register_view.xml'
--- point_of_sale/report/report_cash_register_view.xml	2011-01-14 00:11:01 +0000
+++ point_of_sale/report/report_cash_register_view.xml	2011-03-15 19:27:05 +0000
@@ -35,14 +35,12 @@
 	                        help="Cash Analysis created in current month"/>
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
-	                         separator="1"
 	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                         help="Cash Analysis created in last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
                              string="    Today    "
                              name="today"
-                             separator="1"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
                              help="Cash Analysis created by today"/>	                    
 	                    <separator orientation="vertical"/>
@@ -61,7 +59,7 @@
                         </field>
                     </group>  
                     <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
+	                <group expand="1" string="Group By...">
 	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
 	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>

=== modified file 'process/process_view.xml'
--- process/process_view.xml	2011-01-14 00:11:01 +0000
+++ process/process_view.xml	2011-03-15 19:27:05 +0000
@@ -108,12 +108,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Process">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
                 </search>
@@ -213,13 +213,13 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
-                <group col="10" colspan="4">
+                <group>
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="kind" />
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="4" col="4">
+                <group expand="0" string="Group By...">
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
                 </group>
@@ -302,7 +302,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Process Transition">
-                <group col="10" colspan="4">
+                <group>
                     <field name="name"/>
                     <field name="source_node_id"/>
                     <field name="target_node_id" />

=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml	2011-03-14 10:27:42 +0000
+++ procurement/procurement_view.xml	2011-03-15 19:27:05 +0000
@@ -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>

=== modified file 'profile_tools/misc_tools_installer.xml'
--- profile_tools/misc_tools_installer.xml	2011-01-14 00:11:01 +0000
+++ profile_tools/misc_tools_installer.xml	2011-03-15 19:27:05 +0000
@@ -24,7 +24,7 @@
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
           </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="share"/>
             <field name="lunch"/>
             <field name="idea"/>

=== modified file 'project/project_installer.xml'
--- project/project_installer.xml	2011-01-14 00:11:01 +0000
+++ project/project_installer.xml	2011-03-15 19:27:05 +0000
@@ -23,7 +23,7 @@
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
           </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="project_issue"/>
             <field name="project_long_term" groups="base.group_extended"/>
             <field name="hr_timesheet_sheet"/>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2011-01-27 09:49:39 +0000
+++ project/project_view.xml	2011-03-15 19:27:05 +0000
@@ -106,7 +106,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                   <group col='15' colspan='4'>
+                   <group>
                        <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
@@ -118,7 +118,7 @@
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
                          <separator orientation="vertical"/>
@@ -395,7 +395,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                <search string="Task Edition">
-                    <group col="20" colspan="4">
+                    <group>
                         <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
@@ -407,16 +407,16 @@
                         <separator orientation="vertical"/>
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="project_id" select="1">
+                        <field name="name"/>
+                        <field name="project_id">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
-                        <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" separator="1"/>
+                        <field name="user_id">
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>

=== modified file 'project/report/project_report_view.xml'
--- project/report/project_report_view.xml	2011-01-14 00:11:01 +0000
+++ project/report/project_report_view.xml	2011-03-15 19:27:05 +0000
@@ -59,7 +59,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
-                    <group colspan="10" col="12">
+                    <group>
                         <filter icon="terp-go-year" string="  Year  "
                                 domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
                                 help="Current Year"/>
@@ -69,7 +69,6 @@
                                 help="Current Month"/>
                         <filter icon="terp-go-week"
                                 string="    Month-1    "
-                                separator="1"
                                 domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                                 help="Previous Month"/>
                         <separator orientation="vertical"/>
@@ -109,7 +108,7 @@
                       <field name="partner_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="priority"/>
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
@@ -122,7 +121,7 @@
 
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2011-03-09 04:36:22 +0000
+++ project_issue/project_issue_view.xml	2011-03-15 19:27:05 +0000
@@ -214,12 +214,12 @@
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
+                        <filter icon="terp-go-today" string="Today"  domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" groups="base.group_extended"/>
                         <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                         </field>
                         <field name="project_id"/>
                     </group>
@@ -307,17 +307,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today" separator="1"
+                    <filter icon="terp-go-today" string="Today" 
                         domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
                     <separator orientation="vertical"/>
                     <group>
-                        <field name="name" select='1' string="Feature description"/>
-                        <field name="user_id" select="1"/>
-                        <field name="state" select="1">
+                        <field name="name" string="Feature description"/>
+                        <field name="user_id"/>
+                        <field name="state">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
-                        <field name="project_id" select="1" string="Project"/>
+                        <field name="project_id" string="Project"/>
                     </group>
                 </search>
             </field>

=== modified file 'project_issue/report/project_issue_report_view.xml'
--- project_issue/report/project_issue_report_view.xml	2011-01-14 00:11:01 +0000
+++ project_issue/report/project_issue_report_view.xml	2011-03-15 19:27:05 +0000
@@ -53,7 +53,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
+                  <group>
                            <filter string="Year" icon="terp-go-year" help="Current Year"
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                         />
@@ -61,7 +61,7 @@
                        <filter string="Month" icon="terp-go-month" name="This Month"
                         domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         />
-                       <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
+                       <filter icon="terp-go-week" string="Month-1"  help="Previous Month"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         />
 
@@ -89,10 +89,10 @@
 
                            </field>
                               <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection"/>
+                          <field name="user_id"  widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
                        <field name="partner_id"/>
                        <field name="assigned_to" widget="selection"/>
                        <separator orientation="vertical"/>
@@ -109,7 +109,7 @@
                        <field name="date_closed" string="Date Closed"/>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                   <group  expand="1" string="Group By...">
                            <filter name="User" string="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2011-01-14 09:34:28 +0000
+++ project_long_term/project_long_term_view.xml	2011-03-15 19:27:05 +0000
@@ -74,13 +74,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Resources Allocation">
-                    <group colspan="4" col="20">
+                    <group>
                         <field name="resource_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -266,7 +266,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
-                    <group colspan="4" col="20">
+                    <group>
                         <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
@@ -280,7 +280,7 @@
                         <field name="date_end"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>

=== modified file 'project_messages/project_messages_view.xml'
--- project_messages/project_messages_view.xml	2011-01-27 09:49:39 +0000
+++ project_messages/project_messages_view.xml	2011-03-15 19:27:05 +0000
@@ -70,7 +70,7 @@
            <field name="arch" type="xml">
                <search string="Project Messages">
                		<group>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-go-today" string="Today"  domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                			<field name="project_id"/>
                         <field name="from_id"/>
@@ -78,7 +78,7 @@
                         <field name="message"/>
                		</group>
                		<newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
                         <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
                         <separator orientation="vertical"/>

=== modified file 'project_planning/project_planning_view.xml'
--- project_planning/project_planning_view.xml	2011-01-14 00:11:01 +0000
+++ project_planning/project_planning_view.xml	2011-03-15 19:27:05 +0000
@@ -156,7 +156,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning by Account">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
@@ -274,10 +274,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning statistics">
-                    <group col="10" colspan="4">
-                        <field name="planning_id" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                    <group>
+                        <field name="planning_id"/>
+                        <field name="user_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     </group>
                 </search>
             </field>

=== modified file 'project_scrum/project_scrum_view.xml'
--- project_scrum/project_scrum_view.xml	2011-01-27 09:49:39 +0000
+++ project_scrum/project_scrum_view.xml	2011-03-15 19:27:05 +0000
@@ -129,7 +129,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter
                             icon="terp-check"
                             string="Current"
@@ -163,7 +163,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -317,7 +317,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sprints">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
@@ -329,7 +329,7 @@
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
                         <filter string="Scrum Master" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <separator orientation="vertical"/>
@@ -425,7 +425,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="sprint_id">
@@ -434,7 +434,7 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Meeting Date"/>

=== modified file 'project_timesheet/report/task_report_view.xml'
--- project_timesheet/report/task_report_view.xml	2011-01-14 00:11:01 +0000
+++ project_timesheet/report/task_report_view.xml	2011-03-15 19:27:05 +0000
@@ -30,7 +30,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Tasks by User">
-            		<group colspan="4" col="3">
+            		<group>
                         <filter icon="terp-go-year" string=" Year "
                             name="year"
                             domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
@@ -47,7 +47,7 @@
 	                    <field name="user_id"/>
                 	</group>
                 	<newline/>
-                	<group expand="1" string="Group By..." colspan="4" col="3">
+                	<group expand="1" string="Group By...">
                 	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2011-03-09 16:12:49 +0000
+++ purchase/purchase_view.xml	2011-03-15 19:27:05 +0000
@@ -232,22 +232,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1" help="Purchase order which are in draft state"/>
-                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1" help="Purchase order to be approved"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1" help="Approved purchase order"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="Not Invoiced" domain="[('invoice_ids','=', False)]" separator="1" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
-                    <separator orientation="vertical"/>
-                    <field name="name" select="1" string="Reference"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="create_uid" select="1"/>
+                 <group>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]"  help="Purchase order to be approved"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" string="Reference"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>

=== modified file 'purchase/report/purchase_report_view.xml'
--- purchase/report/purchase_report_view.xml	2011-01-17 08:00:48 +0000
+++ purchase/report/purchase_report_view.xml	2011-03-15 19:27:05 +0000
@@ -53,7 +53,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group colspan="10" col="12">
+            <group>
                 <filter icon="terp-go-year" string="  Year  "
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Order in current year"/>
@@ -63,7 +63,6 @@
                         help="Order in  current month"/>
                 <filter icon="terp-go-month"
                          string="    Month-1    "
-                         separator="1"
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Order in last month"/>
                 <separator orientation="vertical"/>
@@ -80,7 +79,7 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="user_id"/>
                     <field name="validator"/>
                     <separator orientation="vertical"/>
@@ -94,7 +93,7 @@
                     <field name="expected_date"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>

=== modified file 'purchase/wizard/purchase_installer.xml'
--- purchase/wizard/purchase_installer.xml	2011-01-14 00:11:01 +0000
+++ purchase/wizard/purchase_installer.xml	2011-03-15 19:27:05 +0000
@@ -25,7 +25,7 @@
               <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
                </xpath>
-                <group colspan="8">
+                <group colspan="8" position="inside">
                   <field name="purchase_requisition"/>
                   <field name="purchase_analytic_plans"/>
                 </group>

=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml	2011-01-17 08:00:48 +0000
+++ purchase_requisition/purchase_requisition_view.xml	2011-03-15 19:27:05 +0000
@@ -22,7 +22,7 @@
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
             <xpath expr="/search/group/filter[@string='Not Invoiced']" position="after">
-             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1" help="Purchase Orders with requisition"/>
+             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
             </xpath>
         </field>
     </record>
@@ -119,7 +119,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
-                 <group col='10' colspan='4'>
+                 <group>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
@@ -130,7 +130,7 @@
                     <field name="exclusive" />
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                   	<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
 					<separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>

=== modified file 'report_designer/report_designer_installer.xml'
--- report_designer/report_designer_installer.xml	2011-01-14 00:11:01 +0000
+++ report_designer/report_designer_installer.xml	2011-03-15 19:27:05 +0000
@@ -25,7 +25,7 @@
           <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
           </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="base_report_designer"/>
             <field name="base_report_creator"/>
           </group>

=== modified file 'report_intrastat/report_intrastat_view.xml'
--- report_intrastat/report_intrastat_view.xml	2011-01-14 00:11:01 +0000
+++ report_intrastat/report_intrastat_view.xml	2011-03-15 19:27:05 +0000
@@ -97,15 +97,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
                         <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="intrastat_id" select="1"/>
-                        <field name="type" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="code"/>
+                        <field name="intrastat_id"/>
+                        <field name="type"/>
                     </group>
                 </search>
             </field>

=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml	2011-01-14 00:11:01 +0000
+++ resource/resource_view.xml	2011-03-15 19:27:05 +0000
@@ -10,7 +10,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
-                   <group col='15' colspan='4'>
+                   <group>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
@@ -19,7 +19,7 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                   <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
@@ -38,7 +38,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Time">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name" string="Name"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -53,14 +53,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name" string="Reason"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Period" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                         <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

=== modified file 'sale/report/sale_report_view.xml'
--- sale/report/sale_report_view.xml	2011-01-14 00:11:01 +0000
+++ sale/report/sale_report_view.xml	2011-03-15 19:27:05 +0000
@@ -60,7 +60,6 @@
                         help="Sales order created in current month"/>
                     <filter icon="terp-go-month"
                          string="    Month-1    "
-                         separator="1"
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Sales order created in last month"/>
                     <separator orientation="vertical"/>
@@ -94,7 +93,7 @@
                     <field name="date_confirm"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>

=== modified file 'sale/sale_installer.xml'
--- sale/sale_installer.xml	2011-01-14 00:11:01 +0000
+++ sale/sale_installer.xml	2011-03-15 19:27:05 +0000
@@ -24,7 +24,7 @@
           <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
           </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="delivery"/>
             <field name="sale_journal"/>
             <field name="sale_layout"/>

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2011-01-27 09:49:39 +0000
+++ sale/sale_view.xml	2011-03-15 19:27:05 +0000
@@ -266,14 +266,14 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="date_order" select="1" string="Order date" />
-                    <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1">
+                    <field name="name"/>
+                    <field name="date_order" string="Order date" />
+                    <field name="partner_id"/>
+                    <field name="user_id">
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     </field>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -425,7 +425,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -434,7 +434,7 @@
                         <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     </field>
                     <newline/>
-                    <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
@@ -478,7 +478,7 @@
                         <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     </field>
                     <newline />
-                    <group expand="0" string="Group By..." colspan="9" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>

=== modified file 'sale_margin/report/report_margin_view.xml'
--- sale_margin/report/report_margin_view.xml	2011-01-14 00:11:01 +0000
+++ sale_margin/report/report_margin_view.xml	2011-03-15 19:27:05 +0000
@@ -31,7 +31,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Margin">
-                    <group col="10" colspan="4">
+                    <group>
 						<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
 						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
 						<separator orientation="vertical"/>
@@ -53,7 +53,7 @@
                         <field name="categ_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
+                    <group expand="1" string="Group By...">
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
 	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>

=== modified file 'stock/report/report_stock_move_view.xml'
--- stock/report/report_stock_move_view.xml	2011-01-14 00:11:01 +0000
+++ stock/report/report_stock_move_view.xml	2011-03-15 19:27:05 +0000
@@ -187,7 +187,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
-                <group col="16">
+                <group>
                     <filter string="Real"
                         name="real"
                         icon="terp-check"

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2011-01-31 04:55:23 +0000
+++ stock/stock_view.xml	2011-03-15 19:27:05 +0000
@@ -75,13 +75,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Inventory">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -275,7 +275,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Pack Search">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name" />
                         <field name="serial" />
                         <field name="date" />
@@ -383,7 +383,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix"/>
@@ -393,7 +393,7 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
@@ -831,7 +831,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
@@ -845,7 +845,7 @@
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -1024,7 +1024,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
@@ -1040,7 +1040,7 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -1243,7 +1243,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" 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" />
@@ -1256,11 +1256,11 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                    <group expand="0" string="Extended Filters...">
                         <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
@@ -1311,7 +1311,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
@@ -1321,7 +1321,7 @@
                         <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -1489,7 +1489,7 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group col="14" colspan="4">
+                    <group>
                         <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"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
@@ -1502,7 +1502,7 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
                             <field name="origin"/>
                             <field name="picking_id"/>
                             <field name="prodlot_id"/>
@@ -1510,7 +1510,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" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
@@ -1686,7 +1686,7 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group col="8" colspan="4">
+                    <group>
                         <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"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
@@ -1702,7 +1702,7 @@
                        <field name="prodlot_id"/>
                     </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="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -1722,7 +1722,7 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group col="8" colspan="4">
+                    <group>
                         <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"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (available or not)"/>
@@ -1739,7 +1739,7 @@
                        <field name="prodlot_id"/>
                     </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="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>

=== modified file 'stock_planning/stock_planning_view.xml'
--- stock_planning/stock_planning_view.xml	2011-01-14 00:11:01 +0000
+++ stock_planning/stock_planning_view.xml	2011-03-15 19:27:05 +0000
@@ -190,14 +190,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
+                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
@@ -295,13 +295,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
-                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
+                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
                     <field name="product_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>

=== modified file 'subscription/subscription_view.xml'
--- subscription/subscription_view.xml	2011-01-14 00:11:01 +0000
+++ subscription/subscription_view.xml	2011-03-15 19:27:05 +0000
@@ -75,7 +75,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Subscription">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check"
                         string="Running"
                         domain="[('state','=','running')]"/>
@@ -85,11 +85,11 @@
                     domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id"/>
                         <field name="partner_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
@@ -169,7 +169,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Subscription Document">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="model"/>
                     </group>

=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml	2011-03-10 13:07:51 +0000
+++ survey/survey_view.xml	2011-03-15 19:27:05 +0000
@@ -260,17 +260,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
-                   <group col='10' colspan='4'>
+                   <group>
                         <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]"/>
                         <separator orientation="vertical"/>
-                        <field name="title" select="1"/>
-                        <field name="type" select="1" widget="selection"/>
-                        <field name="responsible_id" select="1">
+                        <field name="title"/>
+                        <field name="type" widget="selection"/>
+                        <field name="responsible_id">
                             <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         </field>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
@@ -476,7 +476,7 @@
                     <field name="title"/>
                     <field name="survey_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                     </group>
                 </search>
@@ -682,7 +682,7 @@
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'page_id'}"/>
                     </group>
                </search>
@@ -1093,18 +1093,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
-                   <group col='10' colspan='4'>
+                   <group>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
-                        <field name="survey_id" widget="selection" select="1"/>
-                        <field name="email" select="1"/>
-                        <field name="user_id" select="1">
+                        <field name="survey_id" widget="selection"/>
+                        <field name="email"/>
+                        <field name="user_id">
                         <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>

=== modified file 'survey/wizard/survey_answer.xml'
--- survey/wizard/survey_answer.xml	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_answer.xml	2011-03-15 19:27:05 +0000
@@ -23,7 +23,7 @@
 			<field name="type">search</field>
 			<field name="arch" type="xml">
 				<search string="Your Messages">
-					<field name="name" nolabel="1" colspan="4" />
+					<field name="name"/>
 				</search>
 			</field>
 		</record>

=== modified file 'wiki/wiki_view.xml'
--- wiki/wiki_view.xml	2011-01-27 09:49:39 +0000
+++ wiki/wiki_view.xml	2011-03-15 19:27:05 +0000
@@ -163,14 +163,14 @@
                 <search string="Wiki">
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="tags" select="1"/>
-                    <field name="section" select="1" groups="base.group_extended"/>
-                    <field name="write_uid" select="1"/>
-                    <field name="write_date" select="1"/>
+                    <field name="name"/>
+                    <field name="group_id"/>
+                    <field name="tags"/>
+                    <field name="section" groups="base.group_extended"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="8" col="6">
+                    <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>