From c0596f6d582b5f133ebe0ca05ce8b44c21ea24d3 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 9 Apr 2010 16:39:59 +0530
Subject: [PATCH] [ADD] account : account_fiscal_year_close wizard converted
 into osv memory wizard

bzr revid: vir@tinyerp.com-20100409110959-l6km0qr6k89mztbb
---
 addons/account/__openerp__.py                 |   1 +
 addons/account/account_wizard.xml             |  16 +-
 addons/account/wizard/__init__.py             |   2 +-
 .../wizard/account_fiscalyear_close.py        | 230 ++++++++++++++++++
 .../wizard/account_fiscalyear_close_view.xml  |  47 ++++
 .../account/wizard/wizard_fiscalyear_close.py | 228 -----------------
 6 files changed, 287 insertions(+), 237 deletions(-)
 create mode 100644 addons/account/wizard/account_fiscalyear_close.py
 create mode 100644 addons/account/wizard/account_fiscalyear_close_view.xml
 delete mode 100644 addons/account/wizard/wizard_fiscalyear_close.py

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 1663442f984..6e698c32434 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -61,6 +61,7 @@ module named account_voucherss
         'wizard/account_general_journal_view.xml',
         'wizard/account_central_journal_view.xml',
         'wizard/account_subscription_generate_view.xml',
+        'wizard/account_fiscalyear_close_view.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index fc2859f08d0..46fb98e820b 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -19,14 +19,14 @@
         <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/>
 
         <!-- close year, period, journal -->
-        <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>
-
-        <menuitem
-            action="wizard_fiscalyear_close"
-            id="menu_wizard_fy_close"
-            parent="menu_account_end_year_treatments"
-            type="wizard"
-            sequence="1"/>
+<!--        <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>-->
+<!---->
+<!--        <menuitem-->
+<!--            action="wizard_fiscalyear_close"-->
+<!--            id="menu_wizard_fy_close"-->
+<!--            parent="menu_account_end_year_treatments"-->
+<!--            type="wizard"-->
+<!--            sequence="1"/>-->
 
   <!--     <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
         <menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 18a8c2a9f2b..f1f5eff907f 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -36,7 +36,7 @@ import wizard_third_party_ledger
 import wizard_account_balance_report
 import wizard_partner_balance_report
 import account_period_close
