Merge lp:~jfb-tempo-consulting/unifield-server/us-3124 into lp:unifield-server/uf5

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-06-13 10:26:28 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-07-10 07:12:28 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+        <record id="us_3098_patch" model="patch.scripts">
+            <field name="method">us_3098_patch</field>
+        </record>
+        
         <record id="us_2257_patch" model="patch.scripts">
             <field name="method">us_2257_patch</field>
         </record>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-06-13 10:26:28 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-07-10 07:12:28 +0000
@@ -46,6 +46,90 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def us_3098_patch(self, cr, uid, *a, **b):
+        cr.execute("""
+            SELECT id, name
+            FROM res_partner
+            WHERE name IN (select name from res_partner where partner_type = 'internal')
+            AND name IN (select name from res_partner where partner_type = 'intermission')
+            AND partner_type = 'intermission';
+        """)
+        wrong_partners = cr.fetchall()
+
+        updated_doc = []
+        for partner in wrong_partners:
+            intermission_partner_id = partner[0]
+            partner_name = partner[1]
+            internal_partner_id = self.pool.get('res.partner').search(cr, uid, [
+                ('name', '=', partner_name),
+                ('partner_type', '=', 'internal'),
+            ])[0]
+            address_id = self.pool.get('res.partner.address').search(cr, uid, [
+                ('partner_id', '=', internal_partner_id),
+                ('type', '=', 'default'),
+            ])[0]
+
+            cr.execute("SELECT name FROM stock_picking WHERE partner_id = %s AND state not in ('done', 'cancel');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE stock_picking
+                SET partner_id = %s, partner_id2 = %s, address_id = %s, partner_type_stock_picking = 'internal', invoice_state = 'none'
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel');
+            """, (internal_partner_id, internal_partner_id, address_id, intermission_partner_id) )
+            cr.execute("""
+                UPDATE stock_move
+                SET partner_id = %s, partner_id2 = %s, address_id = %s
+                WHERE (partner_id = %s OR partner_id2 = %s) AND state not in ('done', 'cancel');
+            """, (internal_partner_id, internal_partner_id, address_id, intermission_partner_id, intermission_partner_id) )
+
+            cr.execute("SELECT name FROM purchase_order WHERE partner_id = %s AND state not in ('done', 'cancel');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE purchase_order
+                SET partner_id = %s, partner_address_id = %s, partner_type = 'internal'
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel');
+            """, (internal_partner_id, address_id, intermission_partner_id) )
+            cr.execute("""
+                UPDATE purchase_order_line pol
+                SET partner_id = %s
+                FROM purchase_order po
+                WHERE pol.order_id = po.id
+                AND pol.partner_id = %s
+                AND po.state not in ('done', 'cancel');
+            """, (internal_partner_id, intermission_partner_id) )
+
+            cr.execute("SELECT name FROM sale_order WHERE partner_id = %s AND state not in ('done', 'cancel');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE sale_order
+                SET partner_id = %s, partner_invoice_id = %s, partner_order_id = %s, partner_shipping_id = %s, partner_type = 'internal'
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel');
+            """, (internal_partner_id, address_id, address_id, address_id, intermission_partner_id) )
+            cr.execute("""
+                UPDATE sale_order_line sol
+                SET order_partner_id = %s
+                FROM sale_order so
+                WHERE sol.order_id = so.id
+                AND sol.order_partner_id = %s
+                AND so.state not in ('done', 'cancel');
+            """, (internal_partner_id, intermission_partner_id) )
+
+            cr.execute("SELECT name FROM shipment WHERE partner_id = %s;", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE shipment
+                SET partner_id = %s, partner_id2 = %s, address_id = %s
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel', 'delivered');
+            """, (internal_partner_id, internal_partner_id, address_id, intermission_partner_id) )
+
+        self._logger.warn("Following documents have been updated with internal partner: %s" % ", ".join(updated_doc))
+
+        return True
+
     def us_2257_patch(self, cr, uid, *a, **b):
         context = {}
         user_obj = self.pool.get('res.users')

=== modified file 'bin/addons/sync_so/so_po_common.py'
--- bin/addons/sync_so/so_po_common.py	2017-06-14 18:35:59 +0000
+++ bin/addons/sync_so/so_po_common.py	2017-07-10 07:12:28 +0000
@@ -47,9 +47,12 @@
             context = {}
         context.update({'active_test': False})
         partner_obj = self.pool.get('res.partner')
-        ids = partner_obj.search(cr, uid, [('name', '=', partner_name)], context=context)
+        domain = [('name', '=', partner_name)]
+        ids = partner_obj.search(cr, uid, domain + [('partner_type', '=', 'internal')], context=context)
         if not ids:
-            raise Exception("The partner %s is not found in the system. The operation is thus interrupted." % partner_name)
+            ids = partner_obj.search(cr, uid, domain, context=context)
+            if not ids:
+                raise Exception("The partner %s is not found in the system. The operation is thus interrupted." % partner_name)
 
         return partner_obj.read(cr, uid, ids, ['partner_type'], context=context)[0]['partner_type']
 
@@ -57,9 +60,12 @@
         if not context:
             context = {}
         context.update({'active_test': False})
-        ids = self.pool.get('res.partner').search(cr, uid, [('name', '=', partner_name)], context=context)
+        domain = [('name', '=', partner_name)]
+        ids = self.pool.get('res.partner').search(cr, uid, domain + [('partner_type', '=', 'internal')], context=context)
         if not ids:
-            raise Exception("The partner %s is not found in the system. The operation is thus interrupted." % partner_name)
+            ids = self.pool.get('res.partner').search(cr, uid, domain, context=context)
+            if not ids:
+                raise Exception("The partner %s is not found in the system. The operation is thus interrupted." % partner_name)
         return ids[0]
 
     def get_partner_address_id(self, cr, uid, partner_id, context=None):