[FIX]: apply following patch : wrong behavior when several lines had the same product (cf bug 1197467)
Merge branch '7.0-inventory_duplicates_lines' into 7.0-fill_inventory_zero_qty

Conflicts:
	addons/stock/stock.py