Merge lp:~camptocamp/account-financial-tools/7.0-batch_validate-delay-delaying-second-attempt-lep into lp:~account-core-editors/account-financial-tools/7.0

[Leonardo Pistone]

account_move_batch_validate: if there are many thousands of moves to be validated, even creating the jobs gets too slow. With this, we create a job (one per wizard) that takes care of creating the jobs that will validate moves (one per move).

thanks!

[lp:~camptocamp/account-financial-tools/7.0-batch_validate-delay-delaying-second-attempt-lep]

162. By Leonardo Pistone on 2014-02-27

[imp] move_batch_validate: better job message

163. By Leonardo Pistone on 2014-02-27

[imp] account_move_batch_validate: if creating the jobs takes long, at least commit while marking moves to be validated. that way users will see the flag somewhat sooner.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review)

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

This one is funny :)
LGTM

review: Approve (no test, code review)

[Frederic Clementi - Camptocamp (frederic-clementi)]

Test OK on customer instance.

review: Approve (functional)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

please delete the test files (or better fix them) rather than commenting them out in __openerp__.py

review: Needs Fixing

[Leonardo Pistone (lepistone)]

They had to go Alexandre, as I do not know how to run all enqueued jobs synchronously, while I wait.

But one day...

(thanks to all for reviewing)

[lp:~camptocamp/account-financial-tools/7.0-batch_validate-delay-delaying-second-attempt-lep]

164. By Leonardo Pistone on 2014-02-28

[imp] account_move_batch_validate: with a little trick, tests are back!

[Leonardo Pistone (lepistone)]

Ok Alexandre, you're right: fixing those tests was not at all impossible. We're green again.

Thanks!

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Ok Alexandre, you're right: fixing those tests was not at all impossible.
> We're green again.
>
> Thanks!

Great!

[lp:~camptocamp/account-financial-tools/7.0-batch_validate-delay-delaying-second-attempt-lep]

165. By Leonardo Pistone on 2014-02-28

[merge] upstream

[Leonardo Pistone (lepistone)]

I merged upstream and resolved the conflicts.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

review: Approve

=== modified file 'account_move_batch_validate/account.py'
--- account_move_batch_validate/account.py	2014-02-28 10:09:38 +0000
+++ account_move_batch_validate/account.py	2014-02-28 13:16:56 +0000
@@ -70,7 +70,10 @@
             ('post_job_uuid', '=', False),
             ('state', '=', 'draft'),
         ], context=context)
+        name = self._name
 
+        # maybe not creating too many dictionaries will make us a bit faster
+        values = {'post_job_uuid': None}
         _logger.info(
             u'{0} jobs for posting moves have been created.'.format(
                 len(move_ids)
@@ -78,11 +81,10 @@
         )
 
         for move_id in move_ids:
-            job_uuid = validate_one_move.delay(session, self._name, move_id,
+            job_uuid = validate_one_move.delay(session, name, move_id,
                                                eta=eta)
-            self.write(cr, uid, [move_id], {
-                'post_job_uuid': job_uuid
-            })
+            values['post_job_uuid'] = job_uuid
+            self.write(cr, uid, [move_id], values)
 
     def _cancel_jobs(self, cr, uid, context=None):
         """Find moves where the mark has been removed and cancel the jobs.
@@ -129,6 +131,8 @@
                 move_ids[start:start + BLOCK_SIZE],
                 {'to_post': True},
                 context=context)
+            # users like to see the flag sooner rather than later
+            cr.commit()
         self._delay_post_marked(cr, uid, eta=eta, context=context)
 
     def unmark_for_posting(self, cr, uid, move_ids, context=None):

=== modified file 'account_move_batch_validate/test/batch_validate.yml'
--- account_move_batch_validate/test/batch_validate.yml	2014-01-13 18:58:18 +0000
+++ account_move_batch_validate/test/batch_validate.yml	2014-02-28 13:16:56 +0000
@@ -24,6 +24,7 @@
   I run the wizard
 -
   !python {model: account.move.marker}: |
+    context['automated_test_execute_now'] = True
     self.button_mark(
       cr, uid, [ref('wiz_marker1')], context=context
     )

=== modified file 'account_move_batch_validate/test/batch_validate_then_delete_move.yml'
--- account_move_batch_validate/test/batch_validate_then_delete_move.yml	2014-02-26 13:12:54 +0000
+++ account_move_batch_validate/test/batch_validate_then_delete_move.yml	2014-02-28 13:16:56 +0000
@@ -25,6 +25,7 @@
   I run the wizard
 -
   !python {model: account.move.marker}: |
+    context['automated_test_execute_now'] = True
     self.button_mark(
       cr, uid, [ref('wiz_marker4')], context=context
     )

=== modified file 'account_move_batch_validate/test/batch_validate_then_unmark.yml'
--- account_move_batch_validate/test/batch_validate_then_unmark.yml	2014-01-14 12:40:39 +0000
+++ account_move_batch_validate/test/batch_validate_then_unmark.yml	2014-02-28 13:16:56 +0000
@@ -25,6 +25,7 @@
   I run the wizard
 -
   !python {model: account.move.marker}: |
+    context['automated_test_execute_now'] = True
     self.button_mark(
       cr, uid, [ref('wiz_marker2')], context=context
     )

=== modified file 'account_move_batch_validate/wizard/move_marker.py'
--- account_move_batch_validate/wizard/move_marker.py	2014-01-14 14:33:52 +0000
+++ account_move_batch_validate/wizard/move_marker.py	2014-02-28 13:16:56 +0000
@@ -21,6 +21,8 @@
 """Wizards for batch posting."""
 
 from openerp.osv import fields, orm
+from openerp.addons.connector.session import ConnectorSession
+from openerp.addons.connector.queue.job import job
 
 
 class AccountMoveMarker(orm.TransientModel):
@@ -44,8 +46,27 @@
     }
 
     def button_mark(self, cr, uid, ids, context=None):
-        """Mark/unmark lines and update the queue. Return action."""
-
+        """Create a single job that will create one job per move.
+
+        Return action.
+
+        """
+        session = ConnectorSession(cr, uid, context=context)
+        for wizard_id in ids:
+            # to find out what _classic_write does, read the documentation.
+            wizard_data = self.read(cr, uid, wizard_id, context=context,
+                                    load='_classic_write')
+            wizard_data.pop('id')
+
+            if context.get('automated_test_execute_now'):
+                process_wizard(session, self._name, wizard_data)
+            else:
+                process_wizard.delay(session, self._name, wizard_data)
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    def process_wizard(self, cr, uid, ids, context=None):
+        """Choose the correct list of moves to mark and then validate."""
         for wiz in self.browse(cr, uid, ids, context=context):
 
             move_obj = self.pool['account.move']
@@ -86,4 +107,22 @@
             elif wiz.action == 'unmark':
                 move_obj.unmark_for_posting(cr, uid, move_ids, context=context)
 
-            return {'type': 'ir.actions.act_window_close'}
+
+@job
+def process_wizard(session, model_name, wizard_data):
+    """Create jobs to validate Journal Entries."""
+
+    wiz_obj = session.pool[model_name]
+    new_wiz_id = wiz_obj.create(
+        session.cr,
+        session.uid,
+        wizard_data,
+        session.context
+    )
+
+    wiz_obj.process_wizard(
+        session.cr,
+        session.uid,
+        ids=[new_wiz_id],
+        context=session.context,
+    )