From 9cb70feef3663fc19cd475668c0a78f62864b771 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@serviciosbaeza.com>
Date: Mon, 14 Apr 2014 15:46:02 +0200
Subject: [PATCH] [IMP] account_renumber: PEP8 [IMP] account_renumber: Restrict
 to account managers. [IMP] account_renumber: Fix translations.

---
 account_renumber/i18n/account_renumber.pot    | 130 +++++++++--------
 account_renumber/i18n/es.po                   | 127 +++++++++++++---
 account_renumber/i18n/es_ES.po                | 135 ------------------
 account_renumber/wizard/wizard_renumber.py    | 135 +++++++-----------
 .../wizard/wizard_renumber_view.xml           |   8 +-
 5 files changed, 229 insertions(+), 306 deletions(-)
 delete mode 100644 account_renumber/i18n/es_ES.po

diff --git a/account_renumber/i18n/account_renumber.pot b/account_renumber/i18n/account_renumber.pot
index 707bfe4cb..9ad454f51 100644
--- a/account_renumber/i18n/account_renumber.pot
+++ b/account_renumber/i18n/account_renumber.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0-20130902-231053\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-26 16:17+0000\n"
-"PO-Revision-Date: 2013-09-26 16:17+0000\n"
+"POT-Creation-Date: 2014-04-14 12:33+0000\n"
+"PO-Revision-Date: 2014-04-14 12:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,14 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_renumber
-#: selection:wizard.renumber,state:0
-msgid "Renumbering"
+#: code:_description:0
+#, python-format
+msgid "Account renumber wizard"
 msgstr ""
 
 #. module: account_renumber
-#: help:wizard.renumber,period_ids:0
-msgid "Fiscal periods to renumber"
-msgstr ""
-
-#. module: account_renumber
-#: model:ir.actions.act_window,name:account_renumber.action_account_renumber
-#: model:ir.ui.menu,name:account_renumber.menu_account_renumber
-msgid "Renumber journal entries"
+#: view:wizard.renumber:0
+msgid "Cancel"
 msgstr ""
 
 #. module: account_renumber
@@ -37,13 +32,23 @@ msgid "First Number"
 msgstr ""
 
 #. module: account_renumber
-#: field:wizard.renumber,state:0
-msgid "unknown"
+#: help:wizard.renumber,period_ids:0
+msgid "Fiscal periods to renumber"
 msgstr ""
 
 #. module: account_renumber
 #: view:wizard.renumber:0
-msgid "Renumber"
+msgid "General Data"
+msgstr ""
+
+#. module: account_renumber
+#: selection:wizard.renumber,state:0
+msgid "Initial"
+msgstr ""
+
+#. module: account_renumber
+#: help:wizard.renumber,number_next:0
+msgid "Journal sequences will start counting on this number"
 msgstr ""
 
 #. module: account_renumber
@@ -57,64 +62,23 @@ msgstr ""
 msgid "Journals and periods to consider"
 msgstr ""
 
-#. module: account_renumber
-#: selection:wizard.renumber,state:0
-msgid "Initial"
-msgstr ""
-
 #. module: account_renumber
 #: help:wizard.renumber,journal_ids:0
 msgid "Journals to renumber"
 msgstr ""
 
 #. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Renumber Account Moves"
-msgstr ""
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:197
-#, python-format
-msgid "Renumbered account moves"
-msgstr ""
-
-#. module: account_renumber
-#: model:ir.model,name:account_renumber.model_wizard_renumber
-msgid "wizard.renumber"
-msgstr ""
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:139
+#: code:addons/account_renumber/wizard/wizard_renumber.py:86
 #, python-format
 msgid "No Data Available"
 msgstr ""
 
 #. module: account_renumber
-#: view:wizard.renumber:0
-msgid "General Data"
-msgstr ""
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "This wizard will help you renumber entries in one or more journals."
-msgstr ""
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "sequential numbers using their journal sequence."
-msgstr ""
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:140
+#: code:addons/account_renumber/wizard/wizard_renumber.py:87
 #, python-format
 msgid "No records found for your selection!"
 msgstr ""
 
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Posted moves from those journals will be sorted by date and then assigned"
-msgstr ""
-
 #. module: account_renumber
 #: view:wizard.renumber:0
 #: field:wizard.renumber,period_ids:0
@@ -123,11 +87,53 @@ msgstr ""
 
 #. module: account_renumber
 #: view:wizard.renumber:0
-msgid "Cancel"
+msgid "Posted moves from those journals will be sorted by date and then assigned sequential numbers using their journal sequence."
 msgstr ""
 
 #. module: account_renumber
-#: help:wizard.renumber,number_next:0
-msgid "Journal sequences will start counting on this number"
+#: view:wizard.renumber:0
+msgid "Renumber"
+msgstr ""
+
+#. module: account_renumber
+#: view:wizard.renumber:0
+msgid "Renumber Account Moves"
+msgstr ""
+
+#. module: account_renumber
+#: model:ir.actions.act_window,name:account_renumber.action_account_renumber
+#: model:ir.ui.menu,name:account_renumber.menu_account_renumber
+msgid "Renumber journal entries"
+msgstr ""
+
+#. module: account_renumber
+#: code:addons/account_renumber/wizard/wizard_renumber.py:130
+#, python-format
+msgid "Renumbered account moves"
+msgstr ""
+
+#. module: account_renumber
+#: selection:wizard.renumber,state:0
+msgid "Renumbering"
+msgstr ""
+
+#. module: account_renumber
+#: view:wizard.renumber:0
+msgid "This wizard will help you renumber entries in one or more journals."
+msgstr ""
+
+#. module: account_renumber
+#: view:wizard.renumber:0
+msgid "or"
+msgstr ""
+
+#. module: account_renumber
+#: field:wizard.renumber,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: account_renumber
+#: model:ir.model,name:account_renumber.model_wizard_renumber
+msgid "wizard.renumber"
 msgstr ""
 
diff --git a/account_renumber/i18n/es.po b/account_renumber/i18n/es.po
index 90e08a8a3..a28c33967 100644
--- a/account_renumber/i18n/es.po
+++ b/account_renumber/i18n/es.po
@@ -1,18 +1,25 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account_renumber
+#	* account_renumber
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-09-26 16:17+0000\n"
 "PO-Revision-Date: 2014-04-08 19:42+0000\n"
 "Last-Translator: Juan A. Pérez Ruiz (Otherway) <juanalfonso@otherway.es>\n"
+=======
+"POT-Creation-Date: 2014-04-14 12:12+0000\n"
+"PO-Revision-Date: 2014-04-14 14:17+0100\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>\n"
+>>>>>>> [IMP] account_renumber: PEP8
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
 "X-Launchpad-Export-Date: 2014-04-09 07:04+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 "Language: \n"
@@ -32,6 +39,20 @@ msgstr "Periodos fiscales a renumerar"
 #: model:ir.ui.menu,name:account_renumber.menu_account_renumber
 msgid "Renumber journal entries"
 msgstr "Renumerar asientos"
+=======
+"Plural-Forms: \n"
+
+#. module: account_renumber
+#: code:_description:0
+#, python-format
+msgid "Account renumber wizard"
+msgstr "Asistente de renumeración contable"
+
+#. module: account_renumber
+#: view:wizard.renumber:0
+msgid "Cancel"
+msgstr "Cancelar"
+>>>>>>> [IMP] account_renumber: PEP8
 
 #. module: account_renumber
 #: field:wizard.renumber,number_next:0
@@ -39,14 +60,30 @@ msgid "First Number"
 msgstr "Primer número"
 
 #. module: account_renumber
+<<<<<<< HEAD
 #: field:wizard.renumber,state:0
 msgid "unknown"
 msgstr "desconocido"
+=======
+#: help:wizard.renumber,period_ids:0
+msgid "Fiscal periods to renumber"
+msgstr "Periodos a renumerar"
+>>>>>>> [IMP] account_renumber: PEP8
 
 #. module: account_renumber
 #: view:wizard.renumber:0
-msgid "Renumber"
-msgstr "Renumerar"
+msgid "General Data"
+msgstr "Datos generales"
+
+#. module: account_renumber
+#: selection:wizard.renumber,state:0
+msgid "Initial"
+msgstr "Inicial"
+
+#. module: account_renumber
+#: help:wizard.renumber,number_next:0
+msgid "Journal sequences will start counting on this number"
+msgstr "Las secuencias de diario comenzarán a contar en este número"
 
 #. module: account_renumber
 #: view:wizard.renumber:0
