Merge lp:~camptocamp/account-closing/7.0-port-account_unrelized_currency_gain_loss-20120115 into lp:~account-core-editors/account-closing/7.0

[Yannick Vaucher @ Camptocamp]

Port of module account_unrealized_currency_gain_loss renamed as account_multicurrency_revaluation

[lp:~camptocamp/account-closing/7.0-port-account_unrelized_currency_gain_loss-20120115]

46. By Yannick Vaucher @ Camptocamp on 2013-01-15

[FIX] button style in revaluation wizard

47. By Frederic Clementi - Camptocamp on 2013-01-15

[IMP] module description

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Space after comma
456 + 'account.period', 'Period to use',required=True),

Extraneous parenthesis
674 + (fiscalyear.code,)))

Beside those minor points, LGTM

review: Approve

[lp:~camptocamp/account-closing/7.0-port-account_unrelized_currency_gain_loss-20120115]

48. By Yannick Vaucher @ Camptocamp on 2013-01-15

[IMP] python formating

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Here we go, this is fixed.

Thx for the review

[lp:~camptocamp/account-closing/7.0-port-account_unrelized_currency_gain_loss-20120115]

49. By Yannick Vaucher @ Camptocamp on 2013-01-15

[ADD] po files

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

=== renamed directory 'account_unrealized_currency_gain_loss' => 'account_multicurrency_revaluation'
=== modified file 'account_multicurrency_revaluation/__openerp__.py'
--- account_unrealized_currency_gain_loss/__openerp__.py	2013-01-04 10:32:06 +0000
+++ account_multicurrency_revaluation/__openerp__.py	2013-01-15 15:51:25 +0000
@@ -19,32 +19,68 @@
 #
 ##############################################################################
 
-{"name": "Unrealized currency gain & loss",
+{"name": "Multicurrency revaluation",
  "version": "6.1",
  "category": "Finance",
  "description": """
-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]  [ ]
+===========================
+ Multicurrency revaluation
+===========================
+
+The *Multicurrency revaluation* module allows you generate automatically multicurrency revaluation journal entries. You will also find here a Revaluation report 
+
+Note that an extra aggregation by currency on general ledger & partner ledger (from module : *account_financial_report*) has been added in order to get more details.
+
+---------------
+ Main Features
+---------------
+
+* A checkbox *Allow currency revaluation* on accounts.
+* A wizard to generate the revaluation journal entries. It adjusts account balance having *Allow currency revaluation* checked.
+* A wizard to print a report of revaluation.
+
+The report uses webkit report system.
+
+---------------
+ Configuration
+---------------
+
+Due to the various legislation according the country, in the Company settings you can set the way you want to generate revaluation journal entries.
+
+Please, find below adviced account settings for 3 countries :
+
+For UK (Revaluation)
+====================
+(l10n_uk Chart of account)
+
+::
+
+                          LOSS    GAIN
+  Revaluation account    [7700]  [7700]
+  Provision B.S account  [    ]  [    ]
+  Provision P&L account  [    ]  [    ]
+
+For CH (Provision)
+==================
+(l10n_ch Chart of account)
+
+::
+
+                          LOSS    GAIN
+  Revaluation account    [    ]  [    ]
+  Provision B.S account  [2331]  [2331]
+  Provision P&L account  [3906]  [4906]
 
 For FR
-                        LOSS  GAIN
-- Revaluation account   [x]  [x]
-- Provision B.S account  [x]  [ ]
-- Provision P&L account  [x]  [ ]
-
+======
+(l10n_fr Chart of account)
+
+::
+
+                          LOSS    GAIN
+  Revaluation account    [ 476]  [ 477]
+  Provision B.S account  [1515]  [    ]
+  Provision P&L account  [6865]  [    ]
 """,
 
     "author": "Camptocamp",
@@ -61,7 +97,7 @@
     "update_xml": ['report/report.xml'],
     #"test": ["test/currency_revaluation.yml"],
     "demo_xml": [],
-    'installable': False,
+    'installable': True,
     "active": False,
 #    'certificate': 'certificate',
 }

=== modified file 'account_multicurrency_revaluation/account.py'
--- account_unrealized_currency_gain_loss/account.py	2012-06-19 10:47:52 +0000
+++ account_multicurrency_revaluation/account.py	2013-01-15 15:51:25 +0000
@@ -19,25 +19,26 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-
-
-class AccountAccountLine(osv.osv):
-
+from openerp.osv import fields, orm
+
+
+class AccountAccountLine(orm.Model):
     _inherit = 'account.move.line'
     # By convention added columns stats with gl_.
-    _columns = {'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')}
-    
-
-class AccountAccount(osv.osv):
-
+    _columns = {
+            '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')}
+
+
+class AccountAccount(orm.Model):
     _inherit = 'account.account'
 
-    _columns = {'currency_revaluation':
-                    fields.boolean("Allow Currency revaluation")}
+    _columns = {
+            'currency_revaluation': fields.boolean(
+                "Allow Currency revaluation")
+            }
 
     _defaults = {'currency_revaluation': False}
 
@@ -45,10 +46,10 @@
             '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,
+            'foreign_balance': "COALESCE(SUM(l.amount_currency), 0) as foreign_balance",
+            }
+
+    def _revaluation_query(self, cr, uid, ids,
                            revaluation_date,
                            context=None):
 
@@ -102,6 +103,4 @@
 
         return accounts
 
-AccountAccount()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_multicurrency_revaluation/account_view.xml'
--- account_unrealized_currency_gain_loss/account_view.xml	2012-03-21 16:34:12 +0000
+++ account_multicurrency_revaluation/account_view.xml	2013-01-15 15:51:25 +0000
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='General Information']/group[2]" position="after">
-                   <group col="2" colspan="2">
-                       <separator string="Currency Revaluation"/>
+                <label for="note" position="before">
+                   <separator string="Currency Revaluation"/>
+                   <group>
                        <field name="currency_revaluation"/>
                    </group>
-                </xpath>
+                </label>
             </field>
         </record>
 

=== added file 'account_multicurrency_revaluation/i18n/de.po'
--- account_multicurrency_revaluation/i18n/de.po	1970-01-01 00:00:00 +0000
+++ account_multicurrency_revaluation/i18n/de.po	2013-01-15 15:51:25 +0000
@@ -0,0 +1,16 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-15 15:47+0000\n"
+"PO-Revision-Date: 2013-01-15 15:47+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+

=== added file 'account_multicurrency_revaluation/i18n/en.po'
--- account_multicurrency_revaluation/i18n/en.po	1970-01-01 00:00:00 +0000
+++ account_multicurrency_revaluation/i18n/en.po	2013-01-15 15:51:25 +0000
@@ -0,0 +1,16 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-15 15:47+0000\n"
+"PO-Revision-Date: 2013-01-15 15:47+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+

=== added file 'account_multicurrency_revaluation/i18n/es.po'
--- account_multicurrency_revaluation/i18n/es.po	1970-01-01 00:00:00 +0000
+++ account_multicurrency_revaluation/i18n/es.po	2013-01-15 15:51:25 +0000
@@ -0,0 +1,16 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-15 15:47+0000\n"
+"PO-Revision-Date: 2013-01-15 15:47+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+

=== added file 'account_multicurrency_revaluation/i18n/fr.po'
--- account_multicurrency_revaluation/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ account_multicurrency_revaluation/i18n/fr.po	2013-01-15 15:51:25 +0000
@@ -0,0 +1,16 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-15 15:47+0000\n"
+"PO-Revision-Date: 2013-01-15 15:47+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+

=== modified file 'account_multicurrency_revaluation/report/currency_unrealized_report.py'
--- account_unrealized_currency_gain_loss/report/currency_unrealized_report.py	2012-04-23 12:29:53 +0000
+++ account_multicurrency_revaluation/report/currency_unrealized_report.py	2013-01-15 15:51:25 +0000
@@ -98,7 +98,6 @@
                                   'period_name': self._get_period_name,
                                   'report_name': _('Exchange Rate Gain and Loss Report')})
 
-
     def sort_accounts_with_structure(self, root_account_ids, account_ids, context=None):
         """Sort accounts by code respecting their structure. code Take from
         financial webkit report in order not to depends from it"""
@@ -196,7 +195,6 @@
             res_ids = [res_id for res_id in res_ids if res_id in only_ids]
         return res_ids
 
-
     def set_context(self, objects, data, ids, report_type=None):
         """Populate a ledger_lines attribute on each browse record that will be used
         by mako template"""

=== modified file 'account_multicurrency_revaluation/report/templates/unrealized_currency_gain_loss.mako'
--- account_unrealized_currency_gain_loss/report/templates/unrealized_currency_gain_loss.mako	2012-04-23 12:29:53 +0000
+++ account_multicurrency_revaluation/report/templates/unrealized_currency_gain_loss.mako	2013-01-15 15:51:25 +0000
@@ -10,7 +10,7 @@
         </style>
     </head>
     <body>
-<%setLang(user.context_lang)%>
+<%setLang(user.lang)%>
         <div class="act_as_table data_table">
             <div class="act_as_row labels">
                 <div class="act_as_cell">${_('Report')}</div>

=== modified file 'account_multicurrency_revaluation/res_company.py'
--- account_unrealized_currency_gain_loss/res_company.py	2012-03-21 16:34:12 +0000
+++ account_multicurrency_revaluation/res_company.py	2013-01-15 15:51:25 +0000
@@ -19,54 +19,52 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-
-
-class ResCompany(osv.osv):
-
+from openerp.osv import fields, orm
+
+
+class ResCompany(orm.Model):
     _inherit = "res.company"
 
-    _columns = {'revaluation_loss_account_id':
-                    fields.many2one('account.account',
-                                    'Revaluation loss account',
-                                    domain=[('type', '=', 'other')]),
-                'revaluation_gain_account_id':
-                    fields.many2one('account.account',
-                                    'Revaluation gain account',
-                                    domain=[('type', '=', 'other')]),
-                'revaluation_analytic_account_id':
-                    fields.many2one('account.analytic.account',
-                                    'Revaluation Analytic account'),
-                'provision_bs_loss_account_id':
-                    fields.many2one('account.account',
-                                    'Provision B.S loss account',
-                                    domain=[('type', '=', 'other')]),
-                'provision_bs_gain_account_id':
-                    fields.many2one('account.account',
-                                    'Provision B.S gain account',
-                                    domain=[('type', '=', 'other')]),
-                'provision_pl_loss_account_id':
-                    fields.many2one('account.account',
-                                    'Provision P&L loss account',
-                                    domain=[('type', '=', 'other')]),
-                'provision_pl_gain_account_id':
-                    fields.many2one('account.account',
-                                    'Provision P&L gain account',
-                                    domain=[('type', '=', 'other')]),
-                'default_currency_reval_journal_id':
-                    fields.many2one('account.journal',
-                                    'Currency gain & loss Default Journal',
-                                    domain=[('type', '=', 'general')]),
-                'reversable_revaluations':
-                    fields.boolean('Reversable Revaluations',
-                    help="Revaluations entries will be created"
-                         " as \"To Be Reversed\".")
-                }
+    _columns = {
+        'revaluation_loss_account_id': fields.many2one(
+            'account.account',
+            'Revaluation loss account',
+            domain=[('type', '=', 'other')]),
+        'revaluation_gain_account_id': fields.many2one(
+            'account.account',
+            'Revaluation gain account',
+            domain=[('type', '=', 'other')]),
+        'revaluation_analytic_account_id': fields.many2one(
+            'account.analytic.account',
+            'Revaluation Analytic account'),
+        'provision_bs_loss_account_id': fields.many2one(
+            'account.account',
+            'Provision B.S loss account',
+            domain=[('type', '=', 'other')]),
+        'provision_bs_gain_account_id': fields.many2one(
+            'account.account',
+            'Provision B.S gain account',
+            domain=[('type', '=', 'other')]),
+        'provision_pl_loss_account_id': fields.many2one(
+            'account.account',
+            'Provision P&L loss account',
+            domain=[('type', '=', 'other')]),
+        'provision_pl_gain_account_id': fields.many2one(
+            'account.account',
+            'Provision P&L gain account',
+            domain=[('type', '=', 'other')]),
+        'default_currency_reval_journal_id': fields.many2one(
+            'account.journal',
+            'Currency gain & loss Default Journal',
+            domain=[('type', '=', 'general')]),
+        'reversable_revaluations': fields.boolean(
+            'Reversable Revaluations',
+            help="Revaluations entries will be created"
+                 " as \"To Be Reversed\".")
+        }
 
     _defaults = {
         'reversable_revaluations': True,
-    }
-
-ResCompany()
+        }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_multicurrency_revaluation/res_company_view.xml'
--- account_unrealized_currency_gain_loss/res_company_view.xml	2012-03-21 16:34:12 +0000
+++ account_multicurrency_revaluation/res_company_view.xml	2013-01-15 15:51:25 +0000
@@ -9,30 +9,38 @@
             <field name="inherit_id" ref="base.view_company_form" />
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Configuration']" position="inside">
-                    <group colspan="5">
                     <separator string="Foreign currency gain &amp; loss"  colspan="5"/>
