From 54e1058afd0a70fd48e94319d581836cc7efcade Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 25 Nov 2009 18:50:23 +0100
Subject: [PATCH] [imp] multi-company groups

bzr revid: fp@tinyerp.com-20091125175023-hmi1msewn9ehb3f2
---
 addons/account/account_invoice_view.xml       |   4 +-
 addons/account/account_view.xml               |  76 +--
 addons/account/company_view.xml               |  64 +--
 addons/account/partner_view.xml               |   4 +-
 addons/account/security/account_security.xml  |  67 +--
 .../account_analytic_default_view.xml         |   4 +-
 .../crossovered_budget_view.xml               | 444 +++++++--------
 .../security/account_budget_security.xml      |   4 +-
 addons/account_followup/followup_demo.xml     |   6 +-
 addons/account_followup/followup_view.xml     |   5 +-
 addons/account_voucher/voucher_view.xml       | 520 +++++++++---------
 .../document/security/document_security.xml   |   8 +-
 addons/hr/hr_department_view.xml              |  48 +-
 addons/hr/hr_view.xml                         |   2 +-
 .../hr_timesheet_sheet_view.xml               |   2 +-
 addons/membership/demo_data.xml               | 324 +++++------
 addons/membership/membership_demo.xml         | 324 +++++------
 addons/multi_company/multi_company_demo.xml   | 324 +++++------
 addons/multi_company/multi_company_view.xml   |   4 +-
 addons/product/product_view.xml               |  22 +-
 addons/product/security/product_security.xml  |   2 +-
 addons/project/security/project_security.xml  |  48 +-
 addons/sale/security/sale_security.xml        |  40 +-
 addons/stock/security/stock_security.xml      |  12 +-
 24 files changed, 1178 insertions(+), 1180 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d979262cb4a..84fb0684e3c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -117,7 +117,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="amount_untaxed" sum="Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
@@ -197,7 +197,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection" groups="base.group_multi_company"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cafaa769163..d034b508f46 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -16,7 +16,7 @@
                     <field name="code" select="1"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="end_journal_period_id"/>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
@@ -75,7 +75,7 @@
                     <field name="code" select="1"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="fiscalyear_id"/>
                     <field name="special"/>
                     <separator colspan="4" string="States"/>
@@ -122,7 +122,7 @@
                     <field name="name" select="1" colspan="4"/>
                     <field name="code" select="1"/>
                     <field name="parent_id"/>
-                    <field name="company_id" select="2" widget="selection"/>
+                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
@@ -168,7 +168,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="company_id" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_currency_id"/>
                     <field name="type" invisible="1"/>
                 </tree>
@@ -242,7 +242,7 @@
                 <tree string="Account Journal">
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -270,7 +270,7 @@
                             <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="user_id" groups="base.group_extended"/>
-                            <field name="company_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="centralisation"/>
                             <field name="group_invoice_lines"/>
@@ -460,7 +460,7 @@
                     <field name="code" select="1"/>
                     <field name="sequence"/>
                     <field name="sign"/>
-		    
+            
                     <field name="close_method"/>
                     <field name="partner_account"/>
                 </form>
@@ -540,7 +540,7 @@
                 <form string="Account Tax Code">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection"  groups="base.group_multi_company"/>
                     <field name="notprintable"/>
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
@@ -587,7 +587,7 @@
                 <form string="Account Tax">
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
-                        <field name="company_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="description" select="1"/>
                         <field name="active" select="2"/>
                         <field name="tax_group" select="1"/>
@@ -714,8 +714,8 @@
 
                             <field name="debit" select="2"/>
                             <field name="credit" select="2"/>
-							<field name="company_id" required="1"/>
-							
+                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -795,22 +795,22 @@
                 </form>
             </field>
         </record>
-		
-		<record id="view_account_move_line_filter" model="ir.ui.view">
+        
+        <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">account.move.line.select</field>
             <field name="model">account.move.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move Lines">
-                	<group col='10' colspan='4'>
-                		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                    <group col='10' colspan='4'>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
                         <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
-						<separator orientation="vertical"/>
-						<field name="date" select='1'/>
-						<field name="account_id" select='1'/>
-						<field name="partner_id" select='1'/>
-						<field name="balance" string="Debit/Credit" select='1'/>
-                	</group>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="account_id" select='1'/>
+                        <field name="partner_id" select='1'/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -869,7 +869,7 @@
                     <field name="name" select="1" readonly="True"/>
                     <field name="period_id" select="2"/>
                     <field name="journal_id" select="1"/>
-                    <field name="company_id" required="1"/>
+                    <field name="company_id" required="1" groups="base.group_multi_company"/>
                     <field name="date" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="to_check" select="2"/>
@@ -887,8 +887,8 @@
 
                             <field name="debit" select="1"/>
                             <field name="credit" select="1"/>
-							<field name="date" select="1"/>
-							
+                            <field name="date" select="1"/>
+                            
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -933,21 +933,21 @@
             </field>
         </record>
 
-		<record id="view_account_move_filter" model="ir.ui.view">
+        <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.move.select</field>
             <field name="model">account.move</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
-                	<group col='8' colspan='4'>
-                		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
                         <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
-						<separator orientation="vertical"/>
-						<field name="date" select='1'/>
-						<field name="name" select='1'/>
-						<field name="journal_id" select='1'/>
-						<field name="partner_id" select='1'/>
-                	</group>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="journal_id" select='1'/>
+                        <field name="partner_id" select='1'/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1107,7 +1107,7 @@
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="state"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -1719,7 +1719,7 @@
                 <form string="Generate Chart of Accounts from a Chart Template">
                     <separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
                     <label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
-                    <field name="company_id"  widget="selection"/>
+                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
                     <field name ="code_digits" />
                     <field name="chart_template_id"/>
                     <field name ="seq_journal" />
@@ -1764,11 +1764,11 @@
                     <field name="balance" operator="+"/>
                 </graph>
             </field>
-     	</record>
+         </record>
 
-     	<!-- Fiscal Position Templates -->
+         <!-- Fiscal Position Templates -->
 
-		<record id="view_account_position_template_form" model="ir.ui.view">
+        <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 29eedc72b0c..1d4571e0d4f 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record model="ir.ui.view" id="view_company_inherit_form">
-			<field name="name">res.company.form.inherit</field>
-			<field name="inherit_id" ref="base.view_company_form"/>
-			<field name="model">res.company</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-			 <notebook>
+    <data>
+        <record model="ir.ui.view" id="view_company_inherit_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <notebook>
                 <page string="Overdue Payments" position="inside">
-                	<separator string="Overdue Payments Message" colspan="4"/>
-                	<field name="overdue_msg" nolabel="1" colspan ="4"/>
+                    <separator string="Overdue Payments Message" colspan="4"/>
+                    <field name="overdue_msg" nolabel="1" colspan ="4"/>
                 </page>
              </notebook>
             </field>
-		</record>
-		
-		<!-- Wizard for Configuration of Overdue Payments -->
-		
-		<record model="ir.ui.view" id="wizard_company_setup_form">
-			<field name="name">wizard.company.setup.form</field>
-			<field name="model">wizard.company.setup</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Overdue Payment Report Message">
-					<field name="company_id" select="1" on_change="onchange_company_id(company_id)"/>
-					<field name="partner_id" select="1" readonly="1"/>
-					<separator string="Message" colspan="4"/>
-					<field name="overdue_msg" nolabel="1" colspan="4"/>
-					<group col="2" colspan="4">
-						<button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
-						<button icon="gtk-ok" name="action_create" string="Create" type="object"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        </record>
+        
+        <!-- Wizard for Configuration of Overdue Payments -->
+        
+        <record model="ir.ui.view" id="wizard_company_setup_form">
+            <field name="name">wizard.company.setup.form</field>
+            <field name="model">wizard.company.setup</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Overdue Payment Report Message">
+                    <field name="company_id" select="1" on_change="onchange_company_id(company_id)"  groups="base.group_multi_company"/>
+                    <field name="partner_id" select="1" readonly="1"/>
+                    <separator string="Message" colspan="4"/>
+                    <field name="overdue_msg" nolabel="1" colspan="4"/>
+                    <group col="2" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
         <record id="action_wizard_company_setup_form" model="ir.actions.act_window">
             <field name="name">Overdue Payment Report Message</field>
@@ -52,5 +52,5 @@
             <field name="note">Specify The Message for the Overdue Payment Report.</field>
             <field name="action_id" ref="action_wizard_company_setup_form"/>
         </record>
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 0eed352095a..c8513b6ee36 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <field name="name" select="1"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="note" colspan="4"/>
                     <field name="tax_ids" colspan="4" widget="one2many_list">
@@ -42,7 +42,7 @@
             <field name="arch" type="xml">
                 <tree string="Fiscal Position">
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index bdd7e25bc99..529f287e602 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -12,35 +12,36 @@
         <field name="name">Finance / Manager</field>
     </record>
 
-	<record id="menu_finance_configuration" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_configuration" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_finance_reporting" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_reporting" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_finance_legal_statement" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_legal_statement" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_finance_invoice" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_invoice" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_automatic_reconcile" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-	</record>
+    <record id="menu_automatic_reconcile" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_finance_charts" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_charts" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
+    </record>
 
-	<record id="account_move_comp_rule_group" model="ir.rule.group">
+    <record id="account_move_comp_rule_group" model="ir.rule.group">
             <field name="name">Account Entry</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.move')]"/>
+            <field model="ir.model" ref="model_account_move"/>
             <field eval="True" name="global"/>
     </record>
+
     <record id="account_move_comp_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
@@ -48,21 +49,21 @@
         <field name="rule_group" ref="account_move_comp_rule_group"/>
     </record>
 
-	<record id="account_move_line_comp_rule_group" model="ir.rule.group">
+    <record id="account_move_line_comp_rule_group" model="ir.rule.group">
             <field name="name">Entry lines</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.move.line')]"/>
+            <field model="ir.model" ref="model_account_move_line"/>
             <field eval="True" name="global"/>
     </record>
+
     <record id="account_move_line_comp_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="account_move_line_comp_rule_group"/>
     </record>
-        
     <record id="journal_period_comp_rule_group" model="ir.rule.group">
         <field name="name">Journal Period</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.journal.period')]"/>
+        <field model="ir.model" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
     </record>
     <record id="journal_period_comp_rule" model="ir.rule">
@@ -74,7 +75,7 @@
     
     <record id="journal_comp_rule_group" model="ir.rule.group">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.journal')]"/>
+        <field model="ir.model" ref="model_account_journal"/>
         <field eval="True" name="global"/>
     </record>
     <record id="journal_comp_rule" model="ir.rule">
@@ -86,7 +87,7 @@
     
     <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+        <field model="ir.model" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
     </record>
     <record id="analytic_journal_comp_rule" model="ir.rule">
@@ -97,7 +98,7 @@
     </record>
     <record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+        <field model="ir.model" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
     </record>
     
@@ -110,7 +111,7 @@
     
     <record id="period_comp_rule_group" model="ir.rule.group">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.period')]"/>
+        <field model="ir.model" ref="model_account_period"/>
         <field eval="True" name="global"/>
     </record>
     <record id="period_comp_rule" model="ir.rule">
@@ -123,7 +124,7 @@
     
     <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.fiscalyear')]"/>
+        <field model="ir.model" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
     </record>
     <record id="fiscal_year_comp_rule" model="ir.rule">
@@ -135,7 +136,7 @@
     
     <record id="account_comp_rule_group" model="ir.rule.group">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.account')]"/>
+        <field model="ir.model" ref="model_account_account"/>
         <field eval="True" name="global"/>
     </record>
     <record id="account_comp_rule" model="ir.rule">
@@ -147,7 +148,7 @@
     
     <record id="tax_comp_rule_group" model="ir.rule.group">
         <field name="name">Tax multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.tax')]"/>
+        <field model="ir.model" ref="model_account_tax"/>
         <field eval="True" name="global"/>
     </record>
     <record id="tax_comp_rule" model="ir.rule">
@@ -159,7 +160,7 @@
     
     <record id="tax_code_comp_rule_group" model="ir.rule.group">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.tax.code')]"/>
+        <field model="ir.model" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
     </record>
     <record id="tax_code_comp_rule" model="ir.rule">
@@ -171,7 +172,7 @@
     
     <record id="invoice_comp_rule_group" model="ir.rule.group">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.invoice')]"/>
+        <field model="ir.model" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
     </record>
     <record id="invoice_comp_rule" model="ir.rule">
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 0c477984351..6f8cbadb878 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -12,7 +12,7 @@
                     <field name="product_id" select="2"/>
                     <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="company_id" select="2"/>
+                    <field name="company_id" select="2" groups="base.group_multi_company"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </tree>
@@ -30,7 +30,7 @@
                     <field name="product_id" select="2"/>
                     <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="company_id" select="2" widget="selection"/>
+                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </form>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 423ecfbdbc2..a8d03be8aa4 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	<!-- budget form and tree view from account module *********************************** -->
-		<record id="action_account_budget_post_tree" model="ir.actions.act_window">
+    <data>
+    <!-- budget form and tree view from account module *********************************** -->
+        <record id="action_account_budget_post_tree" model="ir.actions.act_window">
             <field name="name">Budgets</field>
             <field name="res_model">account.budget.post</field>
             <field name="view_type">tree</field>
@@ -19,10 +19,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budgetary Position">
-                    <field name="sequence"/>                
+                    <field name="sequence"/>
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -61,240 +61,240 @@
         <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
 
 
-		<record model="ir.ui.view" id="view_budget_post_form">
-			<field name="name">account.budget.post.form.inherit</field>
-			<field name="model">account.budget.post</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Budgetary Position">
-					<field name="name" select="1"/>
-					<field name="code" select="1"/>
-					<field name="company_id"/>
-                    <field name="sequence" select="2"/>					
-					<notebook colspan="4">
-						<page string="Accounts">
-							<field name="account_ids" colspan="4" nolabel="1"/>
-						</page>
-						<page string="Dotations">
-							<button string="Spread" name="%(wizard_budget_spread)d" type="action" icon="gtk-fullscreen"/>
-							<field name="dotation_ids" colspan="4" nolabel="1"/>
-						</page>
+        <record model="ir.ui.view" id="view_budget_post_form">
+            <field name="name">account.budget.post.form.inherit</field>
+            <field name="model">account.budget.post</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Budgetary Position">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="company_id"  groups="base.group_multi_company"/>
+                    <field name="sequence" select="2"/>                    
+                    <notebook colspan="4">
+                        <page string="Accounts">
+                            <field name="account_ids" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Dotations">
+                            <button string="Spread" name="%(wizard_budget_spread)d" type="action" icon="gtk-fullscreen"/>
+                            <field name="dotation_ids" colspan="4" nolabel="1"/>
+                        </page>
 
-						<page string="Budget Lines">
-							<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
-								<graph type="bar" string="Lines">
-									<field name="analytic_account_id" />
-									<!--<field name="general_budget_id" operator="+" />-->
-									<field name="planned_amount" operator="+"/>
-									<field group="True" name="general_budget_id"/>
-								</graph>
-								<tree string="Budget Lines"  editable="top">
-									<field name="crossovered_budget_id"/>
-									<field name="analytic_account_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-									<field name="practical_amount" select="1"/>
-									<field name="theoritical_amount"/>
-									<field name="percentage"/>
-								</tree>
-								<form string="Budget Lines">
-									<field name="crossovered_budget_id"/>
-									<field name="analytic_account_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-									<field name="practical_amount" select="1"/>
-									<field name="theoritical_amount"/>
-									<field name="percentage"/>
-								</form>
-							</field>
-						</page>
-					</notebook>
-				</form>
-			</field>
-		</record>
+                        <page string="Budget Lines">
+                            <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
+                                <graph type="bar" string="Lines">
+                                    <field name="analytic_account_id" />
+                                    <!--<field name="general_budget_id" operator="+" />-->
+                                    <field name="planned_amount" operator="+"/>
+                                    <field group="True" name="general_budget_id"/>
+                                </graph>
+                                <tree string="Budget Lines"  editable="top">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="analytic_account_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                    <field name="practical_amount" select="1"/>
+                                    <field name="theoritical_amount"/>
+                                    <field name="percentage"/>
+                                </tree>
+                                <form string="Budget Lines">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="analytic_account_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                    <field name="practical_amount" select="1"/>
+                                    <field name="theoritical_amount"/>
+                                    <field name="percentage"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="crossovered_budget_view_form">
-			<field name="name">crossovered.budget.view.form</field>
-			<field name="model">crossovered.budget</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Budget">
-							<field name="name" colspan="1" select="1"/>
-							<field name="code" colspan="1" select="1" />
-							<field name="creating_user_id" />
-							<field name="validating_user_id" readonly="True"/>
-							<field name="date_from" select="2"/>
-							<field name="date_to" select="2"/>
-							<field name="crossovered_budget_line" colspan="4" nolabel="1">
-								<tree string="Budget Lines">
-									<field name="analytic_account_id"/>
-									<field name="general_budget_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-									<field name="practical_amount"/>
-									<field name="theoritical_amount"/>
-									<field name="percentage"/>
-								</tree>
-								<form string="Budget Lines">
-									<field name="analytic_account_id" select="1"/>
-									<field name="general_budget_id" select="1"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date" select="1"/>
-									<field name="planned_amount" select="1"/>
-								</form>
-							</field>
-							<field name="state" select="1"/>
-							<group col="4" colspan="2">
+        <record model="ir.ui.view" id="crossovered_budget_view_form">
+            <field name="name">crossovered.budget.view.form</field>
+            <field name="model">crossovered.budget</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Budget">
+                            <field name="name" colspan="1" select="1"/>
+                            <field name="code" colspan="1" select="1" />
+                            <field name="creating_user_id" />
+                            <field name="validating_user_id" readonly="True"/>
+                            <field name="date_from" select="2"/>
+                            <field name="date_to" select="2"/>
+                            <field name="crossovered_budget_line" colspan="4" nolabel="1">
+                                <tree string="Budget Lines">
+                                    <field name="analytic_account_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                    <field name="practical_amount"/>
+                                    <field name="theoritical_amount"/>
+                                    <field name="percentage"/>
+                                </tree>
+                                <form string="Budget Lines">
+                                    <field name="analytic_account_id" select="1"/>
+                                    <field name="general_budget_id" select="1"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date" select="1"/>
+                                    <field name="planned_amount" select="1"/>
+                                </form>
+                            </field>
+                            <field name="state" select="1"/>
+                            <group col="4" colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
                                 <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
                                 <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
-								<!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
-							</group>
+                                <!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
+                            </group>
 
