Merge lp:~camptocamp/banking-addons/6.1-account_easy_reconcile-extract-dependency into lp:banking-addons/bank-statement-reconcile-61

[Guewen Baconnier @ Camptocamp]

[FIX] remove the dependency on base_scheduler_creator and fix manifest's description

 * update the manifest description because account_advanced_reconcile is no longer in c2c-financial-addons

 * remove the dependency on base_scheduler_creator because it:
   - does not work on the web client
   - is not essential to use the addon (it would need to be put in a glue module, if it was working)
   - complicate the installation of the addon as it is not in the same branch

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM

Thanks !

review: Approve

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'account_easy_reconcile/__openerp__.py'
--- account_easy_reconcile/__openerp__.py	2012-12-20 09:42:44 +0000
+++ account_easy_reconcile/__openerp__.py	2012-12-20 11:11:30 +0000
@@ -22,27 +22,35 @@
 {
     "name" : "Easy Reconcile",
     "version" : "1.1",
-    "depends" : ["account", "base_scheduler_creator"
+    "depends" : ["account",
                 ],
     "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
- - monitoring of reconciliation runs with an history which keep track
-   of the reconciled entries
-
-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.
-
-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.
+ - 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 reconciliation runs with an history
+   which keep track of the reconciled entries
+
+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.
+This latter add more complex reconciliations,
+allows multiple lines and partial.
 
 """,
     "website" : "http://www.akretion.com/",

=== modified file 'account_easy_reconcile/easy_reconcile.py'
--- account_easy_reconcile/easy_reconcile.py	2012-12-20 08:38:25 +0000
+++ account_easy_reconcile/easy_reconcile.py	2012-12-20 11:11:30 +0000
@@ -148,7 +148,6 @@
         '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),
         'unreconciled_count': fields.function(_get_total_unrec,
             type='integer', string='Unreconciled Entries'),
         'reconciled_partial_count': fields.function(_get_partial_rec,
@@ -166,13 +165,6 @@
                 readonly=True),
     }
 
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default = dict(default, scheduler=False)
-        return super(account_easy_reconcile, self).copy_data(
-            cr, uid, id, default=default, context=context)
-
     def _prepare_run_transient(self, cr, uid, rec_method, context=None):
         return {'account_id': rec_method.task_id.account.id,
                 'write_off': rec_method.write_off,

=== modified file 'account_easy_reconcile/easy_reconcile.xml'
--- account_easy_reconcile/easy_reconcile.xml	2012-12-19 15:40:41 +0000
+++ account_easy_reconcile/easy_reconcile.xml	2012-12-20 11:11:30 +0000
@@ -15,7 +15,6 @@
                 <field name="account"/>
                 <field name="unreconciled_count"/>
                 <field name="reconciled_partial_count"/>
-                <field name="scheduler"/>
                 <separator colspan="4" string="Reconcile Method" />
                 <notebook colspan="4">
                     <page name="methods" string="Configuration">
@@ -67,7 +66,6 @@
             <tree string="Automatic Easy Reconcile">
                 <field name="name"/>
                 <field name="account"/>
-                <field name="scheduler"/>
                 <field name="unreconciled_count"/>
                 <field name="reconciled_partial_count"/>
                 <button icon="gtk-ok" name="run_reconcile" colspan="4"
@@ -87,7 +85,6 @@
         <field name="res_model">account.easy.reconcile</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{'wizard_object' : 'account.easy.reconcile', 'function' : 'action_rec_auto', 'object_link' : 'account.easy.reconcile' }</field>
     </record>
 
 
@@ -135,16 +132,5 @@
 
     <menuitem action="action_account_easy_reconcile" id="menu_easy_reconcile" parent="account.periodical_processing_reconciliation"/>
 
-
-<!-- button on the left -->
-
-    <record id="ir_action_create_scheduler_in_easy_reconcile" model="ir.values">
-        <field name="key2">client_action_multi</field>
-        <field name="model">account.easy.reconcile</field>
-        <field name="name">Create a Scheduler</field>
-        <field eval="'ir.actions.act_window,%d'%ref('base_scheduler_creator.action_scheduler_creator_wizard')" name="value"/>
-        <field eval="True" name="object"/>
-    </record>
-
 </data>
 </openerp>

=== modified file 'account_easy_reconcile/i18n/fr.po'
--- account_easy_reconcile/i18n/fr.po	2012-12-20 09:04:42 +0000
+++ account_easy_reconcile/i18n/fr.po	2012-12-20 11:11:30 +0000
@@ -49,7 +49,7 @@
 #. module: account_easy_reconcile
 #: model:ir.model,name:account_easy_reconcile.model_easy_reconcile_options
 msgid "easy.reconcile.options"
-msgstr "lettrage automatisé.options"
+msgstr "easy.reconcile.options"
 
 #. module: account_easy_reconcile
 #: view:easy.reconcile.history:0