Merge lp:~unifield-team/unifield-server/us-1427 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-06-10 14:09:35 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-06-17 09:25:31 +0000
@@ -61,5 +61,9 @@
         <record id="us_1297_patch" model="patch.scripts">
             <field name="method">us_1297_patch</field>
         </record>
+
+        <record id="us_1427_patch" model="patch.scripts">
+            <field name="method">us_1427_patch</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-06-10 14:09:35 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-06-17 09:25:31 +0000
@@ -605,6 +605,34 @@
                 budget_obj.update_parent_budgets(cr, uid, budget_to_correct_ids)
         return True
 
+    def us_1427_patch(self, cr, uid, *a, **b):
+        """
+        Put active all inactive products with stock quantities in internal locations
+        """
+        sql = """
+        UPDATE product_product SET active = 't' WHERE id IN (
+            SELECT DISTINCT(q.product_id) FROM (
+            SELECT location_id, product_id, sum(sm.product_qty) AS qty
+                FROM (
+                    (
+                        SELECT location_id, product_id, sum(-product_qty) AS product_qty
+                        FROM stock_move
+                        WHERE location_id IN (SELECT id FROM stock_location WHERE usage = 'internal') AND state = 'done'
+                        GROUP BY location_id, product_id
+                    )
+                    UNION
+                    (
+                        SELECT location_dest_id, product_id, sum(product_qty) AS product_qty
+                        FROM stock_move
+                        WHERE location_dest_id IN (SELECT id FROM stock_location WHERE usage = 'internal') AND state = 'done'
+                        GROUP BY location_dest_id, product_id
+                    )
+                ) AS sm GROUP BY location_id, product_id) AS q
+            LEFT JOIN product_product pp ON q.product_id = pp.id WHERE q.qty > 0 AND pp.active = 'f' ORDER BY q.product_id)
+        """
+        cr.execute(sql)
+        return True
+
 patch_scripts()
 
 

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2016-05-11 16:10:35 +0000
+++ bin/addons/product_attributes/product_attributes.py	2016-06-17 09:25:31 +0000
@@ -1387,9 +1387,6 @@
 
         internal_loc = location_obj.search(cr, uid, [('usage', '=', 'internal')], context=context)
 
-        c = context.copy()
-        c.update({'location_id': internal_loc})
-
         for product in self.browse(cr, uid, ids, context=context):
             # Raise an error if the product is already inactive
             if not product.active:
@@ -1448,7 +1445,12 @@
                                                             ('invoice_id.state', 'not in', ['paid', 'proforma', 'proforma2', 'cancel'])], context=context)
 
             # Check if the product has stock in internal locations
-            has_stock = product.qty_available
+            for loc_id in internal_loc:
+                c = context.copy()
+                c.update({'location': [loc_id]})
+                has_stock = self.read(cr, uid, product.id, ['qty_available'], context=c)['qty_available'] > 0.00
+                if has_stock:
+                    break
 
             opened_object = has_kit or has_initial_inv_line or has_inventory_line or has_move_line or has_fo_line or has_tender_line or has_po_line or has_invoice_line
             if has_stock or opened_object: