From 5934bc3e52b5dd6b975c9ad86afac7265570a18c Mon Sep 17 00:00:00 2001 From: sebastien beau Date: Thu, 1 Nov 2012 17:14:03 +0100 Subject: [PATCH] [IMP] account_easy_reconcile: add reconciliation by reference (lp:account-extra-addons rev 30) [FIX] account_easy_reconcile : fix domain evaluation (lp:account-extra-addons rev 29) --- account_advanced_reconcile/__openerp__.py | 2 +- account_easy_reconcile/base_reconciliation.py | 2 +- account_easy_reconcile/easy_reconcile.py | 2 +- account_easy_reconcile/simple_reconciliation.py | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/account_advanced_reconcile/__openerp__.py b/account_advanced_reconcile/__openerp__.py index 344da635..4212c3bc 100644 --- a/account_advanced_reconcile/__openerp__.py +++ b/account_advanced_reconcile/__openerp__.py @@ -25,7 +25,7 @@ 'maintainer': 'Camptocamp', 'category': 'Finance', 'complexity': 'normal', - 'depends': ['account_easy_reconcile', # this comes from lp:account-extra-addons + 'depends': ['account_easy_reconcile', ], 'description': """ Advanced reconciliation methods for the module account_easy_reconcile. diff --git a/account_easy_reconcile/base_reconciliation.py b/account_easy_reconcile/base_reconciliation.py index b688e339..c1f4041c 100644 --- a/account_easy_reconcile/base_reconciliation.py +++ b/account_easy_reconcile/base_reconciliation.py @@ -98,7 +98,7 @@ class easy_reconcile_base(AbstractModel): params = [] if rec.filter: dummy, where, params = ml_obj._where_calc( - cr, uid, rec.filter, context=context).get_sql() + cr, uid, eval(rec.filter), context=context).get_sql() if where: where = " AND %s" % where return where, params diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 0c7b2372..6a2899cd 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -75,6 +75,7 @@ class account_easy_reconcile_method(Model): return [ ('easy.reconcile.simple.name', 'Simple. Amount and Name'), ('easy.reconcile.simple.partner', 'Simple. Amount and Partner'), + ('easy.reconcile.simple.reference', 'Simple. Amount and Reference'), ] def _get_rec_method(self, cr, uid, context=None): @@ -175,7 +176,6 @@ class account_easy_reconcile(Model): total_partial_rec = 0 details = [] count = 0 - for method in rec.reconcile_method: count += 1 diff --git a/account_easy_reconcile/simple_reconciliation.py b/account_easy_reconcile/simple_reconciliation.py index 474eff84..37786551 100644 --- a/account_easy_reconcile/simple_reconciliation.py +++ b/account_easy_reconcile/simple_reconciliation.py @@ -111,3 +111,12 @@ class easy_reconcile_simple_partner(TransientModel): # field name used as key for matching the move lines _key_field = 'partner_id' +class easy_reconcile_simple_reference(TransientModel): + + _name = 'easy.reconcile.simple.reference' + _inherit = 'easy.reconcile.simple' + _auto = True # False when inherited from AbstractModel + + # has to be subclassed + # field name used as key for matching the move lines + _key_field = 'ref'