odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Prints dropship 

bzr revid: jco@openerp.com-20130917102301-hqjwoq92w1km8mod
This commit is contained in:
Josse Colpaert 2013-09-17 12:23:01 +02:00
parent 7e4ae4c2c1
commit e3c5b48264
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/delivery/sale.py
View File

@ -70,7 +70,6 @@ class sale_order(osv.osv):
'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),
'tax_id': [(6,0,taxes_ids)],
'type': 'make_to_stock'
})
#remove the value of the carrier_id field on the sale order
return self.write(cr, uid, ids, {'carrier_id': False}, context=context)

3
addons/delivery/test/delivery_cost.yml
View File

@ -61,5 +61,4 @@
{}
-
!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)

2
addons/sale/sale_unit_test.xml
View File

@ -18,7 +18,6 @@
<field name="price_unit">450</field>
<field name="product_uom_qty">2</field>
<field name="product_uos_qty">2</field>
<field name="type">make_to_stock</field>
</record>
<record id="test_order_1_line_3" model="sale.order.line">
<field name="order_id" ref="test_order_1"/>
@ -28,7 +27,6 @@
<field name="price_unit">90</field>
<field name="product_uom_qty">3</field>
<field name="product_uos_qty">3</field>
<field name="type">make_to_stock</field>
</record>
<assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sales order is correctly computed">

11
addons/stock_complex_routes/test/dropship.yml
View File

@ -45,16 +45,11 @@
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
wf_service = netsvc.LocalService('workflow')
wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'purchase_confirm', cr)
-
Use 'Receive Products' button to immediately view this picking, it should have created a picking with 200 pieces
-
!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])
print self.browse(cr, uid, purchase_id).state
assert self.browse(cr, uid, purchase_id).state == 'approved', 'Purchase order should be in the approved state'
-
Send the 200 pieces.
-