@@ -60,27 +97,32 @@ msgid "Journals and periods to consider"
 msgstr "Diarios y periodos a considerar"
 
 #. module: account_renumber
+<<<<<<< HEAD
 #: selection:wizard.renumber,state:0
 msgid "Initial"
 msgstr "Inicial"
 
 #. module: account_renumber
+=======
+>>>>>>> [IMP] account_renumber: PEP8
 #: help:wizard.renumber,journal_ids:0
 msgid "Journals to renumber"
 msgstr "Diarios a renumerar"
 
 #. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Renumber Account Moves"
-msgstr "Renumerar asientos contables"
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:197
+#: code:addons/account_renumber/wizard/wizard_renumber.py:96
 #, python-format
-msgid "Renumbered account moves"
-msgstr "Asientos contables renumerados"
+msgid "No Data Available"
+msgstr "Sin datos disponibles"
 
 #. module: account_renumber
+#: code:addons/account_renumber/wizard/wizard_renumber.py:97
+#, python-format
+msgid "No records found for your selection!"
+msgstr "No se han encontrado registros para la selección"
+
+#. module: account_renumber
+<<<<<<< HEAD
 #: model:ir.model,name:account_renumber.model_wizard_renumber
 msgid "wizard.renumber"
 msgstr "wizard.renumber"
@@ -90,14 +132,26 @@ msgstr "wizard.renumber"
 #, python-format
 msgid "No Data Available"
 msgstr "No hay datos disponibles"
+=======
+#: view:wizard.renumber:0
+#: field:wizard.renumber,period_ids:0
+msgid "Periods"
+msgstr "Periodos"
 
 #. module: account_renumber
 #: view:wizard.renumber:0
-msgid "General Data"
-msgstr "Datos Generales"
+msgid "Posted moves from those journals will be sorted by date and then assigned sequential numbers using their journal sequence."
+msgstr "Los asientos asentados de estos diarios se ordenarán por fecha y entonces se les asignará un número de secuencia usando su secuencia de diario."
+>>>>>>> [IMP] account_renumber: PEP8
 
 #. module: account_renumber
 #: view:wizard.renumber:0
+msgid "Renumber"
+msgstr "Renumerar"
+
+#. module: account_renumber
+#: view:wizard.renumber:0
+<<<<<<< HEAD
 msgid "This wizard will help you renumber entries in one or more journals."
 msgstr ""
 "Este asistente le ayudará a renumerar los asientos en uno o más diarios."
@@ -106,10 +160,21 @@ msgstr ""
 #: view:wizard.renumber:0
 msgid "sequential numbers using their journal sequence."
 msgstr "números secuenciales usando su secuencia de diario."
+=======
+msgid "Renumber Account Moves"
+msgstr "Renumerar asientos contables"
 
 #. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:140
+#: model:ir.actions.act_window,name:account_renumber.action_account_renumber
+#: model:ir.ui.menu,name:account_renumber.menu_account_renumber
+msgid "Renumber journal entries"
+msgstr "Renumerar asientos contables"
+>>>>>>> [IMP] account_renumber: PEP8
+
+#. module: account_renumber
+#: code:addons/account_renumber/wizard/wizard_renumber.py:159
 #, python-format
+<<<<<<< HEAD
 msgid "No records found for your selection!"
 msgstr "No se han encontrado registros en su selección"
 
@@ -120,19 +185,35 @@ msgid ""
 msgstr ""
 "Los elementos asentados de esos diarios serán ordenados por fecha y "
 "asignados a"
+=======
+msgid "Renumbered account moves"
+msgstr "Asientos contables renumerados"
+
+#. module: account_renumber
+#: selection:wizard.renumber,state:0
+msgid "Renumbering"
+msgstr "Renumerados"
+>>>>>>> [IMP] account_renumber: PEP8
 
 #. module: account_renumber
 #: view:wizard.renumber:0
-#: field:wizard.renumber,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
+msgid "This wizard will help you renumber entries in one or more journals."
+msgstr "Este asistente le permite renumerar los asientos de uno o más diarios."
 
 #. module: account_renumber
 #: view:wizard.renumber:0
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "or"
+msgstr "o"
 
 #. module: account_renumber
