From da16170a5d63ce4688091ca89f0d3e54a2254ee4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Feb 2013 16:54:48 +0100 Subject: [PATCH] [ADD] easy-reconcile multi-company support --- account_easy_reconcile/__openerp__.py | 6 ++--- account_easy_reconcile/easy_reconcile.py | 7 ++++++ account_easy_reconcile/easy_reconcile.xml | 2 ++ .../easy_reconcile_history.py | 7 ++++++ .../easy_reconcile_history_view.xml | 1 + account_easy_reconcile/security/ir_rule.xml | 25 +++++++++++++++++++ 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 account_easy_reconcile/security/ir_rule.xml diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index 94230322..a3f22d54 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -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, diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 3f7b2774..7971895e 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -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): diff --git a/account_easy_reconcile/easy_reconcile.xml b/account_easy_reconcile/easy_reconcile.xml index 25d60720..2696419a 100644 --- a/account_easy_reconcile/easy_reconcile.xml +++ b/account_easy_reconcile/easy_reconcile.xml @@ -27,6 +27,7 @@ + @@ -76,6 +77,7 @@ The lines should have the same amount (with the write-off) and the same referenc +