Merge lp:~julie-w/unifield-server/US-5667 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/financing_contract/__openerp__.py'
--- bin/addons/financing_contract/__openerp__.py	2017-10-09 21:06:10 +0000
+++ bin/addons/financing_contract/__openerp__.py	2019-03-20 14:43:46 +0000
@@ -31,7 +31,6 @@
     "update_xml": [
         'security/ir.model.access.csv',
         'financing_contract_view.xml',
-        'financing_contract_workflow.xml',
         'financing_contract_report.xml',
         'wizard/wizard_financing_currency_export_view.xml'
     ],

=== modified file 'bin/addons/financing_contract/contract.py'
--- bin/addons/financing_contract/contract.py	2018-04-03 10:18:51 +0000
+++ bin/addons/financing_contract/contract.py	2019-03-20 14:43:46 +0000
@@ -132,6 +132,19 @@
         return self._check_grant_amount_proxy(cr, uid, ids,
                                               'contract_open', context=context)
 
+    def contract_reopen_proxy(self, cr, uid, ids, context=None):
+        """
+        Sets the contract state from Soft-Closed BACK to Open (no check needed)
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+        for contract in self.read(cr, uid, ids, ['state'], context=context):
+            if contract.get('state', '') == 'soft_closed':
+                self.write(cr, uid, contract['id'], {'state': 'open'}, context=context)
+        return True
+
     def contract_open(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state': 'open',
@@ -628,6 +641,8 @@
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if context is None:
             context = {}
 
@@ -716,6 +731,26 @@
 
         return res
 
+    def change_contract_state(self, cr, uid, ids, signal, context=None):
+        """
+        Changes the contract state:
+        - from Draft to Open (signal contract_open)
+        - from Open to Soft-closed (signal contract_soft_closed)
+        - from Soft-closed to Hard-closed (signal contract_hard_closed)
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+        for contract in self.read(cr, uid, ids, ['state'], context=context):
+            state = contract.get('state', '')
+            if state == 'draft' and signal == 'contract_open':
+                self.contract_open(cr, uid, contract['id'])
+            elif state == 'open' and signal == 'contract_soft_closed':
+                self.contract_soft_closed(cr, uid, contract['id'])
+            elif state == 'soft_closed' and signal == 'contract_hard_closed':
+                self.contract_hard_closed(cr, uid, contract['id'])
+
     def _check_grant_amount_proxy(self, cr, uid, ids, signal, context=None):
         if isinstance(ids, (long, int)):
             ids = [ids]
@@ -723,9 +758,7 @@
                                                 context=context)
         if check_action:
             return check_action
-        wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_validate(uid, self._name, id, signal, cr)
+        self.change_contract_state(cr, uid, ids, signal, context=context)
         return True
 
     def _check_grant_amount(self, cr, uid, ids, signal, context=None):

=== modified file 'bin/addons/financing_contract/financing_contract_view.xml'
--- bin/addons/financing_contract/financing_contract_view.xml	2017-06-13 15:20:13 +0000
+++ bin/addons/financing_contract/financing_contract_view.xml	2019-03-20 14:43:46 +0000
@@ -134,7 +134,7 @@
                         </group>
                         <button name="contract_open_proxy" states="draft" string="Open" type="object" icon="gtk-go-forward"/>
                         <button name="contract_soft_closed_proxy" states="open" string="Soft-close" type="object" icon="gtk-go-forward"/>
-                        <button name="contract_reopen" states="soft_closed" string="Re-Open" type="workflow" icon="gtk-go-forward"/>
+                        <button name="contract_reopen_proxy" states="soft_closed" string="Re-Open" type="object" icon="gtk-go-forward"/>
                         <button name="contract_hard_closed_proxy" states="soft_closed" string="Hard-close" type="object" icon="gtk-ok"/>
                     </form>
                 </field>

