DELIVERY: fix date_planned removed
authorced <>
Mon, 18 Jun 2007 10:25:15 +0000 (10:25 +0000)
committerced <>
Mon, 18 Jun 2007 10:25:15 +0000 (10:25 +0000)
bzr revid: ced-710a5f36c0e947b30a37978f65325944e5712c44

addons/delivery/wizard/delivery_sale_order.py

index 0eefc11..dd2ef2c 100644 (file)
@@ -56,24 +56,19 @@ def _delivery_set(self, cr, uid, data, context):
        line_obj = pooler.get_pool(cr.dbname).get('sale.order.line')
        order_objs = order_obj.browse(cr, uid, data['ids'], context)
 
-       for order in order_objs:                
-               dt = time.strftime('%Y-%m-%d')
-
+       for order in order_objs:
                grid_id = pooler.get_pool(cr.dbname).get('delivery.carrier').grid_get(cr, uid, [data['form']['carrier_id']],order.partner_shipping_id.id)
                if not grid_id: 
                        raise except_osv('No grid avaible !', 'No grid matching for this carrier !')
                grid = pooler.get_pool(cr.dbname).get('delivery.grid').browse(cr, uid, [grid_id])[0]
 
-
                line_obj.create(cr, uid, {
                        'order_id': order.id,
                        'name': grid.carrier_id.name,
                        'product_uom_qty': 1,
                        'product_uom': grid.carrier_id.product_id.uom_id.id,
                        'product_id': grid.carrier_id.product_id.id,
-#                      'price_unit': pooler.get_pool(cr.dbname).get('delivery.grid').get_price(cr, uid, order, data, dt),
-                       'price_unit': grid.get_price(cr, uid, grid.id, order, dt, context), 
-                       'date_planned': dt,
+                       'price_unit': grid.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context), 
                        'tax_id': [(6,0,[ x.id for x in grid.carrier_id.product_id.taxes_id])],
                        'type': 'make_to_stock'
                        })