Merge lp:~unifield-team/unifield-wm/uf-2246 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/uf-2246]

1901. By Olivier DOSSMANN on 2014-01-16

UF-2246 [DEL] Useless code that was disrupting behaviour we should have

The solution to substract reval lines was wrong because the computation is wrong with the booking balance.

Some missing values disrupt the booking balance computation: revaluation lines are not OK. This will be fixed in a next commit.

1902. By Olivier DOSSMANN on 2014-01-16

UF-2246 [FIX] Booking balance computation is wrong because of wrong amount_currency in revaluation lines.

They should be set to 0.0 as debit_currency and credit_currency fields to permit OpenERP to compute in the right way the booking balance.

1903. By Olivier DOSSMANN on 2014-01-16

UF-2246 [FIX] Do not use msf_chart_of_account dependancy on msf_currency_revaluation module.

Unmerged revisions

1903. By Olivier DOSSMANN on 2014-01-16

UF-2246 [FIX] Do not use msf_chart_of_account dependancy on msf_currency_revaluation module.

1902. By Olivier DOSSMANN on 2014-01-16

UF-2246 [FIX] Booking balance computation is wrong because of wrong amount_currency in revaluation lines.

They should be set to 0.0 as debit_currency and credit_currency fields to permit OpenERP to compute in the right way the booking balance.

1901. By Olivier DOSSMANN on 2014-01-16

UF-2246 [DEL] Useless code that was disrupting behaviour we should have

The solution to substract reval lines was wrong because the computation is wrong with the booking balance.

Some missing values disrupt the booking balance computation: revaluation lines are not OK. This will be fixed in a next commit.

=== modified file 'account_corrections/account_move_line.py'
--- account_corrections/account_move_line.py	2013-12-09 10:47:09 +0000
+++ account_corrections/account_move_line.py	2014-01-16 13:10:58 +0000
@@ -94,6 +94,9 @@
             # False if the account is used in a cash/bank/cheque journal
             if ml.account_id.id in account_ids:
                 res[ml.id] = False
+            # False if this line is a revaluation
+            if ml.journal_id.type == 'revaluation':
+                res[ml.id] = False
         return res
 
     _columns = {

=== modified file 'account_journal/account_journal.py'
--- account_journal/account_journal.py	2013-11-26 15:51:50 +0000
+++ account_journal/account_journal.py	2014-01-16 13:10:58 +0000
@@ -71,6 +71,7 @@
                 ('situation', 'Opening/Closing Situation'),
                 ('purchase', 'Purchase'),
                 ('purchase_refund','Purchase Refund'),
+                ('revaluation', 'Revaluation'),
                 ('sale', 'Sale'),
                 ('sale_refund','Sale Refund'),
                 ('stock', 'Stock'),

=== modified file 'account_journal/project/project.py'
--- account_journal/project/project.py	2013-11-12 14:33:35 +0000
+++ account_journal/project/project.py	2014-01-16 13:10:58 +0000
@@ -48,6 +48,7 @@
             ('migration', 'Migration'),
             ('extra', 'OD-Extra Accounting'),
             ('purchase','Purchase'),
+            ('revaluation', 'Revaluation'),
             ('sale','Sale'),
             ('situation','Situation'),
         ]

=== modified file 'analytic_distribution/wizard/mass_reallocation_wizard.py'
--- analytic_distribution/wizard/mass_reallocation_wizard.py	2013-11-27 15:35:21 +0000
+++ analytic_distribution/wizard/mass_reallocation_wizard.py	2014-01-16 13:10:58 +0000
@@ -178,7 +178,7 @@
                 ('id', 'in', context.get('active_ids')), '|', '|', '|', '|', '|', '|',
                 ('commitment_line_id', '!=', False), ('is_reallocated', '=', True),
                 ('is_reversal', '=', True),
-                ('journal_id.type', '=', 'engagement'),
+                ('journal_id.type', 'in', ['engagement', 'revaluation']),
                 ('from_write_off', '=', True),
                 ('move_state', '=', 'draft'),
                 ('account_id.category', 'in', ['FREE1', 'FREE2'])

=== modified file 'msf_chart_of_account/data/journal_data.xml'
--- msf_chart_of_account/data/journal_data.xml	2013-10-25 11:39:40 +0000
+++ msf_chart_of_account/data/journal_data.xml	2014-01-16 13:10:58 +0000
@@ -266,5 +266,17 @@
             <field name="type">migration</field>
             <field name="analytic_journal_id" ref="account_journal.analytic_migration_journal"/>
         </record>
+
+        <record id="account_journal.analytic_currency_revaluation" model="account.analytic.journal">
+            <field name="name">Revaluation</field>
+            <field name="code">REVAL</field>
+            <field name="type">revaluation</field>
+        </record>
+        <record id="account_journal.currency_revaluation" model="account.journal">
+            <field name="name">Revaluation</field>
+            <field name="code">REVAL</field>
+            <field name="type">revaluation</field>
+            <field name="analytic_journal_id" ref="account_journal.analytic_currency_revaluation"/>
+        </record>
     </data>
 </openerp>

