From c6d897dadbe208c774b9274e568b003c713b950c Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 15:24:57 +0200
Subject: [PATCH 01/17] reactivate module stock_reserve

---
 {__unported__/stock_reserve => stock_reserve}/__init__.py       | 0
 {__unported__/stock_reserve => stock_reserve}/__openerp__.py    | 2 +-
 .../stock_reserve => stock_reserve}/data/stock_data.xml         | 0
 {__unported__/stock_reserve => stock_reserve}/model/__init__.py | 0
 {__unported__/stock_reserve => stock_reserve}/model/product.py  | 0
 .../stock_reserve => stock_reserve}/model/stock_reserve.py      | 0
 .../security/ir.model.access.csv                                | 0
 .../stock_reserve => stock_reserve}/test/stock_reserve.yml      | 0
 {__unported__/stock_reserve => stock_reserve}/view/product.xml  | 0
 .../stock_reserve => stock_reserve}/view/stock_reserve.xml      | 0
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename {__unported__/stock_reserve => stock_reserve}/__init__.py (100%)
 rename {__unported__/stock_reserve => stock_reserve}/__openerp__.py (98%)
 rename {__unported__/stock_reserve => stock_reserve}/data/stock_data.xml (100%)
 rename {__unported__/stock_reserve => stock_reserve}/model/__init__.py (100%)
 rename {__unported__/stock_reserve => stock_reserve}/model/product.py (100%)
 rename {__unported__/stock_reserve => stock_reserve}/model/stock_reserve.py (100%)
 rename {__unported__/stock_reserve => stock_reserve}/security/ir.model.access.csv (100%)
 rename {__unported__/stock_reserve => stock_reserve}/test/stock_reserve.yml (100%)
 rename {__unported__/stock_reserve => stock_reserve}/view/product.xml (100%)
 rename {__unported__/stock_reserve => stock_reserve}/view/stock_reserve.xml (100%)

diff --git a/__unported__/stock_reserve/__init__.py b/stock_reserve/__init__.py
similarity index 100%
rename from __unported__/stock_reserve/__init__.py
rename to stock_reserve/__init__.py
diff --git a/__unported__/stock_reserve/__openerp__.py b/stock_reserve/__openerp__.py
similarity index 98%
rename from __unported__/stock_reserve/__openerp__.py
rename to stock_reserve/__openerp__.py
index 99fafbd1f..61684f3c8 100644
--- a/__unported__/stock_reserve/__openerp__.py
+++ b/stock_reserve/__openerp__.py
@@ -54,5 +54,5 @@ exceeded if the reservations are canceled.
  'auto_install': False,
  'test': ['test/stock_reserve.yml',
           ],
- 'installable': False,
+ 'installable': True,
  }
diff --git a/__unported__/stock_reserve/data/stock_data.xml b/stock_reserve/data/stock_data.xml
similarity index 100%
rename from __unported__/stock_reserve/data/stock_data.xml
rename to stock_reserve/data/stock_data.xml
diff --git a/__unported__/stock_reserve/model/__init__.py b/stock_reserve/model/__init__.py
similarity index 100%
rename from __unported__/stock_reserve/model/__init__.py
rename to stock_reserve/model/__init__.py
diff --git a/__unported__/stock_reserve/model/product.py b/stock_reserve/model/product.py
similarity index 100%
rename from __unported__/stock_reserve/model/product.py
rename to stock_reserve/model/product.py
diff --git a/__unported__/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
similarity index 100%
rename from __unported__/stock_reserve/model/stock_reserve.py
rename to stock_reserve/model/stock_reserve.py
diff --git a/__unported__/stock_reserve/security/ir.model.access.csv b/stock_reserve/security/ir.model.access.csv
similarity index 100%
rename from __unported__/stock_reserve/security/ir.model.access.csv
rename to stock_reserve/security/ir.model.access.csv
diff --git a/__unported__/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
similarity index 100%
rename from __unported__/stock_reserve/test/stock_reserve.yml
rename to stock_reserve/test/stock_reserve.yml
diff --git a/__unported__/stock_reserve/view/product.xml b/stock_reserve/view/product.xml
similarity index 100%
rename from __unported__/stock_reserve/view/product.xml
rename to stock_reserve/view/product.xml
diff --git a/__unported__/stock_reserve/view/stock_reserve.xml b/stock_reserve/view/stock_reserve.xml
similarity index 100%
rename from __unported__/stock_reserve/view/stock_reserve.xml
rename to stock_reserve/view/stock_reserve.xml

From 292fd2aa668c312499b46d48a4851681e4c0310f Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 17:06:30 +0200
Subject: [PATCH 02/17] port models and method to api 8.0

---
 stock_reserve/model/product.py       |  29 ++---
 stock_reserve/model/stock_reserve.py | 179 +++++++++++++--------------
 2 files changed, 103 insertions(+), 105 deletions(-)

diff --git a/stock_reserve/model/product.py b/stock_reserve/model/product.py
index fd3aca601..dfdb170ca 100644
--- a/stock_reserve/model/product.py
+++ b/stock_reserve/model/product.py
@@ -19,22 +19,23 @@
 #
 ##############################################################################
 
-from openerp.osv import orm
+from openerp import models, api
 
 
-class product_product(orm.Model):
+class ProductProduct(models.Model):
     _inherit = 'product.product'
 
-    def open_stock_reservation(self, cr, uid, ids, context=None):
-        assert len(ids) == 1, "Expected 1 ID, got %r" % ids
-        mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-        get_ref = mod_obj.get_object_reference
-        __, action_id = get_ref(cr, uid, 'stock_reserve',
-                                'action_stock_reservation')
-        action = act_obj.read(cr, uid, action_id, context=context)
-        action['context'] = {'search_default_draft': 1,
-                             'search_default_reserved': 1,
-                             'default_product_id': ids[0],
-                             'search_default_product_id': ids[0]}
+    @api.multi
+    def open_stock_reservation(self):
+        assert len(self._ids) == 1, "Expected 1 ID, got %r" % self._ids
+        data_obj = self.env['ir.model.data']
+        act_obj = self.env['ir.actions.act_window']
+        ref = 'stock_reserve.action_stock_reservation'
+        action = data_obj.xmlid_to_object(ref)
+        action_dict = action.read()
+        action_dict['context'] = {
+            'search_default_draft': 1,
+            'search_default_reserved': 1,
+            'default_product_id': self._ids[0],
+            'search_default_product_id': self._ids[0]}
         return action
diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index 3dbf09094..ce374219d 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -19,11 +19,12 @@
 #
 ##############################################################################
 
-from openerp.osv import orm, fields
+from openerp import models, fields, api
+from openerp.exceptions import except_orm
 from openerp.tools.translate import _
 
 
