[ADD] multi-company support on easy-reconcile related models

This commit is contained in:
unknown
2013-02-14 09:05:50 +01:00
6 changed files with 45 additions and 3 deletions

View File

@@ -21,9 +21,8 @@
{
"name": "Easy Reconcile",
"version": "1.2",
"depends": ["account",
],
"version": "1.3.0",
"depends": ["account"],
"author": "Akretion,Camptocamp",
"description": """
Easy Reconcile
@@ -58,6 +57,7 @@ allows multiple lines and partial.
"demo_xml": [],
"data": ["easy_reconcile.xml",
"easy_reconcile_history_view.xml",
"security/ir_rule.xml",
"security/ir.model.access.csv"],
'license': 'AGPL-3',
"auto_install": False,

View File

@@ -96,6 +96,12 @@ class account_easy_reconcile_method(orm.Model):
string='Task',
required=True,
ondelete='cascade'),
'company_id': fields.related('task_id','company_id',
relation='res.company',
type='many2one',
string='Company',
store=True,
readonly=True),
}
_defaults = {
@@ -182,6 +188,7 @@ class account_easy_reconcile(orm.Model):
type='many2one',
relation='easy.reconcile.history',
readonly=True),
'company_id': fields.many2one('res.company', 'Company'),
}
def _prepare_run_transient(self, cr, uid, rec_method, context=None):

View File

@@ -27,6 +27,7 @@
<group>
<field name="name" select="1"/>
<field name="account"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group>
<field name="unreconciled_count"/>
@@ -76,6 +77,7 @@ The lines should have the same amount (with the write-off) and the same referenc
<tree string="Automatic Easy Reconcile">
<field name="name"/>
<field name="account"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="unreconciled_count"/>
<field name="reconciled_partial_count"/>
<button icon="gtk-ok" name="run_reconcile" colspan="4"

View File

@@ -81,6 +81,13 @@ class easy_reconcile_history(orm.Model):
relation='account.move.line',
readonly=True,
multi='lines'),
'company_id': fields.related('easy_reconcile_id','company_id',
relation='res.company',
type='many2one',
string='Company',
store=True,
readonly=True),
}
def _open_move_lines(self, cr, uid, history_id, rec_type='full', context=None):

View File

@@ -48,6 +48,7 @@
<group>
<field name="easy_reconcile_id"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group col="2">
<separator colspan="2" string="Reconciliations"/>

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="easy_reconcile_rule" model="ir.rule">
<field name="name">Easy reconcile multi-company</field>
<field name="model_id" ref="model_account_easy_reconcile"/>
<field name="global" eval="True"/>
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
</record>
<record id="easy_reconcile_history_rule" model="ir.rule">
<field name="name">Easy reconcile history multi-company</field>
<field name="model_id" ref="model_easy_reconcile_history"/>
<field name="global" eval="True"/>
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
</record>
<record id="easy_reconcile_method_rule" model="ir.rule">
<field name="name">Easy reconcile method multi-company</field>
<field name="model_id" ref="model_account_easy_reconcile_method"/>
<field name="global" eval="True"/>
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
</record>
</data>
</openerp>