=== added directory 'msf_currency_revaluation'
=== added file 'msf_currency_revaluation/__init__.py'
--- msf_currency_revaluation/__init__.py	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/__init__.py	2014-01-16 13:10:58 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import account
+from . import res_currency
+from . import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'msf_currency_revaluation/__openerp__.py'
--- msf_currency_revaluation/__openerp__.py	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/__openerp__.py	2014-01-16 13:10:58 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2012 Camptocamp SA
+
+#    Author: Sebastien Alix
+#    Copyright 2013 TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{"name": "Unrealized currency gain & loss",
+ "version": "6.0",
+ "category": "Finance",
+ "description": """
+NOTE: Module 'account_unrealized_currency_gain_loss' ported from OpenERP 6.1
+and adapted to UniField.
+
+Add a wizard to generate the unrealized currency gain & loss entries. This adjusts accounts' balance of account with a foreign currency.
+
+To configure it, Foreign currency gain & loss account have been added in company parameters.
+
+For UK (Revaluation) :
+                        LOSS  GAIN
+- Revaluation account   [x]  [x]
+- Provision B.S account  [ ]  [ ]
+- Provision P&L account  [ ]  [ ]
+
+For CH (Provision) :
+                        LOSS  GAIN
+- Revaluation account   [ ]  [ ]
+- Provision B.S account  [x]  [ ]
+- Provision P&L account  [x]  [ ]
+
+For FR
+                        LOSS  GAIN
+- Revaluation account   [x]  [x]
+- Provision B.S account  [x]  [ ]
+- Provision P&L account  [x]  [ ]
+
+""",
+
+    "author": "Camptocamp, TeMPO Consulting",
+    "license": 'AGPL-3',
+    "depends": ["base",
+                "account",
+            ],
+    "init_xml": [
+                 #"res_currency_view.xml",
+                 "account_view.xml",
+                 "wizard/wizard_currency_revaluation_view.xml"],
+    "update_xml": [],
+    #"test": ["test/currency_revaluation.yml"],
+    "demo_xml": [],
+    "installable": True,
+    "active": False,
+#    'certificate': 'certificate',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'msf_currency_revaluation/account.py'
--- msf_currency_revaluation/account.py	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/account.py	2014-01-16 13:10:58 +0000
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher, Guewen Baconnier
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class account_move_line(osv.osv):
+
+    _inherit = 'account.move.line'
+    _columns = {
+        # [account_unrealized_currency_gain_loss module]
+        #  By convention added columns stats with gl_.
+        'gl_foreign_balance': fields.float('Aggregated Amount curency'),
+        'gl_balance': fields.float('Aggregated Amount'),
+        'gl_revaluated_balance': fields.float('Revaluated Amount'),
+        'gl_currency_rate': fields.float('Currency rate'),
+        # [/account_unrealized_currency_gain_loss module]
+        'is_revaluated_ok': fields.boolean(
+            _("Revaluation line"), readonly=True),
+    }
+
+    _defaults = {
+        'is_revaluated_ok': False,
+    }
+
+account_move_line()
+
+
+class account_account(osv.osv):
+
+    _inherit = 'account.account'
+
+    _columns = {
+        'currency_revaluation': fields.boolean(
+            string=_("Included in revaluation?")),
+        'user_type_code': fields.related(
+            'user_type', 'code',
+            type='char', string=_(u"Type (code)")),
+        'instance_level': fields.related(
+            'company_id', 'instance_id', 'level',
+            type='char', string=_(u"Instance level")),
+    }
+
+    _defaults = {'currency_revaluation': False}
+
+    _sql_mapping = {
+            '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"}
+
+    def _revaluation_query(self, cr, uid, ids, revaluation_date, context=None):
+        lines_where_clause = self.pool.get('account.move.line').\
+            _query_get(cr, uid, context=context)
+        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 "
+                        + lines_where_clause +
+                   " GROUP BY l.account_id, l.currency_id")
+        params = {'revaluation_date': revaluation_date,
+                  'account_ids': tuple(ids)}
+        return query, params
+
+    def compute_revaluations(
+            self, cr, uid, ids, period_ids, fiscalyear_id,
+            revaluation_date, revaluation_method, context=None):
+        if context is None:
+            context = {}
+        accounts = {}
+
+        # Compute for each account the balance/debit/credit from the move lines
+        ctx_query = context.copy()
+        ctx_query['periods'] = period_ids
+        ctx_query['fiscalyear'] = fiscalyear_id
+        query, params = self._revaluation_query(
+            cr, uid, ids,
+            revaluation_date,
+            context=ctx_query)
+        cr.execute(query, params)
+        lines = cr.dictfetchall()
+        for line in lines:
+            # generate a tree
+            # - account_id
+            # -- currency_id
+            # ----- balances
+            account_id, currency_id = line['id'], line['currency_id']
+            accounts.setdefault(account_id, {})
+            accounts[account_id].setdefault(currency_id, {})
+            accounts[account_id][currency_id] = line
+
+        # Compute for each account the initial balance/debit/credit from the
+        # move lines and add it to the previous result
+        if revaluation_method == 'liquidity_month':
+            ctx_query = context.copy()
+            ctx_query['periods'] = period_ids
+            ctx_query['fiscalyear'] = fiscalyear_id
+            ctx_query['initial_bal'] = True
+            query, params = self._revaluation_query(
+                cr, uid, ids,
+                revaluation_date,
+                context=ctx_query)
+            cr.execute(query, params)
+            lines = cr.dictfetchall()
+            for line in lines:
+                # generate a tree
+                # - account_id
+                # -- currency_id
+                # ----- balances
+                account_id, currency_id = line['id'], line['currency_id']
+                accounts.setdefault(account_id, {})
+                accounts[account_id].setdefault(
+                    currency_id,
+                    {'balance': 0, 'foreign_balance': 0, 'credit': 0, 'debit': 0})
+                accounts[account_id][currency_id]['balance'] += line['balance']
+                accounts[account_id][currency_id]['foreign_balance'] += line['foreign_balance']
+                accounts[account_id][currency_id]['credit'] += line['credit']
+                accounts[account_id][currency_id]['debit'] += line['debit']
+
+        return accounts
+
+account_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'msf_currency_revaluation/account_view.xml'
--- msf_currency_revaluation/account_view.xml	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/account_view.xml	2014-01-16 13:10:58 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_form_inherit" model="ir.ui.view">
+            <field name="name">account.account.form</field>
+            <field name="model">account.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook" position="inside">
+                    <page string="Currency Revaluation" attrs="{'invisible': [('instance_level', '!=', 'section')]}">
+                        <field name="instance_level" invisible="1"/>
+                        <field name="currency_revaluation"
+                            attrs="{'readonly': [('user_type_code', 'not in', ['receivables', 'payables', 'cash', 'asset', 'stock'])]}"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'msf_currency_revaluation/i18n'
=== added file 'msf_currency_revaluation/res_currency.py'
--- msf_currency_revaluation/res_currency.py	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/res_currency.py	2014-01-16 13:10:58 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+
+from osv import osv
+from tools.translate import _
+
+
+class res_currency(osv.osv):
+
+    _inherit = 'res.currency'
+
+    def _get_conversion_rate(self, cr, uid, from_currency,
+                             to_currency, context=None):
+        if context is None:
+            context = {}
+        if 'revaluation' in context:
+            currency = self.browse(cr, uid, from_currency.id, context=context)
+            rate = currency.rate
+            if rate == 0.0:
+                date = context.get('date', time.strftime('%Y-%m-%d'))
+                raise osv.except_osv(_('Error'),
+                                     _('No rate found \n'
+                                       'for the currency: %s \n'
+                                       'at the date: %s') %
+                                     (currency.symbol, date))
+            return 1.0 / rate
+
+        else:
+            return super(res_currency, self)._get_conversion_rate(
+                cr, uid, from_currency, to_currency, context=context)
+
+res_currency()

=== added file 'msf_currency_revaluation/res_currency_view.xml'
--- msf_currency_revaluation/res_currency_view.xml	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/res_currency_view.xml	2014-01-16 13:10:58 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_currency_form_inherit" model="ir.ui.view">
+            <field name="name">res.currency.form</field>
+            <field name="model">res.currency</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_currency_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//form[@string='Rates']/field[@name='rate']" position="after">
+                    <field name="currency_rate_type_id"/>
+                </xpath>
+                 <xpath expr="//tree[@string='Rates']/field[@name='rate']" position="after">
+                    <field name="currency_rate_type_id"/>
+                </xpath>
+            </field>
+        </record>
+
+
+    </data>
+</openerp>

