[11.0][MIG] stock reserve

stock_reserve/README.rst

@@ -84,6 +84,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_request>`_ project on GitHub.
-
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

stock_reserve/model/product.py

@@ -25,6 +25,8 @@ def action_view_reservations(self):
         action_dict['domain'] = [('product_id', 'in', product_ids)]
         action_dict['context'] = {
             'search_default_draft': 1,
+            'search_default_partially_available': 1,
+            'search_default_confirmed': 1,
             'search_default_reserved': 1
             }
         return action_dict
@@ -42,7 +44,8 @@ def _compute_reservation_count(self):
         for product in self:
             domain = [
                 ('product_id', '=', product.id),
-                ('state', 'in', ['draft', 'assigned'])]
+                ('state', 'in', [
+                    'draft', 'partially_available', 'confirmed', 'assigned'])]
             reservations = self.env['stock.reservation'].search(domain)
             product.reservation_count = sum(reservations.mapped('product_qty'))
 
@@ -54,6 +57,8 @@ def action_view_reservations(self):
         action_dict['domain'] = [('product_id', '=', self.id)]
         action_dict['context'] = {
             'search_default_draft': 1,
+            'search_default_partially_available': 1,
+            'search_default_confirmed': 1,
             'search_default_reserved': 1
             }
         return action_dict

stock_reserve/model/stock_reserve.py

@@ -120,7 +120,7 @@ def reserve(self):
         A date until which the product is reserved can be specified.
         """
         self.write({'date_expected': fields.Datetime.now()})
-        self.mapped('move_id')._action_confirm()
+        self.mapped('move_id')._action_confirm(merge=False)
         self.mapped('move_id.picking_id').action_assign()
         return True
 
@@ -137,7 +137,7 @@ def release_validity_exceeded(self, ids=None):
         """ Release all the reservation having an exceeded validity date """
         domain = [
             ('date_validity', '<', fields.date.today()),
-            ('state', '=', 'assigned')]
+            ('state', 'in', ('assigned', 'partially_available', 'confirmed'))]
         if ids:
             domain.append(('id', 'in', ids))
         self.search(domain).release()

stock_reserve/view/stock_reserve.xml

@@ -14,11 +14,11 @@
                     <button name="release" type="object"
                         string="Release"
                         class="oe_highlight"
-                        states="assigned,confirmed,done"/>
+                        states="assigned,partially_available,confirmed,done"/>
                     <button name="open_move" type="object"
                         string="View Reservation Move"/>
                     <field name="state" widget="statusbar"
-                        statusbar_visible="draft,assigned"/>
+                        statusbar_visible="draft,assigned,cancel"/>
                 </header>
                 <sheet>
                     <group>
@@ -55,8 +55,7 @@
         <field name="name">stock.reservation.tree</field>
         <field name="model">stock.reservation</field>
         <field name="arch" type="xml">
-            <tree string="Stock Reservations"
-                    colors="blue:state == 'draft';grey:state == 'cancel'" >
+            <tree string="Stock Reservations" >
                 <field name="name" />
                 <field name="product_id" />
                 <field name="move_id" />
@@ -76,7 +75,7 @@
                     type="object"
                     help="Release"
                     icon="fa-cogs"
-                    states="assigned,confirmed,done"
+                    states="assigned,partially_available,confirmed,done"
                     />
             </tree>
         </field>
@@ -90,6 +89,12 @@
                 <filter name="draft" string="Draft"
                     domain="[('state', '=', 'draft')]"
                     help="Not already reserved"/>
+                <filter name="partially_available" string="Partially Available"
+                    domain="[('state', '=', 'partially_available')]"
+                    help="Partially Available"/>
+                <filter name="confirmed" string="Waiting Availability"
+                    domain="[('state', '=', 'confirmed')]"
+                    help="Waiting Availability"/>
                 <filter name="reserved" string="Reserved"
                     domain="[('state', '=', 'assigned')]"
                     help="Moves are reserved."/>
@@ -126,6 +131,8 @@
         <field name="search_view_id" ref="view_stock_reservation_search"/>
         <field name="context">{
             'search_default_draft': 1,
+            'search_default_partially_available': 1,
+            'search_default_confirmed': 1,
             'search_default_reserved': 1,
             'search_default_groupby_product': 1}</field>
         <field name="help" type="html">