openerp-dev-web team mailing list archive

["Rohan Nayani\(Open ERP\)" <ron@xxxxxxxxxxx>]

Rohan Nayani(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-778473-ron into lp:openobject-addons.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)
Related bugs:
  Bug #778473 in OpenERP Addons: "Unlink Stock picking doen't work correctly for picking in the state "auto""
  https://bugs.launchpad.net/openobject-addons/+bug/778473

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-778473-ron/+merge/60457
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-778473-ron/+merge/60457
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-778473-ron.

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-05-05 05:46:31 +0000
+++ stock/stock.py	2011-05-10 06:05:59 +0000
@@ -1126,7 +1126,7 @@
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.state in ['done','cancel']:
                 raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
-            elif pick.state in ['confirmed','assigned', 'draft']:
+            else:
                 ids2 = [move.id for move in pick.move_lines]
                 ctx = context.copy()
                 ctx.update({'call_unlink':True})
@@ -1315,6 +1315,7 @@
                 'assigned': _('is ready to process.'),
                 'cancel': _('is cancelled.'),
                 'done': _('is done.'),
+                'auto': _('is waiting.'),
                 'draft':_('is in draft state.'),
             }
             res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))