[ADD] account, account_payment, analytic: added company related record rules for some objects and also added company field.

bzr revid: vra@tinyerp.com-20100820113218-5xg58scsgjavb6fg

addons/account/account.py

@@ -1949,12 +1949,14 @@ class account_model(osv.osv):
         'name': fields.char('Model Name', size=64, required=True, help="This is a model for recurring accounting entries"),
         'ref': fields.char('Reference', size=64),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'),
         'legend' :fields.text('Legend', readonly=True, size=100),
     }
 
     _defaults = {
         'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
     }
     def generate(self, cr, uid, ids, datas={}, context={}):
         move_ids = []

addons/account/account_view.xml

@@ -1551,6 +1551,7 @@
                     <field name="name" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="journal_id" select="1"/>
+                    <field name="company_id" select="1" widget='selection'/>
                     <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
@@ -1568,6 +1569,7 @@
                 <tree string="Entry Model">
                     <field name="name"/>
                     <field name="journal_id"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>

addons/account/security/account_security.xml

@@ -222,4 +222,18 @@
         <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 position company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">[('company_id','=',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="domain_force">[('company_id','=',user.company_id.id)]</field>
+    </record>
+
 </data></openerp>

addons/account_payment/account_payment.py

@@ -46,9 +46,12 @@ class payment_mode(osv.osv):
             required=True,help='Bank Account for the Payment Mode'),
         'journal': fields.many2one('account.journal', 'Journal', required=True,
             domain=[('type', '=', 'cash')], help='Cash Journal for the Payment Mode'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'type': fields.many2one('payment.type', 'Payment type', required=True, help='Select the Payment Type for the Payment Mode.'),
     }
-
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
+    }
     def suitable_bank_types(self, cr, uid, payment_code=None, context={}):
         """Return the codes of the bank type that are suitable
         for the given payment type code"""

addons/account_payment/account_payment_view.xml

@@ -69,6 +69,7 @@
                 <tree string="Payment Mode">
                     <field name="name"/>
                     <field name="journal"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -82,6 +83,7 @@
                     <field name="type"/>
                     <field name="journal"/>
                     <field name="bank_id"/>
+                    <field name="company_id" select="1" widget='selection'/>
                 </form>
             </field>
         </record>

addons/account_payment/security/account_payment_security.xml

@@ -6,5 +6,12 @@
         <field name="name">Accounting / Payments</field>
     </record>
 
+    <record id="payment_mode_comp_rule" model="ir.rule">
+        <field name="name">Payment Mode company rule</field>
+        <field model="ir.model" name="model_id" ref="model_payment_mode"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+    </record>
+
 </data>
 </openerp>

addons/analytic/__openerp__.py

@@ -29,7 +29,8 @@
     "description": """Module for defining analytic accounting object.
     """,
     "init_xml" : [],
-    "update_xml": ["security/ir.model.access.csv",
+    "update_xml": ['security/analytic_security.xml',
+                   "security/ir.model.access.csv",
     ],
     'demo_xml': [
     ],

addons/analytic/security/analytic_security.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp><data>
+
+    <record id="analytic_comp_rule" model="ir.rule">
+        <field name="name">analytic company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_analytic_account"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+    </record>
+
+</data></openerp>