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

[jftempo]

=== modified file 'bin/addons/account_reconciliation/account_move_line.py'
--- bin/addons/account_reconciliation/account_move_line.py	2016-09-16 08:46:29 +0000
+++ bin/addons/account_reconciliation/account_move_line.py	2016-10-06 07:22:07 +0000
@@ -282,10 +282,12 @@
 
         # US-533: date of JI reconciliation for total reconciliation linked
         # with above (4, 0)
-        # US-1682: trigger FXA computation
-        self.pool.get('account.move.line').write(cr, uid, ids, {
-                'reconcile_date': time.strftime('%Y-%m-%d'),
-            }, context=context)
+        # bypass orm methods: for specific lines:
+        #  - US-1766 FXA AJI should not be recomputed
+        #  - US-1682 yealry REV JI have a dedicated rate
+        cr.execute('update account_move_line set reconcile_date=%s where id in %s',
+            (time.strftime('%Y-%m-%d'), tuple(ids))
+        )
 
         # UF-2011: synchronize move lines (not "marked" after reconcile creation)
         if self.pool.get('sync.client.orm_extended'):
 
=== modified file 'bin/addons/analytic_distribution/account_move_line.py'
--- bin/addons/analytic_distribution/account_move_line.py	2016-09-21 15:55:54 +0000
+++ bin/addons/analytic_distribution/account_move_line.py	2016-10-06 07:22:07 +0000
@@ -146,6 +146,7 @@
             'is_revaluated_ok',
             'debit',
             'credit',
+            'is_addendum_line',
         ]
 
         for obj_line in self.read(cr, uid, ids, obj_fields, context=context):
@@ -203,11 +204,19 @@
                             aji_greater_amount['is'] = True
                         else:
                             aji_greater_amount['is'] = False
+                        analytic_currency_id = obj_line.get('currency_id', [False])[0]
+                        amount_aji_book = -1 * anal_amount_rounded
                         # functional amount
                         if obj_line.get('is_revaluated_ok'):
                             # (US-1682) if it's a revaluation line get the functional amount directly from the JI
                             # to avoid slight differences between JI and AJI amounts caused by computation
                             amount_aji_fctal = -1 * distrib_line.percentage * amount_ji_fctal / 100