-#: help:wizard.renumber,number_next:0
-msgid "Journal sequences will start counting on this number"
-msgstr "Las secuencias de los diarios empezarán a contar en este número"
+#: field:wizard.renumber,state:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: account_renumber
+#: code:_description:0
+#: model:ir.model,name:account_renumber.model_wizard_renumber
+#, python-format
+msgid "wizard.renumber"
+msgstr "Asistente de renumeración de asientos"
+
diff --git a/account_renumber/i18n/es_ES.po b/account_renumber/i18n/es_ES.po
deleted file mode 100644
index 61432c8e9..000000000
--- a/account_renumber/i18n/es_ES.po
+++ /dev/null
@@ -1,135 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account_renumber
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-26 16:17+0000\n"
-"PO-Revision-Date: 2013-10-18 17:39+0000\n"
-"Last-Translator: Joaquin Gutierrez <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-01 06:51+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
-"Language: \n"
-
-#. module: account_renumber
-#: selection:wizard.renumber,state:0
-msgid "Renumbering"
-msgstr ""
-
-#. module: account_renumber
-#: help:wizard.renumber,period_ids:0
-msgid "Fiscal periods to renumber"
-msgstr "Periodos fiscales a renumerar"
-
-#. module: account_renumber
-#: model:ir.actions.act_window,name:account_renumber.action_account_renumber
-#: model:ir.ui.menu,name:account_renumber.menu_account_renumber
-msgid "Renumber journal entries"
-msgstr ""
-
-#. module: account_renumber
-#: field:wizard.renumber,number_next:0
-msgid "First Number"
-msgstr "Primer número"
-
-#. module: account_renumber
-#: field:wizard.renumber,state:0
-msgid "unknown"
-msgstr "unknown"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Renumber"
-msgstr "Renumerar"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-#: field:wizard.renumber,journal_ids:0
-msgid "Journals"
-msgstr "Diarios"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Journals and periods to consider"
-msgstr "Diarios y periodos a considerar"
-
-#. module: account_renumber
-#: selection:wizard.renumber,state:0
-msgid "Initial"
-msgstr "Initial"
-
-#. module: account_renumber
-#: help:wizard.renumber,journal_ids:0
-msgid "Journals to renumber"
-msgstr "Diarios a renumerar"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Renumber Account Moves"
-msgstr "Renumerar asientos contables"
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:197
-#, python-format
-msgid "Renumbered account moves"
-msgstr "Asientos contables renumerados"
-
-#. module: account_renumber
-#: model:ir.model,name:account_renumber.model_wizard_renumber
-msgid "wizard.renumber"
-msgstr ""
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:139
-#, python-format
-msgid "No Data Available"
-msgstr "No Data Available"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "General Data"
-msgstr "Datos Generales"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "This wizard will help you renumber entries in one or more journals."
-msgstr ""
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "sequential numbers using their journal sequence."
-msgstr ""
-
-#. module: account_renumber
-#: code:addons/account_renumber/wizard/wizard_renumber.py:140
-#, python-format
-msgid "No records found for your selection!"
-msgstr "No records found for your selection!"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid ""
-"Posted moves from those journals will be sorted by date and then assigned"
-msgstr ""
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-#: field:wizard.renumber,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: account_renumber
-#: view:wizard.renumber:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_renumber
-#: help:wizard.renumber,number_next:0
-msgid "Journal sequences will start counting on this number"
-msgstr "Las secuencias de los diarios empezarán a contar en este número"
diff --git a/account_renumber/wizard/wizard_renumber.py b/account_renumber/wizard/wizard_renumber.py
index 5d113c43e..ebd89ac62 100644
--- a/account_renumber/wizard/wizard_renumber.py
+++ b/account_renumber/wizard/wizard_renumber.py
@@ -19,37 +19,32 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-"""
-Account renumber wizard
-"""
-
-from openerp.osv import fields
-from openerp.osv import orm
+from openerp.osv import fields, orm
 from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
 import logging
 
-
 class wizard_renumber(orm.TransientModel):
     _name = "wizard.renumber"
