From a51c129cfd4cb53f1c7ed360fb5f8023f73d9c00 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Fri, 4 Jan 2013 09:39:10 +0100 Subject: [PATCH] [FIX] reword entries to items --- account_advanced_reconcile/__openerp__.py | 15 ++++++++------- account_easy_reconcile/__openerp__.py | 4 ++-- account_easy_reconcile/base_reconciliation.py | 4 ++-- account_easy_reconcile/easy_reconcile.py | 6 +++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/account_advanced_reconcile/__openerp__.py b/account_advanced_reconcile/__openerp__.py index 795ec459..00ec44b4 100644 --- a/account_advanced_reconcile/__openerp__.py +++ b/account_advanced_reconcile/__openerp__.py @@ -43,19 +43,20 @@ It implements a basis to created advanced reconciliation methods in a few lines of code. Typically, such a method can be: - - Reconcile entries if the partner and the ref are equal - - Reconcile entries if the partner is equal and the ref is the same than ref - or name - - Reconcile entries if the partner is equal and the ref match with a pattern + - Reconcile Journal items if the partner and the ref are equal + - Reconcile Journal items if the partner is equal and the ref + is the same than ref or name + - Reconcile Journal items if the partner is equal and the ref + match with a pattern And they allows: - Reconciliations with multiple credit / multiple debit lines - Partial reconciliations - Write-off amount as well -A method is already implemented in this module, it matches on entries: - * Partner - * Ref on credit move lines should be case insensitive equals to the ref or +A method is already implemented in this module, it matches on items: + - Partner + - Ref on credit move lines should be case insensitive equals to the ref or the name of the debit move line The base class to find the reconciliations is built to be as efficient as diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index 24707d70..eb8b1fc0 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -39,13 +39,13 @@ in order to provide: - a profile a reconciliation can be run manually or by a cron - monitoring of reconciliation runs with an history - which keep track of the reconciled entries + which keep track of the reconciled Journal items 2 simple reconciliation methods are integrated in this module, the simple reconciliations works on 2 lines (1 debit / 1 credit) and do not allow partial reconcilation, they also match on 1 key, -partner or entry name. +partner or Journal item name. You may be interested to install also the ``account_advanced_reconciliation`` module. diff --git a/account_easy_reconcile/base_reconciliation.py b/account_easy_reconcile/base_reconciliation.py index 6707ff3a..b50c06b9 100644 --- a/account_easy_reconcile/base_reconciliation.py +++ b/account_easy_reconcile/base_reconciliation.py @@ -41,7 +41,7 @@ class easy_reconcile_base(orm.AbstractModel): def automatic_reconcile(self, cr, uid, ids, context=None): """ Reconciliation method called from the view. - :return: list of reconciled ids, list of partially reconciled entries + :return: list of reconciled ids, list of partially reconciled items """ if isinstance(ids, (int, long)): ids = [ids] @@ -161,7 +161,7 @@ class easy_reconcile_base(orm.AbstractModel): :param boolean allow_partial: if True, partial reconciliation will be created, otherwise only Full reconciliation will be created - :return: tuple of boolean values, first item is wether the the entries + :return: tuple of boolean values, first item is wether the items have been reconciled or not, the second is wether the reconciliation is full (True) or partial (False) diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 75888367..3f7b2774 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -165,11 +165,11 @@ class account_easy_reconcile(orm.Model): 'reconcile_method': fields.one2many( 'account.easy.reconcile.method', 'task_id', 'Method'), 'unreconciled_count': fields.function( - _get_total_unrec, type='integer', string='Unreconciled Entries'), + _get_total_unrec, type='integer', string='Unreconciled Items'), 'reconciled_partial_count': fields.function( _get_partial_rec, type='integer', - string='Partially Reconciled Entries'), + string='Partially Reconciled Items'), 'history_ids': fields.one2many( 'easy.reconcile.history', 'easy_reconcile_id', @@ -249,7 +249,7 @@ class account_easy_reconcile(orm.Model): raise osv.except_osv( _('Error'), _('There is no history of reconciled ' - 'entries on the task: %s.') % rec.name) + 'items on the task: %s.') % rec.name) def last_history_reconcile(self, cr, uid, rec_id, context=None): """ Get the last history record for this reconciliation profile