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

[jftempo]

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2019-09-17 09:21:24 +0000
+++ bin/addons/product_attributes/product_attributes.py	2019-10-09 13:13:09 +0000
@@ -1552,10 +1552,10 @@
                                                        ('order_id.state', 'not in', ['draft', 'done', 'cancel'])], context=context)
 
             # Check if the product is in stock picking
-            # All stock moves in a stock.picking not draft/cancel/done or all stock moves in a shipment not delivered/done/cancel
+            # All stock moves in a stock.picking not draft/cancel/done/delivered or all stock moves in a shipment not delivered/done/cancel
             has_move_line = move_obj.search(cr, uid, [('product_id', '=', product.id),
                                                       ('picking_id', '!=', False),
-                                                      '|', ('picking_id.state', 'not in', ['draft', 'done', 'cancel']),
+                                                      '|', ('picking_id.state', 'not in', ['draft', 'done', 'delivered', 'cancel']),
                                                       '&', ('picking_id.shipment_id', '!=', False),
                                                       ('picking_id.shipment_id.state', 'not in', ['delivered', 'done', 'cancel']),
                                                       ], context=context)