Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-wms-1273316-csn into lp:~openerp-dev/openobject-addons/trunk-wms

  1. trunk-wms-1273316-csn
  2. Merge into trunk-wms
Proposed by Cedric Snauwaert (OpenERP)
Status: Merged
Merged at revision: 9530
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-wms-1273316-csn
Merge into: lp:~openerp-dev/openobject-addons/trunk-wms
Diff against target: 13 lines (+2/-1)
1 file modified
stock/procurement.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-wms-1273316-csn
Reviewer Review Type Date Requested Status
qdp (OpenERP) Pending
Review via email: mp+203761@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stock/procurement.py'
--- stock/procurement.py 2014-01-17 17:38:51 +0000
+++ stock/procurement.py 2014-01-29 14:28:19 +0000
@@ -309,7 +309,8 @@
309 'company_id': orderpoint.company_id.id,309 'company_id': orderpoint.company_id.id,
310 'product_uom': orderpoint.product_uom.id,310 'product_uom': orderpoint.product_uom.id,
311 'location_id': orderpoint.location_id.id,311 'location_id': orderpoint.location_id.id,
312 'origin': orderpoint.name}312 'origin': orderpoint.name,
313 'warehouse_id': orderpoint.warehouse_id.id}
313314
314 def _product_virtual_get(self, cr, uid, order_point):315 def _product_virtual_get(self, cr, uid, order_point):
315 product_obj = self.pool.get('product.product')316 product_obj = self.pool.get('product.product')