-class stock_reservation(orm.Model):
+class StockReservation(models.Model):
     """ Allow to reserve products.
 
     The fields mandatory for the creation of a reservation are:
@@ -49,41 +50,40 @@ class stock_reservation(orm.Model):
     _description = 'Stock Reservation'
     _inherits = {'stock.move': 'move_id'}
 
-    _columns = {
-        'move_id': fields.many2one('stock.move',
-                                   'Reservation Move',
-                                   required=True,
-                                   readonly=True,
-                                   ondelete='cascade',
-                                   select=1),
-        'date_validity': fields.date('Validity Date'),
-    }
+    move_id = fields.Many2one(
+        'stock.move',
+        'Reservation Move',
+        required=True,
+        readonly=True,
+        ondelete='cascade',
+        select=1)
+    date_validity = fields.Date('Validity Date')
 
-    def get_location_from_ref(self, cr, uid, ref, context=None):
+    @api.model
+    def get_location_from_ref(self, ref):
         """ Get a location from a xmlid if allowed
         :param ref: tuple (module, xmlid)
         """
-        location_obj = self.pool.get('stock.location')
-        data_obj = self.pool.get('ir.model.data')
-        get_ref = data_obj.get_object_reference
+        data_obj = self.env['ir.model.data']
         try:
-            __, location_id = get_ref(cr, uid, *ref)
-            location_obj.check_access_rule(cr, uid, [location_id],
-                                           'read', context=context)
-        except (orm.except_orm, ValueError):
+            location = data_obj.xmlid_to_object(ref, raise_if_not_found=True)
+            location.check_access_rule('read')
+            location_id = location.id
+        except (except_orm, ValueError):
             location_id = False
         return location_id
 
-    def _default_location_id(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        move_obj = self.pool.get('stock.move')
-        context['picking_type'] = 'internal'
-        return move_obj._default_location_source(cr, uid, context=context)
+    @api.model
+    def _default_location_id(self):
+        move_obj = self.env['stock.move']
+        return (move_obj
+                .with_context(picking_type='internal')
+                ._default_location_source())
 
-    def _default_location_dest_id(self, cr, uid, context=None):
-        ref = ('stock_reserve', 'stock_location_reservation')
-        return self.get_location_from_ref(cr, uid, ref, context=context)
+    @api.model
+    def _default_location_dest_id(self):
+        ref = 'stock_reserve.stock_location_reservation'
+        return self.get_location_from_ref(ref)
 
     _defaults = {
         'type': 'internal',
@@ -92,90 +92,87 @@ class stock_reservation(orm.Model):
         'product_qty': 1.0,
     }
 
-    def reserve(self, cr, uid, ids, context=None):
+    @api.multi
+    def reserve(self):
         """ Confirm a reservation
 
         The reservation is done using the default UOM of the product.
         A date until which the product is reserved can be specified.
         """
-        move_obj = self.pool.get('stock.move')
-        reservations = self.browse(cr, uid, ids, context=context)
-        move_ids = [reserv.move_id.id for reserv in reservations]
-        move_obj.write(cr, uid, move_ids,
-                       {'date_expected': fields.datetime.now()},
-                       context=context)
-        move_obj.action_confirm(cr, uid, move_ids, context=context)
-        move_obj.force_assign(cr, uid, move_ids, context=context)
+        move_recs = self.move_id
+        move_recs.date_expected = fields.Datetime.now()
+        move_recs.action_confirm()
+        move_recs.force_assign()
         return True
 
-    def release(self, cr, uid, ids, context=None):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        reservations = self.read(cr, uid, ids, ['move_id'],
-                                 context=context, load='_classic_write')
-        move_obj = self.pool.get('stock.move')
-        move_ids = [reserv['move_id'] for reserv in reservations]
-        move_obj.action_cancel(cr, uid, move_ids, context=context)
+    @api.multi
+    def release(self):
+        """
+        Releas moves from reservation
+        """
+        move_recs = self.move_id
+        move_recs.action_cancel()
         return True
 
-    def release_validity_exceeded(self, cr, uid, ids=None, context=None):
+    @api.model
+    def release_validity_exceeded(self, ids=None):
         """ Release all the reservation having an exceeded validity date """
         domain = [('date_validity', '<', fields.date.today()),
                   ('state', '=', 'assigned')]
         if ids:
             domain.append(('id', 'in', ids))
-        reserv_ids = self.search(cr, uid, domain, context=context)
-        self.release(cr, uid, reserv_ids, context=context)
+        reserv_ids = self.search(domain)
+        self.release(reserv_ids)
         return True
 
-    def unlink(self, cr, uid, ids, context=None):
+    @api.multi
+    def unlink(self):
         """ Release the reservation before the unlink """
-        self.release(cr, uid, ids, context=context)
-        return super(stock_reservation, self).unlink(cr, uid, ids,
-                                                     context=context)
+        self.release()
+        return super(StockReservation, self).unlink()
 
-    def onchange_product_id(self, cr, uid, ids,
-                            product_id=False,
-                            context=None):
-        move_obj = self.pool.get('stock.move')
-        if ids:
-            reserv = self.read(cr, uid, ids, ['move_id'], context=context,
-                               load='_classic_write')
-            move_ids = [rv['move_id'] for rv in reserv]
-        else:
-            move_ids = []
-        result = move_obj.onchange_product_id(
-            cr, uid, move_ids, prod_id=product_id, loc_id=False,
-            loc_dest_id=False, partner_id=False)
-        if result.get('value'):
-            # only keep the existing fields on the view
-            keep = ('product_uom', 'name')
-            result['value'] = dict((key, value) for key, value in
-                                   result['value'].iteritems() if
-                                   key in keep)
-        return result
+    # XXX
+    #def onchange_product_id(self, cr, uid, ids, product_id=False, context=None
+    #):
+        #move_obj = self.pool.get('stock.move')
+        #if ids:
+            #reserv = self.read(cr, uid, ids, ['move_id'], context=context,
+                               #load='_classic_write')
+            #move_ids = [rv['move_id'] for rv in reserv]
+        #else:
+            #move_ids = []
+        #result = move_obj.onchange_product_id(
+            #cr, uid, move_ids, prod_id=product_id, loc_id=False,
+            #loc_dest_id=False, partner_id=False)
+        #if result.get('value'):
+            #vals = result['value']
+            ## only keep the existing fields on the view
+            #keep = ('product_uom', 'name')
+            #result['value'] = dict((key, value) for key, value in
+                                   #result['value'].iteritems() if
+                                   #key in keep)
+        #return result
 
-    def onchange_quantity(self, cr, uid, ids,
-                          product_id,
-                          product_qty,
-                          context=None):
-        """ On change of product quantity avoid negative quantities """
-        if not product_id or product_qty <= 0.0:
-            return {'value': {'product_qty': 0.0}}
-        return {}
+    # XXX
+    #def onchange_quantity(self, cr, uid, ids, product_id, product_qty,
+                           #context=None):
+        #""" On change of product quantity avoid negative quantities """
+        #if not product_id or product_qty <= 0.0:
+            #return {'value': {'product_qty': 0.0}}
+        #return {}
 
-    def open_move(self, cr, uid, ids, context=None):
-        assert len(ids) == 1, "1 ID expected, got %r" % ids
-        reserv = self.read(cr, uid, ids[0], ['move_id'], context=context,
-                           load='_classic_write')
-        mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-        get_ref = mod_obj.get_object_reference
-        __, action_id = get_ref(cr, uid, 'stock', 'action_move_form2')
-        action = act_obj.read(cr, uid, action_id, context=context)
-        action['name'] = _('Reservation Move')
+    @api.multi
+    def open_move(self):
+        assert len(self._ids) == 1, "1 ID expected, got %r" % self._ids
+        reserv = self[0].move_id
+        data_obj = self.env['ir.model.data']
+        ref_form2 = 'stock.action_move_form2'
+        action = data_obj.xmlid_to_object(ref_form2)
+        action_dict = action.read()
+        action_dict['name'] = _('Reservation Move')
         # open directly in the form view
-        __, view_id = get_ref(cr, uid, 'stock', 'view_move_form')
+        ref_form = 'stock.view_move_form'
+        view_id = data_obj.xmlid_to_res_id(ref_form)
         action['views'] = [(view_id, 'form')]
         action['res_id'] = reserv['move_id']
         return action

From d2f0e22bcc1a6e2f0ecb7cfd4bc99ecd52645b67 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 17:20:11 +0200
Subject: [PATCH 03/17] port onchanges

---
 stock_reserve/model/stock_reserve.py | 51 +++++++++++++---------------
 stock_reserve/view/stock_reserve.xml |  8 ++---
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index ce374219d..0fee171af 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -131,35 +131,30 @@ class StockReservation(models.Model):
         self.release()
         return super(StockReservation, self).unlink()
 
-    # XXX
-    #def onchange_product_id(self, cr, uid, ids, product_id=False, context=None
-    #):
-        #move_obj = self.pool.get('stock.move')
-        #if ids:
-            #reserv = self.read(cr, uid, ids, ['move_id'], context=context,
-                               #load='_classic_write')
-            #move_ids = [rv['move_id'] for rv in reserv]
-        #else:
-            #move_ids = []
-        #result = move_obj.onchange_product_id(
-            #cr, uid, move_ids, prod_id=product_id, loc_id=False,
-            #loc_dest_id=False, partner_id=False)
-        #if result.get('value'):
-            #vals = result['value']
-            ## only keep the existing fields on the view
-            #keep = ('product_uom', 'name')
-            #result['value'] = dict((key, value) for key, value in
-                                   #result['value'].iteritems() if
-                                   #key in keep)
-        #return result
+    @api.onchange('product_id')
+    def _onchange_product_id(self):
+        """ set product_uom and name from product onchange """
+        # save value before reading of self.move_id as this last one erase
+        # product_id value
+        product = self.product_id
+        # WARNING this gettattr erase self.product_id
+        move = self.move_id
+        result = move.onchange_product_id(
+            prod_id=product.id, loc_id=False, loc_dest_id=False,
+            partner_id=False)
+        if result.get('value'):
+            vals = result['value']
+            # only keep the existing fields on the view
+            self.name = vals.get('name')
+            self.product_uom = vals.get('product_uom')
+            # repeat assignation of product_id so we don't loose it
+            self.product_id = product.id
 
-    # XXX
-    #def onchange_quantity(self, cr, uid, ids, product_id, product_qty,
-                           #context=None):
-        #""" On change of product quantity avoid negative quantities """
-        #if not product_id or product_qty <= 0.0:
-            #return {'value': {'product_qty': 0.0}}
-        #return {}
+    @api.onchange('product_uom_qty')
+    def _onchange_quantity(self):
+        """ On change of product quantity avoid negative quantities """
+        if not self.product_id or self.product_qty <= 0.0:
+            self.product_qty = 0.0
 
     @api.multi
     def open_move(self):
diff --git a/stock_reserve/view/stock_reserve.xml b/stock_reserve/view/stock_reserve.xml
index a15d08c8c..1ea5f795a 100644
--- a/stock_reserve/view/stock_reserve.xml
+++ b/stock_reserve/view/stock_reserve.xml
@@ -23,14 +23,10 @@
                     <sheet>
                         <group>
                             <group name="main_grp" string="Details">
-                                <field name="product_id"
-                                    on_change="onchange_product_id(product_id)"
-                                    />
+                                <field name="product_id" />
                                 <label for="product_qty" />
                                 <div>
-                                    <field name="product_qty"
-                                        on_change="onchange_quantity(product_id, product_qty)"
-                                        class="oe_inline"/>
+                                    <field name="product_qty" class="oe_inline"/>
                                     <field name="product_uom"
                                         groups="product.group_uom" class="oe_inline"/>
                                 </div>

From d72c566b8d322f2f0adf37cdc281f794ecfbd4ff Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 18:19:41 +0200
Subject: [PATCH 04/17] change type to stock.picking.type

---
 stock_reserve/model/stock_reserve.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index 0fee171af..4508a0720 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -73,11 +73,24 @@ class StockReservation(models.Model):
             location_id = False
         return location_id
 
+    @api.model
+    def _default_picking_type_id(self):
+        """ Search for an internal picking type
+        """
+        move_obj = self.env['stock.move']
+        type_obj = self.env['stock.picking.type']
+
+        types = type_obj.search([('code', '=', 'internal')], limit=1)
+        if types:
+            return types[0].id
+        return False
+
     @api.model
     def _default_location_id(self):
         move_obj = self.env['stock.move']
+        picking_type_id = self._default_picking_type_id()
         return (move_obj
-                .with_context(picking_type='internal')
+                .with_context(default_picking_type_id=picking_type_id)
                 ._default_location_source())
 
     @api.model
@@ -86,7 +99,7 @@ class StockReservation(models.Model):
         return self.get_location_from_ref(ref)
 
     _defaults = {
-        'type': 'internal',
+        'picking_type_id': _default_picking_type_id,
         'location_id': _default_location_id,
         'location_dest_id': _default_location_dest_id,
         'product_qty': 1.0,

From b4fe3059d99d22c94a3c12254644ef36df593b89 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 19:55:01 +0200
Subject: [PATCH 05/17] improve descriptor

---
 stock_reserve/__openerp__.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/stock_reserve/__openerp__.py b/stock_reserve/__openerp__.py
index 61684f3c8..d1114f1fc 100644
--- a/stock_reserve/__openerp__.py
+++ b/stock_reserve/__openerp__.py
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-{'name': 'Stock Reserve',
+{'name': 'Stock Reservation',
+ 'summary': 'Stock reservations on products',
  'version': '0.1',
  'author': 'Camptocamp',
  'category': 'Warehouse',
@@ -28,8 +29,8 @@
  'images': [],
  'website': "http://www.camptocamp.com",
  'description': """
