Turkesh Patel (openERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-993283-tpa into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #993283 in OpenERP Addons: "Sale : some code never reach or bad 
indentation"
  https://bugs.launchpad.net/openobject-addons/+bug/993283

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-993283-tpa/+merge/108533

[FIX] sale: remove unnecessary code.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-993283-tpa/+merge/108533
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-993283-tpa.
=== modified file 'sale/sale.py'
--- sale/sale.py	2012-08-15 20:13:20 +0000
+++ sale/sale.py	2012-08-23 08:43:28 +0000
@@ -799,7 +799,6 @@
         assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
         finished = True
         canceled = False
-        notcanceled = False
         write_done_ids = []
         write_cancel_ids = []
         for order in self.browse(cr, uid, ids, context={}):
@@ -814,8 +813,6 @@
                         canceled = True
                         if line.state != 'exception':
                             write_cancel_ids.append(line.id)
-                    else:
-                        notcanceled = True
         if write_done_ids:
             self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
         if write_cancel_ids:
@@ -825,9 +822,6 @@
             return finished
         elif mode == 'canceled':
             return canceled
-            if notcanceled:
-                return False
-            return canceled
 
     def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
         return {

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to