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-782153-ron into lp:openobject-addons.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)
Related bugs:
  Bug #782153 in OpenERP Addons: "[PS] Having a SO with Picking Policy = Complete Delivery has no effect on the delivery order"
  https://bugs.launchpad.net/openobject-addons/+bug/782153

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

=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py	2011-05-02 18:46:43 +0000
+++ stock/wizard/stock_partial_picking.py	2011-05-16 11:04:34 +0000
@@ -87,14 +87,17 @@
             # not called through an action (e.g. buildbot), return the default.
             return result
 
+        direct_del = False
         for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
             picking_type = self.get_picking_type(cr, uid, pick, context=context)
-        
+            if pick.move_type == 'one':
+                direct_del = True
+
         _moves_arch_lst = """<form string="%s">
                         <field name="date" invisible="1"/>
                         <separator colspan="4" string="%s"/>
-                        <field name="%s" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" ></field>
-                        """ % (_('Process Document'), _('Products'), "product_moves_" + picking_type)
+                        <field name="%s" colspan="4" nolabel="1" readonly="%s" mode="tree,form" width="550" height="200" ></field>
+                        """ % (_('Process Document'), _('Products'), "product_moves_" + picking_type, direct_del)
         _moves_fields = result['fields']
 
         # add field related to picking type only