+                        elif obj_line.get('is_addendum_line'):
+                            # US-1766: AJIs linked to FXA entry should have fct amount = booking amount
+                            # and book currency = fct currency
+                            analytic_currency_id = company_currency
+                            amount_aji_fctal = -1 * distrib_line.percentage * amount_ji_fctal / 100
+                            amount_aji_book = -1 * distrib_line.percentage * amount_ji_fctal / 100
                         else:
                             amount_aji_fctal = -1 * self.pool.get('res.currency').compute(
                                     cr, uid, obj_line.get('currency_id', [False])[0], company_currency, anal_amount,
@@ -218,13 +227,13 @@
                              'ref': obj_line.get('ref', False),
                              'journal_id': journal.get('analytic_journal_id', [False])[0],
                              'amount': amount_aji_fctal,
-                             'amount_currency': -1 * anal_amount_rounded,  # booking amount
+                             'amount_currency': amount_aji_book,  # booking amount
                              'account_id': distrib_line.analytic_id.id,
                              'general_account_id': account.get('id'),
                              'move_id': obj_line.get('id'),
                              'distribution_id': distrib_obj.id,
                              'user_id': uid,
-                             'currency_id': obj_line.get('currency_id', [False])[0],
+                             'currency_id': analytic_currency_id,
                              'distrib_line_id': '%s,%s'%(distrib_line._name, distrib_line.id),
                              'document_date': obj_line.get('document_date', False),
                              'source_date': obj_line.get('source_date', False) or obj_line.get('date', False),  # UFTP-361 source_date from date if not any (posting date)
 
=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2016-08-26 15:48:03 +0000
+++ bin/addons/base/res/res_user.py	2016-10-06 07:22:07 +0000
@@ -129,6 +129,10 @@
         cr.execute('select company_id, res_company.name from res_users left join res_company on res_company.id = company_id where res_users.id=%s' %uid)
         return cr.fetchall()
 
+    def get_company_currency_id(self, cr, uid):
+        user = self.browse(cr, uid, uid, fields_to_fetch=['company_id'])
+        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.id or False
+
     def send_welcome_email(self, cr, uid, id, context=None):
         logger= netsvc.Logger()
         user = self.pool.get('res.users').read(cr, uid, id, context=context)
 
=== modified file 'bin/addons/msf_instance/add_instance.py'
--- bin/addons/msf_instance/add_instance.py	2016-08-23 12:54:03 +0000
+++ bin/addons/msf_instance/add_instance.py	2016-10-06 07:22:07 +0000
@@ -262,16 +262,26 @@
 
     def create(self, cr, uid, vals, context=None):
         if 'journal_id' in vals:
-            journal = self.pool.get('account.analytic.journal').read(cr, uid, vals['journal_id'], ['instance_id'], context=context)
+            journal = self.pool.get('account.analytic.journal').read(cr, uid, vals['journal_id'], ['instance_id', 'type'], context=context)
             vals['instance_id'] = journal.get('instance_id')[0]
+            # US-1766: in pipe FXA sync update: force currency
+            if journal['type'] == 'cur_adj':
+                currency = self.pool.get('res.users').get_company_currency_id(cr, uid)
+                if currency:
+                    vals['currency_id'] = currency
         return super(account_analytic_line, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
         if 'journal_id' in vals:
-            journal = self.pool.get('account.analytic.journal').read(cr, uid, vals['journal_id'], ['instance_id'], context=context)
+            journal = self.pool.get('account.analytic.journal').read(cr, uid, vals['journal_id'], ['instance_id', 'type'], context=context)
             vals['instance_id'] = journal.get('instance_id')[0]
+            # US-1766: in pipe FXA sync update: force currency
+            if journal['type'] == 'cur_adj':
+                currency = self.pool.get('res.users').get_company_currency_id(cr, uid)
+                if currency:
+                    vals['currency_id'] = currency
         return super(account_analytic_line, self).write(cr, uid, ids, vals, context=context)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-09-26 10:03:42 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-10-06 07:22:07 +0000
@@ -107,5 +107,8 @@
             <field name="method">us_1732_sync_state_ud</field>
         </record>
 
+        <record id="us_1766_fix_fxa_aji_curr" model="patch.scripts">
+            <field name="method">us_1766_fix_fxa_aji_curr</field>
+        </record>
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-09-27 08:48:13 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-10-06 07:22:07 +0000
@@ -865,6 +865,32 @@
                         SELECT id FROM product_product WHERE state_ud IS NOT NULL
             )""")
 
+    def us_1766_fix_fxa_aji_curr(self, cr, uid, *a, **b):
+        """
+        Fix FXA AJIs:
+            - set book currency = fct currency
+            - set book amount = fct amount
+        """
+        context = {}
+        logger = logging.getLogger('fix_us_1766')
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        currency_id = user.company_id.currency_id and user.company_id.currency_id.id or False
+
+        if currency_id:
+            journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'cur_adj'), ('active', 'in', ['t', 'f'])])
+            if journal_ids:
+                cr.execute("""select entry_sequence from account_analytic_line
+                    where journal_id in %s and
+                    currency_id != %s """, (tuple(journal_ids), currency_id))
+                all_seq = [x[0] for x in cr.fetchall()]
+                logger.warn('Fix %d FXA AJIs: %s' % (len(all_seq), ','.join(all_seq)))
+                cr.execute("""update account_analytic_line set
+                    currency_id = %s,
+                    amount = amount_currency
+                    where journal_id in %s and
+                    currency_id != %s""", (currency_id, tuple(journal_ids), currency_id))
+
+
 patch_scripts()
 
 
 
=== modified file 'bin/addons/res_currency_functional/account_move_line_compute_currency.py'
--- bin/addons/res_currency_functional/account_move_line_compute_currency.py	2016-09-29 16:26:19 +0000
+++ bin/addons/res_currency_functional/account_move_line_compute_currency.py	2016-10-06 07:22:07 +0000
@@ -330,7 +330,7 @@
                         cr.execute(sql, [0.0, 0.0, 0.0, partner_db or 0.0, partner_cr or 0.0, tuple([o.id])])
                     # Update analytic lines
                     analytic_line_ids = al_obj.search(cr, uid, [('move_id', 'in', other_line_ids)], context=context)
-                    al_obj.write(cr, uid, analytic_line_ids, {'amount': -1*total, 'amount_currency': -1*total,}, context=context)
+                    al_obj.write(cr, uid, analytic_line_ids, {'amount': -1*total, 'amount_currency': -1*total, 'currency_id': al.functional_currency_id.id}, context=context)
                     # Update Addendum line that's not reconciled
                     addendum_counterpart_ids = self.search(cr, uid, [('move_id', '=', al.move_id.id), ('id', '!=', al.id), ('is_addendum_line', '=', True)])
                     if not addendum_counterpart_ids:
@@ -367,8 +367,20 @@
                         from_another_instance = True
                     if multi_instance and (from_sync or from_another_instance):
                         continue
+
+
+                    # create_addendum_line: we need a context (if currency_table is used by yearly reval US-1682)
+                    # but this context should not contain any sync value or FXA JI/AJI is not well created in some use case
+                    # for example: create func. unbalanced entries at proj, sync to coordo and reconcile at coordo
+                    # when reconcilation is received at project, FXA entries should be created (UF-2501)
+                    new_ctx = context.copy()
+                    for sync_context_key in ('sync_update_execution', 'do_not_create_analytic_line', 'update_mode'):
+                        if new_ctx.get(sync_context_key):
+                            del new_ctx[sync_context_key]
+
+
                     # If no exception, do main process about new addendum lines
-                    partner_line_id = self.create_addendum_line(cr, uid, reconciled_line_ids, total, context=context)
+                    partner_line_id = self.create_addendum_line(cr, uid, reconciled_line_ids, total, context=new_ctx)
                     if partner_line_id:
                         # Add it to reconciliation (same that other lines)
                         reconcile_txt = ''
 
=== modified file 'bin/addons/sync_client/update.py'
--- bin/addons/sync_client/update.py	2016-09-26 09:43:26 +0000
+++ bin/addons/sync_client/update.py	2016-10-06 07:22:07 +0000
@@ -311,9 +311,6 @@
         'editable' : fields.boolean("Set editable"),
     }
 
-    _defaults = {
-        'log_first_notrun': '',
-    }
     line_error_re = re.compile(r"^Line\s+(\d+)\s*:\s*(.+)", re.S)
 
     _logger = logging.getLogger('sync.client')