=== added directory 'msf_currency_revaluation/security'
=== added directory 'msf_currency_revaluation/test'
=== added file 'msf_currency_revaluation/test/currency_revaluation.yml'
--- msf_currency_revaluation/test/currency_revaluation.yml	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/test/currency_revaluation.yml	2014-01-16 13:10:58 +0000
@@ -0,0 +1,321 @@
+-
+  In order to test the currency revaluation wizard
+    I will set all 6 provision account
+    And set 2 new currencies
+      currency1 with an old rate and a new rate that will make loss
+      currency2 with an old rate and a new rate that will make profit
+    Then I define an account with currency1 with a starting amount
+    Then I create a move to increase balance of account1
+    Then I define an account with currency2 with a starting amount
+    Then I create a move to increase balance of account2
+    Then I launch the revaluation wizard
+    Then I check 8 entries have been correctly created
+-
+  I create 6 provision accounts
+-
+  !record {model: account.account, id: acc_reval_loss}:
+    name: "Reval Loss"
+    code: "XR001"
+    #company_id: default
+    type: "other"
+    user_type: !ref {model: account.account.type,
+                     search: "[('code', '=', 'asset'), ('close_method', '=', 'balance')]"}
+-
+  !record {model: account.account, id: acc_reval_gain}:
+    name: "Reval Gain"
+    code: "XR002"
+    #company_id: default
+    type: "other"
+    user_type: !ref {model: account.account.type,
+                     search: "[('code', '=', 'asset'), ('close_method', '=', 'balance')]"}
+-
+  !record {model: account.account, id: acc_prov_bs_loss}:
+    name: "Prov B.S Loss"
+    code: "XPBS001"
+    #company_id: default
+    type: "other"
+    user_type: !ref {model: account.account.type,
+                     search: "[('code', '=', 'asset'), ('close_method', '=', 'balance')]"}
+-
+  !record {model: account.account, id: acc_prov_bs_gain}:
+    name: "Prov B.S Gain"
+    code: "XPBS002"
+    #company_id: default
+    type: "other"
+    user_type: !ref {model: account.account.type,
+                     search: "[('code', '=', 'asset'), ('close_method', '=', 'balance')]"}
+-
+  !record {model: account.account, id: acc_prov_pl_loss}:
+    name: "Prov P&L Loss"
+    code: "XPPL001"
+    #company_id: default
+    type: "other"
+    user_type: !ref {model: account.account.type,
+                     search: "[('code', '=', 'asset'), ('close_method', '=', 'balance')]"}
+-
+  !record {model: account.account, id: acc_prov_pl_gain}:
+    name: "Prov P&L Gain"
+    code: "XPPL002"
+    #company_id: default
+    type: "other"
+    user_type: !ref {model: account.account.type,
+                     search: "[('code', '=', 'asset'), ('close_method', '=', 'balance')]"}
+
+-
+  I set the 6 provision account in company
+-
+  !python {model: res.company}: |
+    #select first company
+    cp_id = self.search(cr, uid, [], limit=1)[0]
+
+    data_accounts = {'revaluation_loss_account_id': ref('acc_reval_loss'),
+                     'revaluation_gain_account_id': ref('acc_reval_gain'),
+                     'provision_bs_loss_account_id': ref('acc_prov_bs_loss'),
+                     'provision_bs_gain_account_id': ref('acc_prov_bs_gain'),
+                     'provision_pl_loss_account_id': ref('acc_prov_pl_loss'),
+                     'provision_pl_gain_account_id': ref('acc_prov_pl_gain')}
+    self.write(cr, uid, cp_id, data_accounts)
+
+-
+  I create a rate type
+-
+  !record {model: res.currency.rate.type, id: rate_type1}:
+    name: "Type 1"
+
+-
+  I ensure there is an opening entry if a previous fiscalyear exists
+-
+  !python {model: account.fiscalyear}: |
+    from datetime import datetime
+
+    user_obj = self.pool.get('res.users')
+    move_obj = self.pool.get('account.move')
+    move_line_obj = self.pool.get('account.move.line')
+    journal_obj = self.pool.get('account.journal')
+    period_obj = self.pool.get('account.period')
+    cp = user_obj.browse(cr, uid, uid).company_id
+
+    my_date = '%s-01-01' %(datetime.now().year)
+
+    previous_fy = self.search(cr, uid,
+                              [('date_stop', '<', my_date),
+                               ('company_id', '=', cp.id)],
+                              limit=1,
+                              context=context)
+
+    if previous_fy:
+
+       journal_ids = journal_obj.search(cr, uid,
+                                        [('type', '=', 'situation')],
+                                        limit=1)
+       current_fy_id = self.search(cr, uid,
+                                [('date_start', '<=', my_date),
+                                 ('date_stop', '>=', my_date),
+                                 ('company_id', '=', cp.id)],
+                                limit=1,
+                                context=context)[0]
+       current_fy = self.browse(cr, uid, current_fy_id)
+       period_id = [p.id for p in current_fy.period_ids if p.special == True][0]
+
+       # Create an entry
+       move_data = {'name': "Opening entry",
+                    'journal_id': journal_ids[0],
+                    'period_id': period_id,
+                    'date': my_date}
+       move_id = move_obj.create(cr, uid, move_data, context=context)
+
+
+-
+  I set a default rate of our type for all currency to ensure all account will pass
+-
+  !python {model: res.currency}: |
+    rate_obj = self.pool.get('res.currency.rate')
+    currency_ids = self.search(cr, uid, [])
+    currencies = self.browse(cr, uid, currency_ids)
+    for cur in currencies:
+      rate_data = {'name': "2010-01-01",
+                   'rate': cur.rate,
+                   'currency_id': cur.id,
+                   'currency_rate_type_id': ref('rate_type1')}
+      rate_obj.create(cr, uid, rate_data)
+
+-
+  I create 2 foreign currencies
+-
+  !record {model: res.currency, id: currency1}:
+    name: "Florin"
+    symbol: "fl"
+    rate_ids:
+    - name: !eval "'%s-01-01' %(datetime.now().year)"
+      rate: 100
+      currency_rate_type_id: rate_type1
+    - name: !eval "'%s-01-11' %(datetime.now().year)"
+      rate: 50
+      currency_rate_type_id: rate_type1
+-
+  !record {model: res.currency, id: currency2}:
+    name: "Sesterce"
+    symbol: "HS"
+    rate_ids:
+    - name: !eval "'%s-01-01' %(datetime.now().year)"
+      rate: 2
+      currency_rate_type_id: rate_type1
+    - name: !eval "'%s-01-11' %(datetime.now().year)"
+      rate: 4
+      currency_rate_type_id: rate_type1
+
+-
+  I define a 2 accounts
+-
+  !record {model: account.account, id: wiz_test_acc1}:
+    name: "Account 1"
+    code: "acc1"
+    #company_id: default
+    #type: default
+    user_type: !ref {model: account.account.type,
+                     search: "[('code','=','asset'), ('close_method', '!=', 'none')]"}
+    #currency_mode: default
+    currency_id: currency1
+-
+  !record {model: account.account, id: wiz_test_acc2}:
+    name: "Account 2"
+    code: "acc2"
+    #company_id: default
+    #type: default
+    user_type: !ref {model: account.account.type,
+                     search: "[('code','=','asset'), ('close_method', '!=', 'none')]"}
+    #currency_mode: default
+    currency_id: currency2
+
+-
+  I create a journal
+-
+  !record {model: account.journal, id: wiz_general_journal}:
+    name: "A General Journal"
+    code: "GJ"
+    type: 'general'
+    view_id: !ref {model: account.journal.view,
+                   search: "[('name', '=', 'Bank/Cash Journal (Multi-Currency) View')]"}
+
+-
+  I increase balance of my 2 accounts on 1st january (using old rate)
+-
+  !record {model: account.move, id: wiz_test_move1}:
+    #name: default
+    #period_id: default
+    journal_id: !ref {model: account.journal,
+                      search: "[('type', '=', 'sale')]"}
+    state: 'posted'
+    date: !eval "'%s-01-01' %(datetime.now().year)"
+- !record {model: account.move, id: wiz_test_move2}:
+    #name: default
+    #period_id: default
+    journal_id: !ref {model: account.journal,
+                      search: "[('type', '=', 'sale')]"}
+    state: 'posted'
+    date: !eval "'%s-01-01' %(datetime.now().year)"
+
+-
+  I insert a move line in move 1
+-
+  !python {model: account.move.line}: |
+    from datetime import datetime
+    vals = {
+        'account_id': ref('wiz_test_acc1'),
+        'amount_currency': -100000.0,
+        'currency_id': ref('currency1'),
+        'credit': 1000.0,
+        'date': '%s-01-01' %(datetime.now().year),
+        'debit': 0.0,
+        'name': 'Increase balance',
+        'quantity': 0.0,
+        'move_id': ref('wiz_test_move1'),
+        'state': 'valid'
+    }
+    line_id = self.create(cr, uid, vals)
+    assert line_id, "Account move line has not been created"
+
+-
+  I insert a move line in move 2
+-
+  !python {model: account.move.line}: |
+    from datetime import datetime
+    vals = {
+        'account_id': ref('wiz_test_acc2'),
+        'amount_currency': -2000.0,
+        'currency_id': ref('currency2'),
+        'credit': 1000.0,
+        'date': '%s-01-01' %(datetime.now().year),
+        'debit': 0.0,
+        'name': 'Increase balance',
+        'quantity': 0.0,
+        'move_id': ref('wiz_test_move2'),
+        'state': 'valid'
+    }
+    line_id = self.create(cr, uid, vals)
+    assert line_id, "Account move line has not been created"
+
+-
+  I Force my 2 move lines with a state to valid
+-
+  !python {model: account.move.line}: |
+     cr.execute("UPDATE account_move_line SET state='valid' WHERE name = 'Increase balance'")
+
+-
+  Launch the computing with the currency revaluation wizard on 20 january (using new rates)
+-
+  !python {model: wizard.currency.revaluation}: |
+    from datetime import datetime
+    # Enter wizard data
+    wiz_data = {'revaluation_date': '%s-01-20' %(datetime.now().year),
+                'journal_id': ref('wiz_general_journal'),
+                'currency_type': ref('rate_type1'),
+                'label': '[%(account)s] wiz_test'}
+    wiz_id = self.create(cr, uid, wiz_data)
+    wiz = self.browse(cr, uid, wiz_id)
+    # Call wizard computing
+    result = wiz.revaluate_currency(context=context)
+    assert result, "No result returned"
+
+-
+  I check I have the 8 following entries
+
+    |---------------|--------|--------|
+
+    | Account       | debit  | credit |
+
+    |---------------|--------|--------|
+
+    | Prov P&L Loss |    0.0 | 1000.0 |
+
+    | Prov B.S Loss | 1000.0 |    0.0 |
+
+    | Reval Loss   |    0.0 | 1000.0 |
+
+    | Account 1     | 1000.0 |    0.0 |
+
+    | Prov P&L Gain |  500.0 |    0.0 |
+
+    | Prov B.S Gain |    0.0 |  500.0 |
+
+    | Reval Gain   |  500.0 |    0.0 |
+
+    | Account 2     |    0.0 |  500.0 |
+-
+  !python {model: account.move.line}: |
+     label_search = "wiz_test"
+     move_line_ids = self.search(cr, uid,
+                                 [('name', 'like', label_search)])
+     count_l = len(move_line_ids)
+     assert count_l >= 8, "Some entries are missing found only %s on 8" %count_l
+     lines = self.browse(cr, uid, move_line_ids)
+     res = [(l.name, l.account_id.id, l.debit, l.credit) for l in lines]
+     check_list = [(u'[acc1] wiz_test', ref('acc_prov_pl_loss'), 1000.0, 0.0),
+                   (u'[acc1] wiz_test', ref('acc_prov_bs_loss'), 0.0, 1000.0),
+                   (u'[acc1] wiz_test', ref('acc_reval_loss'), 1000.0, 0.0),
+                   (u'[acc1] wiz_test', ref('wiz_test_acc1'), 0.0, 1000.0),
+                   (u'[acc2] wiz_test', ref('acc_prov_pl_gain'), 0.0, 500.0),
+                   (u'[acc2] wiz_test', ref('acc_prov_bs_gain'), 500.0, 0.0),
+                   (u'[acc2] wiz_test', ref('acc_reval_gain'), 0.0, 500.0),
+                   (u'[acc2] wiz_test', ref('wiz_test_acc2'), 500.0, 0.0),]
+     assert set(check_list) <= set(res), ("Those lines are missing\n"+"\n".join([el[0] + " " + str(el[1:]) for el in list(set(check_list) - set(res))]))