-				</form>
-			</field>
-		</record>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="crossovered_budget_view_tree">
-			<field name="name">crossovered.budget.view.tree</field>
-			<field name="model">crossovered.budget</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Budget">
-					<field name="name" colspan="1" select="1"/>
-					<field name="code" colspan="1" select="1" />
-					<field name="state"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-				</tree>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="crossovered_budget_view_tree">
+            <field name="name">crossovered.budget.view.tree</field>
+            <field name="model">crossovered.budget</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Budget">
+                    <field name="name" colspan="1" select="1"/>
+                    <field name="code" colspan="1" select="1" />
+                    <field name="state"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_crossovered_budget_view">
-			<field name="name">Budget</field>
-			<field name="res_model">crossovered.budget</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crossovered_budget_view_tree"/>
-		</record>
-		<menuitem parent="next_id_31"
-			id="menu_act_crossovered_budget_view"
-			action="act_crossovered_budget_view" />
+        <record model="ir.actions.act_window" id="act_crossovered_budget_view">
+            <field name="name">Budget</field>
+            <field name="res_model">crossovered.budget</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crossovered_budget_view_tree"/>
+        </record>
+        <menuitem parent="next_id_31"
+            id="menu_act_crossovered_budget_view"
+            action="act_crossovered_budget_view" />
 
-		<record model="ir.ui.view" id="view_crossovered_budget_line_tree">
-			<field name="name">crossovered.budget.line.tree</field>
-			<field name="model">crossovered.budget.lines</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Budget Lines">
-					<field name="analytic_account_id"/>
-					<field name="general_budget_id"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-					<field name="paid_date"/>
-					<field name="planned_amount"/>
-					<field name="practical_amount" select="1"/>
-					<field name="theoritical_amount"/>
-					<field name="percentage"/>
-				</tree>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="view_crossovered_budget_line_form">
-			<field name="name">crossovered.budget.line.form</field>
-			<field name="model">crossovered.budget.lines</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Budget Lines">
-					<field name="crossovered_budget_id"/>
-					<field name="analytic_account_id" select="1"/>
-					<field name="general_budget_id" select="1"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-					<field name="paid_date" select="1"/>
-					<field name="planned_amount" select="1"/>
-					<field name="practical_amount" select="1"/>
-					<field name="theoritical_amount"/>
-					<field name="percentage"/>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
+            <field name="name">crossovered.budget.line.tree</field>
+            <field name="model">crossovered.budget.lines</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Budget Lines">
+                    <field name="analytic_account_id"/>
+                    <field name="general_budget_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="paid_date"/>
+                    <field name="planned_amount"/>
+                    <field name="practical_amount" select="1"/>
+                    <field name="theoritical_amount"/>
+                    <field name="percentage"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_crossovered_budget_line_form">
+            <field name="name">crossovered.budget.line.form</field>
+            <field name="model">crossovered.budget.lines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Budget Lines">
+                    <field name="crossovered_budget_id"/>
+                    <field name="analytic_account_id" select="1"/>
+                    <field name="general_budget_id" select="1"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="paid_date" select="1"/>
+                    <field name="planned_amount" select="1"/>
+                    <field name="practical_amount" select="1"/>
+                    <field name="theoritical_amount"/>
+                    <field name="percentage"/>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_crossovered_budget_lines_view">
-			<field name="name">Budget Lines</field>
-			<field name="res_model">crossovered.budget.lines</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="view_crossovered_budget_line_tree"/>
-		</record>
+        <record model="ir.actions.act_window" id="act_crossovered_budget_lines_view">
+            <field name="name">Budget Lines</field>
+            <field name="res_model">crossovered.budget.lines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_crossovered_budget_line_tree"/>
+        </record>
 
-		<menuitem parent="menu_action_account_budget_post_tree"
-			id="menu_act_crossovered_budget_lines_view"
-			action="act_crossovered_budget_lines_view" />
+        <menuitem parent="menu_action_account_budget_post_tree"
+            id="menu_act_crossovered_budget_lines_view"
+            action="act_crossovered_budget_lines_view" />
 
-		<!--  Shortcuts -->
-		<act_window name="Budget Lines"
-			domain="[('analytic_account_id', '=', active_id)]"
-			res_model="crossovered.budget.lines"
-			src_model="account.analytic.account"
-			id="act_account_analytic_account_cb_lines"/>
+        <!--  Shortcuts -->
+        <act_window name="Budget Lines"
+            domain="[('analytic_account_id', '=', active_id)]"
+            res_model="crossovered.budget.lines"
+            src_model="account.analytic.account"
+            id="act_account_analytic_account_cb_lines"/>
 
 
-		<record model="ir.ui.view" id="view_account_analytic_account_form_inherit_cci">
-			<field name="name">account.analytic.account.form.inherot.cci</field>
-			<field name="type">form</field>
-			<field name="model">account.analytic.account</field>
-			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Budget Lines">
-							<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
-								<tree string="Budget Lines" editable="top">
-									<field name="crossovered_budget_id"/>
-									<field name="general_budget_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-								</tree>
-								<form string="Budget Lines">
-									<field name="crossovered_budget_id"/>
-									<field name="general_budget_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-								</form>
-								<graph type="bar" string="Lines">
-									<field name="general_budget_id" />
-									<!--<field name="analytic_account_id" operator="+"/>-->
-									<field name="planned_amount" operator="+"/>
-									<field group="True" name="analytic_account_id"/>
-								</graph>
-							</field>
-					</page>
-				</notebook>
-			</field>
-		</record>
-		<!-- moved from account module -->
-		 <!--Budget -->
+        <record model="ir.ui.view" id="view_account_analytic_account_form_inherit_cci">
+            <field name="name">account.analytic.account.form.inherot.cci</field>
+            <field name="type">form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Budget Lines">
+                            <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+                                <tree string="Budget Lines" editable="top">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                </tree>
+                                <form string="Budget Lines">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                </form>
+                                <graph type="bar" string="Lines">
+                                    <field name="general_budget_id" />
+                                    <!--<field name="analytic_account_id" operator="+"/>-->
+                                    <field name="planned_amount" operator="+"/>
+                                    <field group="True" name="analytic_account_id"/>
+                                </graph>
+                            </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        <!-- moved from account module -->
+         <!--Budget -->
         <!--<report
- 			id="account_analytic_budget_print"
-			string="Print Budget"
-			model="account.analytic.budget.post"
-			name="account.analytic.budget.print"
-			rml="account/project/report/account_analytic_budget_report.rml"
-			auto="False"
-			menu="False"/>-->
+             id="account_analytic_budget_print"
+            string="Print Budget"
+            model="account.analytic.budget.post"
+            name="account.analytic.budget.print"
+            rml="account/project/report/account_analytic_budget_report.rml"
+            auto="False"
+            menu="False"/>-->
 
-	</data>
+    </data>
 </openerp>
 
 
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 2cc983619c3..69fc92eb16a 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
     <record id="budget_post_comp_rule_group" model="ir.rule.group">
         <field name="name">Budget post multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.budget.post')]"/>
+        <field name="model_id" model="model_account_budget_post"/>
         <field eval="True" name="global"/>
     </record>
     <record id="budget_post_comp_rule" model="ir.rule">
@@ -16,4 +16,4 @@
         <field name="operand">False</field>
         <field name="rule_group" ref="budget_post_comp_rule_group"/>
     </record>
-</data></openerp>
\ No newline at end of file
+</data></openerp>
diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/followup_demo.xml
index c38084fac24..2bf627de9b7 100644
--- a/addons/account_followup/followup_demo.xml
+++ b/addons/account_followup/followup_demo.xml
@@ -22,7 +22,7 @@ Exception made if there was a mistake of ours, it seems that the following amoun
 Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
-			</field>
+</field>
         </record>
 
         <record id="demo_followup_line2" model="account_followup.followup.line">
@@ -44,7 +44,7 @@ If there is a problem with paying invoice that we are not aware of, do not hesit
 Details of due payments is printed below.
 
 Best Regards,
-			</field>
+</field>
         </record>
 
         <record id="demo_followup_line3" model="account_followup.followup.line">
@@ -65,7 +65,7 @@ I trust that this action will prove unnecessary and details of due payments is p
 In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
-			</field>
+</field>
         </record>
 
     </data>
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index ecc73f34954..841ce2c9f18 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -45,7 +45,7 @@
             <field name="arch" type="xml">
                 <form string="Follow-Up">
                     <field name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                     <separator colspan="4" string="Description"/>
                     <field colspan="4" name="description" nolabel="1" select="1"/>
                     <separator colspan="4" string="Lines"/>
@@ -61,8 +61,7 @@
             <field name="arch" type="xml">
                 <tree string="Follow-Up">
                     <field name="name"/>
-                    <field name="company_id"/>
-                    <field name="description"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 11858390e97..172aedd92ec 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -1,264 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-		<record model="ir.ui.view" id="view_voucher_tree">
-			<field name="name">account.voucher.tree</field>
-			<field name="model">account.voucher</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Vouchers">
-					<field name="name"/>
-					<field name="journal_id"/>
-					<field name="account_id" />
-					<field name="amount"/>
-					<field name="date"/>
-					<field name="period_id"/>
-				</tree>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="view_voucher_form">
-			<field name="name">account.voucher.form</field>
-			<field name="model">account.voucher</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Voucher">
-				    <group col="6" colspan="4">
-				        <field name="name" select="1" colspan="4"/>
-				        <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
-					    <field name="account_id" select="2" on_change="onchange_account(account_id)"/>
-					    <field name="type" select="2" on_change="onchange_journal(journal_id,type)"/>
-					    <field name="number"/>
-					    <!--field name="amount" select="1" invisible="1"/-->
-					    <!--field name="partner_id" select="2"/-->
-					</group>
-					<notebook colspan="4">
-						<page string="Entry Lines">
-							<field name="payment_ids" colspan="4" nolabel="1" height="275">
-								<tree string="Voucher Lines" editable="top">
-									<field name="account_analytic_id"/>
-									<field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
-									<field name="account_id"/>
-									<field name="name"/>
-									<field name="type"/>
-									<field name="amount"/>
-									<field name="ref"/>
-								</tree>
-							</field>
-							<separator string="Narration" colspan="4"/>
-							<field name="narration" colspan="4" nolabel="1"/>
-							<group col="6" colspan="6">
-								<field name="state"/>
-								<button name="open_voucher" string="Pro-forma" states="draft" type="object" icon="gtk-open"/>
-								<button name="proforma_voucher" string="Create" states="proforma" type="object"  icon="gtk-go-forward"/>
-								<button name="cancel_voucher" string="Cancel" states="draft,proforma,posted" type="object" icon="gtk-cancel"/>
-								<button name="action_cancel_draft" states="cancel" type="object" string="Set to Draft" icon="gtk-convert"/>
-							</group>
-						</page>
-						<page string="Other Info">
-							<field name="company_id" select="1" widget="selection"/>
-							<field name="currency_id" select="1" />
-							<field name="period_id"/>
-							<field name="date" select="1"/>
-							<!--field name="reference_type" select="2" nolabel="1" size="0"/>
-							<field name="reference" select="1" nolabel="1"/-->
-							<separator string="General Entries" colspan="4"/>
-							<field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
-						</page>
-					</notebook>
-				</form>
-			</field>
-		</record>
-		
-		<record model="ir.actions.act_window" id="action_voucher_list">
-			<field name="name">Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries" 
-		id="menu_action_voucher_list" action="action_voucher_list"/>
-		
-		<!--  Receipt Vouchers -->
-		<record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-			<field name="name">Receipt Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','like','rec_voucher')]</field>
-			<field name="context">{'type':'rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers" 
-		id="menu_action_receipt_vou_voucher_list" action="action_receipt_vou_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
-			<field name="name">Cash Receipt</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','rec_voucher')]</field>
-			<field name="context">{'type':'rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts" 
-		id="menu_action_receipt_cashreceipt_voucher_list" action="action_receipt_cashreceipt_voucher_list"/>
-				
-		<record model="ir.actions.act_window" id="action_view_cash_rec_voucher_form">
-			<field name="name">Cash Receipt Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','rec_voucher')]</field>
-			<field name="context">{'type':'rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
-		
-		<record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
-			<field name="name">Bank Receipt</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','bank_rec_voucher')]</field>
-			<field name="context">{'type':'bank_rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts" 
-		id="menu_action_receipt_bakreceipt_voucher_list" action="action_receipt_bakreceipt_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_bank_rec_voucher_form">
-			<field name="name">Bank Receipt Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','bank_rec_voucher')]</field>
-			<field name="context">{'type':'bank_rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
-		
-		
-		<!--  End Receipt Vouchers -->
-		
-		
-		<!-- Payment Vouchers -->
-		<record model="ir.actions.act_window" id="action_payments_voucher_list">
-			<field name="name">Payment Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','like','pay_voucher')]</field>
-			<field name="context">{'type':'pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers" 
-		id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
-			<field name="name">Payment Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','pay_voucher')]</field>
-			<field name="context">{'type':'pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments" 
-		id="menu_action_payments_cashpay_voucher_list" action="action_payments_cashpay_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_cash_pay_voucher_form">
-			<field name="name">Cash Payment Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','pay_voucher')]</field>
-			<field name="context">{'type':'pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
-	
-		<record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
-			<field name="name">Payment Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','bank_pay_voucher')]</field>
-			<field name="context">{'type':'bank_pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments" 
-		id="menu_action_payments_bankpay_voucher_list" action="action_payments_bankpay_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_bank_pay_voucher_form">
-			<field name="name">Bank Payment Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','bank_pay_voucher')]</field>
-			<field name="context">{'type':'bank_pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
-		
-		<!-- End Payment Vouchers -->
-		
-		<!-- Other Voucher Enries -->
-		<record model="ir.actions.act_window" id="action_other_voucher_list">
-			<field name="name">Other Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers" 
-		id="menu_action_other_voucher_list" action="action_other_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_cont_voucher_form">
-			<field name="name">Contra Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','cont_voucher')]</field>
-			<field name="context">{'type':'cont_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Contra Voucher" id="menu_action_view_cont_voucher_form" action="action_view_cont_voucher_form"/>
-		<record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
-			<field name="name">Journal Sale Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_sale_vou')]</field>
-			<field name="context">{'type':'journal_sale_vou'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" action="action_view_jour_sale_voucher_form"/>
-		<record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
-			<field name="name">Journal Purchase Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_pur_voucher')]</field>
-			<field name="context">{'type':'journal_pur_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" action="action_view_jour_pur_voucher_form"/>
-		
-		<record model="ir.actions.act_window" id="action_view_jour_voucher_form">
-			<field name="name">Journal Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_voucher')]</field>
-			<field name="context">{'type':'journal_voucher'}</field>
-		</record>
-		<menuitem 
-			name="Financial Management/Voucher Entries/Other Vouchers/Journal Voucher" 
-			id="menu_action_view_jour_voucher_form" 
-			action="action_view_jour_voucher_form"/>
+    <data>
+        <record model="ir.ui.view" id="view_voucher_tree">
+            <field name="name">account.voucher.tree</field>
+            <field name="model">account.voucher</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Vouchers">
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="account_id" />
+                    <field name="amount"/>
+                    <field name="date"/>
+                    <field name="period_id"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_voucher_form">
+            <field name="name">account.voucher.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Voucher">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" select="2" on_change="onchange_account(account_id)"/>
+                        <field name="type" select="2" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="number"/>
+                        <!--field name="amount" select="1" invisible="1"/-->
+                        <!--field name="partner_id" select="2"/-->
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Entry Lines">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="275">
+                                <tree string="Voucher Lines" editable="top">
+                                    <field name="account_analytic_id"/>
+                                    <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="amount"/>
+                                    <field name="ref"/>
+                                </tree>
+                            </field>
+                            <separator string="Narration" colspan="4"/>
+                            <field name="narration" colspan="4" nolabel="1"/>
+                            <group col="6" colspan="6">
+                                <field name="state"/>
+                                <button name="open_voucher" string="Pro-forma" states="draft" type="object" icon="gtk-open"/>
+                                <button name="proforma_voucher" string="Create" states="proforma" type="object"  icon="gtk-go-forward"/>
+                                <button name="cancel_voucher" string="Cancel" states="draft,proforma,posted" type="object" icon="gtk-cancel"/>
+                                <button name="action_cancel_draft" states="cancel" type="object" string="Set to Draft" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                        <page string="Other Info">
+                            <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                            <field name="currency_id" select="1" />
+                            <field name="period_id"/>
+                            <field name="date" select="1"/>
+                            <!--field name="reference_type" select="2" nolabel="1" size="0"/>
+                            <field name="reference" select="1" nolabel="1"/-->
+                            <separator string="General Entries" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_voucher_list">
+            <field name="name">Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries" 
+        id="menu_action_voucher_list" action="action_voucher_list"/>
+        
+        <!--  Receipt Vouchers -->
+        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
+            <field name="name">Receipt Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','like','rec_voucher')]</field>
+            <field name="context">{'type':'rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers" 
+        id="menu_action_receipt_vou_voucher_list" action="action_receipt_vou_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
+            <field name="name">Cash Receipt</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','rec_voucher')]</field>
+            <field name="context">{'type':'rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts" 
+        id="menu_action_receipt_cashreceipt_voucher_list" action="action_receipt_cashreceipt_voucher_list"/>
+                
+        <record model="ir.actions.act_window" id="action_view_cash_rec_voucher_form">
+            <field name="name">Cash Receipt Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','rec_voucher')]</field>
+            <field name="context">{'type':'rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
+        
+        <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
+            <field name="name">Bank Receipt</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','bank_rec_voucher')]</field>
+            <field name="context">{'type':'bank_rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts" 
+        id="menu_action_receipt_bakreceipt_voucher_list" action="action_receipt_bakreceipt_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_bank_rec_voucher_form">
+            <field name="name">Bank Receipt Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','bank_rec_voucher')]</field>
+            <field name="context">{'type':'bank_rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
+        
+        
+        <!--  End Receipt Vouchers -->
+        
+        
+        <!-- Payment Vouchers -->
+        <record model="ir.actions.act_window" id="action_payments_voucher_list">
+            <field name="name">Payment Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','like','pay_voucher')]</field>
+            <field name="context">{'type':'pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers" 
+        id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
+            <field name="name">Payment Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','pay_voucher')]</field>
+            <field name="context">{'type':'pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments" 
+        id="menu_action_payments_cashpay_voucher_list" action="action_payments_cashpay_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_cash_pay_voucher_form">
+            <field name="name">Cash Payment Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','pay_voucher')]</field>
+            <field name="context">{'type':'pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
+    
+        <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
+            <field name="name">Payment Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','bank_pay_voucher')]</field>
+            <field name="context">{'type':'bank_pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments" 
+        id="menu_action_payments_bankpay_voucher_list" action="action_payments_bankpay_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_bank_pay_voucher_form">
+            <field name="name">Bank Payment Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','bank_pay_voucher')]</field>
+            <field name="context">{'type':'bank_pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
+        
+        <!-- End Payment Vouchers -->
+        
+        <!-- Other Voucher Enries -->
+        <record model="ir.actions.act_window" id="action_other_voucher_list">
+            <field name="name">Other Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers" 
+        id="menu_action_other_voucher_list" action="action_other_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_cont_voucher_form">
+            <field name="name">Contra Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','cont_voucher')]</field>
+            <field name="context">{'type':'cont_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers/Contra Voucher" id="menu_action_view_cont_voucher_form" action="action_view_cont_voucher_form"/>
+        <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
+            <field name="name">Journal Sale Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','journal_sale_vou')]</field>
+            <field name="context">{'type':'journal_sale_vou'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" action="action_view_jour_sale_voucher_form"/>
+        <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
+            <field name="name">Journal Purchase Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','journal_pur_voucher')]</field>
+            <field name="context">{'type':'journal_pur_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" action="action_view_jour_pur_voucher_form"/>
+        
+        <record model="ir.actions.act_window" id="action_view_jour_voucher_form">
+            <field name="name">Journal Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','journal_voucher')]</field>
+            <field name="context">{'type':'journal_voucher'}</field>
+        </record>
+        <menuitem 
+            name="Financial Management/Voucher Entries/Other Vouchers/Journal Voucher" 
+            id="menu_action_view_jour_voucher_form" 
+            action="action_view_jour_voucher_form"/>
 
-		</data>
+        </data>
 </openerp>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 4cef19d31ed..52b4e6de990 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,12 +3,12 @@
 <data noupdate="0">
 
     <record id="group_document_manager" model="res.groups">
-		<field name="name">Document / Manager</field>
+        <field name="name">Document / Manager</field>
     </record>
 
-	<record id="menu_document_configuration" model="ir.ui.menu">
-		<field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
-	</record>
+    <record id="menu_document_configuration" model="ir.ui.menu">
+        <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 7c6b2bccc9e..fe65d988237 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -3,20 +3,20 @@
     <data>
 
         <!--
-	======================
-	department
-	======================
-	-->
+    ======================
+    department
+    ======================
+    -->
         <record id="view_department_form" model="ir.ui.view">
             <field name="name">hr.department.form</field>
             <field name="model">hr.department</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department">
-					<field colspan="4" name="name" select="1"/>
-					<field name="company_id" select="1" widget="selection"/>
-					<field name="parent_id" select="2"/>
-					<field colspan="4" name="manager_id" select="1"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    <field name="parent_id" select="2"/>
+                    <field colspan="4" name="manager_id" select="1"/>
                     <notebook colspan="4" >
                         <page string="Members">
                             <field colspan="4" name="member_ids" nolabel="1"/>
@@ -36,7 +36,7 @@
             <field name="arch" type="xml">
                 <tree string="Companies">
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="manager_id"/>
                 </tree>
             </field>
@@ -59,21 +59,21 @@
 
         <!-- res.users inherit -->
         <record model="ir.ui.view" id="view_users_form_inherit">
-			<field name="name">res.users.form</field>
-			<field name="type">form</field>
-			<field name="model">res.users</field>
-			<field name="inherit_id" ref="base.view_users_form"/>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Departements Informations">
-						<separator string="Managers" colspan="4"/>
-						<field name="parent_id" nolabel="1" colspan="4"/>
-						<separator string="Subordinates" colspan="4"/>
-						<field name="child_ids" nolabel="1" colspan="4"/>
-					</page>
-				</notebook>
-			</field>
-		</record>
+            <field name="name">res.users.form</field>
+            <field name="type">form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Departements Informations">
+                        <separator string="Managers" colspan="4"/>
+                        <field name="parent_id" nolabel="1" colspan="4"/>
+                        <separator string="Subordinates" colspan="4"/>
+                        <field name="child_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 8771ccf1e0b..7b459b21c47 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,7 +27,7 @@
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
                         <field name="active" select="1"/>
-                        <field name="company_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="user_id"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 87abe7ce82e..ea3317e10e2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -87,7 +87,7 @@
                     <field name="user_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml
index 6689ced1eb4..c900bb4eacc 100644
--- a/addons/membership/demo_data.xml
+++ b/addons/membership/demo_data.xml
@@ -1,181 +1,181 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
-		<record id="account_tax_testingtax0" model="account.tax">
-			<field eval="1" name="sequence"/>
-			<field eval="1.0" name="base_sign"/>
-			<field eval="&quot;true&quot;" name="applicable_type"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="&quot;# price_unit
+    <data noupdate="1">
+        <record id="account_tax_testingtax0" model="account.tax">
+            <field eval="1" name="sequence"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="&quot;true&quot;" name="applicable_type"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="&quot;# price_unit
 # address : res.partner.address object or False
 # product : product.product object or False
 
 result = price_unit * 0.10&quot;" name="python_compute_inv"/>
-			<field eval="1.0" name="ref_tax_sign"/>
-			<field eval="&quot;percent&quot;" name="type"/>
-			<field eval="1.0" name="ref_base_sign"/>
-			<field eval="&quot;vat&quot;" name="tax_group"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="&quot;testing tax&quot;" name="name"/>
-			<field eval="0.069" name="amount"/>
-			<field eval="&quot;# price_unit
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field eval="&quot;percent&quot;" name="type"/>
+            <field eval="1.0" name="ref_base_sign"/>
+            <field eval="&quot;vat&quot;" name="tax_group"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="&quot;testing tax&quot;" name="name"/>
+            <field eval="0.069" name="amount"/>
+            <field eval="&quot;# price_unit
 # address : res.partner.address object or False
 # product : product.product object or None
 # partner : res.partner object or None
 
 result = price_unit * 0.10&quot;" name="python_compute"/>
-			<field eval="1.0" name="tax_sign"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="base.EUR" model="res.currency"/>
-	</data>
-	<data>
-		<record id="product_template_0" model="product.template">
-			<field name="list_price" eval="150.0"/>
-			<field name="name" eval="&quot;Membership 2006&quot;"/>
-			<field name="categ_id" eval="7"/>
-			<field name="type" eval="&quot;service&quot;"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_product_0" model="product.product">
-			<field eval="&quot;2007-03-31&quot;" name="membership_date_to"/>
-			<field eval="&quot;1&quot;" name="membership"/>
-			<field eval="&quot;m2006&quot;" name="default_code"/>
-			<field eval="&quot;2006-01-01&quot;" name="membership_date_from"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="150.0" name="price_margin"/>
-			<field name="product_tmpl_id" ref="product_template_0"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_template_1" model="product.template">
-			<field name="list_price" eval="160.0"/>
-			<field name="name" eval="&quot;Membership 2007&quot;"/>
-			<field name="categ_id" eval="7"/>
-			<field name="type" eval="&quot;service&quot;"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_product_1" model="product.product">
-			<field eval="&quot;2008-03-31&quot;" name="membership_date_to"/>
-			<field eval="&quot;1&quot;" name="membership"/>
-			<field eval="&quot;m2007&quot;" name="default_code"/>
-			<field eval="&quot;2007-01-01&quot;" name="membership_date_from"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="160.0" name="price_margin"/>
-			<field name="product_tmpl_id" ref="product_template_1"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_template_2" model="product.template">
-			<field name="list_price" eval="165.0"/>
-			<field name="name" eval="&quot;Membership 2008&quot;"/>
-			<field name="categ_id" eval="7"/>
-			<field name="type" eval="&quot;service&quot;"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_product_2" model="product.product">
-			<field eval="&quot;2009-03-31&quot;" name="membership_date_to"/>
-			<field eval="&quot;1&quot;" name="membership"/>
-			<field eval="&quot;m2008&quot;" name="default_code"/>
-			<field eval="&quot;2008-01-01&quot;" name="membership_date_from"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="165.0" name="price_margin"/>
-			<field name="product_tmpl_id" ref="product_template_2"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="account_invoice_0" model="account.invoice">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;none&quot;" name="reference_type"/>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;paid&quot;" name="state"/>
-			<field eval="&quot;out_invoice&quot;" name="type"/>
-			<field eval="&quot;2006-02-10&quot;" name="date_invoice"/>
-		</record>
-		<record id="account_invoice_line_membership0" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field eval="&quot;Membership 2006&quot;" name="name"/>
-			<field name="invoice_id" ref="account_invoice_0"/>
-			<field eval="150.0" name="price_unit"/>
-			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-			<field name="product_id" ref="product_product_0"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="account_id" ref="account.a_sale"/>
-		</record>
-	</data>
+            <field eval="1.0" name="tax_sign"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="base.EUR" model="res.currency"/>
+    </data>
+    <data>
+        <record id="product_template_0" model="product.template">
+            <field name="list_price" eval="150.0"/>
+            <field name="name" eval="&quot;Membership 2006&quot;"/>
+            <field name="categ_id" eval="7"/>
+            <field name="type" eval="&quot;service&quot;"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_product_0" model="product.product">
+            <field eval="&quot;2007-03-31&quot;" name="membership_date_to"/>
+            <field eval="&quot;1&quot;" name="membership"/>
+            <field eval="&quot;m2006&quot;" name="default_code"/>
+            <field eval="&quot;2006-01-01&quot;" name="membership_date_from"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="150.0" name="price_margin"/>
+            <field name="product_tmpl_id" ref="product_template_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_template_1" model="product.template">
+            <field name="list_price" eval="160.0"/>
+            <field name="name" eval="&quot;Membership 2007&quot;"/>
+            <field name="categ_id" eval="7"/>
+            <field name="type" eval="&quot;service&quot;"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_product_1" model="product.product">
+            <field eval="&quot;2008-03-31&quot;" name="membership_date_to"/>
+            <field eval="&quot;1&quot;" name="membership"/>
+            <field eval="&quot;m2007&quot;" name="default_code"/>
+            <field eval="&quot;2007-01-01&quot;" name="membership_date_from"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="160.0" name="price_margin"/>
+            <field name="product_tmpl_id" ref="product_template_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_template_2" model="product.template">
+            <field name="list_price" eval="165.0"/>
+            <field name="name" eval="&quot;Membership 2008&quot;"/>
+            <field name="categ_id" eval="7"/>
+            <field name="type" eval="&quot;service&quot;"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_product_2" model="product.product">
+            <field eval="&quot;2009-03-31&quot;" name="membership_date_to"/>
+            <field eval="&quot;1&quot;" name="membership"/>
+            <field eval="&quot;m2008&quot;" name="default_code"/>
+            <field eval="&quot;2008-01-01&quot;" name="membership_date_from"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="165.0" name="price_margin"/>
+            <field name="product_tmpl_id" ref="product_template_2"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="account_invoice_0" model="account.invoice">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;none&quot;" name="reference_type"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;paid&quot;" name="state"/>
+            <field eval="&quot;out_invoice&quot;" name="type"/>
+            <field eval="&quot;2006-02-10&quot;" name="date_invoice"/>
+        </record>
+        <record id="account_invoice_line_membership0" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field eval="&quot;Membership 2006&quot;" name="name"/>
+            <field name="invoice_id" ref="account_invoice_0"/>
+            <field eval="150.0" name="price_unit"/>
+            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+            <field name="product_id" ref="product_product_0"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+    </data>
 
-	<data noupdate="1">
-		<record id="account_invoice_1" model="account.invoice">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;none&quot;" name="reference_type"/>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;paid&quot;" name="state"/>
-			<field eval="&quot;out_invoice&quot;" name="type"/>
-			<field eval="&quot;2007-01-30&quot;" name="date_invoice"/>
-		</record>
-		<record id="account_invoice_line_membership1" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field eval="&quot;Membership 2007&quot;" name="name"/>
-			<field name="invoice_id" ref="account_invoice_1"/>
-			<field eval="160.0" name="price_unit"/>
-			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-			<field name="product_id" ref="product_product_1"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="account_id" ref="account.a_sale"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="account_invoice_1" model="account.invoice">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;none&quot;" name="reference_type"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;paid&quot;" name="state"/>
+            <field eval="&quot;out_invoice&quot;" name="type"/>
+            <field eval="&quot;2007-01-30&quot;" name="date_invoice"/>
+        </record>
+        <record id="account_invoice_line_membership1" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field eval="&quot;Membership 2007&quot;" name="name"/>
+            <field name="invoice_id" ref="account_invoice_1"/>
+            <field eval="160.0" name="price_unit"/>
+            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+            <field name="product_id" ref="product_product_1"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+    </data>
 
-	<data noupdate="1">
-		<record id="account_invoice_2" model="account.invoice">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;none&quot;" name="reference_type"/>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;paid&quot;" name="state"/>
-			<field eval="&quot;out_invoice&quot;" name="type"/>
-			<field eval="&quot;2007-11-30&quot;" name="date_invoice"/>
-		</record>
-		<record id="account_invoice_line_membership1" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field eval="&quot;Membership 2007&quot;" name="name"/>
-			<field name="invoice_id" ref="account_invoice_2"/>
-			<field eval="160.0" name="price_unit"/>
-			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-			<field name="product_id" ref="product_product_2"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="account_id" ref="account.a_sale"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="account_invoice_2" model="account.invoice">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;none&quot;" name="reference_type"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;paid&quot;" name="state"/>
+            <field eval="&quot;out_invoice&quot;" name="type"/>
+            <field eval="&quot;2007-11-30&quot;" name="date_invoice"/>
+        </record>
+        <record id="account_invoice_line_membership1" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field eval="&quot;Membership 2007&quot;" name="name"/>
+            <field name="invoice_id" ref="account_invoice_2"/>
+            <field eval="160.0" name="price_unit"/>
+            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+            <field name="product_id" ref="product_product_2"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+    </data>
 <!--
-	<data>
-		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_2"/>
-	</data>
+    <data>
+        <workflow action="invoice_open" model="account.invoice" ref="account_invoice_2"/>
+    </data>
 
-	<data>
-		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_1"/>
-	</data>
+    <data>
+        <workflow action="invoice_open" model="account.invoice" ref="account_invoice_1"/>
+    </data>
 
 
-	<data>
-		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
-	</data>
+    <data>
+        <workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
+    </data>
 -->
 </openerp>
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index 495050398d1..d16c6db68aa 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -1,183 +1,183 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
 <!-- Demo Data for Membership Product -->
-	<record id="member_product_0" model="product.product">
-		<field name="membership">True</field>
-		<field name="membership_date_from">2009-01-01</field>
-		<field name="membership_date_to">2010-06-01</field>
-		<field name="name">Membership Product - 1</field>
-		<field name="list_price">80</field>
-		<field name="categ_id" ref="product.cat1"/>
-		<field name="type">service</field>
-	</record>
-	<record id="member_product_1" model="product.product">
-		<field name="membership">True</field>
-		<field name="membership_date_from">2009-01-01</field>
-		<field name="membership_date_to">2010-08-01</field>
-		<field name="name">Membership Product - 2</field>
-		<field name="categ_id" ref="product.cat1"/>
-		<field name="list_price">80</field>
-		<field name="type">service</field>
-	</record>
+    <record id="member_product_0" model="product.product">
+        <field name="membership">True</field>
+        <field name="membership_date_from">2009-01-01</field>
+        <field name="membership_date_to">2010-06-01</field>
+        <field name="name">Membership Product - 1</field>
+        <field name="list_price">80</field>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="type">service</field>
+    </record>
+    <record id="member_product_1" model="product.product">
+        <field name="membership">True</field>
+        <field name="membership_date_from">2009-01-01</field>
+        <field name="membership_date_to">2010-08-01</field>
+        <field name="name">Membership Product - 2</field>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="list_price">80</field>
+        <field name="type">service</field>
+    </record>
 
 
 <!-- Demo data for Accounts -->
-	<record id="account_account_membershipparent" model="account.account">
-		<field name="name">membership</field>
-		<field name="code">Membership-0</field>
-		<field name="company_id" ref="base.main_company"/>
-		<!--<field eval="1" name="sign"/>-->
-		<field eval="1" name="active"/>
-		<field name="type">view</field>
-		<field eval="0" name="reconcile"/>
-		<field name="user_type" ref="account.account_type_root"/>
-	</record>
-	<record id="account_account_membershipaccount0" model="account.account">
-		<field name="name">membership account</field>
-		<field name="code">Membership-1254</field>
-		<field name="company_id" ref="base.main_company"/>
-		<!--<field eval="1" name="sign"/>-->
-		<field eval="1" name="active"/>
-		<field name="type">other</field>
-		<field eval="1" name="reconcile"/>
-		<field name="user_type" ref="account.account_type_expense"/>
-		<field name="parent_id" ref="account_account_membershipparent"/>
-	</record>
+    <record id="account_account_membershipparent" model="account.account">
+        <field name="name">membership</field>
+        <field name="code">Membership-0</field>
+        <field name="company_id" ref="base.main_company"/>
+        <!--<field eval="1" name="sign"/>-->
+        <field eval="1" name="active"/>
+        <field name="type">view</field>
+        <field eval="0" name="reconcile"/>
+        <field name="user_type" ref="account.account_type_root"/>
+    </record>
+    <record id="account_account_membershipaccount0" model="account.account">
+        <field name="name">membership account</field>
+        <field name="code">Membership-1254</field>
+        <field name="company_id" ref="base.main_company"/>
+        <!--<field eval="1" name="sign"/>-->
+        <field eval="1" name="active"/>
+        <field name="type">other</field>
+        <field eval="1" name="reconcile"/>
+        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="parent_id" ref="account_account_membershipparent"/>
+    </record>
 
 <!-- Demo data for Invoices -->
-	<record id="account_invoice_0" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">paid</field>
-		<field name="type">out_invoice</field>
-	</record>
-	<record id="account_invoice_1" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_9"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">open</field>
-		<field name="type">out_invoice</field>
-	</record>
-	<record id="account_invoice_2" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_zen"/>
-		<field name="partner_id" ref="base.res_partner_3"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">cancel</field>
-		<field name="type">out_invoice</field>
-	</record>
-	<record id="account_invoice_3" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_14"/>
-		<field name="partner_id" ref="base.res_partner_15"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">draft</field>
-		<field name="type">out_invoice</field>
-	</record>
+    <record id="account_invoice_0" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">paid</field>
+        <field name="type">out_invoice</field>
+    </record>
+    <record id="account_invoice_1" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_9"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">open</field>
+        <field name="type">out_invoice</field>
+    </record>
+    <record id="account_invoice_2" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_zen"/>
+        <field name="partner_id" ref="base.res_partner_3"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">cancel</field>
+        <field name="type">out_invoice</field>
+    </record>
+    <record id="account_invoice_3" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_14"/>
+        <field name="partner_id" ref="base.res_partner_15"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">draft</field>
+        <field name="type">out_invoice</field>
+    </record>
 
 <!-- Demo data for invoice line -->
-	<record id="account_invoice_line_membershipproduct0" model="account.invoice.line">
-		<field name="name">Membership Product - 1</field>
-		<field name="invoice_id" ref="account_invoice_0"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_0"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
-	<record id="account_invoice_line_membershipproduct1" model="account.invoice.line">
-		<field name="name">Membership Product - 2</field>
-		<field name="invoice_id" ref="account_invoice_1"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_1"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
-	<record id="account_invoice_line_membershipproduct2" model="account.invoice.line">
-		<field name="name">Membership Product - 2</field>
-		<field name="invoice_id" ref="account_invoice_2"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_1"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
-	<record id="account_invoice_line_membershipproduct3" model="account.invoice.line">
-		<field name="name">Membership Product - 2</field>
-		<field name="invoice_id" ref="account_invoice_3"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_1"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
+    <record id="account_invoice_line_membershipproduct0" model="account.invoice.line">
+        <field name="name">Membership Product - 1</field>
+        <field name="invoice_id" ref="account_invoice_0"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_0"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
+    <record id="account_invoice_line_membershipproduct1" model="account.invoice.line">
+        <field name="name">Membership Product - 2</field>
+        <field name="invoice_id" ref="account_invoice_1"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_1"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
+    <record id="account_invoice_line_membershipproduct2" model="account.invoice.line">
+        <field name="name">Membership Product - 2</field>
+        <field name="invoice_id" ref="account_invoice_2"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_1"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
+    <record id="account_invoice_line_membershipproduct3" model="account.invoice.line">
+        <field name="name">Membership Product - 2</field>
+        <field name="invoice_id" ref="account_invoice_3"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_1"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
 
 <!-- Demo data for membership line -->
-	<record id="member_line_1" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
-		<field name="state">paid</field>
-		<field name="partner" ref="base.res_partner_agrolait"/>
-	</record>
-	<record id="member_line_2" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
-		<field name="state">invoiced</field>
-		<field name="partner" ref="base.res_partner_2"/>
-	</record>
-	<record id="member_line_3" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="date_cancel">2008-08-05</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
-		<field name="state">canceled</field>
-		<field name="partner" ref="base.res_partner_3"/>
-	</record>
-	<record id="member_line_3" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
-		<field name="state">waiting</field>
-		<field name="partner" ref="base.res_partner_15"/>
-	</record>
+    <record id="member_line_1" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
+        <field name="state">paid</field>
+        <field name="partner" ref="base.res_partner_agrolait"/>
+    </record>
+    <record id="member_line_2" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
+        <field name="state">invoiced</field>
+        <field name="partner" ref="base.res_partner_2"/>
+    </record>
+    <record id="member_line_3" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="date_cancel">2008-08-05</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
+        <field name="state">canceled</field>
+        <field name="partner" ref="base.res_partner_3"/>
+    </record>
+    <record id="member_line_3" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
+        <field name="state">waiting</field>
+        <field name="partner" ref="base.res_partner_15"/>
+    </record>
 
 <!-- Demo data for cancel member -->
-	<record id="base.res_partner_3" model="res.partner">
-		<field name="membership_cancel">2009-01-01</field>
-	</record>
+    <record id="base.res_partner_3" model="res.partner">
+        <field name="membership_cancel">2009-01-01</field>
+    </record>
 
 <!-- Demo data for free member -->
-	<record id="base.res_partner_desertic_hispafuentes" model="res.partner">
-		<field name="free_member">True</field>
-	</record>
+    <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
+        <field name="free_member">True</field>
+    </record>
 
 <!-- Demo data for associate member -->
-	<record id="base.res_partner_9" model="res.partner">
-		<field name="associate_member" ref="base.res_partner_agrolait"/>
-	</record>
-	<record id="base.res_partner_8" model="res.partner">
-		<field name="associate_member" ref="base.res_partner_agrolait"/>
-	</record>
+    <record id="base.res_partner_9" model="res.partner">
+        <field name="associate_member" ref="base.res_partner_agrolait"/>
+    </record>
+    <record id="base.res_partner_8" model="res.partner">
+        <field name="associate_member" ref="base.res_partner_agrolait"/>
+    </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 2ceb2fe00e9..a7853319237 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -5,175 +5,175 @@
         <record id="base.main_partner" model="res.partner">
             <field name="name">OpenERP Corp.</field>
         </record>
-		<record id="res_partner_oerp_editor" model="res.partner">
-			<field name="name">OpenERP Editor</field>
-		</record>
-		<record id="res_partner_oerp_us" model="res.partner">
-			<field name="name">OpenERP US</field>
-		</record>
-		<record id="res_partner_oerp_in" model="res.partner">
-			<field name="name">OpenERP IN</field>
-		</record>
-		<record id="res_partner_oerp_be" model="res.partner">
-			<field name="name">OpenERP BE</field>
-		</record>
-		<record id="res_partner_odoo" model="res.partner">
-			<field name="name">Odoo</field>
-		</record>
-		
-<!--                      Company                        -->    		
-		<record id="base.main_company" model="res.company">
-			<field name="name">OpenERP Corp.</field>
-		</record>
-		<record id="res_company_oerp_editor" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_editor"/>
-			<field name="parent_id" ref="base.main_company"/>
-			<field name="name">OpenERP Editor</field>
-		</record>
-		<record id="res_company_oerp_us" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_us"/>
-			<field name="parent_id" ref="res_company_oerp_editor"/>
-			<field name="name">OpenERP US</field>
-		</record>
-		<record id="res_company_oerp_be" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_be"/>
-			<field name="parent_id" ref="res_company_oerp_editor"/>
-			<field name="name">OpenERP BE</field>
-		</record>OpenERP IN
-		<record id="res_company_oerp_in" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_in"/>
-			<field name="parent_id" ref="res_company_oerp_editor"/>
-			<field name="name">OpenERP IN</field>
-		</record>
-		<record id="res_company_odoo" model="res.company">
-			<field name="partner_id" ref="res_partner_odoo"/>
-			<field name="parent_id" ref="base.main_company"/>
-			<field name="name">Odoo</field>
-		</record>
-		
+        <record id="res_partner_oerp_editor" model="res.partner">
+            <field name="name">OpenERP Editor</field>
+        </record>
+        <record id="res_partner_oerp_us" model="res.partner">
+            <field name="name">OpenERP US</field>
+        </record>
+        <record id="res_partner_oerp_in" model="res.partner">
+            <field name="name">OpenERP IN</field>
+        </record>
+        <record id="res_partner_oerp_be" model="res.partner">
+            <field name="name">OpenERP BE</field>
+        </record>
+        <record id="res_partner_odoo" model="res.partner">
+            <field name="name">Odoo</field>
+        </record>
+        
+<!--                      Company                        -->            
+        <record id="base.main_company" model="res.company">
+            <field name="name">OpenERP Corp.</field>
+        </record>
+        <record id="res_company_oerp_editor" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_editor"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="name">OpenERP Editor</field>
+        </record>
+        <record id="res_company_oerp_us" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_us"/>
+            <field name="parent_id" ref="res_company_oerp_editor"/>
+            <field name="name">OpenERP US</field>
+        </record>
+        <record id="res_company_oerp_be" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_be"/>
+            <field name="parent_id" ref="res_company_oerp_editor"/>
+            <field name="name">OpenERP BE</field>
+        </record>OpenERP IN
+        <record id="res_company_oerp_in" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_in"/>
+            <field name="parent_id" ref="res_company_oerp_editor"/>
+            <field name="name">OpenERP IN</field>
+        </record>
+        <record id="res_company_odoo" model="res.company">
+            <field name="partner_id" ref="res_partner_odoo"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="name">Odoo</field>
+        </record>
+        
 <!--                      User                        -->
 
-		<record id="res_users_editor_demo" model="res.users">
-			<field name="password">editor_demo</field>
-			<field name="name">OpenERP Editor</field>
-			<field name="login">editor_demo</field>
-			<field name="company_id" ref="res_company_oerp_editor"/>
+        <record id="res_users_editor_demo" model="res.users">
+            <field name="password">editor_demo</field>
+            <field name="name">OpenERP Editor</field>
+            <field name="login">editor_demo</field>
+            <field name="company_id" ref="res_company_oerp_editor"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_sales_demo_us" model="res.users">
-			<field name="password">sales_demo_us</field>
-			<field name="name">OpenERP Salesman US</field>
-			<field name="login">sales_demo_us</field>
-			<field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="res_users_sales_demo_us" model="res.users">
+            <field name="password">sales_demo_us</field>
+            <field name="name">OpenERP Salesman US</field>
+            <field name="login">sales_demo_us</field>
+            <field name="company_id" ref="res_company_oerp_us"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_sales_demo_be" model="res.users">
-			<field name="password">sales_demo_be</field>
-			<field name="name">OpenERP Salesman BE</field>
-			<field name="login">sales_demo_be</field>
-			<field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="res_users_sales_demo_be" model="res.users">
+            <field name="password">sales_demo_be</field>
+            <field name="name">OpenERP Salesman BE</field>
+            <field name="login">sales_demo_be</field>
+            <field name="company_id" ref="res_company_oerp_be"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_sales_demo_in" model="res.users">
-			<field name="password">sales_demo_in</field>
-			<field name="name">OpenERP Salesman IN</field>
-			<field name="login">sales_demo_in</field>
-			<field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="res_users_sales_demo_in" model="res.users">
+            <field name="password">sales_demo_in</field>
+            <field name="name">OpenERP Salesman IN</field>
+            <field name="login">sales_demo_in</field>
+            <field name="company_id" ref="res_company_oerp_in"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_odoo_demo" model="res.users">
-			<field name="password">odoo_demo</field>
-			<field name="name">Odoo</field>
-			<field name="login">odoo_demo</field>
-			<field name="company_id" ref="res_company_odoo"/>
+        </record>
+        <record id="res_users_odoo_demo" model="res.users">
+            <field name="password">odoo_demo</field>
+            <field name="name">Odoo</field>
+            <field name="login">odoo_demo</field>
+            <field name="company_id" ref="res_company_odoo"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
+        </record>
 
 
         <!--
-	Resource: product.product
-	-->
+    Resource: product.product
+    -->
         
         <record id="product.product_product_0" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc1" model="product.product">
-    	    <field name="company_id" ref="res_company_oerp_editor"/>
+            <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc3" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc4" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_mb1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_mb2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu3" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_hdd1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_hdd2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_hdd3" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_fan" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_fan2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu_gen" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_ram" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_ram512" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_tow1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_20" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_21" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_22" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_23" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_24" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_25" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_26" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="Odoo1" model="product.category">
             <field name="parent_id" ref="product.cat0"/>
@@ -188,186 +188,186 @@
             <field name="uom_po_id" ref="product.product_uom_unit"/>
             <field name="name">Odoo Offer</field>
             <field name="categ_id" ref="Odoo1"/>
-	    <field name="company_id" ref="res_company_odoo"/>
+        <field name="company_id" ref="res_company_odoo"/>
         </record>
 
         <!--
-	Resource: sale.order
-	-->
+    Resource: sale.order
+    -->
 
         <record id="sale.order" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
         <record id="sale.order2" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
         <record id="sale.order3" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
         <record id="sale.order4" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
         <record id="sale.order5" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
 
-<!--		Project		-->
+<!--        Project        -->
 
         <record id="project.project_project_9" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_project_21" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_project_22" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_project_23" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
 
         <record id="project.project_task_116" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_130" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_131" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_184" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_186" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_188" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_189" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_190" model="project.task">
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_192" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_193" model="project.task">
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_194" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_195" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_196" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_197" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_198" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_199" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_200" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_201" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_202" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_203" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_204" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_205" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_206" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
 
        
         <!--
-		Resource: res.partner
-		-->
+        Resource: res.partner
+        -->
         
         <record id="base.res_partner_asus" model="res.partner">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_agrolait" model="res.partner">
-            	    <field name="company_id" ref="res_company_oerp_be"/>
+                    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_c2c" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_sednacom" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_be"/>
+                  <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_thymbra" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_in"/>
+                   <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
-        	    <field name="company_id" ref="res_company_oerp_be"/>
+                <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_tinyatwork" model="res.partner">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_2" model="res.partner">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_3" model="res.partner">
-            	    <field name="company_id" ref="res_company_oerp_in"/>
+                    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="base.res_partner_4" model="res.partner">
-        	    <field name="company_id" ref="res_company_oerp_be"/>
+                <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_5" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_6" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_maxtor" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_us"/>
+                  <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_seagate" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_us"/>
+                  <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_8" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_9" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_be"/>
+                  <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_10" model="res.partner">
-       	    <field name="company_id" ref="res_company_oerp_in"/>
+               <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="base.res_partner_11" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_14" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_be"/>
+                  <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_15" model="res.partner">
-         	    <field name="company_id" ref="res_company_oerp_be"/>
+                 <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_accent" model="res.partner">
-         	    <field name="company_id" ref="res_company_oerp_be"/>
+                 <field name="company_id" ref="res_company_oerp_be"/>
         </record>        
         
 
diff --git a/addons/multi_company/multi_company_view.xml b/addons/multi_company/multi_company_view.xml
index d2d26c48591..baac5b322d4 100644
--- a/addons/multi_company/multi_company_view.xml
+++ b/addons/multi_company/multi_company_view.xml
@@ -9,7 +9,7 @@
                 <tree string="Multi Company">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_dest_id"/>
                     <field name="object_id"/>
                     <field name="expression" />
@@ -24,7 +24,7 @@
                 <form string="Multi Company">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_dest_id"/>
                     <field name="object_id"/>
                     <field name="expression" />
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6d79a5c9952..60995fde34a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -130,7 +130,7 @@
                             <group colspan="2" col="2" name="misc">
                                 <separator string="Miscelleanous" colspan="2"/>
                                 <field name="active" select="2"/>
-                                <field name="company_id" select="2" groups="base.group_extended" widget="selection"/>
+                                <field name="company_id" select="2" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
                         </page>
@@ -139,11 +139,11 @@
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <field name="standard_price_multi"/>
-            				<field name="list_price_multi"/>
-            				<newline/>
+                            <field name="list_price_multi"/>
+                            <newline/>
                             <field name="standard_price_ids" nolabel="1" colspan="2"/>
-            				<field name="list_price_ids" nolabel="1" colspan="2"/>
-            				<newline/>
+                            <field name="list_price_ids" nolabel="1" colspan="2"/>
+                            <newline/>
                             <field name="price_margin" select="1"/>
                             <field name="price_extra" select="1"/>
                             <newline/>
@@ -414,7 +414,7 @@
                     <field name="product_code"/>
                     <field name="delay"/>
                     <field name="qty"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
                         <tree editable="bottom" string="Pricelist">
                             <field name="min_quantity"/>
@@ -439,7 +439,7 @@
                     <field name="delay"/>
                     <field name="qty"/>
                     <field name="product_code"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -601,7 +601,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Company Wise Cost Prices">
-                    <field name="company_id" on_change="company_cost_onchange(company_id)"/>
+                    <field name="company_id" on_change="company_cost_onchange(company_id)" groups="base.group_multi_company"/>
                     <field name="standard_price"/>
                     <field name="currency_id"/>
                 </form>
@@ -614,7 +614,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Company Wise Cost Prices">
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="standard_price"/>
                     <field name="currency_id"/>
                 </tree>
@@ -627,7 +627,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Company Wise Sale Prices">
-                    <field name="company_id" on_change="company_sale_onchange(company_id)"/>
+                    <field name="company_id" on_change="company_sale_onchange(company_id)" groups="base.group_multi_company"/>
                     <field name="list_price"/>
                     <field name="currency_id"/>
                 </form>
@@ -640,7 +640,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Company Wise Sale Prices">
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="list_price"/>
                     <field name="currency_id"/>
                 </tree>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 1d255aff2c8..e0744f8ba95 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -14,7 +14,7 @@
 
      <record model="ir.rule.group" id="product_comp_rule_group">
         <field name="name" >Product multi-company</field>
-        <field name="model_id" search="[('model','=','product.product')]" model="ir.model"/>
+        <field name="model_id" ref="model_product_product"/>
         <field name="global" eval="True"/>
     </record>
     <record id="product_comp_rule" model="ir.rule">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index cb5bad3db9c..a350354ffca 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -12,32 +12,32 @@
         <field name="name">Project / User</field>
     </record>
 
-	<record model="ir.ui.menu" id="menu_definitions">
-		<field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
-	</record>
-	<record model="ir.ui.menu" id="menu_open_view_project">
-		<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
-	</record>
+    <record model="ir.ui.menu" id="menu_definitions">
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
+    </record>
+    <record model="ir.ui.menu" id="menu_open_view_project">
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
+    </record>
 
-	<record model="ir.rule.group" id="project_comp_rule_group">
-		<field name="name">Project multi-company</field>
-		<field name="model_id" search="[('model','=','project.project')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="project_comp_rule">
-		<field name="rule_group" ref="project_comp_rule_group"/>
-        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
-	</record>
+    <record model="ir.rule.group" id="project_comp_rule_group">
+        <field name="name">Project multi-company</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="project_comp_rule">
+        <field name="rule_group" ref="project_comp_rule_group"/>
+            <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 
-	<record model="ir.rule.group" id="task_comp_rule_group">
-		<field name="name" >Task multi-company</field>
-		<field name="model_id" search="[('model','=','project.task')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="task_comp_rule">
-        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
-		<field name="rule_group" ref="task_comp_rule_group"/>
-	</record>
+    <record model="ir.rule.group" id="task_comp_rule_group">
+        <field name="name" >Task multi-company</field>
+        <field name="model_id" ref="model_project_task"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="task_comp_rule">
+            <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="rule_group" ref="task_comp_rule_group"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 932dd9ff747..4faf2990fa9 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -2,30 +2,28 @@
 <openerp>
 <data noupdate="0">
 
-    	<record id="group_sale_manager" model="res.groups">
-        	<field name="name">Sale / Manager</field>
-    	</record>
-    	<record id="group_sale_user" model="res.groups">
-        	<field name="name">Sale / Salesman</field>
-     	</record>
+    <record id="group_sale_manager" model="res.groups">
+        <field name="name">Sale / Manager</field>
+    </record>
+    <record id="group_sale_user" model="res.groups">
+        <field name="name">Sale / Salesman</field>
+    </record>
 
 
-	<record model='ir.ui.menu' id='menu_shop_configuration'>
-		<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_shop_configuration'>
+        <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
+    </record>
 
-	<record model="ir.rule.group" id="sale_order_comp_rule_group">
-		<field name="name">Sale Order multi-company</field>
-		<field name="model_id" search="[('model','=','sale.order')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="sale_order_comp_rule">
-		<field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
-		<field name="rule_group" ref="sale_order_comp_rule_group"/>
-        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
-	</record>
-
-	
+    <record model="ir.rule.group" id="sale_order_comp_rule_group">
+        <field name="name">Sale Order multi-company</field>
+        <field name="model_id" ref="model_sale_order"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="sale_order_comp_rule">
+        <field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="sale_order_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f3f28df553f..bdb7c4eed74 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -9,13 +9,13 @@
         <field name="name">Stock / Worker</field>
     </record>
 
-	<record model='ir.ui.menu' id='menu_stock_root'>
-		<field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_stock_root'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user')])]"/>
+    </record>
 
-	<record model='ir.ui.menu' id='menu_stock_configuration'>
-		<field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_stock_configuration'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/>
+    </record>
 
 </data>
 </openerp>