From 1c3c640ca2aaf57d18e9b283fbb201d6ae92b069 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 28 Feb 2014 18:32:57 +0100
Subject: [PATCH 1/4] [FIX] stock: prefered and fallback domain aren't used
 anymore in action_Assign

bzr revid: qdp-launchpad@openerp.com-20140228173257-4mguyrw0l23965o2
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5c57a14ad97..d78753d648c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1917,7 +1917,7 @@ class stock_move(osv.osv):
             if move.state != 'assigned':
                 qty_already_assigned = move.reserved_availability
                 qty = move.product_qty - qty_already_assigned
-                quants = quant_obj.quants_get_prefered_domain(cr, uid, move.location_id, move.product_id, qty, domain=main_domain[move.id], prefered_domain=prefered_domain[move.id], fallback_domain=fallback_domain[move.id], restrict_lot_id=move.restrict_lot_id.id, restrict_partner_id=move.restrict_partner_id.id, context=context)
+                quants = quant_obj.quants_get_prefered_domain(cr, uid, move.location_id, move.product_id, qty, domain=main_domain[move.id], prefered_domain=[], fallback_domain=[], restrict_lot_id=move.restrict_lot_id.id, restrict_partner_id=move.restrict_partner_id.id, context=context)
                 quant_obj.quants_reserve(cr, uid, quants, move, context=context)
 
         #force assignation of consumable products and picking type auto_force_assign

From f2194de731a7ee4f5bd025221585d3434443dca3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Sun, 2 Mar 2014 18:06:46 +0100
Subject: [PATCH 2/4] [FIX] purchase: wrong reference in xml file (introduced
 with the last merge with trunk)

bzr revid: qdp-launchpad@openerp.com-20140302170646-r1megbxkhmgfqlzy
---
 addons/purchase/edi/purchase_order_action_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index dbd92dbe5dd..fc195f86ee4 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -98,7 +98,7 @@
             <field name="partner_to">${object.partner_id.id}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
-            <field name="report_template" ref="report_purchase_order"/>
+            <field name="report_template" ref="action_report_purchase_order"/>
             <field name="report_name">PO_${(object.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="body_html"><![CDATA[

From 65aa1424f7ea8e184180d93e790b1ece6705775d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Sun, 2 Mar 2014 20:04:07 +0100
Subject: [PATCH 3/4] [FIX] purchase_requisition: fix missing coma

bzr revid: qdp-launchpad@openerp.com-20140302190407-77cnjpxf6rmwzieg
---
 addons/purchase_requisition/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index be8419bfca2..be5f9838bf9 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -44,7 +44,7 @@ keep track and order all your purchase orders.
               'purchase_requisition_view.xml',
               'purchase_requisition_report.xml',
               'purchase_requisition_workflow.xml',
-              'security/ir.model.access.csv','purchase_requisition_sequence.xml'
+              'security/ir.model.access.csv','purchase_requisition_sequence.xml',
               'views/report_purchaserequisition.xml',
     ],
     'auto_install': False,

From 485ac1ab765fc2fc07e149c2716161a37423d672 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 3 Mar 2014 00:57:50 +0100
Subject: [PATCH 4/4] [FIX] stock: when unboxing, the package must be given
 explicitelly (introduced in revision 9583)

bzr revid: qdp-launchpad@openerp.com-20140302235750-c8s99jzhsqqu7v9a
---
 addons/stock/test/packing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/test/packing.yml b/addons/stock/test/packing.yml
index c85e2b0d769..3be5b9038c6 100644
--- a/addons/stock/test/packing.yml
+++ b/addons/stock/test/packing.yml
@@ -106,7 +106,7 @@
     for rec in delivery_id.pack_operation_ids:
       if rec.package_id.name == 'Pallet 2':
         lot_ids = self.pool.get("stock.production.lot").search(cr, uid, [('product_id', '=', ref('product1')), ('name','=','Lot A')])
-        stock_pack.write(cr, uid, [rec.id], {'product_id': ref('product1'), 'product_qty': 20, 'lot_id': lot_ids[0], 'package_id': False, 'product_uom_id': ref('product.product_uom_unit')}, context=context)
+        stock_pack.write(cr, uid, [rec.id], {'product_id': ref('product1'), 'product_qty': 20, 'lot_id': lot_ids[0], 'product_uom_id': ref('product.product_uom_unit')}, context=context)
       if rec.package_id.name == 'Pallet 3':
         stock_pack.write(cr, uid, [rec.id], {'product_id': ref('product1'),'product_qty': 10, 'product_uom_id': ref('product.product_uom_unit')}, context=context)
 -