=== added directory 'msf_currency_revaluation/wizard'
=== added file 'msf_currency_revaluation/wizard/__init__.py'
--- msf_currency_revaluation/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/wizard/__init__.py	2014-01-16 13:10:58 +0000
@@ -0,0 +1,1 @@
+from . import wizard_currency_revaluation

=== added file 'msf_currency_revaluation/wizard/wizard_currency_revaluation.py'
--- msf_currency_revaluation/wizard/wizard_currency_revaluation.py	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/wizard/wizard_currency_revaluation.py	2014-01-16 13:10:58 +0000
@@ -0,0 +1,863 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher, Guewen Baconnier
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+
+from dateutil.relativedelta import relativedelta
+
+from osv import osv, fields
+from tools.translate import _
+
+class WizardCurrencyrevaluation(osv.osv_memory):
+    _name = 'wizard.currency.revaluation'
+
+    _columns = {'revaluation_date': fields.date(
+                    _('Revaluation Date')),
+                'revaluation_method': fields.selection(
+                    [('liquidity_month', _("Liquidity (Month-end)")),
+                     ('liquidity_year', _("Liquidity (Year-end)")),
+                     ('other_bs', _("Other B/S (Year-end)")),
+                     ],
+                    string=_("Revaluation method"), required=True),
+                #'revaluation_year_ok': fields.boolean(
+                #    _("Year-end revaluation"),
+                #    help=_("In 'Liquidity' mode, you can choose to do a "
+                #           "year-end revaluation instead of month-end.")),
+                'fiscalyear_id': fields.many2one(
+                    'account.fiscalyear', string=_("Fiscal year"),
+                    domain=[('state', '=', 'draft')],
+                    required=True),
+                'period_id': fields.many2one(
+                    'account.period', string=_("Period"),
+                    domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', '!=', ['created'])]"),
+                'currency_table_id': fields.many2one(
+                    'res.currency.table', string=_("Currency table"),
+                    domain=[('state', '=', 'valid')]),
+                'journal_id': fields.many2one(
+                    'account.journal', string=_("Entry journal"),
+                    #domain="[('type','=','general')]",
+                    help=_("Journal used for revaluation entries."),
+                    readonly=True),
+                'result_period_id': fields.many2one(
+                    'account.period', string=_(u"Entry period"), required=True,
+                    domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', '!=', 'created')]",
+                    help=_("Period used for revaluation entries.")),
+                'posting_date': fields.date(
+                    _('Entry date'), readonly=True,
+                    help=_("Revaluation entry date (document and posting date)")),
+                'label': fields.char(
+                    'Entry description',
+                     size=100,
+                     help="This label will be inserted in entries description."
+                         " You can use %(account)s, %(currency)s"
+                         " and %(rate)s keywords.",
+                     required=True),
+    }
+
+    #def _get_default_revaluation_date(self, cr, uid, context):
+    #    """Get stop date of the fiscal year."""
+    #    if context is None:
+    #        context = {}
+    #    #period_obj = self.pool.get('account.period')
+    #    #period_id = self._get_default_result_period_id(cr, uid, context=context)
+    #    #if period_id:
+    #    #    period = period_obj.browse(cr, uid, period_id, context=context)
+    #    #    return period.date_stop
+    #    #return False
+    #    fiscalyear_obj = self.pool.get('account.fiscalyear')
+    #    fiscalyear_id = self._get_default_fiscalyear_id(cr, uid, context=context)
+    #    if fiscalyear_id:
+    #        fiscalyear = fiscalyear_obj.browse(cr, uid, fiscalyear_id, context=context)
+    #        return fiscalyear.date_stop
+    #    return False
+
+    def _get_default_fiscalyear_id(self, cr, uid, context=None):
+        """Get default fiscal year to process."""
+        if context is None:
+            context = {}
+        user_obj = self.pool.get('res.users')
+        cp = user_obj.browse(cr, uid, uid, context=context).company_id
+        current_date = datetime.date.today().strftime('%Y-%m-%d')
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        fiscalyear_ids = fiscalyear_obj.search(
+            cr, uid,
+            [('date_start', '<', current_date),
+             ('date_stop', '>', current_date),
+             ('company_id', '=', cp.id)],
+            limit=1,
+            context=context)
+        return fiscalyear_ids and fiscalyear_ids[0] or False
+
+    _defaults = {
+        'label': "%(currency)s %(account)s %(rate)s",
+        'revaluation_method': lambda *args: 'liquidity_month',
+        'fiscalyear_id': _get_default_fiscalyear_id,
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """'default_get' method overridden."""
+        res = super(WizardCurrencyrevaluation, self).default_get(
+            cr, uid, fields, context=context)
+        user_obj = self.pool.get('res.users')
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
+        journal_obj = self.pool.get('account.journal')
+        # Fiscalyear
+        cp = user_obj.browse(cr, uid, uid, context=context).company_id
+        current_date = datetime.date.today().strftime('%Y-%m-%d')
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        fiscalyear_ids = fiscalyear_obj.search(
+            cr, uid,
+            [('date_start', '<', current_date),
+             ('date_stop', '>', current_date),
+             ('company_id', '=', cp.id)],
+            limit=1,
+            context=context)
+        res['fiscalyear_id'] = fiscalyear_ids and fiscalyear_ids[0] or False
+        # Revaluation date
+        res['revaluation_date'] = False
+        if res['fiscalyear_id']:
+            fiscalyear = fiscalyear_obj.browse(
+                cr, uid, res['fiscalyear_id'], context=context)
+            res['revaluation_date'] = fiscalyear.date_stop
+        # Period
+        period_date = datetime.date.today()
+        if period_date.month > 1:
+            period_date = period_date - relativedelta(months=1)
+        # NOTE: the method 'get_period_from_date()' supplied by the
+        #       'account_tools' module is used here
+        period_ids = period_obj.get_period_from_date(
+            cr, uid, period_date.strftime('%Y-%m-%d'))
+        res['period_id'] = period_ids and period_ids[0] or False
+        # Journal
+        journal_ids = journal_obj.search(
+            cr, uid, [('code', '=', 'REVAL')], context=context)
+        if not journal_ids:
+            raise osv.except_osv(
+                _(u"Error"),
+                _(u"No revaluation journal found!"))
+        res['journal_id'] = journal_ids and journal_ids[0] or False
+        # Entry period
+        res['result_period_id'] = False
+        if res['fiscalyear_id']:
+            period_ids = period_obj.search(
+                cr, uid,
+                [('number', '=', 13),
+                 ('fiscalyear_id', '=', res['fiscalyear_id']),
+                 ('state', '!=', 'created')],
+                context=context)
+            res['result_period_id'] = period_ids and period_ids[0] or False
+        # Posting date
+        res['posting_date'] = False
+        if res['period_id']:
+            period = period_obj.browse(
+                cr, uid, res['period_id'], context=context)
+            res['posting_date'] = period.date_stop
+        return res
+
+    def on_change_revaluation_method(
+            self, cr, uid, ids, method, fiscalyear_id, period_id):
+        """'on_change' method for the 'revaluation_method', 'fiscalyear_id' and
+        'period_id' fields.
+        """
+        if not method or not fiscalyear_id:
+            return {}
+        value = {}
+        warning = {}
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
+        move_obj = self.pool.get('account.move')
+        fiscalyear = fiscalyear_obj.browse(cr, uid, fiscalyear_id)
+        # Check
+        previous_fiscalyear_ids = fiscalyear_obj.search(
+            cr, uid,
+            [('date_stop', '<', fiscalyear.date_start),
+             ('company_id', '=', fiscalyear.company_id.id)],
+            limit=1)
+        if previous_fiscalyear_ids:
+            special_period_ids = [p.id for p in fiscalyear.period_ids
+                                  if p.special == True]
+            opening_move_ids = []
+            if special_period_ids:
+                opening_move_ids = move_obj.search(
+                    cr, uid, [('period_id', '=', special_period_ids[0])])
+            if not opening_move_ids or not special_period_ids:
+                warning = {
+                    'title': _('Warning!'),
+                    'message': _('No opening entries in opening period for this fiscal year')
+                }
+        # Set values according to the user input
+        value['period_id'] = period_id
+        value['revaluation_date'] = False
+        if method == 'liquidity_month':
+            #if period_id == 'no_period' and fiscalyear_id:
+            #    # If the current fiscal year is the actual one, we get the
+            #    # previous month as the right period (except for january)
+            #    if fiscalyear_id == self._get_default_fiscalyear_id(cr, uid):
+            #        period_date = datetime.date.today()
+            #        if period_date.month > 1:
+            #            period_date = period_date - relativedelta(months=1)
+            #    # If the selected fiscal year is not the actual one, we get its
+            #    # last period
+            #    else:
+            #        period_date = datetime.datetime.strptime(
+            #            fiscalyear.date_stop, '%Y-%m-%d')
+            #    # NOTE: the method 'get_period_from_date()' supplied by the
+            #    #       'account_tools' module is used here
+            #    period_ids = period_obj.get_period_from_date(
+            #        cr, uid, period_date.strftime('%Y-%m-%d'))
+            #    period_id = period_ids and period_ids[0] or False
+            #    value['period_id'] = period_id
+            if period_id:
+                period = period_obj.browse(cr, uid, period_id)
+                value['revaluation_date'] = period.date_stop
+        else:
+            value['revaluation_date'] = fiscalyear.date_stop
+            value['posting_date'] = fiscalyear.date_stop
+            period_ids = period_obj.search(
+                cr, uid,
+                [('state', '!=', 'created'),
+                 ('fiscalyear_id', '=', fiscalyear.id),
+                 ('number', '=', 13)])
+            if period_ids:
+                value['result_period_id'] = period_ids[0]
+        res = {'value': value, 'warning': warning}
+        return res
+
+    def on_change_fiscalyear_id(self, cr, uid, ids, method, fiscalyear_id):
+        """'on_change' method for the 'fiscalyear_id' field."""
+        if not method or not fiscalyear_id:
+            return {}
+        value = {}
+        warning = {}
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
+        fiscalyear = fiscalyear_obj.browse(cr, uid, fiscalyear_id)
+        if method in ['liquidity_month', 'liquidity_year']:
+            if fiscalyear_id:
+                # If the current fiscal year is the actual one, we get the
+                # previous month as the right period (except for january)
+                if fiscalyear_id == self._get_default_fiscalyear_id(cr, uid):
+                    period_date = datetime.date.today()
+                    if period_date.month > 1:
+                        period_date = period_date - relativedelta(months=1)
+                # If the selected fiscal year is not the actual one, we get its
+                # last period
+                else:
+                    period_date = datetime.datetime.strptime(
+                        fiscalyear.date_stop, '%Y-%m-%d')
+                # NOTE: the method 'get_period_from_date()' supplied by the
+                #       'account_tools' module is used here
+                period_ids = period_obj.get_period_from_date(
+                    cr, uid, period_date.strftime('%Y-%m-%d'))
+                period_id = period_ids and period_ids[0] or False
+                value['period_id'] = period_id
+                value['result_period_id'] = period_id
+                period = period_obj.browse(cr, uid, period_id)
+                value['revaluation_date'] = period.date_stop
+                value['posting_date'] = period.date_stop
+                # Set the next period as the 'Entry period' + the entry date
+                #next_period_date = datetime.datetime.strptime(
+                #    period.date_start, '%Y-%m-%d') + relativedelta(months=1)
+                #next_period_ids = period_obj.get_period_from_date(
+                #    cr, uid, next_period_date.strftime('%Y-%m-%d'))
+                #value['result_period_id'] = \
+                #    next_period_ids and next_period_ids[0] or False
+        elif method == 'other_bs':
+            value['revaluation_date'] = fiscalyear.date_stop
+            value['posting_date'] = fiscalyear.date_stop
+            period_ids = period_obj.search(
+                cr, uid,
+                [('state', '!=', 'created'),
+                 ('fiscalyear_id', '=', fiscalyear.id),
+                 ('number', '=', 13)])
+            if period_ids:
+                value['result_period_id'] = period_ids[0]
+        res = {'value': value, 'warning': warning}
+        return res
+
+    def on_change_result_period_id(self, cr, uid, ids, result_period_id, context=None):
+        """'on_change' method for the 'result_period_id' field."""
+        if context is None:
+            context = {}
+        value = {}
+        warning = {}
+        if result_period_id:
+            period_obj = self.pool.get('account.period')
+            period = period_obj.browse(cr, uid, result_period_id, context=context)
+            value['posting_date'] = period.date_stop
+        return {'value': value, 'warning': warning}
+
+    def _compute_unrealized_currency_gl(self, cr, uid,
+                                        currency_id,
+                                        balances,
+                                        form,
+                                        context=None):
+        """
+        Update data dict with the unrealized currency gain and loss
+        plus add 'currency_rate' which is the value used for rate in
+        computation
+
+        @param int currency_id: currency to revaluate
+        @param dict balances: contains foreign balance and balance
+
+        @return: updated data for foreign balance plus rate value used
+        """
+        context = context or {}
+
+        currency_obj = self.pool.get('res.currency')
+
+        # Compute unrealized gain loss
+        ctx_rate = context.copy()
+        ctx_rate['date'] = form.revaluation_date
+        user_obj = self.pool.get('res.users')
+        cp_currency_id = user_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+
+        currency = currency_obj.browse(cr, uid, currency_id, context=ctx_rate)
+
+        foreign_balance = adjusted_balance = balances.get('foreign_balance', 0.0)
+        balance = balances.get('balance', 0.0)
+        unrealized_gain_loss =  0.0
+        # Check if reval_balance exists
+        if foreign_balance:
+            ctx_rate['revaluation'] = True
+            # Use reval_balance to fix booking balance problems
+            adjusted_balance = currency_obj.compute(
+                cr, uid, currency_id, cp_currency_id, foreign_balance,
+                context=ctx_rate)
+            # Substract reval lines from amount
+            unrealized_gain_loss =  adjusted_balance - balance
+        else:
+            if balance:
+                if currency_id != cp_currency_id:
+                    unrealized_gain_loss =  0.0 - balance
+                else:
+                    unrealized_gain_loss = 0.0
+            else:
+                unrealized_gain_loss =  0.0
+        return {'unrealized_gain_loss': unrealized_gain_loss,
+                'currency_rate': currency.rate,
+                'revaluated_balance': adjusted_balance}
+
+    def _format_label(self, cr, uid, text, account_id, currency_id,
+                      rate, context=None):
+        """
+        Return a text with replaced keywords by values
+
+        @param str text: label template, can use
+            %(account)s, %(currency)s, %(rate)s
+        @param int account_id: id of the account to display in label
+        @param int currency_id: id of the currency to display
+        @param float rate: rate to display
+        """
+        account_obj = self.pool.get('account.account')
+        currency_obj = self.pool.get('res.currency')
+        account = account_obj.browse(cr, uid,
+                                     account_id,
+                                    context=context)
+        currency = currency_obj.browse(cr, uid, currency_id, context=context)
+        data = {'account': account.code or False,
+                'currency': currency.name or False,
+                'rate': rate or False}
+        return text % data
+
+    def _write_adjust_balance(self, cr, uid, account_id, currency_id,
+                              partner_id, amount, label, rate, form, sums,
+                              context=None):
+        """
+        Generate entries to adjust balance in the revaluation accounts
+
+        @param account_id: ID of account to be reevaluated
+        @param amount: Amount to be written to adjust the balance
+        @param label: Label to be written on each entry
+        @param form: Wizard browse record containing data
+
+        @return: ids of created move_lines
+        """
+        if context is None:
+            context = {}
+
+        def create_move():
+            account = self.pool.get('account.account').browse(
+                cr, uid, account_id, context=context)
+            currency = self.pool.get('res.currency').browse(
+                cr, uid, currency_id, context=context)
+            base_move = {'name': label,
+                         'ref': "%s-%s-%s" % (currency.name, account.code, rate),
+                         'journal_id': form.journal_id.id,
+                         'period_id': form.result_period_id.id,
+                         'document_date': form.posting_date,
+                         'date': form.posting_date}
+            return move_obj.create(cr, uid, base_move, context=context)
+
+        def create_move_line(move_id, line_data, sums):
+            line_name = "Revaluation - %s" % form.fiscalyear_id.name
+            if form.revaluation_method == 'liquidity_month':
+                line_name = "Revaluation - %s" % form.period_id.name
+            base_line = {'name': line_name,
+                         'currency_id': currency_id,
+                         'amount_currency': 0.0,
+                         'document_date': form.posting_date,
+                         'date': form.posting_date,
+                         'is_revaluated_ok': True,
+                         }
+            base_line.update(line_data)
+            # we can assume that keys should be equals columns name + gl_
+            # but it was not decide when the code was designed. So commented code may sucks
+            #for k, v in sums.items():
+            #    line_data['gl_' + k] = v
+            base_line['gl_foreign_balance'] = sums.get('foreign_balance', 0.0)
+            base_line['gl_balance'] = sums.get('balance', 0.0)
+            base_line['gl_revaluated_balance'] = sums.get('revaluated_balance', 0.0)
+            base_line['gl_currency_rate'] = sums.get('currency_rate', 0.0)
+            return move_line_obj.create(cr, uid, base_line, context=context)
+
+        account_obj = self.pool.get('account.account')
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        #user_obj = self.pool.get('res.users')
+        distrib_obj = self.pool.get('analytic.distribution')
+        cc_distrib_obj = self.pool.get('cost.center.distribution.line')
+        fp_distrib_obj = self.pool.get('funding.pool.distribution.line')
+        account_ana_obj = self.pool.get('account.analytic.account')
+        model_data_obj = self.pool.get('ir.model.data')
+
+        # UF-2246: Use 6940 account as default for reevaluation line.
+        revaluation_account_ids = account_obj.search(cr, uid, [('code', '=', '6940')])
+        if not revaluation_account_ids:
+            raise osv.except_osv(_('Settings Error!'), _('G/L account 6940 is missing, please create it'))
+
+        revaluation_account_id = revaluation_account_ids[0]
+        revaluation_account = account_obj.browse(
+            cr, uid, revaluation_account_id, context=context)
+
+        # Prepare the analytic distribution for the account revaluation entry
+        # if the account has a 'expense' or 'income' type
+        distribution_id = False
+        if revaluation_account.user_type.code in ['expense', 'income']:
+            destination_id = model_data_obj.get_object_reference(
+                cr, uid, 'analytic_distribution', 'analytic_account_destination_support')[1]
+            #cost_center_id = model_data_obj.get_object_reference(
+            #    cr, uid, 'analytic_distribution', 'analytic_account_project_intermission')[1]
+            cost_center_id = account_ana_obj.search(
+                cr, uid, [('for_fx_gain_loss', '=', True)], context=context)[0]
+            funding_pool_id = model_data_obj.get_object_reference(
+                cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
+            distribution_id = distrib_obj.create(cr, uid, {}, context=context)
+            cc_distrib_obj.create(
+                cr, uid,
+                {'distribution_id': distribution_id,
+                 'analytic_id': cost_center_id,
+                 'destination_id': destination_id,
+                 'currency_id': currency_id,
+                 'percentage': 100.0,
+                 'source_date': form.posting_date,
+                },
+                context=context)
+            fp_distrib_obj.create(
+                cr, uid,
+                {'distribution_id': distribution_id,
+                 'analytic_id': funding_pool_id,
+                 'destination_id': destination_id,
+                 'cost_center_id': cost_center_id,
+                 'currency_id': currency_id,
+                 'percentage': 100.0,
+                 'source_date': form.posting_date,
+                },
+                context=context)
+
+        move_id = False
+        created_ids = []
+        # over revaluation
+        if amount >= 0.02:
+            if revaluation_account_id:
+                move_id = create_move()
+                # Create a move line to Debit account to be revaluated
+                line_data = {
+                    'debit': amount,
+                    'debit_currency': False,
+                    'move_id': move_id,
+                    'account_id': account_id,
+                }
+                created_ids.append(create_move_line(move_id, line_data, sums))
+                # Create a move line to Credit revaluation account
+                line_data = {
+                    'credit': amount,
+                    'credit_currency': False,
+                    'move_id': move_id,
+                    'account_id': revaluation_account_id,
+                    'analytic_distribution_id': distribution_id,
+                }
+                created_ids.append(create_move_line(move_id, line_data, sums))
+        # under revaluation
+        elif amount <= -0.02:
+            amount = -amount
+            if revaluation_account_id:
+                move_id = create_move()
+
+                # Create a move line to Debit revaluation loss account
+                line_data = {
+                    'debit': amount,
+                    'move_id': move_id,
+                    'account_id': revaluation_account_id,
+                    'analytic_distribution_id': distribution_id,
+                }
+
+                created_ids.append(create_move_line(move_id, line_data, sums))
+                # Create a move line to Credit account to be revaluated
+                line_data = {
+                    'credit': amount,
+                    'move_id': move_id,
+                    'account_id': account_id,
+                }
+                created_ids.append(create_move_line(move_id, line_data, sums))
+        # Hard post the move
+        if move_id:
+            move_obj.post(cr, uid, [move_id], context=context)
+        return move_id, created_ids
+
+    def revaluate_currency(self, cr, uid, ids, context=None):
+        """
+        Compute unrealized currency gain and loss and add entries to
+        adjust balances
+
+        @return: dict to open an Entries view filtered on generated move lines
+        """
+        if context is None:
+            context = {}
+        user_obj = self.pool.get('res.users')
+        period_obj = self.pool.get('account.period')
+        account_obj = self.pool.get('account.account')
+        #move_obj = self.pool.get('account.move')
+        currency_obj = self.pool.get('res.currency')
+        seq_obj = self.pool.get('ir.sequence')
+
+        company = user_obj.browse(cr, uid, uid).company_id
+
+        created_ids = []
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        form = self.browse(cr, uid, ids[0], context=context)
+
+        # Set the currency table in the context for later computations
+        if form.revaluation_method in ['liquidity_year', 'other_bs']:
+            context['currency_table_id'] = form.currency_table_id.id
+
+        # Get all currency names to map them with main currencies later
+        currency_codes_from_table = {}
+        if form.revaluation_method in ['liquidity_year', 'other_bs']:
+            for currency in form.currency_table_id.currency_ids:
+                # Check the revaluation date and dates in the currency table
+                #if currency.date != form.revaluation_date:
+                #    raise osv.except_osv(
+                #        _("Error"),
+                #        _("The revaluation date seems to differ with the data of "
+                #          "the currency table."))
+                currency_codes_from_table[currency.name] = currency.id
+
+        # Get posting date (as the field is readonly, its value is not sent
+        # to the server by the web client
+        form.posting_date = form.result_period_id and form.result_period_id.date_stop
+        #if form.revaluation_method == 'liquidity':
+        #    form.revaluation_date = form.period_id and form.period_id.date_stop
+
+        # Search for accounts Balance Sheet or Liquidity to be eevaluated
+        account_ids = []
+        if form.revaluation_method in ['liquidity_month', 'liquidity_year']:
+            account_ids = account_obj.search(
+                cr, uid,
+                [('currency_revaluation', '=', True),
+                 ('type', '=', 'liquidity'),
+                 ('user_type_code', '=', 'cash')],
+                 #('user_type.close_method', '!=', 'none'),
+                context=context)
+        elif form.revaluation_method == 'other_bs':
+            account_ids = account_obj.search(
+                cr, uid,
+                [('currency_revaluation', '=', True),
+                 ('user_type_code', 'in', ['receivables', 'payables', 'asset', 'stock'])],
+                 #('type', '!=', 'liquidity')],
+                context=context)
+        if not account_ids:
+            raise osv.except_osv(
+                _('Settings Error!'),
+                _("No account to be revaluated found. "
+                  "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]
+        if not special_period_ids:
+            raise osv.except_osv(_('Error!'),
+                                 _('No special period found for the fiscalyear %s') %
+                                   form.fiscalyear_id.code)
+
+        # FIXME
+        #opening_move_ids = []
+        #if special_period_ids:
+        #    opening_move_ids = move_obj.search(
+        #        cr, uid, [('period_id', '=', special_period_ids[0])])
+        #    if not opening_move_ids:
+        #        # if the first move is on this fiscalyear, this is the first
+        #        # financial year
+        #        first_move_id = move_obj.search(
+        #            cr, uid, [('company_id', '=', company.id)],
+        #            order='date', limit=1)
+        #        if not first_move_id:
+        #            raise osv.except_osv(
+        #                _('Error!'),
+        #                _('No fiscal entries found'))
+        #        first_move = move_obj.browse(
+        #                cr, uid, first_move_id[0], context=context)
+        #        if fiscalyear.id != first_move.period_id.fiscalyear_id:
+        #            raise osv.except_osv(
+        #                _('Error!'),
+        #                _('No opening entries in opening period for this fiscal year %s' % (
+        #                    fiscalyear.code,)))
+
+        period_ids = []
+        if form.revaluation_method == 'liquidity_month':
+            period_ids = [form.period_id.id]
+        else:
+            period_ids = []
+            for period in form.fiscalyear_id.period_ids:
+                if period.number < 13:
+                    period_ids.append(period.id)
+        if not period_ids:
+            raise osv.except_osv(
+                _('Error!'),
+                _('No period found for the fiscalyear %s') % (
+                    form.fiscalyear_id.code))
+        # 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']:
+                periods_not_field_closed.append(period.name)
+        if periods_not_field_closed:
+            raise osv.except_osv(
+                _(u"Error"),
+                _(u"Revaluation aborted, the following periods are not field-closed: %s" % (
+                    ', '.join(periods_not_field_closed))))
+
+        # Get balance sums
+        account_sums = account_obj.compute_revaluations(
+            cr, uid, account_ids, period_ids, form.fiscalyear_id.id,
+            form.revaluation_date, form.revaluation_method, context=context)
+        for account_id, account_tree in account_sums.iteritems():
+            for currency_id, sums in account_tree.iteritems():
+                new_currency_id = currency_id
+                # If the method is 'other_bs' or 'liquidity_year', check if the
+                # account move currency is declared in the currency table and
+                # get it there
+                if form.revaluation_method in ['liquidity_year', 'other_bs']:
+                    currency = currency_obj.browse(cr, uid, currency_id, context=context)
+                    if currency.id != company.currency_id.id and currency.name not in currency_codes_from_table:
+                        raise osv.except_osv(
+                            _("Error"),
+                            _("The currency %s is not declared in the currency table.") % currency.name)
+                    new_currency_id = currency_codes_from_table[currency.name]
+                if not sums['balance']:
+                    continue
+                # Update sums with compute amount currency balance
+                diff_balances = self._compute_unrealized_currency_gl(
+                    cr, uid, new_currency_id, sums, form, context=context)
+                account_sums[account_id][currency_id].update(diff_balances)
+        # Create entries only after all computation have been done
+        for account_id, account_tree in account_sums.iteritems():
+            for currency_id, sums in account_tree.iteritems():
+                new_currency_id = currency_id
+                # If the method is 'other_bs' or 'liquidity_year', get the
+                # account move currency in the currency table
+                if form.revaluation_method in ['liquidity_year', 'other_bs']:
+                    currency = currency_obj.browse(cr, uid, currency_id, context=context)
+                    new_currency_id = currency_codes_from_table[currency.name]
+                adj_balance = sums.get('unrealized_gain_loss', 0.0)
+                if not adj_balance:
+                    continue
+
+                rate = sums.get('currency_rate', 0.0)
+                #label = self._format_label(
+                #    cr, uid, form.label, account_id, new_currency_id, rate)
+                # Generate the entry sequence
+                #seq = seq_obj.get_id(
+                #    cr, uid, form.journal_id.sequence_id.id,
+                #    context={'fiscalyear_id': form.fiscalyear_id.id})
+                #label = "%s-%s-%s" % (
+                #    company.instance_id.move_prefix, form.journal_id.code, seq)
+                label = '/'
+
+                # Write an entry to adjust balance
+                move_id, new_ids = self._write_adjust_balance(
+                    cr, uid,
+                    account_id, currency_id, False, adj_balance,
+                    label, rate, form, sums, context=context)
+                if move_id:
+                    created_ids.extend(new_ids)
+                    # Create a second journal entry that will offset the first one
+                    # if the revaluation method is 'Other B/S'
+                    if form.revaluation_method == 'other_bs':
+                        move_id, rev_line_ids = self._reverse_other_bs_move_lines(
+                            cr, uid, form, move_id, new_ids, context=context)
+                        created_ids.extend(rev_line_ids)
+
+        if created_ids:
+            # Set all booking amount to 0 for revaluation lines
+            cr.execute('UPDATE account_move_line '
+                       'SET debit_currency = 0, credit_currency = 0, amount_currency = 0'
+                       'WHERE id IN %s', (tuple(created_ids),))
+            # Return the view
+            return {'domain': "[('id','in', %s)]" % (created_ids,),
+                    'name': _("Created revaluation lines"),
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'auto_search': True,
+                    'res_model': 'account.move.line',
+                    'view_id': False,
+                    'search_view_id': False,
+                    'type': 'ir.actions.act_window'}
+        else:
+            raise osv.except_osv(_("Warning"),
+                                 _("No revaluation accounting entry have been posted."))
+
+    def _get_next_fiscalyear_id(self, cr, uid, fiscalyear_id, context=None):
+        """Return the next fiscal year ID."""
+        if context is None:
+            context = {}
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        fiscalyear = fiscalyear_obj.browse(
+            cr, uid, fiscalyear_id, context=context)
+        date_stop = datetime.datetime.strptime(
+            fiscalyear.date_stop, '%Y-%m-%d')
+        next_year_start = date_stop + relativedelta(years=1)
+        next_fiscalyear_ids = fiscalyear_obj.search(
+            cr, uid,
+            [('state', '=', 'draft'),
+             ('date_start', '<=', next_year_start.strftime('%Y-%m-%d')),
+             ('date_stop', '>=', next_year_start.strftime('%Y-%m-%d'))],
+            context=context)
+        if not next_fiscalyear_ids:
+            raise osv.except_osv(
+                _("Error"),
+                _("The next fiscal year does not exist."))
+        return next_fiscalyear_ids[0]
+
+    def _get_first_fiscalyear_period_id(self, cr, uid, fiscalyear_id, context=None):
+        """Return the first period ID of a fiscal year."""
+        if context is None:
+            context = {}
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
+        period_ids = period_obj.search(
+            cr, uid,
+            [('fiscalyear_id', '=', fiscalyear_id), ('number', '=', 1)],
+            context=context)
+        if not period_ids:
+            fiscalyear = fiscalyear_obj.browse(
+                cr, uid, fiscalyear_id, context=context)
+            raise osv.except_osv(
+                _("Error"),
+                _("No first period found in the fiscal year %s.") % (
+                    fiscalyear.name))
+        return period_ids[0]
+
+    def _reverse_other_bs_move_lines(
+            self, cr, uid, form, move_id, line_ids, context=None):
+        """Reverse 'Other B/S' revaluation entries."""
+        if context is None:
+            context = {}
+        move_obj = self.pool.get('account.move')
+        line_obj = self.pool.get('account.move.line')
+        aal_obj = self.pool.get('account.analytic.line')
+        period_obj = self.pool.get('account.period')
+        # Get reserved move
+        rev_move = move_obj.browse(cr, uid, move_id, context=context)
+        # Compute the posting date:
+        # Get the start date of the first period of the next fiscal year
+        fiscalyear_id = self._get_next_fiscalyear_id(
+            cr, uid, form.fiscalyear_id.id, context=context)
+        period_id = self._get_first_fiscalyear_period_id(
+            cr, uid, fiscalyear_id, context=context)
+        period = period_obj.browse(cr, uid, period_id, context=context)
+        posting_date = period.date_start
+        # Create a new move
+        move_vals = {
+            'journal_id': form.journal_id.id,
+            'period_id': period_id,
+            'date': posting_date,
+            'ref': rev_move.ref,
+        }
+        move_id = move_obj.create(cr, uid, move_vals, context=context)
+        # Reverse lines + associate them to the newly created move
+        rev_line_ids = []
+        lines_to_reconcile = []
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            # Prepare default value for new line
+            vals = {
+                'move_id': move_id,
+                'date': posting_date,
+                'document_date': posting_date,
+                'journal_id': form.journal_id.id,
+                'period_id': period_id,
+            }
+            # Copy the line
+            rev_line_id = line_obj.copy(cr, uid, line.id, vals, context=context)
+            # Do the reverse
+            amt = -1 * line.amount_currency
+            vals.update({
+                'debit': line.credit,
+                'credit': line.debit,
+                'amount_currency': amt,
+                'journal_id': form.journal_id.id,
+                'name': line_obj.join_without_redundancy(line.name, 'REV'),
+                'reversal_line_id': line.id,
+                'account_id': line.account_id.id,
+                'source_date': line.date,
+                'reversal': True,
+                'reference': line.move_id and line.move_id.name or '',
+                'ref': line.move_id and line.move_id.name or '',
+            })
+            line_obj.write(cr, uid, [rev_line_id], vals, context=context)
+            # Inform old line that it have been corrected
+            #line_obj.write(
+            #    cr, uid, [line.id],
+            #    {'corrected': True, 'have_an_historic': True},
+            #    context=context)
+            # Keep lines to reconcile
+            if line.account_id.reconcile:
+                lines_to_reconcile.append((line.id, rev_line_id))
+            # Search analytic lines from first move line
+            aal_ids = aal_obj.search(cr, uid, [('move_id', '=', line.id)])
+            aal_obj.write(cr, uid, aal_ids, {'is_reallocated': True})
+            # Search analytic lines from reversed line and flag them as "is_reversal"
+            new_aal_ids = aal_obj.search(cr, uid, [('move_id', '=', rev_line_id)])
+            aal_obj.write(cr, uid, new_aal_ids, {'is_reversal': True,})
+            rev_line_ids.append(rev_line_id)
+        # Hard post the move
+        move_obj.post(cr, uid, [move_id], context=context)
+        # Reconcile lines
+        for line_id, rev_line_id in lines_to_reconcile:
+            line_obj.reconcile_partial(
+                cr, uid, [line_id, rev_line_id], context=context)
+        return move_id, rev_line_ids
+
+WizardCurrencyrevaluation()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'msf_currency_revaluation/wizard/wizard_currency_revaluation_view.xml'
--- msf_currency_revaluation/wizard/wizard_currency_revaluation_view.xml	1970-01-01 00:00:00 +0000
+++ msf_currency_revaluation/wizard/wizard_currency_revaluation_view.xml	2014-01-16 13:10:58 +0000
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_currency_revaluation_wizard" model="ir.ui.view">
+            <field name="name">Revaluation</field>
+            <field name="model">wizard.currency.revaluation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Revaluation" col="4">
+                    <field name="revaluation_method"
+                        on_change="on_change_revaluation_method(revaluation_method, fiscalyear_id, period_id)"/>
+                    <newline/>
+                    <newline/>
+                    <field name="fiscalyear_id"
+                        on_change="on_change_fiscalyear_id(revaluation_method, fiscalyear_id)"/>
+                    <newline/>
+                    <field name="period_id"
+                        attrs="{'invisible': ['|', ('revaluation_method', '=', 'other_bs'), ('revaluation_method', '=', 'liquidity_year')],
+                                'required': [('revaluation_method', '=', 'liquidity_month')]}"
+                        on_change="on_change_revaluation_method(revaluation_method, fiscalyear_id, period_id)"/>
+                    <newline/>
+                    <field name="currency_table_id"
+                        attrs="{'invisible': [('revaluation_method', '=', 'liquidity_month')],
+                                'required': [('revaluation_method', 'in', ['liquidity_year', 'other_bs'])]}"/>
+                    <field name="revaluation_date" invisible="1"/>
+                    <newline/>
+                    <separator string="" colspan="6"/>
+                    <field name="result_period_id"
+                        on_change="on_change_result_period_id(result_period_id)"/>
+                    <newline/>
+                    <field name="posting_date"/>
+                    <newline/>
+                    <field name="journal_id"/>
+                    <newline/>
+                    <field name="label" invisible="1"/>
+                    <newline/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                    <button name="revaluate_currency" string="Validate" type="object" icon="gtk-execute"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_account_currency_revaluation_wizard" model="ir.actions.act_window">
+            <field name="name">Revaluation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.currency.revaluation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            action="action_view_account_currency_revaluation_wizard"
+            id="menu_view_account_currency_revaluation_wizard"
+            parent="account.menu_finance_periodical_processing"/>
+
+    </data>
+</openerp>
+

=== modified file 'msf_profile/__openerp__.py'
--- msf_profile/__openerp__.py	2013-12-19 15:10:23 +0000
+++ msf_profile/__openerp__.py	2014-01-16 13:10:58 +0000
@@ -116,6 +116,7 @@
         "msf_field_access_rights",
         "unifield_tests",
         "vertical_integration",
+        "msf_currency_revaluation",
     ],
     "update_xml": [
         "report.xml",

=== modified file 'res_currency_functional/res_currency_rate_functional.py'
--- res_currency_functional/res_currency_rate_functional.py	2012-09-21 14:49:36 +0000
+++ res_currency_functional/res_currency_rate_functional.py	2014-01-16 13:10:58 +0000
@@ -36,7 +36,7 @@
         if currency is None:
             currency_obj = self.read(cr, uid, ids, ['currency_id'])[0]
             currency = currency_obj['currency_id'][0]
-        move_line_search_params = [('currency_id', '=', currency)]
+        move_line_search_params = [('currency_id', '=', currency), ('is_revaluated_ok', '=', False)]
         if date is not None:
             move_line_search_params.append(('date', '>=', date))