savoirfairelinux-openerp team mailing list archive

[Sébastien BEAU - http://www.akretion.com <sebastien.beau@xxxxxxxxxxxx>]

Sébastien BEAU - http://www.akretion.com has proposed merging lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow-merge-fix into lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow.

Requested reviews:
  Guewen Baconnier @ Camptocamp (gbaconnier-c2c)

For more details, see:
https://code.launchpad.net/~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow-merge-fix/+merge/193163
-- 
https://code.launchpad.net/~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow-merge-fix/+merge/193163
Your team extra-addons-commiter is subscribed to branch lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow.

=== modified file 'sale_automatic_workflow/__openerp__.py'
--- sale_automatic_workflow/__openerp__.py	2013-03-27 11:09:33 +0000
+++ sale_automatic_workflow/__openerp__.py	2013-10-29 23:45:47 +0000
@@ -51,9 +51,11 @@
 """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
-    'depends': ['sale_payment_method',
-                'stock',
-                ],
+    'depends': [
+        'sale_payment_method',
+        'stock',
+        'sale_exceptions',
+    ],
     'data': ['sale_view.xml',
              'sale_workflow.xml',
              'sale_workflow_process_view.xml',

=== modified file 'sale_automatic_workflow/automatic_workflow_job.py'
--- sale_automatic_workflow/automatic_workflow_job.py	2013-09-25 08:33:06 +0000
+++ sale_automatic_workflow/automatic_workflow_job.py	2013-10-29 23:45:47 +0000
@@ -81,7 +81,8 @@
         sale_ids = sale_obj.search(
             cr, uid,
             [('state', '=', 'draft'),
-             ('workflow_process_id.validate_order', '=', True)],
+             ('workflow_process_id.validate_order', '=', True),
+             ('exceptions_ids', '=', False)],
             context=context)
         _logger.debug('Sale Orders to validate: %s', sale_ids)
         for sale_id in sale_ids: