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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-02-18 10:24:23 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-03-02 13:32:12 +0000
@@ -501,6 +501,7 @@
             <field name="method">us_6692_new_od_journals</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_6684_push_backup" model="patch.scripts">
             <field name="method">us_6684_push_backup</field>
         </record>
@@ -512,5 +513,12 @@
         <record id="us_7181_add_oc_subscrpition_to_unidata_products" model="patch.scripts">
             <field name="method">us_7181_add_oc_subscrpition_to_unidata_products</field>
         </record>
+=======
+        <!-- UF17.0 -->
+        <record id="us_7025_7039_fix_nr_empty_ins" model="patch.scripts">
+            <field name="method">us_7025_7039_fix_nr_empty_ins</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-02-18 10:24:23 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-03-02 13:32:12 +0000
@@ -52,6 +52,65 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF17.0
+    def us_7025_7039_fix_nr_empty_ins(self, cr, uid, *a, **b):
+        """
+        1. Set the Not Runs to run:
+            - Error from coordo: "Exception: Something goes wrong with this message and no confirmation of delivery".
+            - Error from project: "Exception: Unable to receive Shipment Details into an Incoming Shipment in this
+                instance as IN IN/XXXXX (POXXXXX) already fully/partially cancelled/Closed".
+        2. Remove reference data from empty INs (Backorder, Origin, links to FO, links to PO, Ship Reference, ...) and
+            modify "Change Reason" to "False movement, bug US-7025/7039".
+        3. Remove empty Draft IVOs.
+        """
+        # 1
+        cr.execute("""
+            SELECT id, identifier, arguments FROM sync_client_message_received
+            WHERE run = 'f' AND remote_call IN ('stock.picking.closed_in_validates_delivery_out_ship', 'stock.picking.partial_shipped_fo_updates_in_po')
+        """)
+        to_run_ids = []
+        to_run_name = []
+        for msg in cr.fetchall():
+            args = eval(msg[2])[0]
+            if args.get('shipment_ref', False) and '-s' in args['shipment_ref'] or args.get('name', False) and '-s' in args['name']:
+                to_run_ids.append(msg[0])
+                to_run_name.append(msg[1])
+        if to_run_ids:
+            cr.execute("""
+                UPDATE sync_client_message_received SET run = 't', manually_ran = 't', execution_date = %s 
+                WHERE id IN %s""", (time.strftime("%Y-%m-%d %H:%M:%S"), tuple(to_run_ids))
+            )
+            self._logger.warn('The following Not Runs have been set to Run: %s.', (', '.join(to_run_name),))
+
+        # 2
+        cr.execute("""
+            SELECT p.id, p.name FROM stock_picking p LEFT JOIN stock_move m ON p.id = m.picking_id WHERE m.id IS NULL 
+                AND p.type = 'in' AND p.subtype = 'standard' AND p.state = 'done'
+        """)
+        empty_in_ids = []
+        empty_in_names = []
+        for inc in cr.fetchall():
+            empty_in_ids.append(inc[0])
+            empty_in_names.append(inc[1])
+        if empty_in_ids:
+            cr.execute("""
+                UPDATE stock_picking SET sale_id = NULL, purchase_id = NULL, backorder_id = NULL, origin = '', 
+                    shipment_ref = '', change_reason = 'False movement, bug US-7025/7039' WHERE id IN %s
+            """, (tuple(empty_in_ids),))
+            self._logger.warn('The following empty INs have been modified: %s.', (', '.join(empty_in_names),))
+
+        # 3
+        cr.execute("""
+            DELETE FROM account_invoice WHERE id IN (
+                SELECT a.id FROM account_invoice a LEFT JOIN account_invoice_line l ON a.id = l.invoice_id 
+                    WHERE l.id IS NULL AND a.state = 'draft' AND a.type = 'out_invoice' AND a.is_debit_note = 'f'
+                    AND a.is_inkind_donation = 'f' AND a.is_intermission = 't' 
+            )
+        """)
+        self._logger.warn('%s empty IVOs have been deleted.', (cr.rowcount,))
+
+        return True
+
     # UF16.0
     def us_7181_add_oc_subscrpition_to_unidata_products(self, cr, uid, *a, **b):
         """