Merge lp:~openerp-dev/openobject-addons/trunk-bug-999506-amp into lp:openobject-addons

[Amit Parik]

Added a multi-company access rules for Entry analysis report.

Thanks.

=== modified file 'account/security/account_security.xml'
--- account/security/account_security.xml	2012-09-16 15:05:17 +0000
+++ account/security/account_security.xml	2012-09-24 14:24:28 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
+<openerp>
+<data>
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
@@ -7,11 +8,13 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
+
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
+
     <record id="group_account_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
@@ -25,100 +28,107 @@
 
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
-        <field ref="model_account_move" name="model_id"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_move"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
-         <field name="name">Entry lines</field>
-        <field model="ir.model" name="model_id" ref="model_account_move_line"/>
-        <field eval="True" name="global"/>
+        <field name="name">Entry lines</field>
+        <field name="model_id" ref="model_account_move_line"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
         <field name="name">Journal Period</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_journal_period"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-     
+
 
     <record id="journal_comp_rule" model="ir.rule">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_journal"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_analytic_journal"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_period"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_period"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_fiscalyear"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_account"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_account"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
-         <field name="name">Tax multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax"/>
-        <field eval="True" name="global"/>
+        <field name="name">Tax multi-company</field>
+        <field name="model_id" ref="model_account_tax"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_tax_code"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_invoice"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_analysis_comp_rule" model="ir.rule">
         <field name="name">Invoice Analysis multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_invoice_report"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record id="entry_analysis_comp_rule" model="ir.rule">
+        <field name="name">Entries Analysis multi-company</field>
+        <field name="model_id" ref="model_account_entries_report"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_fiscal_position"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_model"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_model"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
@@ -143,4 +153,5 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-</data></openerp>
+</data>
+</openerp>

=== modified file 'portal_sale/security/portal_security.xml'
--- portal_sale/security/portal_security.xml	2012-09-14 13:42:51 +0000
+++ portal_sale/security/portal_security.xml	2012-09-24 14:24:28 +0000
@@ -12,7 +12,7 @@
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders</field>
-            <field ref="stock.model_stock_picking" name="model_id"/>
+            <field name="model_id" ref="stock.model_stock_picking"/>
             <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>