-import wizard_fiscalyear_close
+import account_fiscalyear_close
 import account_fiscalyear_close_state
 import account_vat
 import account_open_closed_fiscalyear
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
new file mode 100644
index 00000000000..4a48011d8c3
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -0,0 +1,230 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 fields, osv
+from tools.translate import _
+import tools
+
+class account_fiscalyear_close(osv.osv_memory):
+    """
+    Closes Account Fiscalyear and Generate Opening entries for New Fiscalyear
+    """
+    _name = "account.fiscalyear.close"
+    _description = "Fiscalyear Close"
+    _columns = {
+       'fy_id': fields.many2one('account.fiscalyear', \
+                                 'Fiscal Year to close', required=True),
+       'fy2_id': fields.many2one('account.fiscalyear', \
+                                 'New Fiscal Year', required=True),
+       'journal_id': fields.many2one('account.journal', \
+                                 'Opening Entries Journal', required=True),
+       'period_id': fields.many2one('account.period', \
+                                 'Opening Entries Period', required=True),
+       'report_name': fields.char('Name of new entries',size=64,required=True),
+       'sure': fields.boolean('Check this box', required=False),
+              }
+    _defaults = {
+        'report_name':'End of Fiscal Year Entry',
+
+        }
+
+    def data_save(self, cr, uid, ids, context):
+        """
+        This function close account fiscalyear and create entries in new fiscalyear
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Account fiscalyear close state’s IDs
+
+        """
+        obj_acc_period = self.pool.get('account.period')
+        obj_acc_fiscalyear = self.pool.get('account.fiscalyear')
+        obj_acc_journal = self.pool.get('account.journal')
+        obj_acc_move_line = self.pool.get('account.move.line')
+        obj_acc_account = self.pool.get('account.account')
+        obj_acc_journal_period = self.pool.get('account.journal.period')
+
+        data =  self.read(cr, uid, ids,context=context)
+
+        if not data[0]['sure']:
+                raise osv.except_osv(_('UserError'), _('Closing of fiscal year cancelled, please check the box !'))
+        fy_id = data[0]['fy_id']
+
+
+        period_ids = obj_acc_period.search(cr, uid, [('fiscalyear_id', '=', fy_id)])
+        periods_fy2 = obj_acc_period.search(cr, uid, [('fiscalyear_id', '=', data[0]['fy2_id'])])
+
+        period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
+        new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context)
+        old_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy_id'], context=context)
+
+        new_journal = data[0]['journal_id']
+        new_journal = obj_acc_journal.browse(cr, uid, new_journal, context=context)
+
+        if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
+            raise osv.except_osv(_('UserError'),
+                    _('The journal must have default credit and debit account'))
+        if not new_journal.centralisation:
+            raise osv.except_osv(_('UserError'),
+                    _('The journal must have centralised counterpart'))
+
+        move_ids = obj_acc_move_line.search(cr, uid, [
+            ('journal_id','=',new_journal.id),('period_id.fiscalyear_id','=',new_fyear.id)])
+        if move_ids:
+            raise osv.except_osv(_('UserError'),
+                    _('The opening journal must not have any entry in the new fiscal year !'))
+        query = "SELECT id FROM account_fiscalyear WHERE date_stop < '" + str(new_fyear.date_start) + "'"
+        cr.execute(query)
+        result = cr.dictfetchall()
+        fy_ids = ','.join([str(x['id']) for x in result])
+        query_line = obj_acc_move_line._query_get(cr, uid,
+                obj='account_move_line', context={'fiscalyear': fy_ids})
+        cr.execute('select id from account_account WHERE active')
+        ids = map(lambda x: x[0], cr.fetchall())
+        for account in obj_acc_account.browse(cr, uid, ids,
+            context={'fiscalyear': fy_id}):
+
+            accnt_type_data = account.user_type
+            if not accnt_type_data:
+                continue
+            if accnt_type_data.close_method=='none' or account.type == 'view':
+                continue
+            if accnt_type_data.close_method=='balance':
+                if abs(account.balance)>0.0001:
+                    obj_acc_move_line.create(cr, uid, {
+                        'debit': account.balance>0 and account.balance,
+                        'credit': account.balance<0 and -account.balance,
+                        'name': data[0]['report_name'],
+                        'date': period.date_start,
+                        'journal_id': new_journal.id,
+                        'period_id': period.id,
+                        'account_id': account.id
+                    }, {'journal_id': new_journal.id, 'period_id':period.id})
+            if accnt_type_data.close_method == 'unreconciled':
+                offset = 0
+                limit = 100
+                while True:
+                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
+                                'amount_currency, currency_id, blocked, partner_id, ' \
+                                'date_maturity, date_created ' \
+                            'FROM account_move_line ' \
+                            'WHERE account_id = %s ' \
+                                'AND ' + query_line + ' ' \
+                                'AND reconcile_id is NULL ' \
+                            'ORDER BY id ' \
+                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
+                    result = cr.dictfetchall()
+                    if not result:
+                        break
+                    for move in result:
+                        move.pop('id')
+                        move.update({
+                            'date': period.date_start,
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                        })
+                        obj_acc_move_line.create(cr, uid, move, {
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                            })
+                    offset += limit
+
+                #We have also to consider all move_lines that were reconciled
+                #on another fiscal year, and report them too
+                offset = 0
+                limit = 100
+                while True:
+                    #TODO: this query could be improved in order to work if there is more than 2 open FY
+                    # a.period_id IN ('+fy2_period_set+') is the problematic clause
+                    cr.execute('SELECT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
+                                'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \
+                                'b.date_maturity, b.date_created ' \
+                            'FROM account_move_line a, account_move_line b ' \
+                            'WHERE b.account_id = %s ' \
+                                'AND b.reconcile_id is NOT NULL ' \
+                                'AND a.reconcile_id = b.reconcile_id ' \
+                                'AND b.period_id =ANY(%s)'\
+                                'AND a.period_id =ANY(%s)' \
+                            'ORDER BY id ' \
+                            'LIMIT %s OFFSET %s', (account.id,period_ids,periods_fy2,limit, offset))
+                    result = cr.dictfetchall()
+                    if not result:
+                        break
+                    for move in result:
+                        move.pop('id')
+                        move.update({
+                            'date': period.date_start,
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                        })
+                        obj_acc_move_line.create(cr, uid, move, {
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                            })
+                    offset += limit
+            if accnt_type_data.close_method=='detail':
+                offset = 0
+                limit = 100
+                while True:
+                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
+                                'amount_currency, currency_id, blocked, partner_id, ' \
+                                'date_maturity, date_created ' \
+                            'FROM account_move_line ' \
+                            'WHERE account_id = %s ' \
+                                'AND ' + query_line + ' ' \
+                            'ORDER BY id ' \
+                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
+
+                    result = cr.dictfetchall()
+                    if not result:
+                        break
+                    for move in result:
+                        move.pop('id')
+                        move.update({
+                            'date': period.date_start,
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                        })
+                        obj_acc_move_line.create(cr, uid, move)
+                    offset += limit
+        ids = obj_acc_move_line.search(cr, uid, [('journal_id','=',new_journal.id),
+            ('period_id.fiscalyear_id','=',new_fyear.id)])
+        context['fy_closing'] = True
+
+        if ids:
+            obj_acc_move_line.reconcile(cr, uid, ids, context=context)
+        new_period = data[0]['period_id']
+        ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
+        if not ids:
+            ids = [obj_acc_journal_period.create(cr, uid, {
+                   'name': (new_journal.name or '')+':'+(period.code or ''),
+                   'journal_id': new_journal.id,
+                   'period_id': period.id
+               })]
+        cr.execute('UPDATE account_fiscalyear ' \
+                    'SET end_journal_period_id = %s ' \
+                    'WHERE id = %s', (ids[0], old_fyear.id))
+        return {}
+
+
+account_fiscalyear_close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
new file mode 100644
index 00000000000..e8db5193275
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_fiscalyear_close" model="ir.ui.view">
+            <field name="name">account.fiscalyear.close.form</field>
+            <field name="model">account.fiscalyear.close</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Generate Fiscal Year Opening Entries Close a Fiscal Year with new entries">
+                	<group colspan="4" >
+	                	<field name="fy_id"  domain = "[('state','=','draft')]"/>
+	                	<field name="fy2_id"  domain = "[('state','=','draft')]"/>
+	                	<field name="journal_id" />
+	                	<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
+                	</group>
+                	<group colspan="4" >
+                		<field name="report_name" />
+                	</group>
+                	<group colspan="4" >
+              			 <separator string="Are you sure you want to create entries?" colspan="4"/>
+                		 <field name="sure"/>
+                    </group>
+                  	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
+            <field name="name">Generate Fiscal Year Opening Entries</field>
+            <field name="res_model">account.fiscalyear.close</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_fiscalyear_close"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_account_fiscalyear_close"
+        	id="menu_wizard_fy_close"
+        	parent="menu_account_end_year_treatments" />
+
+    </data>
+</openerp>
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
deleted file mode 100644
index cbf4b8d0529..00000000000
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 wizard
-import osv
-import pooler
-from tools.translate import _
-
-_transaction_form = '''<?xml version="1.0"?>
-<form string="Close Fiscal Year with new entries">
-    <field name="fy_id"/>
-    <field name="fy2_id"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-    <field name="report_name" colspan="4"/>
-
-    <separator string="Are you sure you want to create entries?" colspan="4"/>
-    <field name="sure"/>
-</form>'''
-
-_transaction_fields = {
-    'fy_id': {'string':'Fiscal Year to close', 'type':'many2one', 'relation': 'account.fiscalyear','required':True, 'domain':[('state','=','draft')]},
-    'journal_id': {'string':'Opening Entries Journal', 'type':'many2one', 'relation': 'account.journal','required':True},
-    'period_id': {'string':'Opening Entries Period', 'type':'many2one', 'relation': 'account.period','required':True, 'domain':"[('fiscalyear_id','=',fy2_id)]"},
-    'fy2_id': {'string':'New Fiscal Year', 'type':'many2one', 'relation': 'account.fiscalyear', 'domain':[('state','=','draft')], 'required':True},
-    'report_name': {'string':'Name of new entries', 'type':'char', 'size': 64, 'required':True},
-    'sure': {'string':'Check this box', 'type':'boolean'},
-}
-
-def _data_load(self, cr, uid, data, context):
-    data['form']['report_name'] = _('End of Fiscal Year Entry')
-    return data['form']
-
-def _data_save(self, cr, uid, data, context):
-    if not data['form']['sure']:
-        raise wizard.except_wizard(_('UserError'), _('Closing of fiscal year cancelled, please check the box !'))
-    pool = pooler.get_pool(cr.dbname)
-
-    fy_id = data['form']['fy_id']
-    period_ids = pool.get('account.period').search(cr, uid, [('fiscalyear_id', '=', fy_id)])
-    periods_fy2 = pool.get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fy2_id'])])
-
-    period = pool.get('account.period').browse(cr, uid, data['form']['period_id'], context=context)
-    new_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy2_id'], context=context)
-    old_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy_id'], context=context)
-
-    new_journal = data['form']['journal_id']
-    new_journal = pool.get('account.journal').browse(cr, uid, new_journal, context=context)
-
-    if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
-        raise wizard.except_wizard(_('UserError'),
-                _('The journal must have default credit and debit account'))
-    if not new_journal.centralisation:
-        raise wizard.except_wizard(_('UserError'),
-                _('The journal must have centralised counterpart'))
-
-    move_ids = pool.get('account.move.line').search(cr, uid, [
-        ('journal_id','=',new_journal.id),('period_id.fiscalyear_id','=',new_fyear.id)])
-    if move_ids:
-        raise wizard.except_wizard(_('UserError'),
-                _('The opening journal must not have any entry in the new fiscal year !'))
-    query = "SELECT id FROM account_fiscalyear WHERE date_stop < '" + str(new_fyear.date_start) + "'"
-    cr.execute(query)
-    result = cr.dictfetchall()
-    fy_ids = ','.join([str(x['id']) for x in result])
-    query_line = pool.get('account.move.line')._query_get(cr, uid,
-            obj='account_move_line', context={'fiscalyear': fy_ids})
-    cr.execute('select id from account_account WHERE active')
-    ids = map(lambda x: x[0], cr.fetchall())
-    for account in pool.get('account.account').browse(cr, uid, ids,
-        context={'fiscalyear': fy_id}):
-
-        accnt_type_data = account.user_type
-        if not accnt_type_data:
-            continue
-        if accnt_type_data.close_method=='none' or account.type == 'view':
-            continue
-        if accnt_type_data.close_method=='balance':
-            if abs(account.balance)>0.0001:
-                pool.get('account.move.line').create(cr, uid, {
-                    'debit': account.balance>0 and account.balance,
-                    'credit': account.balance<0 and -account.balance,
-                    'name': data['form']['report_name'],
-                    'date': period.date_start,
-                    'journal_id': new_journal.id,
-                    'period_id': period.id,
-                    'account_id': account.id
-                }, {'journal_id': new_journal.id, 'period_id':period.id})
-        if accnt_type_data.close_method == 'unreconciled':
-            offset = 0
-            limit = 100
-            while True:
-                cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
-                            'amount_currency, currency_id, blocked, partner_id, ' \
-                            'date_maturity, date_created ' \
-                        'FROM account_move_line ' \
-                        'WHERE account_id = %s ' \
-                            'AND ' + query_line + ' ' \
-                            'AND reconcile_id is NULL ' \
-                        'ORDER BY id ' \
-                        'LIMIT %s OFFSET %s', (account.id, limit, offset))
-                result = cr.dictfetchall()
-                if not result:
-                    break
-                for move in result:
-                    move.pop('id')
-                    move.update({
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                    })
-                    pool.get('account.move.line').create(cr, uid, move, {
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                        })
-                offset += limit
-
-            #We have also to consider all move_lines that were reconciled
-            #on another fiscal year, and report them too
-            offset = 0
-            limit = 100
-            while True:
-                #TODO: this query could be improved in order to work if there is more than 2 open FY
-                # a.period_id IN ('+fy2_period_set+') is the problematic clause
-                cr.execute('SELECT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
-                            'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \
-                            'b.date_maturity, b.date_created ' \
-                        'FROM account_move_line a, account_move_line b ' \
-                        'WHERE b.account_id = %s ' \
-                            'AND b.reconcile_id is NOT NULL ' \
-                            'AND a.reconcile_id = b.reconcile_id ' \
-                            'AND b.period_id =ANY(%s)'\
-                            'AND a.period_id =ANY(%s)' \
-                        'ORDER BY id ' \
-                        'LIMIT %s OFFSET %s', (account.id,period_ids,periods_fy2,limit, offset))
-                result = cr.dictfetchall()
-                if not result:
-                    break
-                for move in result:
-                    move.pop('id')
-                    move.update({
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                    })
-                    pool.get('account.move.line').create(cr, uid, move, {
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                        })
-                offset += limit
-        if accnt_type_data.close_method=='detail':
-            offset = 0
-            limit = 100
-            while True:
-                cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
-                            'amount_currency, currency_id, blocked, partner_id, ' \
-                            'date_maturity, date_created ' \
-                        'FROM account_move_line ' \
-                        'WHERE account_id = %s ' \
-                            'AND ' + query_line + ' ' \
-                        'ORDER BY id ' \
-                        'LIMIT %s OFFSET %s', (account.id, limit, offset))
-
-                result = cr.dictfetchall()
-                if not result:
-                    break
-                for move in result:
-                    move.pop('id')
-                    move.update({
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                    })
-                    pool.get('account.move.line').create(cr, uid, move)
-                offset += limit
-    ids = pool.get('account.move.line').search(cr, uid, [('journal_id','=',new_journal.id),
-        ('period_id.fiscalyear_id','=',new_fyear.id)])
-    context['fy_closing'] = True
-
-    if ids:
-        pool.get('account.move.line').reconcile(cr, uid, ids, context=context)
-    new_period = data['form']['period_id']
-    ids = pool.get('account.journal.period').search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
-    if not ids:
-        ids = [pool.get('account.journal.period').create(cr, uid, {
-               'name': (new_journal.name or '')+':'+(period.code or ''),
-               'journal_id': new_journal.id,
-               'period_id': period.id
-           })]
-    cr.execute('UPDATE account_fiscalyear ' \
-                'SET end_journal_period_id = %s ' \
-                'WHERE id = %s', (ids[0], old_fyear.id))
-    return {}
-
-class wiz_journal_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_data_load],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('close','Create', 'gtk-ok')]}
-        },
-        'close': {
-            'actions': [_data_save],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_journal_close('account.fiscalyear.close')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-