-                    <field name="reversable_revaluations"/>
-                    <newline/>
-                    <label colspan="1"/>
-                    <separator string="LOSS"/>
-                    <separator string="GAIN"/>
-                    <separator string="ANALYTIC ACCOUNT"/>
-                    <newline/>
-                    <label string="Revaluation accounts:" colspan="1"/>
-                    <field name="revaluation_loss_account_id" nolabel="1"/>
-                    <field name="revaluation_gain_account_id" nolabel="1"/>
-                    <field name="revaluation_analytic_account_id" nolabel="1"/>
-                    <newline/>
-                    <label string="Provision B.S accounts:" colspan="1"/>
-                    <field name="provision_bs_loss_account_id" nolabel="1"/>
-                    <field name="provision_bs_gain_account_id" nolabel="1"/>
-                    <newline/>
-                    <label string="Provision P&amp;L accounts:" colspan="1"/>
-                    <field name="provision_pl_loss_account_id" nolabel="1"/>
-                    <field name="provision_pl_gain_account_id" nolabel="1"/>
-                    <newline/>
-                    <separator colspan="5"/>
-                    <field name="default_currency_reval_journal_id"/>
+                    <group>
+                        <field name="reversable_revaluations"/>
+                    </group>
+                    <table colspan="2">
+                        <tr>
+                            <th></th>
+                            <th width="250px"><label string="LOSS"/></th>
+                            <th width="250px"><label string="GAIN"/></th>
+                            <th width="250px"><label string="ANALYTIC ACCOUNT"/></th>
+                        </tr>
+                        <tr>
+                            <th><label string="Revaluation accounts"/></th>
+                            <td> <field name="revaluation_loss_account_id" nolabel="1"/> </td>
+                            <td> <field name="revaluation_gain_account_id" nolabel="1"/> </td>
+                            <td> <field name="revaluation_analytic_account_id" nolabel="1"/> </td>
+                        </tr>
+                        <tr>
+                            <th><label string="Provision B.S accounts"/></th>
+                            <td> <field name="provision_bs_loss_account_id" nolabel="1"/> </td>
+                            <td> <field name="provision_bs_gain_account_id" nolabel="1"/> </td>
+                            <td> </td>
+                        </tr>
+                        <tr>
+                            <th><label string="Provision P&amp;L accounts"/></th>
+                            <td> <field name="provision_pl_loss_account_id" nolabel="1"/> </td>
+                            <td> <field name="provision_pl_gain_account_id" nolabel="1"/> </td>
+                            <td> </td>
+                        </tr>
+                    </table>
+                    <group>
+                        <field name="default_currency_reval_journal_id"/>
                     </group>
                 </xpath>
             </field>

=== modified file 'account_multicurrency_revaluation/res_currency_view.xml'
--- account_unrealized_currency_gain_loss/res_currency_view.xml	2012-02-24 16:41:09 +0000
+++ account_multicurrency_revaluation/res_currency_view.xml	2013-01-15 15:51:25 +0000
@@ -8,15 +8,11 @@
             <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>

=== modified file 'account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py'
--- account_unrealized_currency_gain_loss/wizard/print_currency_unrealized_report.py	2012-04-23 12:29:53 +0000
+++ account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py	2013-01-15 15:51:25 +0000
@@ -1,25 +1,53 @@
-from openerp.osv.orm import TransientModel, fields
-
-class UnrealizedCurrencyReportPrinter(TransientModel):
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier, 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 openerp.osv import fields, orm
+
+
+class UnrealizedCurrencyReportPrinter(orm.TransientModel):
     _name = "unrealized.report.printer"
 
