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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2018-08-01 16:12:31 +0000
+++ bin/addons/msf_profile/data/patches.xml	2018-08-17 12:02:47 +0000
@@ -6,6 +6,9 @@
             <field name="method">us_3427_update_third_parties_in_gl_selector</field>
         </record>
 
+        <record id="us_4879_fo_from_shipping_except_to_close" model="patch.scripts">
+            <field name="method">us_4879_fo_from_shipping_except_to_close</field>
+        </record>
         <!-- UF 9.1 -->
         <record id="change_xml_payment_method" model="patch.scripts">
             <field name="method">change_xml_payment_method</field>
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2018-08-16 09:59:11 +0000
+++ bin/addons/msf_profile/msf_profile.py	2018-08-17 12:02:47 +0000
@@ -89,6 +89,11 @@
             }
             selector_obj.write(cr, uid, selector.id, vals)
 
+    def us_4879_fo_from_shipping_except_to_close(self, cr, uid, *a, **b):
+        cr.execute("update sale_order set state='done' where state='shipping_except' and procurement_request='f'")
+        self._logger.warn('FO from shipping_except do done: %d' % (cr.rowcount,))
+        return True
+
     # UF9.1
     def change_xml_payment_method(self, cr, uid, *a, **b):
         user_obj = self.pool.get('res.users')
 
=== modified file 'bin/addons/sync_client/special_handling.py'
--- bin/addons/sync_client/special_handling.py	2017-10-02 15:51:29 +0000
+++ bin/addons/sync_client/special_handling.py	2018-08-17 12:02:47 +0000
@@ -165,6 +165,7 @@
         # US 1214: HQ closed tolerate update under certains conditions only
         # 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
         # http://jira.unifield.org/browse/US-1214?focusedCommentId=47237&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-47237
+        # US-4963: allow changes on employee_id
 
         # => get field by field diff
         fields_to_check = [
@@ -175,7 +176,6 @@
             ('debit', 'float'),
             ('debit_currency', 'float'),
             ('document_date', False),
-            ('employee_id', 'id'),
             ('journal_id', 'id'),
             ('move_id', 'id'),
             ('partner_id', 'id'),