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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2018-11-20 11:14:57 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-01-07 13:53:45 +0000
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+        <!-- UF11.1 -->
+        <record id="us_5425_reset_amount_currency" model="patch.scripts">
+            <field name="method">us_5425_reset_amount_currency</field>
+        </record>
+
         <!-- UF11.0 -->
         <record id="us_5356_reset_ud_prod" model="patch.scripts">
             <field name="method">us_5356_reset_ud_prod</field>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2018-11-20 11:14:57 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-01-07 13:53:45 +0000
@@ -51,6 +51,23 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF11.1
+    def us_5425_reset_amount_currency(self, cr, uid, *a, **b):
+        """
+        Sets to zero the JI "amount_currency" which wrongly have a value
+        Note: it fixes only the reval and FX entries where we forced the booking values to be exactly 0.00
+        """
+        update_ji_booking = """
+                    UPDATE account_move_line
+                    SET amount_currency = 0.0
+                    WHERE (debit_currency = 0.0 OR debit_currency IS NULL) 
+                    AND (credit_currency = 0.0 OR credit_currency IS NULL) 
+                    AND (amount_currency != 0.0 AND amount_currency IS NOT NULL)
+                    AND journal_id IN (SELECT id FROM account_journal WHERE type IN ('cur_adj', 'revaluation'));
+                """
+        cr.execute(update_ji_booking)
+        self._logger.warn('amount_currency reset in %s JI.' % (cr.rowcount,))
+
     # UF11.0
     def us_5356_reset_ud_prod(self, cr, uid, *a, **b):
         instance_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id

=== modified file 'bin/addons/res_currency_functional/account_move_line_compute_currency.py'
--- bin/addons/res_currency_functional/account_move_line_compute_currency.py	2018-09-19 09:18:26 +0000
+++ bin/addons/res_currency_functional/account_move_line_compute_currency.py	2019-01-07 13:53:45 +0000
@@ -601,7 +601,7 @@
         # or if it's a revaluation line (US-1682)
         if vals.get('is_addendum_line', False) or \
                 (context.get('sync_update_execution', False) and 'is_revaluated_ok' in newvals and newvals['is_revaluated_ok']):
-            newvals.update({'debit_currency': 0.0, 'credit_currency': 0.0})
+            newvals.update({'debit_currency': 0.0, 'credit_currency': 0.0, 'amount_currency': 0.0})
         return newvals
 
     def create(self, cr, uid, vals, context=None, check=True):

=== modified file 'bin/addons/res_currency_functional/account_move_line_view.xml'
--- bin/addons/res_currency_functional/account_move_line_view.xml	2018-09-20 07:55:18 +0000
+++ bin/addons/res_currency_functional/account_move_line_view.xml	2019-01-07 13:53:45 +0000
@@ -69,6 +69,7 @@
                         <field name="invoice" invisible="1"/>
                         <field name="purchase_order_id" invisible="1"/>
                         <field name="cheque_number" invisible="1"/>
+                        <field name="amount_currency" invisible="1"/>
                     </group>
 
                     <group col="6" colspan="4">