-    _columns = {'chart_account_id': fields.many2one('account.account', 'Chart root',
+    _columns = {
+            'chart_account_id': fields.many2one(
+                'account.account', 'Chart root',
                                 domain=[('parent_id', '=', False)]),
-               'period_id': fields.many2one('account.period', 'Period to use',required=True)}
-
+            'period_id': fields.many2one(
+                'account.period', 'Period to use', required=True),
+            }
 
     def print_report(self, cursor, uid, wid, data, context=None):
+        """
+        Show the report
+        """
         context = context or {}
         # we update form with display account value
         if isinstance(wid, list):
             wid = wid[0]
-        current = self.browse(cursor, uid, wid, context)
+        current = self.browse(cursor, uid, wid, context=context)
         form = {}
         form['period_id'] = current.period_id.id
         form['period_name'] = current.period_id.name
         form['account_ids'] = [current.chart_account_id.id]
         data['form'] = form
-        print data
+
         return {'type': 'ir.actions.report.xml',
                 'report_name': 'currency_unrealized',
                 'datas': data}

=== modified file 'account_multicurrency_revaluation/wizard/print_currency_unrealized_report_view.xml'
--- account_unrealized_currency_gain_loss/wizard/print_currency_unrealized_report_view.xml	2012-04-23 12:29:53 +0000
+++ account_multicurrency_revaluation/wizard/print_currency_unrealized_report_view.xml	2013-01-15 15:51:25 +0000
@@ -7,18 +7,20 @@
             <field name="model">unrealized.report.printer</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form>
-                <field name="period_id"/>
-                <field name="chart_account_id" />
-                <newline/>
-                <group col="3" colspan="4">
-                   <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-execute"/>
-                </group>
-              </form>
+                <form string="Print Currency Unrealized" version="7.0">
+                    <group>
+                        <field name="period_id"/>
+                        <field name="chart_account_id"/>
+                    </group>
+                    <footer>
+                        <button name="print_report" type="object" string="_Print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
             </field>
         </record>
-       
+
         <record id="currency_urealized_report_action_wizard" model="ir.actions.act_window">
             <field name="name">Print Currency Unrealized</field>
             <field name="type">ir.actions.act_window</field>

=== modified file 'account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py'
--- account_unrealized_currency_gain_loss/wizard/wizard_currency_revaluation.py	2012-08-21 09:49:04 +0000
+++ account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py	2013-01-15 15:51:25 +0000
@@ -21,34 +21,38 @@
 
 from datetime import date
 
-from osv import osv, fields
+from openerp.osv import fields, orm, osv
 from tools.translate import _
 
-class WizardCurrencyrevaluation(osv.osv_memory):
+
+class WizardCurrencyrevaluation(orm.TransientModel):
     _name = 'wizard.currency.revaluation'
 
-    _columns = {'revaluation_date': fields.date('Revaluation Date',
-                                                 required=True),
-                'journal_id': fields.many2one(
-                    'account.journal',
-                    'Journal',
-                    domain="[('type','=','general')]",
-                    help="You can set the default "
-                         "journal in company settings.",
-                    required=True),
-                'currency_type': fields.many2one(
-                    'res.currency.rate.type',
-                    'Currency Type',
-                     help="If no currency_type is selected,"
-                          " only rates with no type will be browsed.",
-                     required=False),
-                '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)}
+    _columns = {
+        'revaluation_date': fields.date(
+            'Revaluation Date',
+             required=True),
+        'journal_id': fields.many2one(
+            'account.journal',
+            'Journal',
+            domain="[('type','=','general')]",
+            help="You can set the default "
+                 "journal in company settings.",
+            required=True),
+        'currency_type': fields.many2one(
+            'res.currency.rate.type',
+            'Currency Type',
+             help="If no currency_type is selected,"
+                  " only rates with no type will be browsed.",
+             required=False),
+        '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):
         """
@@ -85,10 +89,12 @@
         journal = cp.default_currency_reval_journal_id
         return journal and journal.id or False
 
-    _defaults = {'label': "%(currency)s %(account)s "
-                          "%(rate)s currency revaluation",
-                 'revaluation_date': _get_default_revaluation_date,
-                 'journal_id': _get_default_journal_id}
+    _defaults = {
+        'label': "%(currency)s %(account)s "
+                     "%(rate)s currency revaluation",
+        'revaluation_date': _get_default_revaluation_date,
+        'journal_id': _get_default_journal_id,
+        }
 
     def on_change_revaluation_date(self, cr, uid, id, revaluation_date):
         if not revaluation_date:
@@ -157,7 +163,7 @@
         ctx_rate['currency_rate_type_id'] = type_id
         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(
@@ -178,7 +184,7 @@
                     unrealized_gain_loss =  0.0 - balance
                 else:
                     unrealized_gain_loss = 0.0
-            else:    
+            else:
                 unrealized_gain_loss =  0.0
         return {'unrealized_gain_loss': unrealized_gain_loss,
                 'currency_rate': currency.rate,
@@ -407,35 +413,53 @@
             context=context)
 
         if not fiscalyear_ids:
-            raise osv.except_osv(_('Error!'),
-                                 _('No fiscalyear found for company %s on %s.'
-                                   % (company.name, form.revaluation_date)))
+            raise osv.except_osv(
+                    _('Error!'),
+                    _('No fiscalyear found for company %s on %s.' %
+                        (company.name, form.revaluation_date)))
 
         fiscalyear = fiscalyear_obj.browse(
             cr, uid, fiscalyear_ids[0], context=context)
-        
+
         special_period_ids = [p.id for p in fiscalyear.period_ids
                                       if p.special == True]
         if not special_period_ids:
-            raise osv.except_osv(_('Error!'),
-                                 _('No special period found for the fiscalyear %s' %
-                                   (fiscalyear.code,)))
-            
+            raise osv.except_osv(
+                    _('Error!'),
+                    _('No special period found for the fiscalyear %s' %
+                        (fiscalyear.code,)))
+
         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:
-                raise osv.except_osv(_('Error!'),
-                                     _('No opening entries in opening period for this fiscal year %s' %
-                                   (fiscalyear.code,)))
-            
+            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 != 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 = [p.id for p in fiscalyear.period_ids]
         if not period_ids:
             raise osv.except_osv(_('Error!'),
                                  _('No period found for the fiscalyear %s' %
-                                   (fiscalyear.code,)))
+                                   fiscalyear.code))
 
 
         # Get balance sums
@@ -495,6 +519,4 @@
             raise osv.except_osv(_("Warning"),
                                  _("No accounting entry have been posted."))
 
-WizardCurrencyrevaluation()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml'
--- account_unrealized_currency_gain_loss/wizard/wizard_currency_revaluation_view.xml	2012-05-23 13:10:02 +0000
+++ account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml	2013-01-15 15:51:25 +0000
@@ -7,25 +7,24 @@
             <field name="model">wizard.currency.revaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Currency Revaluation" col="4">
-                    <field name="revaluation_date" on_change="on_change_revaluation_date(revaluation_date)"/>
-                    <newline/>
-                    <field name="journal_id"/>
-                    <newline/>
-                    <field name="currency_type"/>
-                    <newline/>
-                    <separator string="" colspan="6"/>
-                    <field name="label"/>
-                    <newline/>
-                    <label/>
+                <form string="Currency Revaluation" version="7.0">
+                    <label string="This will reevaluate the currency gain &amp; loss"/>
+                    <group>
+                        <field name="revaluation_date" on_change="on_change_revaluation_date(revaluation_date)"/>
+                        <field name="journal_id"/>
+                        <field name="currency_type"/>
+                        <separator string="" colspan="6"/>
+                        <field name="label"/>
+                    </group>
                     <group>
                         <label string="%%(account)s : Account for which the revaluation is applied"/>
-                        <newline/>            
                         <label string="%%(rate)s : Value of rate applied during revaluation"/>
                     </group>
-                    <newline/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                    <button name="revaluate_currency" string="Validate" type="object" icon="gtk-execute"/>
+                    <footer>
+                        <button name="revaluate_currency" type="object" string="_Validate" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>