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

Proposed by jftempo
Status: Merged
Merged at revision: 5055
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/us-4879
Merge into: lp:unifield-server
Diff against target: 49 lines (+9/-1)
3 files modified
bin/addons/msf_profile/data/patches.xml (+3/-0)
bin/addons/msf_profile/msf_profile.py (+5/-0)
bin/addons/sync_client/special_handling.py (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/us-4879
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+353322@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
1=== modified file 'bin/addons/msf_profile/data/patches.xml'
2--- bin/addons/msf_profile/data/patches.xml 2018-08-01 16:12:31 +0000
3+++ bin/addons/msf_profile/data/patches.xml 2018-08-17 12:02:47 +0000
4@@ -6,6 +6,9 @@
5 <field name="method">us_3427_update_third_parties_in_gl_selector</field>
6 </record>
7
8+ <record id="us_4879_fo_from_shipping_except_to_close" model="patch.scripts">
9+ <field name="method">us_4879_fo_from_shipping_except_to_close</field>
10+ </record>
11 <!-- UF 9.1 -->
12 <record id="change_xml_payment_method" model="patch.scripts">
13 <field name="method">change_xml_payment_method</field>
14
15=== modified file 'bin/addons/msf_profile/msf_profile.py'
16--- bin/addons/msf_profile/msf_profile.py 2018-08-16 09:59:11 +0000
17+++ bin/addons/msf_profile/msf_profile.py 2018-08-17 12:02:47 +0000
18@@ -89,6 +89,11 @@
19 }
20 selector_obj.write(cr, uid, selector.id, vals)
21
22+ def us_4879_fo_from_shipping_except_to_close(self, cr, uid, *a, **b):
23+ cr.execute("update sale_order set state='done' where state='shipping_except' and procurement_request='f'")
24+ self._logger.warn('FO from shipping_except do done: %d' % (cr.rowcount,))
25+ return True
26+
27 # UF9.1
28 def change_xml_payment_method(self, cr, uid, *a, **b):
29 user_obj = self.pool.get('res.users')
30
31=== modified file 'bin/addons/sync_client/special_handling.py'
32--- bin/addons/sync_client/special_handling.py 2017-10-02 15:51:29 +0000
33+++ bin/addons/sync_client/special_handling.py 2018-08-17 12:02:47 +0000
34@@ -165,6 +165,7 @@
35 # US 1214: HQ closed tolerate update under certains conditions only
36 # Enable the sync on account.move.line field only if they are not : Dates / Journal / Sequence / Description / Reference / all field amounts / Third party / Currency / State
37 # http://jira.unifield.org/browse/US-1214?focusedCommentId=47237&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-47237
38+ # US-4963: allow changes on employee_id
39
40 # => get field by field diff
41 fields_to_check = [
42@@ -175,7 +176,6 @@
43 ('debit', 'float'),
44 ('debit_currency', 'float'),
45 ('document_date', False),
46- ('employee_id', 'id'),
47 ('journal_id', 'id'),
48 ('move_id', 'id'),
49 ('partner_id', 'id'),

Subscribers

People subscribed via source and target branches