-Stock Reserve
-=============
+Stock Reservation
+=================
 
 Allows to create stock reservations on products.
 
@@ -42,6 +43,12 @@ stock below the minimum, the orderpoint will be triggered and new
 purchase orders will be generated. It also implies that the max may be
 exceeded if the reservations are canceled.
 
+Contributors
+------------
+
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
+
 """,
  'depends': ['stock',
              ],

From e648a372d9846f3ef4a519903acb5ac76c5cfdb2 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 19:56:13 +0200
Subject: [PATCH 06/17] improve action_view_reservations from product

---
 stock_reserve/model/product.py       | 65 +++++++++++++++++++++++-----
 stock_reserve/view/product.xml       | 28 +++++++++---
 stock_reserve/view/stock_reserve.xml |  5 +--
 3 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/stock_reserve/model/product.py b/stock_reserve/model/product.py
index dfdb170ca..1349a660b 100644
--- a/stock_reserve/model/product.py
+++ b/stock_reserve/model/product.py
@@ -19,23 +19,66 @@
 #
 ##############################################################################
 
-from openerp import models, api
+from openerp import models, fields, api
 
 
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    reservation_count = fields.Integer(
+        compute='_reservation_count',
+        string='# Sales')
+
+    @api.multi
+    def _reservation_count(self):
+        StockReservation = self.env['stock.reservation']
+        product_ids = self._get_products()
+        domain = [('product_id', 'in', product_ids),
+                  ('state', 'in', ['draft', 'assigned'])]
+        reservations = StockReservation.search(domain)
+        self.reservation_count = sum(reserv.product_uom_qty
+                                     for reserv in reservations)
+
+    @api.multi
+    def action_view_reservations(self):
+        assert len(self._ids) == 1, "Expected 1 ID, got %r" % self._ids
+        ref = 'stock_reserve.action_stock_reservation_tree'
+        product_ids = self._get_products()
+        action_dict = self._get_act_window_dict(ref)
+        action_dict['domain'] = ("[('product_id','in',[" +
+                                 ','.join(map(str, product_ids)) + "])]")
+        action_dict['context'] = {
+            'search_default_draft': 1,
+            'search_default_reserved': 1
+            }
+        return action_dict
+
 class ProductProduct(models.Model):
     _inherit = 'product.product'
 
+    reservation_count = fields.Integer(
+        compute='_reservation_count',
+        string='# Sales')
+
     @api.multi
-    def open_stock_reservation(self):
+    def _reservation_count(self):
+        StockReservation = self.env['stock.reservation']
+        product_id = self._ids[0]
+        domain = [('product_id', '=', product_id),
+                  ('state', 'in', ['draft', 'assigned'])]
+        reservations = StockReservation.search(domain)
+        self.reservation_count = sum(reserv.product_uom_qty
+                                     for reserv in reservations)
+
+    @api.multi
+    def action_view_reservations(self):
         assert len(self._ids) == 1, "Expected 1 ID, got %r" % self._ids
-        data_obj = self.env['ir.model.data']
-        act_obj = self.env['ir.actions.act_window']
-        ref = 'stock_reserve.action_stock_reservation'
-        action = data_obj.xmlid_to_object(ref)
-        action_dict = action.read()
+        ref = 'stock_reserve.action_stock_reservation_tree'
+        product_id = self._ids[0]
+        action_dict = self.product_tmpl_id._get_act_window_dict(ref)
+        action_dict['domain'] = ("[('product_id','='," + str(product_id) + ")]")
         action_dict['context'] = {
             'search_default_draft': 1,
-            'search_default_reserved': 1,
-            'default_product_id': self._ids[0],
-            'search_default_product_id': self._ids[0]}
-        return action
+            'search_default_reserved': 1
+            }
+        return action_dict
diff --git a/stock_reserve/view/product.xml b/stock_reserve/view/product.xml
index 9ff624dc1..e4e1dc3fb 100644
--- a/stock_reserve/view/product.xml
+++ b/stock_reserve/view/product.xml
@@ -2,18 +2,32 @@
 <openerp>
     <data noupdate="0">
 
-        <record model="ir.ui.view" id="product_form_view">
-            <field name="name">product.product.form.reserve</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
+        <record model="ir.ui.view" id="product_template_form_view_reservation_button">
+            <field name="name">product.template.reservation.button</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button string="Stock Reservations"
-                        name="open_stock_reservation"
-                        type="object"/>
+                    <button class="oe_inline oe_stat_button" name="action_view_reservations"
+                        type="object" groups="base.group_sale_salesman" icon="fa-lock">
+                        <field string="Stock Reservations" name="reservation_count" widget="statinfo" />
+                    </button>
                 </xpath>
             </field>
         </record>
 
+        <record model="ir.ui.view" id="product_product_form_view_reservation_button">
+            <field name="name">product.template.reservation.button</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button class="oe_inline oe_stat_button" name="action_view_reservations"
+                        type="object" groups="base.group_sale_salesman" icon="fa-lock">
+                        <field string="Stock Reservations" name="reservation_count" widget="statinfo" />
+                    </button>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/stock_reserve/view/stock_reserve.xml b/stock_reserve/view/stock_reserve.xml
index 1ea5f795a..ad69446cf 100644
--- a/stock_reserve/view/stock_reserve.xml
+++ b/stock_reserve/view/stock_reserve.xml
@@ -108,11 +108,10 @@
             </field>
         </record>
 
-        <record id="action_stock_reservation" model="ir.actions.act_window">
+        <record id="action_stock_reservation_tree" model="ir.actions.act_window">
             <field name="name">Stock Reservations</field>
             <field name="res_model">stock.reservation</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
             <field name="view_id" ref="view_stock_reservation_tree"/>
             <field name="search_view_id" ref="view_stock_reservation_search"/>
             <field name="context">{'search_default_draft': 1,
@@ -128,7 +127,7 @@
             </field>
         </record>
 
-        <menuitem action="action_stock_reservation"
+        <menuitem action="action_stock_reservation_tree"
             id="menu_action_stock_reservation"
             parent="stock.menu_stock_inventory_control"
             sequence="30"/>

From 2cec2e50fff646a12b35690ccf12cbcf4995470f Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 1 Sep 2014 20:31:53 +0200
Subject: [PATCH 07/17] replace product_qty by product_uom_qty

---
 stock_reserve/model/stock_reserve.py | 8 ++++----
 stock_reserve/test/stock_reserve.yml | 2 +-
 stock_reserve/view/stock_reserve.xml | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index 4508a0720..145f37e52 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -30,7 +30,7 @@ class StockReservation(models.Model):
     The fields mandatory for the creation of a reservation are:
 
     * product_id
-    * product_qty
+    * product_uom_qty
     * product_uom
     * name
 
@@ -102,7 +102,7 @@ class StockReservation(models.Model):
         'picking_type_id': _default_picking_type_id,
         'location_id': _default_location_id,
         'location_dest_id': _default_location_dest_id,
-        'product_qty': 1.0,
+        'product_uom_qty': 1.0,
     }
 
     @api.multi
@@ -166,8 +166,8 @@ class StockReservation(models.Model):
     @api.onchange('product_uom_qty')
     def _onchange_quantity(self):
         """ On change of product quantity avoid negative quantities """
-        if not self.product_id or self.product_qty <= 0.0:
-            self.product_qty = 0.0
+        if not self.product_id or self.product_uom_qty <= 0.0:
+            self.product_uom_qty = 0.0
 
     @api.multi
     def open_move(self):
diff --git a/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
index 5cd92e29f..ec63834d8 100644
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -36,7 +36,7 @@
 -
  !record {model: stock.reservation, id: reserv_sorbet1}:
     product_id: product_sorbet
-    product_qty: 5.0
+    product_uom_qty: 5.0
     product_uom: product.product_uom_kgm
     name: reserve 5 kgm of sorbet for test
 -
diff --git a/stock_reserve/view/stock_reserve.xml b/stock_reserve/view/stock_reserve.xml
index ad69446cf..7ee9cbdd3 100644
--- a/stock_reserve/view/stock_reserve.xml
+++ b/stock_reserve/view/stock_reserve.xml
@@ -24,9 +24,9 @@
                         <group>
                             <group name="main_grp" string="Details">
                                 <field name="product_id" />
-                                <label for="product_qty" />
+                                <label for="product_uom_qty" />
                                 <div>
-                                    <field name="product_qty" class="oe_inline"/>
+                                    <field name="product_uom_qty" class="oe_inline"/>
                                     <field name="product_uom"
                                         groups="product.group_uom" class="oe_inline"/>
                                 </div>
@@ -60,7 +60,7 @@
                     <field name="name" />
                     <field name="product_id" />
                     <field name="move_id" />
-                    <field name="product_qty" sum="Total" />
+                    <field name="product_uom_qty" sum="Total" />
                     <field name="product_uom" />
                     <field name="date_validity" />
                     <field name="state"/>

From b664229bb9e8126b4eb6b8361cebc90dcd6151fa Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 3 Sep 2014 16:20:08 +0200
Subject: [PATCH 08/17] fix default_get to ensure product_qty is not set

---
 stock_reserve/model/stock_reserve.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index 145f37e52..aa5e08844 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -59,6 +59,17 @@ class StockReservation(models.Model):
         select=1)
     date_validity = fields.Date('Validity Date')
 
+    @api.model
+    def default_get(self, fields_list):
+        """
+        Ensure default value of computed field `product_qty` is not set
+        as it would raise an error
+        """
+        res = super(StockReservation, self).default_get(fields_list)
+        if 'product_qty' in res:
+            del res['product_qty']
+        return res
+
     @api.model
     def get_location_from_ref(self, ref):
         """ Get a location from a xmlid if allowed