+    _description = "Account renumber wizard"
     _columns = {
-                'journal_ids': fields.many2many('account.journal', 'account_journal_wzd_renumber_rel',
+        'journal_ids': fields.many2many('account.journal',
+                                        'account_journal_wzd_renumber_rel',
                                         'wizard_id', 'journal_id',
                                         required=True,
                                         help="Journals to renumber",
                                         string="Journals"),
-                'period_ids': fields.many2many('account.period', 'account_period_wzd_renumber_rel',
-                                        'wizard_id', 'period_id',
-                                        required=True,
-                                        help='Fiscal periods to renumber',
-                                        string="Periods", ondelete='null'),
-                'number_next': fields.integer('First Number', required=True,
-                                        help="Journal sequences will start counting on this number"),
-                'state': fields.selection([
-                                           ('init', 'Initial'),
-                                           ('renumber', 'Renumbering')
-                                           ], readonly=True)
-                }
+        'period_ids': fields.many2many('account.period',
+                                       'account_period_wzd_renumber_rel',
+                                       'wizard_id', 'period_id',
+                                       required=True,
+                                       help='Fiscal periods to renumber',
+                                       string="Periods", ondelete='null'),
+        'number_next': fields.integer('First Number', required=True,
+                help="Journal sequences will start counting on this number"),
+        'state': fields.selection([('init', 'Initial'),
+                                   ('renumber', 'Renumbering')], readonly=True)
+    }
 
     _defaults = {
         'number_next': 1,
@@ -60,17 +55,15 @@ class wizard_renumber(orm.TransientModel):
     # Helper methods
     ###############################
 
-    def get_sequence_id_for_fiscalyear_id(self, cr, uid, sequence_id, fiscalyear_id, context=None):
+    def get_sequence_id_for_fiscalyear_id(self, cr, uid, sequence_id,
+                                          fiscalyear_id, context=None):
         """
         Based on ir_sequence.get_id from the account module.
         Allows us to get the real sequence for the given fiscal year.
         """
-        sequences = self.pool.get('ir.sequence').browse(
-                                                        cr,
-                                                        uid,
-                                                        sequence_id,
-                                                        context=context)
-        for line in sequences.fiscal_ids:
+        sequence = self.pool['ir.sequence'].browse(cr, uid, sequence_id,
+                                                    context=context)
+        for line in sequence.fiscal_ids:
             if line.fiscalyear_id.id == fiscalyear_id:
                 return line.sequence_id.id
         return sequence_id
@@ -79,92 +72,70 @@ class wizard_renumber(orm.TransientModel):
     # Renumber form/action
     ##########################################################################
 
-    def renumber(self, cr, uid, ids, context):
+    def renumber(self, cr, uid, ids, context=None):
         """
         Action that renumbers all the posted moves on the given
         journal and periods, and returns their ids.
         """
         logger = logging.getLogger("account_renumber")
-        obj = self.browse(cr, uid, ids[0])
-
-        period_ids = [x.id for x in obj.period_ids]
-        journal_ids = [x.id for x in obj.journal_ids]
-        number_next = obj.number_next or 1
-
+        form = self.browse(cr, uid, ids[0], context=context)
+        period_ids = [x.id for x in form.period_ids]
+        journal_ids = [x.id for x in form.journal_ids]
+        number_next = form.number_next or 1
         if not (period_ids and journal_ids):
-            raise orm.except_orm(
-                                 _('No Data Available'),
+            raise orm.except_orm(_('No Data Available'),
                                  _('No records found for your selection!'))
-
         logger.debug("Searching for account moves to renumber.")
-        move_facade = self.pool.get('account.move')
-        obj_sequence = self.pool.get('ir.sequence')
+        move_obj = self.pool['account.move']
+        sequence_obj = self.pool['ir.sequence']
         sequences_seen = []
         for period in period_ids:
-            move_ids = move_facade.search(
-                            cr,
-                            uid,
-                            [
-                            ('journal_id', 'in', journal_ids),
-                            ('period_id', '=', period),
-                            ('state', '=', 'posted')],
-                            limit=0, order='date,id',
-                            context=context)
-            if len(move_ids) == 0:
+            move_ids = move_obj.search(cr, uid,
+                                          [('journal_id', 'in', journal_ids),
+                                           ('period_id', '=', period),
+                                           ('state', '=', 'posted')],
+                                          limit=0, order='date,id',
+                                          context=context)
+            if not move_ids:
                 continue
-
-            for move in move_facade.browse(cr, uid, move_ids):
-
+            logger.debug("Renumbering %d account moves." % len(move_ids))
+            for move in move_obj.browse(cr, uid, move_ids, context=context):
                 sequence_id = self.get_sequence_id_for_fiscalyear_id(
-                                cr,
-                                uid,
+                                cr, uid,
                                 sequence_id=move.journal_id.sequence_id.id,
                                 fiscalyear_id=move.period_id.fiscalyear_id.id)
                 if not sequence_id in sequences_seen:
-                    self.pool.get('ir.sequence').write(
-                                            cr,
-                                            uid,
-                                            [sequence_id],
-                                            {'number_next': number_next})
+                    sequence_obj.write(cr, SUPERUSER_ID, [sequence_id],
+                                       {'number_next': number_next})
                     sequences_seen.append(sequence_id)
-                #
                 # Generate (using our own get_id) and write the new move number
-                #
                 c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
-                new_name = obj_sequence.next_by_id(
-                                            cr,
-                                            uid,
-                                            move.journal_id.sequence_id.id,
-                                            c)
+                new_name = sequence_obj.next_by_id(cr,uid,
+                               move.journal_id.sequence_id.id, context=c)
                 # Note: We can't just do a
-                # "move_facade.write(cr, uid, [move.id], {'name': new_name})"
+                # "move_obj.write(cr, uid, [move.id], {'name': new_name})"
                 # cause it might raise a
                 #"You can't do this modification on a confirmed entry"
                 # exception.
                 cr.execute('UPDATE account_move SET name=%s WHERE id=%s',
-                               (new_name, move.id))
-                logger.debug("%d account moves renumbered." % len(move_ids))
-                logger.debug("Renumbering %d account moves." % len(move_ids))
+                           (new_name, move.id))
+            logger.debug("%d account moves renumbered." % len(move_ids))
         sequences_seen = []
-        obj.write({'state': 'renumber'})
-
-        view_ref = self.pool.get('ir.model.data').get_object_reference(
-                                                cr,
-                                                uid,
-                                                'account',
-                                                'view_move_tree')
+        form.write({'state': 'renumber'})
+        view_ref = self.pool['ir.model.data'].get_object_reference(cr,
+                                        uid, 'account', 'view_move_tree')
         view_id = view_ref and view_ref[1] or False,
         res = {
             'type': 'ir.actions.act_window',
             'name': _("Renumbered account moves"),
             'res_model': 'account.move',
-            'domain': "[('journal_id','in',%s), ('period_id','in',%s), ('state','=','posted')]" % (repr(journal_ids), repr(period_ids)),
+            'domain': ("[('journal_id','in',%s), ('period_id','in',%s), "
+                       "('state','=','posted')]"
+                       % (journal_ids, period_ids)),
             'view_type': 'form',
             'view_mode': 'tree',
             'view_id': view_id,
             'context': context,
             'target': 'current',
-            }
+        }
         return res
