From 85c7586c1994b4a5c954edf18d46c15d9016a0c0 Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Tue, 18 Dec 2012 15:20:56 +0100 Subject: [PATCH 1/5] [IMP] update the module description, remove the link to c2c-financial-addons --- account_easy_reconcile/__openerp__.py | 31 +++++++++++++++++---------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index 3d341325..82873ab3 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -22,26 +22,35 @@ { "name" : "Easy Reconcile", "version" : "1.1", - "depends" : ["account", "base_scheduler_creator" + "depends" : ["account", + "base_scheduler_creator" ], "author" : "Akretion,Camptocamp", "description": """ -This is a shared work between Akretion and Camptocamp in order to provide: +Easy Reconcile +============== + +This is a shared work between Akretion and Camptocamp +in order to provide: - reconciliation facilities for big volume of transactions - setup different profiles of reconciliation by account - each profile can use many methods of reconciliation - - this module is also a base to create others reconciliation methods - which can plug in the profiles - - a profile a reconciliation can be run manually or by a cron + - this module is also a base to create others + reconciliation methods which can plug in the profiles + - a profile a reconciliation can be run manually + or by a cron - monitoring of reconcilation runs with a few logs -2 simple reconciliation methods are integrated in this module, the simple -reconciliations works on 2 lines (1 debit / 1 credit) and do not allows -partial reconcilation, they also match on 1 key, partner or entry name. +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. -You may be interested to install also the account_advanced_reconciliation -module available at: https://code.launchpad.net/c2c-financial-addons -This latter add more complex reconciliations, allows multiple lines and partial. +You may be interested to install also the +``account_advanced_reconciliation`` module. +This latter add more complex reconciliations, +allows multiple lines and partial. """, "website" : "http://www.akretion.com/", From e997a1508a444d9b0b515060bc5697c38cf93ae4 Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Tue, 18 Dec 2012 15:21:50 +0100 Subject: [PATCH 2/5] [FIX] remove the dependency on base_scheduler_creator, this module is not mandatory --- account_easy_reconcile/__openerp__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index 82873ab3..fa2b763d 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -23,7 +23,6 @@ "name" : "Easy Reconcile", "version" : "1.1", "depends" : ["account", - "base_scheduler_creator" ], "author" : "Akretion,Camptocamp", "description": """ From 9df6207b3689c07ecb4e72ef5c5ec2a6b8807a43 Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Tue, 18 Dec 2012 15:24:23 +0100 Subject: [PATCH 3/5] [FIX] typos in french translation --- account_easy_reconcile/i18n/fr.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/account_easy_reconcile/i18n/fr.po b/account_easy_reconcile/i18n/fr.po index 8b7ab385..17252d3b 100644 --- a/account_easy_reconcile/i18n/fr.po +++ b/account_easy_reconcile/i18n/fr.po @@ -23,7 +23,7 @@ msgstr "Information" #. module: account_easy_reconcile #: view:account.easy.reconcile.method:0 msgid "Automatic Easy Reconcile Method" -msgstr "Méthode de léttrage automatisé" +msgstr "Méthode de lettrage automatisé" #. module: account_easy_reconcile #: view:account.easy.reconcile:0 @@ -43,27 +43,27 @@ msgstr "Lettre un débit avec un crédit ayant le même montant et la même desc #. module: account_easy_reconcile #: view:account.easy.reconcile:0 msgid "Automatic Easy Reconcile" -msgstr "Léttrage automatisé" +msgstr "Lettrage automatisé" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_account_easy_reconcile_method msgid "reconcile method for account_easy_reconcile" -msgstr "Méthode de léttrage" +msgstr "Méthode de lettrage" #. module: account_easy_reconcile #: view:account.easy.reconcile:0 msgid "Start Auto Reconcilation" -msgstr "Lancer le léttrage automatisé" +msgstr "Lancer le lettrage automatisé" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_simple_name msgid "easy.reconcile.simple.name" -msgstr "Léttrage automatisé.simple.Description" +msgstr "easy.reconcile.simple.name" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_options msgid "easy.reconcile.options" -msgstr "Léttrage automatisé.options" +msgstr "easy.reconcile.options" #. module: account_easy_reconcile #: view:account.easy.reconcile:0 @@ -73,28 +73,28 @@ msgstr "Simple. Montant et description" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_simple msgid "easy.reconcile.simple" -msgstr "Léttrage automatisé.simple" +msgstr "easy.reconcile.simple" #. module: account_easy_reconcile #: model:ir.actions.act_window,name:account_easy_reconcile.action_account_easy_reconcile #: model:ir.ui.menu,name:account_easy_reconcile.menu_easy_reconcile msgid "Easy Automatic Reconcile" -msgstr "Léttrage automatisé" +msgstr "Lettrage automatisé" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_simple_reference msgid "easy.reconcile.simple.reference" -msgstr "Léttrage automatisé.simple.réference" +msgstr "easy.reconcile.simple.reference" #. module: account_easy_reconcile #: view:account.easy.reconcile:0 msgid "Reconcile Method" -msgstr "Méthode de léttrage" +msgstr "Méthode de lettrage" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_base msgid "easy.reconcile.base" -msgstr "Léttrage automatisé.base" +msgstr "easy.reconcile.base" #. module: account_easy_reconcile #: view:account.easy.reconcile:0 @@ -104,7 +104,7 @@ msgstr "Configuration" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_simple_partner msgid "easy.reconcile.simple.partner" -msgstr "Léttrage automatisé.simple.partenaire" +msgstr "easy.reconcile.simple.partner" #. module: account_easy_reconcile #: view:account.easy.reconcile:0 @@ -114,5 +114,5 @@ msgstr "Information sur la tâche" #. module: account_easy_reconcile #: model:ir.model,name:account_easy_reconcile.model_account_easy_reconcile msgid "account easy reconcile" -msgstr "Léttrage automatisé" +msgstr "Lettrage automatisé" From dbac5b5ebc38d1c23836d2a1bfaa934d3ca0efa0 Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Thu, 20 Dec 2012 11:43:34 +0100 Subject: [PATCH 4/5] [FIX] a reference to base_scheduler_creator is used, so revert the revision guewen.baconnier@camptocamp.com-20121218142150-vrel6cz52ebtb4cg --- account_easy_reconcile/__openerp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index fa2b763d..82873ab3 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Easy Reconcile", "version" : "1.1", "depends" : ["account", + "base_scheduler_creator" ], "author" : "Akretion,Camptocamp", "description": """ From f86dbe5aa1f3e3e9b86aa291ec7d1e43fafe2f6a Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Thu, 20 Dec 2012 11:59:57 +0100 Subject: [PATCH 5/5] [FIX] remove the dependency on base_scheduler_creator, it doesn't work on webclient 6.1 (and is very optional for the usage of the module) --- account_easy_reconcile/__openerp__.py | 2 +- account_easy_reconcile/easy_reconcile.py | 3 +-- account_easy_reconcile/easy_reconcile.xml | 14 -------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index 3d341325..d52b8482 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -22,7 +22,7 @@ { "name" : "Easy Reconcile", "version" : "1.1", - "depends" : ["account", "base_scheduler_creator" + "depends" : ["account", ], "author" : "Akretion,Camptocamp", "description": """ diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 6a2899cd..8bab1e86 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -141,7 +141,6 @@ class account_easy_reconcile(Model): 'name': fields.char('Name', size=64, required=True), 'account': fields.many2one('account.account', 'Account', required=True), 'reconcile_method': fields.one2many('account.easy.reconcile.method', 'task_id', 'Method'), - 'scheduler': fields.many2one('ir.cron', 'scheduler', readonly=True), 'rec_log': fields.text('log', readonly=True), 'unreconciled_count': fields.function(_get_total_unrec, type='integer', string='Fully Unreconciled Entries'), @@ -152,7 +151,7 @@ class account_easy_reconcile(Model): def copy_data(self, cr, uid, id, default=None, context=None): if default is None: default = {} - default = dict(default, rec_log=False, scheduler=False) + default = dict(default, rec_log=False) return super(account_easy_reconcile, self).copy_data( cr, uid, id, default=default, context=context) diff --git a/account_easy_reconcile/easy_reconcile.xml b/account_easy_reconcile/easy_reconcile.xml index 1bd84c66..fecef540 100644 --- a/account_easy_reconcile/easy_reconcile.xml +++ b/account_easy_reconcile/easy_reconcile.xml @@ -15,7 +15,6 @@ - @@ -48,7 +47,6 @@ The lines should have the same amount (with the write-off) and the same partner - @@ -61,7 +59,6 @@ The lines should have the same amount (with the write-off) and the same partner account.easy.reconcile form tree,form - {'wizard_object' : 'account.easy.reconcile', 'function' : 'action_rec_auto', 'object_link' : 'account.easy.reconcile' } @@ -109,16 +106,5 @@ The lines should have the same amount (with the write-off) and the same partner - - - - - client_action_multi - account.easy.reconcile - Create a Scheduler - - - -