Merge lp:~dorian-kemps/unifield-server/US-7306 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/stock_override/wizard/stock_card_view.xml'
--- bin/addons/stock_override/wizard/stock_card_view.xml	2019-08-29 13:46:55 +0000
+++ bin/addons/stock_override/wizard/stock_card_view.xml	2020-10-27 10:14:32 +0000
@@ -20,7 +20,7 @@
                     <field name="perishable" invisible="1" />
                     <field name="prodlot_id" 
                            domain="[('product_id', '=', product_id)]"
-                           attrs="{'invisible': [('perishable', '=', False)], 'required': [('perishable', '=', True)]}" />
+                           attrs="{'invisible': [('perishable', '=', False)]}" />
                     <separator colspan="4" string="Period" />
                     <field name="from_date" />
                     <field name="to_date" />
 
=== modified file 'bin/addons/stock_override/wizard/stock_card_wizard.py'
--- bin/addons/stock_override/wizard/stock_card_wizard.py	2020-07-29 15:36:49 +0000
+++ bin/addons/stock_override/wizard/stock_card_wizard.py	2020-10-27 10:14:32 +0000
@@ -100,7 +100,6 @@
         # 'Old' physical inventories
         oldinv_line_obj = self.pool.get('stock.inventory.line')
 
-
         if not context:
             context = {}
 
@@ -120,16 +119,15 @@
         context.update({'to_date': card.from_date})
 
         prodlot_id = card.prodlot_id and card.prodlot_id.id or False
-        product = product_obj.browse(cr, uid, card.product_id.id,
-                                     context=context)
+        product = product_obj.browse(cr, uid, card.product_id.id, context=context)
         if not card.from_date:
             initial_stock = 0.00
         else:
             initial_stock = product.qty_available
 
-        domain = [('product_id', '=', product.id),
-                  ('prodlot_id', '=', prodlot_id),
-                  ('state', '=', 'done')]
+        domain = [('product_id', '=', product.id), ('state', '=', 'done')]
+        if prodlot_id:
+            domain.append(('prodlot_id', '=', prodlot_id))
 
         # "Old" physical inventory
         inv_dom = [