From 31db6978199375f6490161ac8dc70605ed4b3cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= <adria.gil@eficent.com>
Date: Mon, 21 Oct 2019 16:02:34 +0200
Subject: [PATCH] fixup

---
 stock_barcodes/wizard/stock_barcodes_read_picking.py | 6 ++++--
 stock_barcodes/wizard/stock_barcodes_read_views.xml  | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/stock_barcodes/wizard/stock_barcodes_read_picking.py b/stock_barcodes/wizard/stock_barcodes_read_picking.py
index 62ccb4549a4a..8c02a60aeeeb 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_picking.py
+++ b/stock_barcodes/wizard/stock_barcodes_read_picking.py
@@ -103,8 +103,10 @@ def name_get(self):
     @api.onchange('product_id')
     def onchange_product_id(self):
         if self.product_id:
-            candidate_picking_ids = self.env['stock.pack.operation'].search(
-                [('product_id', '=', self.product_id.id)]).mapped('picking_id')
+            candidate_picking_ids = self.env['stock.pack.operation'].search([
+                ('product_id', '=', self.product_id.id),
+                ('state', 'in', ['assigned']),
+            ]).mapped('picking_id')
             if self.picking_id not in candidate_picking_ids:
                 self.picking_id = False
             return {'domain': {'picking_id': [
diff --git a/stock_barcodes/wizard/stock_barcodes_read_views.xml b/stock_barcodes/wizard/stock_barcodes_read_views.xml
index 9614479b39c4..efaa331dbe53 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_views.xml
+++ b/stock_barcodes/wizard/stock_barcodes_read_views.xml
@@ -52,8 +52,7 @@
                     </group>
                     <group name="product_group">
                         <field name="product_id" options="{'no_create': True}"
-                               attrs="{'required': [('manual_entry', '=', True)]}"
-                               force_save="1" widget="selection"/>
+                               attrs="{'required': [('manual_entry', '=', True)]}"/>
                         <field name="packaging_id" options="{'no_create': True}" domain="[('product_id', '=', product_id)]" attrs="{'readonly': [('manual_entry', '=', False)]}" force_save="1" groups="product.group_stock_packaging"/>
                         <field name="packaging_qty" attrs="{'invisible': ['|', ('packaging_id', '=', False), ('manual_entry', '=', False)], 'readonly': [('manual_entry', '=', False)]}" force_save="1" widget="FieldFloatNumericMode"/>
                         <field name="product_qty"  attrs="{'invisible': [('manual_entry', '=', False)], 'readonly': [('manual_entry', '=', False)]}" force_save="1" widget="FieldFloatNumericMode"/>