-
-wizard_renumber()
diff --git a/account_renumber/wizard/wizard_renumber_view.xml b/account_renumber/wizard/wizard_renumber_view.xml
index fcc84a6e3..73292b687 100644
--- a/account_renumber/wizard/wizard_renumber_view.xml
+++ b/account_renumber/wizard/wizard_renumber_view.xml
@@ -9,8 +9,7 @@
                 <form string="Renumber Account Moves" version="7.0">
                     <field name="state" invisible="1" />
                     <p>This wizard will help you renumber entries in one or more journals.</p>
-                    <p>Posted moves from those journals will be sorted by date and then assigned</p>
-                    <p>sequential numbers using their journal sequence.</p>
+                    <p>Posted moves from those journals will be sorted by date and then assigned sequential numbers using their journal sequence.</p>
                     <group string="General Data">
                         <field name="number_next"/>
                     </group>
@@ -27,7 +26,7 @@
                     <footer>
                         <div states="init">
                             <button name="renumber" string="Renumber" type="object" class="oe_highlight"/>
-                            o
+                            or
                             <button special="cancel" string="Cancel" class="oe_link"/>
                         </div>
                     </footer>
@@ -45,7 +44,8 @@
         <menuitem id="menu_account_renumber"
                 parent="account.menu_account_end_year_treatments"
                 action="action_account_renumber"
-                sequence="-1"/>
+                sequence="-1"
+                groups="account.group_account_manager"/>
 
     </data>
 </openerp>