Unifield Server

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

  1. US-5667
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5310
Proposed branch: lp:~julie-w/unifield-server/US-5667
Merge into: lp:unifield-server
Diff against target: 248 lines (+76/-76)
7 files modified
bin/addons/financing_contract/__openerp__.py (+0/-1)
bin/addons/financing_contract/contract.py (+36/-3)
bin/addons/financing_contract/financing_contract_view.xml (+1/-1)
bin/addons/financing_contract/financing_contract_workflow.xml (+0/-68)
bin/addons/financing_contract/wizard/wizard_financing_contract_warning.py (+2/-3)
bin/addons/msf_profile/data/patches.xml (+5/-0)
bin/addons/msf_profile/msf_profile.py (+32/-0)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5667
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+364808@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
31 "update_xml": [31 "update_xml": [
32 'security/ir.model.access.csv',32 'security/ir.model.access.csv',
33 'financing_contract_view.xml',33 'financing_contract_view.xml',
34 'financing_contract_workflow.xml',
35 'financing_contract_report.xml',34 'financing_contract_report.xml',
36 'wizard/wizard_financing_currency_export_view.xml'35 'wizard/wizard_financing_currency_export_view.xml'
37 ],36 ],
3837
=== 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 @@
132 return self._check_grant_amount_proxy(cr, uid, ids,132 return self._check_grant_amount_proxy(cr, uid, ids,
133 'contract_open', context=context)133 'contract_open', context=context)
134134
135 def contract_reopen_proxy(self, cr, uid, ids, context=None):
136 """
137 Sets the contract state from Soft-Closed BACK to Open (no check needed)
138 """
139 if context is None:
140 context = {}
141 if isinstance(ids, (long, int)):
142 ids = [ids]
143 for contract in self.read(cr, uid, ids, ['state'], context=context):
144 if contract.get('state', '') == 'soft_closed':
145 self.write(cr, uid, contract['id'], {'state': 'open'}, context=context)
146 return True
147
135 def contract_open(self, cr, uid, ids, *args):148 def contract_open(self, cr, uid, ids, *args):
136 self.write(cr, uid, ids, {149 self.write(cr, uid, ids, {
137 'state': 'open',150 'state': 'open',
@@ -628,6 +641,8 @@
628 def write(self, cr, uid, ids, vals, context=None):641 def write(self, cr, uid, ids, vals, context=None):
629 if not ids:642 if not ids:
630 return True643 return True
644 if isinstance(ids, (int, long)):
645 ids = [ids]
631 if context is None:646 if context is None:
632 context = {}647 context = {}
633648
@@ -716,6 +731,26 @@
716731
717 return res732 return res
718733
734 def change_contract_state(self, cr, uid, ids, signal, context=None):
735 """
736 Changes the contract state:
737 - from Draft to Open (signal contract_open)
738 - from Open to Soft-closed (signal contract_soft_closed)
739 - from Soft-closed to Hard-closed (signal contract_hard_closed)
740 """
741 if context is None:
742 context = {}
743 if isinstance(ids, (long, int)):
744 ids = [ids]
745 for contract in self.read(cr, uid, ids, ['state'], context=context):
746 state = contract.get('state', '')
747 if state == 'draft' and signal == 'contract_open':
748 self.contract_open(cr, uid, contract['id'])
749 elif state == 'open' and signal == 'contract_soft_closed':
750 self.contract_soft_closed(cr, uid, contract['id'])
751 elif state == 'soft_closed' and signal == 'contract_hard_closed':
752 self.contract_hard_closed(cr, uid, contract['id'])
753
719 def _check_grant_amount_proxy(self, cr, uid, ids, signal, context=None):754 def _check_grant_amount_proxy(self, cr, uid, ids, signal, context=None):
720 if isinstance(ids, (long, int)):755 if isinstance(ids, (long, int)):
721 ids = [ids]756 ids = [ids]
@@ -723,9 +758,7 @@
723 context=context)758 context=context)
724 if check_action:759 if check_action:
725 return check_action760 return check_action
726 wf_service = netsvc.LocalService("workflow")761 self.change_contract_state(cr, uid, ids, signal, context=context)
727 for id in ids:
728 wf_service.trg_validate(uid, self._name, id, signal, cr)
729 return True762 return True
730763
731 def _check_grant_amount(self, cr, uid, ids, signal, context=None):764 def _check_grant_amount(self, cr, uid, ids, signal, context=None):
732765
=== 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 @@
134 </group>134 </group>
135 <button name="contract_open_proxy" states="draft" string="Open" type="object" icon="gtk-go-forward"/>135 <button name="contract_open_proxy" states="draft" string="Open" type="object" icon="gtk-go-forward"/>
136 <button name="contract_soft_closed_proxy" states="open" string="Soft-close" type="object" icon="gtk-go-forward"/>136 <button name="contract_soft_closed_proxy" states="open" string="Soft-close" type="object" icon="gtk-go-forward"/>
137 <button name="contract_reopen" states="soft_closed" string="Re-Open" type="workflow" icon="gtk-go-forward"/>137 <button name="contract_reopen_proxy" states="soft_closed" string="Re-Open" type="object" icon="gtk-go-forward"/>
138 <button name="contract_hard_closed_proxy" states="soft_closed" string="Hard-close" type="object" icon="gtk-ok"/>138 <button name="contract_hard_closed_proxy" states="soft_closed" string="Hard-close" type="object" icon="gtk-ok"/>
139 </form>139 </form>
140 </field>140 </field>
141141
=== 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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <record id="wkf" model="workflow">
6 <field name="name">wkf.financing.contract</field>
7 <field name="osv">financing.contract.contract</field>
8 <field name="on_create">True</field>
9 </record>
10
11 <record id="act_draft" model="workflow.activity">
12 <field name="wkf_id" ref="wkf"/>
13 <field name="flow_start">True</field>
14 <field name="name">draft</field>
15 </record>
16
17 <record id="act_open" model="workflow.activity">
18 <field name="wkf_id" ref="wkf"/>
19 <field name="name">open</field>
20 <field name="action">contract_open()</field>
21 <field name="kind">function</field>
22 </record>
23
24 <record id="act_soft_closed" model="workflow.activity">
25 <field name="wkf_id" ref="wkf"/>
26 <field name="name">soft_closed</field>
27 <field name="action">contract_soft_closed()</field>
28 <field name="kind">function</field>
29 </record>
30
31 <record id="act_hard_closed" model="workflow.activity">
32 <field name="wkf_id" ref="wkf"/>
33 <field name="name">hard_closed</field>
34 <field name="flow_stop">True</field>
35 <field name="action">contract_hard_closed()</field>
36 <field name="kind">function</field>
37 </record>
38
39 <record id="t1" model="workflow.transition">
40 <field name="act_from" ref="act_draft"/>
41 <field name="act_to" ref="act_open"/>
42 <field name="sequence" eval="10" />
43 <field name="signal">contract_open</field>
44 </record>
45
46 <record id="t2" model="workflow.transition">
47 <field name="act_from" ref="act_open"/>
48 <field name="act_to" ref="act_soft_closed"/>
49 <field name="sequence" eval="10" />
50 <field name="signal">contract_soft_closed</field>
51 </record>
52
53 <record id="t3" model="workflow.transition">
54 <field name="act_from" ref="act_soft_closed"/>
55 <field name="act_to" ref="act_hard_closed"/>
56 <field name="sequence" eval="10" />
57 <field name="signal">contract_hard_closed</field>
58 </record>
59
60 <record id="t4" model="workflow.transition">
61 <field name="act_from" ref="act_soft_closed"/>
62 <field name="act_to" ref="act_open"/>
63 <field name="sequence" eval="20" />
64 <field name="signal">contract_reopen</field>
65 </record>
66
67 </data>
68</openerp>
690
=== 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 @@
42 }42 }
4343
44 def btn_close(self, cr, uid, ids, context=None):44 def btn_close(self, cr, uid, ids, context=None):
45 contract_obj = self.pool.get('financing.contract.contract')
45 signal = context.get('financing_contract_warning', {}).get(46 signal = context.get('financing_contract_warning', {}).get(
46 'signal', False)47 'signal', False)
47 res_id = context.get('financing_contract_warning', {}).get(48 res_id = context.get('financing_contract_warning', {}).get(
48 'res_id', False)49 'res_id', False)
49 if signal and res_id:50 if signal and res_id:
50 wf_service = netsvc.LocalService("workflow")51 contract_obj.change_contract_state(cr, uid, res_id, signal, context=context)
51 wf_service.trg_validate(uid, 'financing.contract.contract', res_id,
52 signal, cr)
53 return {52 return {
54 'type': 'ir.actions.act_window_close', 'context': context,53 'type': 'ir.actions.act_window_close', 'context': context,
55 }54 }
5655
=== 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 @@
1<?xml version="1.0" encoding="utf-8" ?>1<?xml version="1.0" encoding="utf-8" ?>
2<openerp>2<openerp>
3 <data>3 <data>
4 <!-- UF13.0 -->
5 <record id="us_5667_remove_contract_workflow" model="patch.scripts">
6 <field name="method">us_5667_remove_contract_workflow</field>
7 </record>
8
4 <!-- UF12.0 -->9 <!-- UF12.0 -->
5 <record id="us_5724_set_previous_fy_dates_allowed" model="patch.scripts">10 <record id="us_5724_set_previous_fy_dates_allowed" model="patch.scripts">
6 <field name="method">us_5724_set_previous_fy_dates_allowed</field>11 <field name="method">us_5724_set_previous_fy_dates_allowed</field>
712
=== 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 @@
52 'model': lambda *a: 'patch.scripts',52 'model': lambda *a: 'patch.scripts',
53 }53 }
5454
55 # UF13.0
56 def us_5667_remove_contract_workflow(self, cr, uid, *a, **b):
57 """
58 Deletes the workflow related to Financing Contracts (not used anymore)
59 """
60 delete_wkf_transition = """
61 DELETE FROM wkf_transition
62 WHERE signal IN ('contract_open', 'contract_soft_closed', 'contract_hard_closed', 'contract_reopen')
63 AND act_from IN
64 (SELECT id FROM wkf_activity WHERE wkf_id =
65 (SELECT id FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract')
66 );
67 """
68 delete_wkf_workitem = """
69 DELETE FROM wkf_workitem WHERE act_id IN
70 (SELECT id FROM wkf_activity WHERE wkf_id =
71 (SELECT id FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract')
72 );
73 """
74 delete_wkf_activity = """
75 DELETE FROM wkf_activity
76 WHERE wkf_id = (SELECT id FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract');
77 """
78 delete_wkf = """
79 DELETE FROM wkf WHERE name='wkf.financing.contract' AND osv='financing.contract.contract';
80 """
81 cr.execute(delete_wkf_transition)
82 cr.execute(delete_wkf_workitem)
83 cr.execute(delete_wkf_activity)
84 cr.execute(delete_wkf) # will also delete data in wkf_instance because of the ONDELETE 'cascade'
85 return True
86
55 # UF12.087 # UF12.0
56 def us_5724_set_previous_fy_dates_allowed(self, cr, uid, *a, **b):88 def us_5724_set_previous_fy_dates_allowed(self, cr, uid, *a, **b):
57 """89 """

Subscribers

People subscribed via source and target branches