Merge lp:~unifield-team/unifield-server/us-1251 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_currency_revaluation/account.py'
--- bin/addons/msf_currency_revaluation/account.py	2014-11-12 14:31:29 +0000
+++ bin/addons/msf_currency_revaluation/account.py	2016-04-28 14:54:24 +0000
@@ -66,17 +66,22 @@
             'balance': "COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance",
             'debit': "COALESCE(SUM(l.debit), 0) as debit",
             'credit': "COALESCE(SUM(l.credit), 0) as credit",
-            'foreign_balance': "COALESCE(SUM(l.amount_currency), 0) as foreign_balance"}
+            # US-1251: booking balance mapping: use directly booking balance vs JI amount_currency as we have discrepedencies
+            'foreign_balance': "COALESCE(SUM(l.debit_currency),0) - COALESCE(SUM(l.credit_currency), 0) as foreign_balance"
+            #'foreign_balance': "COALESCE(SUM(l.amount_currency), 0) as foreign_balance"
+    }
 
     def _revaluation_query(self, cr, uid, ids, revaluation_date, context=None):
         query = ("SELECT l.account_id as id, l.currency_id, " +
                    ', '.join(self._sql_mapping.values()) +
-                   " FROM account_move_line l "
-                   " WHERE l.account_id IN %(account_ids)s AND "
-                   " l.date <= %(revaluation_date)s AND "
-                   " l.currency_id IS NOT NULL AND "
-                   " l.reconcile_id IS NULL AND "
-                   " l.state <> 'draft' "
+                   " FROM account_move_line l"
+                   " inner join account_period p on p.id = l.period_id"
+                   " WHERE l.account_id IN %(account_ids)s AND"
+                   " l.date <= %(revaluation_date)s AND"
+                   " l.currency_id IS NOT NULL AND"
+                   " l.reconcile_id IS NULL AND"
+                   " l.state <> 'draft' AND"
+                   " p.number != 0"  # US-1251 exclude IB entries period 0 for monthly and yearly
                    " GROUP BY l.account_id, l.currency_id")
         params = {'revaluation_date': revaluation_date,
                   'account_ids': tuple(ids)}
 
=== modified file 'bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py'
--- bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py	2016-02-25 10:12:25 +0000
+++ bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py	2016-04-28 14:54:24 +0000
@@ -635,7 +635,8 @@
                   "Please check 'Included in revaluation' "
                   "for at least one account in account form."))
 
-        special_period_ids = [p.id for p in form.fiscalyear_id.period_ids if p.special == True]
+        special_period_ids = [ p.id for p in form.fiscalyear_id.period_ids \
+            if p.special == True and p.number != 0 ]
         if not special_period_ids:
             raise osv.except_osv(_('Error!'),
                                  _('No special period found for the fiscalyear %s') %
@@ -651,9 +652,10 @@
                 )
             period_ids = [form.period_id.id]
         else:
+            # NOTE: US-1251 exclude IB entries period 0 for monthly and yearly
             period_ids = []
             for period in form.fiscalyear_id.period_ids:
-                if period.number < 13:
+                if 0 < period.number < 13:
                     period_ids.append(period.id)
         if not period_ids:
             raise osv.except_osv(
@@ -663,7 +665,7 @@
         # Check periods state
         periods_not_field_closed = []
         for period in period_obj.browse(cr, uid, period_ids, context=context):
-            if period.state in ['created', 'draft']:
+            if period.number != 0 and period.state in ['created', 'draft']:
                 periods_not_field_closed.append(period.name)
 
         # check if revaluation has already been run for this period