From 1c131d9fabda6744406d5a656659f0fecd2434d4 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 3 Sep 2014 19:04:28 +0200
Subject: [PATCH 09/17] some products' fields moved in stock_accout. removing
 them to make the test pass as it isn't a dependancy.

---
 stock_reserve/test/stock_reserve.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
index ec63834d8..ccced7023 100644
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -10,11 +10,6 @@
     standard_price: 70.0
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
-    procure_method: make_to_stock
-    valuation: real_time
-    cost_method: average
-    property_stock_account_input: account.o_expense
-    property_stock_account_output: account.o_income
 -
   I update the current stock of the Sorbet with 10 kgm
 -

From d59372733f0d7db899d676f6b6b29e1dbde98c28 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 8 Sep 2014 15:19:59 +0200
Subject: [PATCH 10/17] fix flake8 warnings

---
 stock_reserve/model/product.py       | 3 ++-
 stock_reserve/model/stock_reserve.py | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stock_reserve/model/product.py b/stock_reserve/model/product.py
index 1349a660b..4e7fbd982 100644
--- a/stock_reserve/model/product.py
+++ b/stock_reserve/model/product.py
@@ -53,6 +53,7 @@ class ProductTemplate(models.Model):
             }
         return action_dict
 
+
 class ProductProduct(models.Model):
     _inherit = 'product.product'
 
