[FIX] Prints dropship
bzr revid: jco@openerp.com-20130917102301-hqjwoq92w1km8mod
This commit is contained in:
parent
7e4ae4c2c1
commit
e3c5b48264
|
@ -70,7 +70,6 @@ class sale_order(osv.osv):
|
||||||
'product_id': grid.carrier_id.product_id.id,
|
'product_id': grid.carrier_id.product_id.id,
|
||||||
'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
|
'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
|
||||||
'tax_id': [(6,0,taxes_ids)],
|
'tax_id': [(6,0,taxes_ids)],
|
||||||
'type': 'make_to_stock'
|
|
||||||
})
|
})
|
||||||
#remove the value of the carrier_id field on the sale order
|
#remove the value of the carrier_id field on the sale order
|
||||||
return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
|
return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
|
||||||
|
|
|
@ -61,5 +61,4 @@
|
||||||
{}
|
{}
|
||||||
-
|
-
|
||||||
!python {model: sale.config.settings}: |
|
!python {model: sale.config.settings}: |
|
||||||
self.execute(cr, uid, [ref('default_delivery_policy')], context=context)
|
self.execute(cr, uid, [ref('default_delivery_policy')], context=context)
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
<field name="price_unit">450</field>
|
<field name="price_unit">450</field>
|
||||||
<field name="product_uom_qty">2</field>
|
<field name="product_uom_qty">2</field>
|
||||||
<field name="product_uos_qty">2</field>
|
<field name="product_uos_qty">2</field>
|
||||||
<field name="type">make_to_stock</field>
|
|
||||||
</record>
|
</record>
|
||||||
<record id="test_order_1_line_3" model="sale.order.line">
|
<record id="test_order_1_line_3" model="sale.order.line">
|
||||||
<field name="order_id" ref="test_order_1"/>
|
<field name="order_id" ref="test_order_1"/>
|
||||||
|
@ -28,7 +27,6 @@
|
||||||
<field name="price_unit">90</field>
|
<field name="price_unit">90</field>
|
||||||
<field name="product_uom_qty">3</field>
|
<field name="product_uom_qty">3</field>
|
||||||
<field name="product_uos_qty">3</field>
|
<field name="product_uos_qty">3</field>
|
||||||
<field name="type">make_to_stock</field>
|
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sales order is correctly computed">
|
<assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sales order is correctly computed">
|
||||||
|
|
|
@ -45,16 +45,11 @@
|
||||||
sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng'))
|
sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng'))
|
||||||
procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0]
|
procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0]
|
||||||
purchase_id = procurement_order.purchase_line_id.order_id.id
|
purchase_id = procurement_order.purchase_line_id.order_id.id
|
||||||
|
|
||||||
wf_service = netsvc.LocalService('workflow')
|
wf_service = netsvc.LocalService('workflow')
|
||||||
wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'purchase_confirm', cr)
|
wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'purchase_confirm', cr)
|
||||||
-
|
print self.browse(cr, uid, purchase_id).state
|
||||||
Use 'Receive Products' button to immediately view this picking, it should have created a picking with 200 pieces
|
assert self.browse(cr, uid, purchase_id).state == 'approved', 'Purchase order should be in the approved state'
|
||||||
-
|
|
||||||
!python {model: purchase.order}: |
|
|
||||||
sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng'))
|
|
||||||
procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0]
|
|
||||||
purchase_id = procurement_order.purchase_line_id.order_id.id
|
|
||||||
self.view_picking(cr, uid, [purchase_id])
|
|
||||||
-
|
-
|
||||||
Send the 200 pieces.
|
Send the 200 pieces.
|
||||||
-
|
-
|
||||||
|
|
Loading…
Reference in New Issue