[FIX] Fields amount_mva, base_reduction and tax_discount are not displayed
Return a product must drop backorder data
Return a product must drop backorder data
price_surcharge must be affiliated with product uom
price_surcharge must be affiliated with product uom
[FIX] Replacing date_order with date_confirm
[FIX] Replacing date_order with date_confirm
Do not duplicate origin when merging purchase orders
Do not duplicate origin when merging purchase orders
[MRG] stock: drop backorder data when returning product
[MRG] purchase: don't duplicate origin when merging purchase orders
[MRG] sale_stock: delivery order must use the confirmation date of sale.order
[MRG] product: use product UOM when computing price surcharge
[MRG] Fields amount_mva, base_reduction and tax_discount are not displayed
Merge branch 'ocb-7.0' of github.com:akretion/openerp-addons into ocb-7.0