@@ -76,7 +77,7 @@ class ProductProduct(models.Model):
         ref = 'stock_reserve.action_stock_reservation_tree'
         product_id = self._ids[0]
         action_dict = self.product_tmpl_id._get_act_window_dict(ref)
-        action_dict['domain'] = ("[('product_id','='," + str(product_id) + ")]")
+        action_dict['domain'] = "[('product_id','=', %s)]" % product_id
         action_dict['context'] = {
             'search_default_draft': 1,
             'search_default_reserved': 1
diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index aa5e08844..4295b92eb 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -88,7 +88,6 @@ class StockReservation(models.Model):
     def _default_picking_type_id(self):
         """ Search for an internal picking type
         """
-        move_obj = self.env['stock.move']
         type_obj = self.env['stock.picking.type']
 
         types = type_obj.search([('code', '=', 'internal')], limit=1)

From 25c434cd4c30924e81d68461345f1e72a395365e Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 8 Sep 2014 15:29:03 +0200
Subject: [PATCH 11/17] update test

don't use half the quantity so that the reserved qty is different from
available qty
---
 stock_reserve/test/stock_reserve.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
index ccced7023..c5d70a2a8 100644
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -27,13 +27,13 @@
     product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
     assert product.virtual_available == 10, "Stock is not updated."
 -
-  I create a stock reservation for 5 kgm
+  I create a stock reservation for 6 kgm
 -
  !record {model: stock.reservation, id: reserv_sorbet1}:
     product_id: product_sorbet
-    product_uom_qty: 5.0
+    product_uom_qty: 6.0
     product_uom: product.product_uom_kgm
-    name: reserve 5 kgm of sorbet for test
+    name: reserve 6 kgm of sorbet for test
 -
   I confirm the reservation
 -
@@ -44,7 +44,7 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
-    assert product.virtual_available == 5, "Stock is not updated."
+    assert product.virtual_available == 4, "Stock is not updated."
 -
   I release the reservation
 -

From 7e81c6c31472249e88eb7f278f17933cc6fca2e8 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 8 Sep 2014 15:36:29 +0200
Subject: [PATCH 12/17] more stock_reserve tests

* check that multiple reservations are handled correctly
* check that various UOM are handled correctly
---
 stock_reserve/test/stock_reserve.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
index c5d70a2a8..3f6e782c0 100644
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -33,18 +33,31 @@
     product_id: product_sorbet
     product_uom_qty: 6.0
     product_uom: product.product_uom_kgm
-    name: reserve 6 kgm of sorbet for test
+    name: reserve 6 kg of sorbet for test
 -
   I confirm the reservation
 -
   !python {model: stock.reservation}: |
     self.reserve(cr, uid, [ref('reserv_sorbet1')], context=context)
+-
+  I create a stock reservation for 500g
+-
+ !record {model: stock.reservation, id: reserv_sorbet2}:
+    product_id: product_sorbet
+    product_uom_qty: 500
+    product_uom: product.product_uom_gram
+    name: reserve 500g of sorbet for test
+-
+  I confirm the reservation
+-
+  !python {model: stock.reservation}: |
+    self.reserve(cr, uid, [ref('reserv_sorbet2')], context=context)
 -
   I check Virtual stock of Sorbet after update reservation
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
-    assert product.virtual_available == 4, "Stock is not updated."
+    assert product.virtual_available == 3.5, "Stock is not updated."
 -
   I release the reservation
 -
@@ -55,4 +68,4 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
-    assert product.virtual_available == 10, "Stock is not updated."
+    assert product.virtual_available == 9.5, "Stock is not updated."

From 8061ad3ada92678e9237a4a28073e6c2c5fd923d Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 8 Sep 2014 16:40:29 +0200
Subject: [PATCH 13/17] product_reserve: test orderpoint

test that reservations will trigger orderpoint procurements
---
 stock_reserve/test/stock_reserve.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
index 3f6e782c0..ba0cbc590 100644
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -1,7 +1,7 @@
 -
   I create a product to test the stock reservation
 -
- !record {model: product.product, id: product_sorbet}:
+  !record {model: product.product, id: product_sorbet}:
     default_code: 001SORBET
     name: Sorbet
     type: product
@@ -10,6 +10,16 @@
     standard_price: 70.0
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
+-
+  I create a stock orderpoint for the product
+-
+  !record {model: stock.warehouse.orderpoint, id: sorbet_orderpoint}:
+    warehouse_id: stock.warehouse0
+    location_id: stock.stock_location_stock
+    product_id: product_sorbet
+    product_uom: product.product_uom_kgm
+    product_min_qty: 4.0
+    product_max_qty: 15.0
 -
   I update the current stock of the Sorbet with 10 kgm
 -
@@ -58,6 +68,19 @@
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
     assert product.virtual_available == 3.5, "Stock is not updated."
+-
+  I run the scheduler
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  The procurement linked to the orderpoint must be in exception (no routes configured)
+-
+  !python {model: stock.warehouse.orderpoint}: |
+    orderpoint = self.browse(cr, uid, ref('sorbet_orderpoint'))
+    assert orderpoint.procurement_ids[0].state == 'exception', 'procurement must be in exception as there is no rule for procurement'
+    import math
+    assert orderpoint.procurement_ids[0].product_qty == math.ceil(15 - 3.5), 'wrong product qty ordered'
 -
   I release the reservation
 -

From ea8050059b30f8ef86ea962465402f064a3d4204 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 8 Sep 2014 16:54:54 +0200
Subject: [PATCH 14/17] fix typo in docstring

---
 stock_reserve/model/stock_reserve.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index 4295b92eb..d28e26079 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -131,7 +131,7 @@ class StockReservation(models.Model):
     @api.multi
     def release(self):
         """
-        Releas moves from reservation
+        Release moves from reservation
         """
         move_recs = self.move_id
         move_recs.action_cancel()

From f47528346f12fc85b81dc56332b48ca6ccbe5498 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 8 Sep 2014 16:55:23 +0200
Subject: [PATCH 15/17] add test for expiration of reservations

fix a bug in the code to make the tests green
---
 stock_reserve/model/stock_reserve.py |  2 +-
 stock_reserve/test/stock_reserve.yml | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index d28e26079..55b20a10e 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -145,7 +145,7 @@ class StockReservation(models.Model):
         if ids:
             domain.append(('id', 'in', ids))
         reserv_ids = self.search(domain)
-        self.release(reserv_ids)
+        reserv_ids.release()
         return True
 
     @api.multi
diff --git a/stock_reserve/test/stock_reserve.yml b/stock_reserve/test/stock_reserve.yml
index ba0cbc590..e23ac9465 100644
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -92,3 +92,23 @@
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
     assert product.virtual_available == 9.5, "Stock is not updated."
+-
+  I set the validity of the second reservation to yesterday
+-
+  !python {model: stock.reservation}: |
+    import datetime
+    from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
+    yesterday = datetime.date.today() - datetime.timedelta(days=1)
+    yesterday = yesterday.strftime(DEFAULT_SERVER_DATE_FORMAT)
+    self.write(cr, uid, [ref('reserv_sorbet2')], {'date_validity': yesterday})
+-
+  I call the function releasing expired reservations
+-
+  !python {model: stock.reservation}: |
+    self.release_validity_exceeded(cr, uid, [])
+-
+  I check Virtual stock of Sorbet after update reservation
+-
+  !python {model: product.product}: |
+    product = self.browse(cr, uid, ref('stock_reserve.product_sorbet'), context=context)
+    assert product.virtual_available == 10.0, "Stock is not updated."

From 5b9758bf01d8556218cab038c558b2aca249c247 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 8 Sep 2014 18:38:14 +0200
Subject: [PATCH 16/17] fix button to open related move

---
 stock_reserve/model/stock_reserve.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/model/stock_reserve.py
index 55b20a10e..0b61a8b69 100644
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -181,16 +181,18 @@ class StockReservation(models.Model):
 
     @api.multi
     def open_move(self):
-        assert len(self._ids) == 1, "1 ID expected, got %r" % self._ids
-        reserv = self[0].move_id
-        data_obj = self.env['ir.model.data']
+        assert len(self.ids) == 1, "1 ID expected, got %r" % self.ids
+        reserv = self.move_id
+        IrModelData = self.env['ir.model.data']
         ref_form2 = 'stock.action_move_form2'
-        action = data_obj.xmlid_to_object(ref_form2)
-        action_dict = action.read()
+        action = IrModelData.xmlid_to_object(ref_form2)
+        action_dict = action.read()[0]
         action_dict['name'] = _('Reservation Move')
         # open directly in the form view
         ref_form = 'stock.view_move_form'
-        view_id = data_obj.xmlid_to_res_id(ref_form)
-        action['views'] = [(view_id, 'form')]
-        action['res_id'] = reserv['move_id']
-        return action
+        view_id = IrModelData.xmlid_to_res_id(ref_form)
+        action_dict.update(
+            views=[(view_id, 'form')],
+            res_id=reserv.id,
+            )
+        return action_dict

From a4e888516aced20f2a4ab11267088cede5f1e5c0 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Mon, 8 Sep 2014 18:43:28 +0200
Subject: [PATCH 17/17] fix domain using list instead of string

---
 stock_reserve/model/product.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/stock_reserve/model/product.py b/stock_reserve/model/product.py
index 4e7fbd982..fd9ea385b 100644
--- a/stock_reserve/model/product.py
+++ b/stock_reserve/model/product.py
@@ -45,8 +45,7 @@ class ProductTemplate(models.Model):
         ref = 'stock_reserve.action_stock_reservation_tree'
         product_ids = self._get_products()
         action_dict = self._get_act_window_dict(ref)
-        action_dict['domain'] = ("[('product_id','in',[" +
-                                 ','.join(map(str, product_ids)) + "])]")
+        action_dict['domain'] = [('product_id', 'in', product_ids)]
         action_dict['context'] = {
             'search_default_draft': 1,
             'search_default_reserved': 1
@@ -77,7 +76,7 @@ class ProductProduct(models.Model):
         ref = 'stock_reserve.action_stock_reservation_tree'
         product_id = self._ids[0]
         action_dict = self.product_tmpl_id._get_act_window_dict(ref)
-        action_dict['domain'] = "[('product_id','=', %s)]" % product_id
+        action_dict['domain'] = [('product_id', '=', product_id)]
         action_dict['context'] = {
             'search_default_draft': 1,
             'search_default_reserved': 1