=== removed file 'bin/addons/financing_contract/financing_contract_workflow.xml'
--- bin/addons/financing_contract/financing_contract_workflow.xml	2018-09-28 15:47:23 +0000
+++ bin/addons/financing_contract/financing_contract_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="wkf" model="workflow">
-            <field name="name">wkf.financing.contract</field>
-            <field name="osv">financing.contract.contract</field>
-            <field name="on_create">True</field>
-        </record>
-
-        <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-        </record>
-
-        <record id="act_open" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">open</field>
-            <field name="action">contract_open()</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="act_soft_closed" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">soft_closed</field>
-            <field name="action">contract_soft_closed()</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="act_hard_closed" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">hard_closed</field>
-            <field name="flow_stop">True</field>
-            <field name="action">contract_hard_closed()</field>
-            <field name="kind">function</field>
-        </record>
-
-        <record id="t1" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_open"/>
-            <field name="sequence" eval="10" />
-            <field name="signal">contract_open</field>
-        </record>
-        
-        <record id="t2" model="workflow.transition">
-            <field name="act_from" ref="act_open"/>
-            <field name="act_to" ref="act_soft_closed"/>
-            <field name="sequence" eval="10" />
-            <field name="signal">contract_soft_closed</field>
-        </record>
-        
-        <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_soft_closed"/>
-            <field name="act_to" ref="act_hard_closed"/>
-            <field name="sequence" eval="10" />
-            <field name="signal">contract_hard_closed</field>
-        </record>
-        
-        <record id="t4" model="workflow.transition">
-            <field name="act_from" ref="act_soft_closed"/>
-            <field name="act_to" ref="act_open"/>
-            <field name="sequence" eval="20" />
-            <field name="signal">contract_reopen</field>
-        </record>
-        
-    </data>
-</openerp>

=== modified file 'bin/addons/financing_contract/wizard/wizard_financing_contract_warning.py'
--- bin/addons/financing_contract/wizard/wizard_financing_contract_warning.py	2015-02-03 13:29:39 +0000
+++ bin/addons/financing_contract/wizard/wizard_financing_contract_warning.py	2019-03-20 14:43:46 +0000
@@ -42,14 +42,13 @@
     }
 
     def btn_close(self, cr, uid, ids, context=None):
+        contract_obj = self.pool.get('financing.contract.contract')
         signal = context.get('financing_contract_warning', {}).get(
             'signal', False)
         res_id = context.get('financing_contract_warning', {}).get(
             'res_id', False)
         if signal and res_id:
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'financing.contract.contract', res_id,
-                signal, cr)
+            contract_obj.change_contract_state(cr, uid, res_id, signal, context=context)
         return {
             'type': 'ir.actions.act_window_close', 'context': context,
         }

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2019-02-21 16:12:25 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-03-20 14:43:46 +0000
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+        <!-- UF13.0 -->
+        <record id="us_5667_remove_contract_workflow" model="patch.scripts">
+            <field name="method">us_5667_remove_contract_workflow</field>
+        </record>
+
         <!-- UF12.0 -->
         <record id="us_5724_set_previous_fy_dates_allowed" model="patch.scripts">
             <field name="method">us_5724_set_previous_fy_dates_allowed</field>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-02-21 16:12:25 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-03-20 14:43:46 +0000
@@ -52,6 +52,38 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF13.0
+    def us_5667_remove_contract_workflow(self, cr, uid, *a, **b):
+        """
+        Deletes the workflow related to Financing Contracts (not used anymore)
+        """
+        delete_wkf_transition = """
+            DELETE FROM wkf_transition
+            WHERE signal IN ('contract_open', 'contract_soft_closed', 'contract_hard_closed', 'contract_reopen')
+            AND act_from IN 
+                (SELECT id FROM wkf_activity WHERE wkf_id = 
+                    (SELECT id FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract')
+                );
+        """
+        delete_wkf_workitem = """
+            DELETE FROM wkf_workitem WHERE act_id IN
+                (SELECT id FROM wkf_activity WHERE wkf_id = 
+                    (SELECT id FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract')
+                );
+        """
+        delete_wkf_activity = """
+            DELETE FROM wkf_activity 
+            WHERE wkf_id = (SELECT id FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract');
+        """
+        delete_wkf = """
+            DELETE FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract';
+        """
+        cr.execute(delete_wkf_transition)
+        cr.execute(delete_wkf_workitem)
+        cr.execute(delete_wkf_activity)
+        cr.execute(delete_wkf)  # will also delete data in wkf_instance because of the ONDELETE 'cascade'
+        return True
+
     # UF12.0
     def us_5724_set_previous_fy_dates_allowed(self, cr, uid, *a, **b):
         """