Merge lp:~pexego/openerp-spain/6.1_account_balance_reporting_imp into lp:~openerp-spain-team/openerp-spain/6.1

[Omar (Pexego)]

Se permite filtran por fechas los informes de la misma forma que ya se podía por periodos y se permite hacer un desglose por nivel en el informe.

[lp:~pexego/openerp-spain/6.1_account_balance_reporting_imp]

397. By Omar (Pexego) on 2014-05-14

[UPD] account_balance_reporting: Actualizamos la licencia a AGPL

[Pedro Manuel Baeza (pedro.baeza)]

Buenas, Omar,

Muchas gracias por la mejora aportada. Cuando terminemos de refinarla, la llevaré también a la versión 7.

Te hago una primera revisión mirando código, y luego la probaré funcionalmente:

- ¿Por qué el filtro de fechas se añade al de periodos en lugar de ser excluyentes (mediante un selection o similar), como los de los informes financieros? No veo ningún caso de uso en el que haga falta filtrar por los dos a la vez. Es más, eso puede provocar confusión al usuario, ya que puede dar con una combinación de filtros de periodos y de fechas que saque datos distintos a si lo hiciera por separado (debido a las diferencias que pueden haber a veces de fechas y periodos en los asientos de proveedor).

- He visto que has mejorado bastante la convención PEP8 en el código Python, pero todavía quedan algunas cosas que corregir, por lo que te paso la salida de errores que me da un comprobador del mismo (flake8), que ya que estamos estaría bien corregir:

account_balance_reporting.py:86:9: E128 continuation line under-indented for visual indent
account_balance_reporting.py:87:9: E128 continuation line under-indented for visual indent
account_balance_reporting.py:88:9: E128 continuation line under-indented for visual indent
account_balance_reporting.py:96:9: E128 continuation line under-indented for visual indent
account_balance_reporting.py:97:9: E128 continuation line under-indented for visual indent
account_balance_reporting.py:98:9: E128 continuation line under-indented for visual indent
account_balance_reporting.py:156:46: E128 continuation line under-indented for visual indent
account_balance_reporting.py:233:9: E122 continuation line missing indentation or outdented
account_balance_reporting.py:234:9: E122 continuation line missing indentation or outdented
account_balance_reporting.py:298:49: E128 continuation line under-indented for visual indent
account_balance_reporting.py:318:49: E128 continuation line under-indented for visual indent
account_balance_reporting.py:542:9: F841 local variable 'child_ids' is assigned to but never used
account_balance_reporting_template.py:30:28: E231 missing whitespace after ','
account_balance_reporting_template.py:33:80: E501 line too long (104 > 79 characters)
account_balance_reporting_template.py:39:80: E501 line too long (119 > 79 characters)
account_balance_reporting_template.py:42:80: E501 line too long (84 > 79 characters)
account_balance_reporting_template.py:48:26: E231 missing whitespace after ','
account_balance_reporting_template.py:55:1: E302 expected 2 blank lines, found 1
account_balance_reporting_template.py:72:29: E126 continuation line over-indented for hanging indent
account_balance_reporting_template.py:76:29: E126 continuation line over-indented for hanging indent
account_balance_reporting_template.py:98:21: E126 continuation line over-indented for hanging indent
account_balance_reporting_template.py:98:36: E225 missing whitespace around operator
account_balance_reporting_template.py:99:36: E261 at least two spaces before inline comment
account_balance_reporting_template.py:104:17: E126 continuation line over-indented for hanging indent
account_balance_reporting_template.py:108:21: ...

review: Needs Fixing (code review)

[lp:~pexego/openerp-spain/6.1_account_balance_reporting_imp]

398. By Omar (Pexego) on 2014-05-26

[UPD] account_balance_reporting: Actualizamos pep8

[Omar (Pexego) (omar7r)]

Hola Pedro,

Ya está adaptado todo el código a Pep8.

Sobre cambiar de checkboxes a un selection, no lo veo apropiado al menos en está versión, quizás se podría hacer para futuras versiones, porque se cambiaría la estructura de la tabla, perdiendo información los informes que ya se tengan creados.

Un saludo

[Alejandro Santana (alejandrosantana)]

Hola, Omar.

Genial el cambio.

Lo estoy probando y tengo 1 error, 1 duda y 2 sugerencias menores.
Por mí, en cuanto se corrija el error (seguro que no es complicado), aceptaré la propuesta. Aparte, valorar las dudas y sugerencias para un próximo MP.

1) ERROR:
Sólo me da error en una situación concreta:
Cuando no hay líneas distintas de 0 en el periodo o fecha seleccionado e intento imprimir en formato "Informe balance genérico (sin líneasa cero)", da el siguiente error:
-------------------------------------
2014-06-06 15:27:45,808 14015 ERROR ? openerp.service.web_services: Exception:
Traceback (most recent call last):
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/service/web_services.py", line 727, in go
    (result, format) = obj.create(cr, uid, ids, datas, context)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/report_sxw.py", line 440, in create
    fnct_ret = fnct(cr, uid, ids, data, report_xml, context)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/report_sxw.py", line 509, in create_source_pdf
    return self.create_single_pdf(cr, uid, ids, data, report_xml, context)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/report_sxw.py", line 531, in create_single_pdf
    pdf = create_doc(etree.tostring(processed_rml),rml_parser.localcontext,logo,title.encode('utf8'))
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/interface.py", line 207, in create_pdf
    obj.render()
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/render.py", line 59, in render
    self._result = self._render()
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml.py", line 41, in _render
    return rml2pdf.parseNode(self.rml, self.localcontext, images=self.bin_datas, path=self.path,title=self.title)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 1016, in parseNode
    r.render(fp)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 314, in render
    pt_obj.render(el)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 992, in render
    fis += r.render(node_story)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 886, in render
    return process_story(node_story)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 879, in process_story
    flow = self._flowable(node)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 802, in _flowable
    return self._table(node)
  File "/mnt/workZone/openerp/openerp_61_ocb_devel/ocb-server/openerp/report/render/rml2pdf/trml2pdf.py", line 697, in _table
    assert length == len(node.get('colWidths').split(','))
AssertionError
2014-06-06 15:27:45,969 14015 ERROR ? openerp.netsvc:
(<type 'exceptions.AssertionError'>, AssertionError(), <traceback object at 0x7f517b61c128>...

review: Needs Fixing (test)

[Alejandro Santana (alejandrosantana)]

Hola, Omar.
He corregiso el error del informe sin líneas a cero cuando no hay líneas diferentes a cero.
El MP:
https://code.launchpad.net/~alejandrosantana/openerp-spain/6.1_account_balance_reporting_imp_fix_report_non_zero/+merge/223536

[Omar (Pexego) (omar7r)]

Perfecto Alejandro,

Estuve de vacaciones hasta ayer y no lo mirara todavía, en cuanto saque un momento pruebo el merge.

Un saludo

[Alejandro Santana (alejandrosantana)]

Por cierto, ¿quién lo va a portar a v7/v8?
¿Hay trabajo hecho? ¿Se le quiere dar una vuelta?
Nosotros podemos intentarlo, porque lo vamos a necesitar en unas semanas.

[Pedro Manuel Baeza (pedro.baeza)]

El proyecto está hospedado ahora en https://github.com/OCA/l10n-spain.

Mueve por favor tu propuesta allí. Esta guía puede ayudarte: https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Un saludo.

review: Needs Resubmitting

[Pedro Manuel Baeza (pedro.baeza)]

Alejandro, ¿llegaste a portar algo de esto?

Omar, ¿podéis repetir la propuesta de inclusión en Github?

[Alejandro Santana (alejandrosantana)]

El cliente se cayó y el trabajo quedó a medias. Me gustaría retomarlo yo cuando vuelva (hasta finales de noviembre apenas estoy para apagar fuegos) y ver dónde lo dejaron.

Unmerged revisions

398. By Omar (Pexego) on 2014-05-26

[UPD] account_balance_reporting: Actualizamos pep8

397. By Omar (Pexego) on 2014-05-14

[UPD] account_balance_reporting: Actualizamos la licencia a AGPL

396. By Omar (Pexego) on 2014-05-14

[REF] account_balance_reporting: PEP8 y traducciones

395. By Omar (Pexego) on 2014-05-14

[IMP] account_balance_reporting: Añadimos la posibilidad de filtrar entre fechas y desglosar por niveles al calcular los informes

=== modified file 'account_balance_reporting/__init__.py'
--- account_balance_reporting/__init__.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/__init__.py	2014-05-26 16:36:55 +0000
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
-# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP - Account balance reporting engine
 #    Copyright (C) 2009 Pexego Sistemas Informáticos. All Rights Reserved
-#    AvanzOSC, Avanzed Open Source Consulting 
-#    Copyright (C) 2011-2012 Iker Coranti (www.avanzosc.com). All Rights Reserved
-#    $Id$
+#    AvanzOSC, Avanzed Open Source Consulting
+#    Copyright (C) 2011-2012 Iker Coranti (www.avanzosc.com).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -18,7 +16,7 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################

=== modified file 'account_balance_reporting/__openerp__.py'
--- account_balance_reporting/__openerp__.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/__openerp__.py	2014-05-26 16:36:55 +0000
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
-# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP - Account balance reporting engine
 #    Copyright (C) 2009 Pexego Sistemas Informáticos. All Rights Reserved
-#    AvanzOSC, Avanzed Open Source Consulting 
-#    Copyright (C) 2011-2012 Iker Coranti (www.avanzosc.com). All Rights Reserved
-#    $Id$
+#    AvanzOSC, Avanzed Open Source Consulting
+#    Copyright (C) 2011-2012 Iker Coranti (www.avanzosc.com).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -18,24 +16,24 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
-        "name" : "Account balance reporting engine",
-        "version" : "0.3",
-        "author" : "Pexego",
-        "website" : "http://www.pexego.es",
-        "category" : "Enterprise Specific Modules",
-        "description": """
+    "name": "Account balance reporting engine",
+    "version": "0.3",
+    "author": "Pexego",
+    "website": "http://www.pexego.es",
+    "category": "Enterprise Specific Modules",
+    "description": """
 The module allows the user to create account balance reports and templates,
 comparing the values of 'accounting concepts' between two fiscal years
 or a set of fiscal periods.
 
-Accounting concepts values can be calculated as the sum of some account balances,
-the sum of its children, other account concepts or constant values.
+Accounting concepts values can be calculated as the sum of some account
+balances, the sum of its children, other account concepts or constant values.
 
 Generated reports are stored as objects on the server,
 so you can check them anytime later or edit them
@@ -51,20 +49,15 @@
 Note: It has been designed to meet Spanish/Spain localization needs,
 but it might be used as a generic accounting report engine.
             """,
-        "depends" : [
-                'base',
-                'account',
-            ],
-        "init_xml" : [
-            ],
-        "demo_xml" : [ ],
-        "update_xml" : [
-                'security/ir.model.access.csv',
-                'account_balance_reporting_wizard.xml',
-                'account_balance_reporting_template_view.xml',
-                'account_balance_reporting_view.xml',
-                'account_balance_reporting_workflow.xml',
-                'account_balance_reporting_reports.xml',
-            ],
-        "installable": True
+    "depends": ['base',
+                'account'],
+    "init_xml": [],
+    "demo_xml": [],
+    "update_xml": ['security/ir.model.access.csv',
+                   'account_balance_reporting_wizard.xml',
+                   'account_balance_reporting_template_view.xml',
+                   'account_balance_reporting_view.xml',
+                   'account_balance_reporting_workflow.xml',
+                   'account_balance_reporting_reports.xml'],
+    "installable": True
 }

=== modified file 'account_balance_reporting/account_balance_reporting.py'
--- account_balance_reporting/account_balance_reporting.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/account_balance_reporting.py	2014-05-26 16:36:55 +0000
@@ -6,8 +6,8 @@
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -15,7 +15,7 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
@@ -26,7 +26,7 @@
 Designed following the needs of the
 Spanish/Spain localization.
 """
-from openerp.osv import orm,fields
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 import re
 import time
@@ -34,8 +34,9 @@
 import logging
 
 # CSS classes for the account line templates
-CSS_CLASSES = [('default','Default'),('l1', 'Level 1'), ('l2', 'Level 2'),
-                ('l3', 'Level 3'), ('l4', 'Level 4'), ('l5', 'Level 5')]
+CSS_CLASSES = [('default', 'Default'), ('l1', 'Level 1'), ('l2', 'Level 2'),
+               ('l3', 'Level 3'), ('l4', 'Level 4'), ('l5', 'Level 5')]
+
 
 class account_balance_reporting(orm.Model):
     """
@@ -46,48 +47,69 @@
     """
     _name = "account.balance.reporting"
 
+    READONLY_STATES = {'calc_done': [('readonly', True)],
+                       'done': [('readonly', True)]}
+
+    def _get_levels(self, cr, uid, context=None):
+        cr.execute("select distinct level from account_account order by level")
+        reg = cr.fetchall()
+        res = [(str(x[0]), str(x[0])) for x in reg if x[0]]
+        return res
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True),
         'template_id': fields.many2one('account.balance.reporting.template',
-                'Template', ondelete='set null', required=True, select=True,
-                states={'calc_done': [('readonly', True)],
-                        'done': [('readonly', True)]}),
+                                       'Template', ondelete='set null',
+                                       required=True, select=True,
+                                       states=READONLY_STATES),
         'calc_date': fields.datetime("Calculation date", readonly=True),
-        'state': fields.selection([('draft','Draft'),
-                                   ('calc','Processing'),
-                                   ('calc_done','Processed'),
-                                   ('done','Done'),
-                                   ('canceled','Canceled')], 'State'),
+        'state': fields.selection([('draft', 'Draft'),
+                                   ('calc', 'Processing'),
+                                   ('calc_done', 'Processed'),
+                                   ('done', 'Done'),
+                                   ('canceled', 'Canceled')], 'State'),
         'company_id': fields.many2one('res.company', 'Company',
-                ondelete='cascade', required=True, readonly=True,
-                states={'draft': [('readonly', False)]}),
+                                      ondelete='cascade', required=True,
+                                      readonly=True, states=READONLY_STATES),
+        'check_periods': fields.boolean('Compute by periods',
+                                        states=READONLY_STATES),
+        'check_dates': fields.boolean('Compute by dates',
+                                      states=READONLY_STATES),
+        'level': fields.selection(_get_levels, string='Level',
+                                  states=READONLY_STATES),
         'current_fiscalyear_id': fields.many2one('account.fiscalyear',
-                'Fiscal year 1', select=True, required=True,
-                states={'calc_done': [('readonly', True)],
-                          'done': [('readonly', True)]}),
-        'current_period_ids': fields.many2many('account.period',
-                'account_balance_reporting_account_period_current_rel',
-                'account_balance_reporting_id', 'period_id',
-                'Fiscal year 1 periods',
-                states={'calc_done': [('readonly', True)],
-                        'done': [('readonly', True)]}),
+                                                 'Fiscal year 1', select=True,
+                                                 required=True,
+                                                 states=READONLY_STATES),
+        'current_period_ids':
+        fields.many2many(
+            'account.period',
+            'account_balance_reporting_account_period_current_rel',
+            'account_balance_reporting_id', 'period_id',
+            'Fiscal year 1 periods', states=READONLY_STATES),
+
+        'current_date_from': fields.date('Date From', states=READONLY_STATES),
+        'current_date_to': fields.date('Date To', states=READONLY_STATES),
         'previous_fiscalyear_id': fields.many2one('account.fiscalyear',
-                'Fiscal year 2', select=True,
-                states={'calc_done': [('readonly', True)],
-                        'done': [('readonly', True)]}),
-        'previous_period_ids': fields.many2many('account.period',
-                'account_balance_reporting_account_period_previous_rel',
-                'account_balance_reporting_id', 'period_id',
-                'Fiscal year 2 periods',
-                states={'calc_done': [('readonly', True)],
-                        'done': [('readonly', True)]}),
+                                                  'Fiscal year 2', select=True,
+                                                  states=READONLY_STATES),
+        'previous_period_ids':
+        fields.many2many(
+            'account.period',
+            'account_balance_reporting_account_period_previous_rel',
+            'account_balance_reporting_id',
+            'period_id', 'Fiscal year 2 periods', states=READONLY_STATES),
+
+        'previous_date_from': fields.date('Date From', states=READONLY_STATES),
+        'previous_date_to': fields.date('Date To', states=READONLY_STATES),
         'line_ids': fields.one2many('account.balance.reporting.line',
                                     'report_id', 'Lines',
-                                    states = {'done': [('readonly', True)]}),
+                                    states={'done': [('readonly', True)]}),
     }
 
     _defaults = {
-        'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id,
+        'company_id': lambda self, cr, uid, context:
+        self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id,
         'state': 'draft',
     }
 
@@ -107,20 +129,21 @@
             # Clear the report data (unlink the lines of detail)
             line_obj.unlink(cr, uid, [line.id for line in report.line_ids],
                             context=context)
-            # Fill the report with a 'copy' of the lines of its template (if it has one)
+            # Fill the report with a 'copy' of the lines
+            # of its template (if it has one)
             if report.template_id:
                 for template_line in report.template_id.line_ids:
-                    line_obj.create(cr, uid, {
-                            'code': template_line.code,
-                            'name': template_line.name,
-                            'report_id': report.id,
-                            'template_line_id': template_line.id,
-                            'parent_id': None,
-                            'current_value': None,
-                            'previous_value': None,
-                            'sequence': template_line.sequence,
-                            'css_class': template_line.css_class,
-                        }, context=context)
+                    line_obj.create(cr, uid,
+                                    {'code': template_line.code,
+                                     'name': template_line.name,
+                                     'report_id': report.id,
+                                     'template_line_id': template_line.id,
+                                     'parent_id': None,
+                                     'current_value': None,
+                                     'previous_value': None,
+                                     'sequence': template_line.sequence,
+                                     'css_class': template_line.css_class},
+                                    context=context)
         # Set the parents of the lines in the report
         # Note: We reload the reports objects to refresh the lines of detail.
         for report in self.browse(cr, uid, ids, context=context):
@@ -129,13 +152,16 @@
                 for line in report.line_ids:
                     tmpl_line = line.template_line_id
                     if tmpl_line and tmpl_line.parent_id:
-                        parent_line_ids = line_obj.search(cr, uid,
-                                [('report_id', '=', report.id),
-                                 ('code', '=', tmpl_line.parent_id.code)])
-                        line_obj.write(cr, uid, line.id, {
-                                'parent_id': (parent_line_ids and
-                                              parent_line_ids[0] or False),
-                            }, context=context)
+                        parent_line_ids = \
+                            line_obj.search(cr, uid,
+                                            [('report_id', '=', report.id),
+                                             ('code', '=',
+                                             tmpl_line.parent_id.code)])
+                        line_obj.write(cr, uid, line.id,
+                                       {'parent_id': (parent_line_ids and
+                                                      parent_line_ids[0] or
+                                                      False)},
+                                       context=context)
         # Calculate the values of the lines
         # Note: We reload the reports objects to refresh the lines of detail.
         for report in self.browse(cr, uid, ids, context=context):
@@ -202,13 +228,14 @@
         'code': fields.char('Code', size=64, required=True, select=True),
         'name': fields.char('Name', size=256, required=True, select=True),
         'notes': fields.text('Notes'),
-        'current_value': fields.float('Fiscal year 1', digits=(16,2)),
-        'previous_value': fields.float('Fiscal year 2', digits=(16,2)),
+        'current_value': fields.float('Fiscal year 1', digits=(16, 2)),
+        'previous_value': fields.float('Fiscal year 2', digits=(16, 2)),
         'calc_date': fields.datetime("Calculation date"),
         'css_class': fields.selection(CSS_CLASSES, 'CSS Class'),
-        'template_line_id': fields.many2one(
-                                'account.balance.reporting.template.line',
-                                'Line template', ondelete='set null'),
+        'template_line_id':
+        fields.many2one('account.balance.reporting.template.line',
+                        'Line template', ondelete='set null'),
+
         'parent_id': fields.many2one('account.balance.reporting.line',
                                      'Parent', ondelete='cascade'),
         'child_ids': fields.one2many('account.balance.reporting.line',
@@ -216,11 +243,12 @@
     }
 
     _defaults = {
-        'report_id': lambda self, cr, uid, context: context.get('report_id', None),
+        'report_id':
+        lambda self, cr, uid, context: context.get('report_id', None),
         'css_class': 'default',
     }
 
-    _order = "sequence, code"
+    _order = "sequence asc, code asc"
 
     _sql_constraints = [
         ('report_code_uniq', 'unique(report_id, code)',
@@ -239,13 +267,90 @@
         """Redefine the method to allow searching by code."""
         ids = []
         if name:
-            ids = self.search(cr, uid, [('code','ilike',name)]+ args,
+            ids = self.search(cr, uid, [('code', 'ilike', name)] + args,
                               limit=limit, context=context)
         if not ids:
-            ids = self.search(cr, uid, [('name',operator,name)]+ args,
+            ids = self.search(cr, uid, [('name', operator, name)] + args,
                               limit=limit, context=context)
         return self.name_get(cr, uid, ids, context=context)
 
+    def _create_child_lines(self, cr, uid, ids, code, bmode, fyear,
+                            context=None):
+        acc_obj = self.pool.get('account.account')
+        line = self.browse(cr, uid, ids[0], context=context)
+        cont = 1000
+        for acc_code in re.findall('(-?\w*\(?[0-9a-zA-Z_]*\)?)', code):
+            # Check if the code is valid (findall might return empty strings)
+            acc_code = acc_code.strip()
+            if acc_code:
+                sign, acc_code, mode, sign_mode = \
+                    self._get_code_sign_mode(acc_code, bmode)
+
+                # Search for the account (perfect match)
+                account_ids = acc_obj.search(cr, uid,
+                                             [('code', '=', acc_code),
+                                              ('company_id', '=',
+                                               line.report_id.company_id.id)],
+                                             context=context)
+
+                for account in acc_obj.browse(cr, uid, account_ids,
+                                              context=context):
+                    child_ids = acc_obj.search(cr, uid,
+                                               [('id', 'child_of', account.id),
+                                                ('level', '<=',
+                                                line.report_id.level)],
+                                               order="code asc")
+                    for child_account in acc_obj.browse(cr, uid, child_ids,
+                                                        context=context):
+                        value = 0.0
+                        if mode == 'debit':
+                            value -= child_account.debit * sign
+                        elif mode == 'credit':
+                            value += child_account.credit * sign
+                        else:
+                            value += child_account.balance * sign * sign_mode
+
+                        line_ids = self.search(cr, uid,
+                                               [('template_line_id', '=',
+                                                line.template_line_id.id),
+                                                ('name', '=',
+                                                    child_account.code +
+                                                    u": " +
+                                                    child_account.name),
+                                                ('report_id', '=',
+                                                line.report_id.id)])
+                        if not line_ids:
+                            line_id = self.create(cr, uid, {
+                                'code': line.code + u"/" + str(cont),
+                                'name': (child_account.code + u": " +
+                                         child_account.name),
+                                'report_id': line.report_id.id,
+                                'template_line_id': line.template_line_id.id,
+                                'parent_id': line.id,
+                                'current_value': None,
+                                'previous_value': None,
+                                'sequence': line.sequence,
+                                'css_class':
+                                (child_account.level and
+                                 child_account.level < 5) and
+                                u'l' + str(child_account.level)
+                                or'default'
+                            }, context=context)
+                            cont += 1
+                        else:
+                            line_id = line_ids[0]
+
+                        if line.template_line_id.negate:
+                            value = -value
+                        vals = {}
+                        if fyear == 'current':
+                            vals = {'current_value': value,
+                                    'calc_date': line.report_id.calc_date}
+                        elif fyear == 'previous':
+                            vals = {'previous_value': value,
+                                    'calc_date': line.report_id.calc_date}
+                        self.write(cr, uid, [line_id], vals, context=context)
+
     def refresh_values(self, cr, uid, ids, context=None):
         """
         Recalculates the values of this report line using the
@@ -254,9 +359,11 @@
         Depending on this formula the final value is calculated as follows:
         - Empy report value: sum of (this concept) children values.
         - Number with decimal point ("10.2"): that value (constant).
-        - Account numbers separated by commas ("430,431,(437)"): Sum of the account balances.
+        - Account numbers separated by commas ("430,431,(437)"):
+            Sum of the account balances.
             (The sign of the balance depends on the balance mode)
-        - Concept codes separated by "+" ("11000+12000"): Sum of those concepts values.
+        - Concept codes separated by "+" ("11000+12000"):
+            Sum of those concepts values.
         """
         if context is None:
             context = {}
@@ -274,12 +381,13 @@
                     tmpl_value = tmpl_line.current_value
                 elif fyear == 'previous':
                     tmpl_value = (tmpl_line.previous_value or
-                                      tmpl_line.current_value)
+                                  tmpl_line.current_value)
                 # Remove characters after a ";" (we use ; for comments)
                 if tmpl_value:
                     tmpl_value = tmpl_value.split(';')[0]
                 if (fyear == 'current' and not report.current_fiscalyear_id) \
-                        or (fyear == 'previous' and not report.previous_fiscalyear_id):
+                        or (fyear == 'previous' and
+                            not report.previous_fiscalyear_id):
                     value = 0
                 else:
                     if not tmpl_value:
@@ -307,15 +415,38 @@
                         if fyear == 'current':
                             ctx.update({
                                 'fiscalyear': report.current_fiscalyear_id.id,
-                                'periods': [p.id for p in report.current_period_ids],
                             })
                         elif fyear == 'previous':
                             ctx.update({
                                 'fiscalyear': report.previous_fiscalyear_id.id,
-                                'periods': [p.id for p in report.previous_period_ids],
                             })
+                        if line.report_id.check_dates:
+                            if fyear == 'current':
+                                ctx.update({
+                                    'date_from': report.current_date_from,
+                                    'date_to': report.current_date_to
+                                })
+                            elif fyear == 'previous':
+                                ctx.update({
+                                    'date_from': report.previous_date_from,
+                                    'date_to': report.previous_date_to
+                                })
+                        if line.report_id.check_periods:
+                            if fyear == 'current':
+                                ctx.update({
+                                    'periods':
+                                    [p.id for p in report.current_period_ids]
+                                })
+                            elif fyear == 'previous':
+                                ctx.update({
+                                    'periods':
+                                    [p.id for p in report.previous_period_ids]
+                                })
                         value = line._get_account_balance(tmpl_value,
                                                           balance_mode, ctx)
+                        if line.report_id.level:
+                            line._create_child_lines(tmpl_value, balance_mode,
+                                                     fyear, ctx)
                     elif re.match(r'^[\+\-0-9a-zA-Z_\*\ ]*$', tmpl_value):
                         # Account concept codes separated by "+" => sum of the
                         # concepts (template lines) values.
@@ -323,20 +454,22 @@
                                                     tmpl_value):
                             sign = 1
                             if line_code.startswith('-') or \
-                                    (line_code.startswith('(') and 
+                                    (line_code.startswith('(') and
                                      balance_mode in (2, 4)):
                                 sign = -1
                             line_code = line_code.strip('-()*')
                             # findall might return empty strings
                             if line_code:
                                 # Search for the line (perfect match)
-                                line_ids = self.search(cr, uid, [
-                                        ('report_id','=', report.id),
-                                        ('code', '=', line_code),
-                                    ], context=context)
+                                line_ids = \
+                                    self.search(cr, uid,
+                                                [('report_id', '=', report.id),
+                                                 ('code', '=', line_code)],
+                                                context=context)
                                 for child in self.browse(cr, uid, line_ids,
                                                          context=context):
-                                    if child.calc_date != child.report_id.calc_date:
+                                    if (child.calc_date !=
+                                            child.report_id.calc_date):
                                         child.refresh_values()
                                         # Reload the child data
                                         child = self.browse(cr, uid, child.id,
@@ -353,13 +486,43 @@
                 elif fyear == 'previous':
                     previous_value = value
             # Write the values
-            self.write(cr, uid, line.id, {
-                    'current_value': current_value,
-                    'previous_value': previous_value,
-                    'calc_date': line.report_id.calc_date,
-                }, context=context)
+            self.write(cr, uid, line.id,
+                       {'current_value': current_value,
+                        'previous_value': previous_value,
+                        'calc_date': line.report_id.calc_date},
+                       context=context)
         return True
 
+    def _get_code_sign_mode(self, acc_code, balance_mode):
+        # Check the sign of the code (substraction)
+        if acc_code.startswith('-'):
+            sign = -1
+            acc_code = acc_code[1:].strip()  # Strip the sign
+        else:
+            sign = 1
+        if re.match(r'^debit\(.*\)$', acc_code):
+            # Use debit instead of balance
+            mode = 'debit'
+            acc_code = acc_code[6:-1]  # Strip debit()
+        elif re.match(r'^credit\(.*\)$', acc_code):
+            # Use credit instead of balance
+            mode = 'credit'
+            acc_code = acc_code[7:-1]  # Strip credit()
+        else:
+            mode = 'balance'
+        # Calculate sign of the balance mode
+        sign_mode = 1
+        if balance_mode in (1, 2, 3):
+            # for accounts in brackets or mode 2, the sign is reversed
+            if (acc_code.startswith('(') and acc_code.endswith(')')) \
+                    or balance_mode == 2:
+                sign_mode = -1
+        # Strip the brackets (if any)
+        if acc_code.startswith('(') and acc_code.endswith(')'):
+            acc_code = acc_code[1:-1]
+
+        return sign, acc_code, mode, sign_mode
+
     def _get_account_balance(self, cr, uid, ids, code, balance_mode=0,
                              context=None):
         """
@@ -373,12 +536,13 @@
           Mode 2: credit-debit for all accounts;
           Mode 3: credit-debit, debit-credit for accounts in brackets.
 
-        Also the user may specify to use only the debit or credit of the account
+        Also the user may specify to use only the debit or credit of account
         instead of the balance writing "debit(551)" or "credit(551)".
         """
         acc_obj = self.pool.get('account.account')
         logger = logging.getLogger(__name__)
         res = 0.0
+
         line = self.browse(cr, uid, ids[0], context=context)
         company_id = line.report_id.company_id.id
         # We iterate over the accounts listed in "code", so code can be
@@ -388,46 +552,25 @@
             # Check if the code is valid (findall might return empty strings)
             acc_code = acc_code.strip()
             if acc_code:
-                # Check the sign of the code (substraction)
-                if acc_code.startswith('-'):
-                    sign = -1
-                    acc_code = acc_code[1:].strip() # Strip the sign
-                else:
-                    sign = 1
-                if re.match(r'^debit\(.*\)$', acc_code):
-                    # Use debit instead of balance
-                    mode = 'debit'
-                    acc_code = acc_code[6:-1] # Strip debit()
-                elif re.match(r'^credit\(.*\)$', acc_code):
-                    # Use credit instead of balance
-                    mode = 'credit'
-                    acc_code = acc_code[7:-1] # Strip credit()
-                else:
-                    mode = 'balance'
-                # Calculate sign of the balance mode
-                sign_mode = 1
-                if balance_mode in (1, 2, 3):
-                    # for accounts in brackets or mode 2, the sign is reversed
-                    if (acc_code.startswith('(') and acc_code.endswith(')')) \
-                            or balance_mode == 2:
-                        sign_mode = -1
-                # Strip the brackets (if any)
-                if acc_code.startswith('(') and acc_code.endswith(')'):
-                    acc_code = acc_code[1:-1]
+                sign, acc_code, mode, sign_mode = \
+                    self._get_code_sign_mode(acc_code, balance_mode)
                 # Search for the account (perfect match)
-                account_ids = acc_obj.search(cr, uid, [
-                        ('code', '=', acc_code),
-                        ('company_id','=', company_id)
-                    ], context=context)
+                account_ids = acc_obj.search(cr, uid,
+                                             [('code', '=', acc_code),
+                                              ('company_id', '=', company_id)],
+                                             context=context)
                 if not account_ids:
                     # Search for a subaccount ending with '0'
-                    account_ids = acc_obj.search(cr, uid, [
-                            ('code', '=like', '%s%%0' % acc_code),
-                            ('company_id','=', company_id)
-                        ], context=context)
+                    account_ids = acc_obj.search(cr, uid,
+                                                 [('code', '=like',
+                                                   '%s%%0' % acc_code),
+                                                  ('company_id', '=',
+                                                   company_id)],
+                                                 context=context)
                 if not account_ids:
                     logger.warning("Account with code '%s' not found!"
-                                   %acc_code)
+                                   % acc_code)
+
                 for account in acc_obj.browse(cr, uid, account_ids,
                                               context=context):
                     if mode == 'debit':

=== modified file 'account_balance_reporting/account_balance_reporting_template.py'
--- account_balance_reporting/account_balance_reporting_template.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/account_balance_reporting_template.py	2014-05-26 16:36:55 +0000
@@ -6,8 +6,8 @@
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -15,7 +15,7 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
@@ -27,31 +27,35 @@
 Designed following the needs of the Spanish/Spain localization.
 """
 
-from openerp.osv import orm,fields
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
-_BALANCE_MODE_HELP = """Formula calculation mode: Depending on it, the balance is calculated as follows:
+_BALANCE_MODE_HELP = """Formula calculation mode: Depending on it,
+  the balance is calculated as follows:
   Mode 0: debit-credit (default);
   Mode 1: debit-credit, credit-debit for accounts in brackets;
   Mode 2: credit-debit;
   Mode 3: credit-debit, debit-credit for accounts in brackets."""
 
-_VALUE_FORMULA_HELP = """Value calculation formula: Depending on this formula the final value is calculated as follows:
+_VALUE_FORMULA_HELP = """Value calculation formula: Depending on this formula
+  the final value is calculated as follows:
   Empy template value: sum of (this concept) children values.
   Number with decimal point ("10.2"): that value (constant).
-  Account numbers separated by commas ("430,431,(437)"): Sum of the account balances
+  Account numbers separated by commas ("430,431,(437)"):
+  Sum of the account balances
     (the sign of the balance depends on the balance mode).
   Concept codes separated by "+" ("11000+12000"): Sum of those concepts values.
 """
 
 # CSS classes for the account lines
-CSS_CLASSES = [('default','Default'),
-               ('l1', 'Level 1'), 
+CSS_CLASSES = [('default', 'Default'),
+               ('l1', 'Level 1'),
                ('l2', 'Level 2'),
-               ('l3', 'Level 3'), 
-               ('l4', 'Level 4'), 
+               ('l3', 'Level 3'),
+               ('l4', 'Level 4'),
                ('l5', 'Level 5')]
 
+
 class account_balance_reporting_template(orm.Model):
     """
     Account balance report template.
@@ -68,12 +72,12 @@
         'report_xml_id': fields.many2one('ir.actions.report.xml',
                                          'Report design', ondelete='set null'),
         'description': fields.text('Description'),
-        'balance_mode': fields.selection(
-                            [('0', 'Debit-Credit'),
-                             ('1', 'Debit-Credit, reversed with brackets'),
-                             ('2', 'Credit-Debit'),
-                             ('3', 'Credit-Debit, reversed with brackets')],
-                            'Balance mode', help=_BALANCE_MODE_HELP),
+        'balance_mode':
+        fields.selection([('0', 'Debit-Credit'),
+                          ('1', 'Debit-Credit, reversed with brackets'),
+                          ('2', 'Credit-Debit'),
+                          ('3', 'Credit-Debit, reversed with brackets')],
+                         'Balance mode', help=_BALANCE_MODE_HELP),
         'line_ids': fields.one2many('account.balance.reporting.template.line',
                                     'report_id', 'Lines'),
     }
@@ -94,45 +98,43 @@
         # Read the current item data:
         template = self.browse(cr, uid, id, context=context)
         # Create the template
-        new_id = self.create(cr, uid, {
-                    'name': '%s*' %template.name,
-                    'type': 'user', # Copies are always user templates
-                    'report_xml_id': template.report_xml_id.id,
-                    'description': template.description,
-                    'balance_mode': template.balance_mode,
-                    'line_ids': None,
-                }, context=context)
+        new_id = self.create(cr, uid,
+                             {'name': '%s*' % template.name,
+                              'type': 'user',
+                              'report_xml_id': template.report_xml_id.id,
+                              'description': template.description,
+                              'balance_mode': template.balance_mode,
+                              'line_ids': None}, context=context)
         # Now create the lines (without parents)
         for line in template.line_ids:
-            line_obj.create(cr, uid, {
-                    'report_id': new_id,
-                    'sequence': line.sequence,
-                    'css_class': line.css_class,
-                    'code': line.code,
-                    'name': line.name,
-                    'current_value': line.current_value,
-                    'previous_value': line.previous_value,
-                    'negate': line.negate,
-                    'parent_id': None,
-                    'child_ids': None,
-                }, context=context)
+            line_obj.create(cr, uid,
+                            {'report_id': new_id,
+                             'sequence': line.sequence,
+                             'css_class': line.css_class,
+                             'code': line.code,
+                             'name': line.name,
+                             'current_value': line.current_value,
+                             'previous_value': line.previous_value,
+                             'negate': line.negate,
+                             'parent_id': None,
+                             'child_ids': None}, context=context)
         # Now set the (lines) parents
         for line in template.line_ids:
             if line.parent_id:
                 # Search for the copied line
-                new_line_id = line_obj.search(cr, uid, [
-                        ('report_id', '=', new_id),
-                        ('code', '=', line.code),
-                    ], context=context)[0]
+                new_line_id = line_obj.search(cr, uid,
+                                              [('report_id', '=', new_id),
+                                               ('code', '=', line.code)],
+                                              context=context)[0]
                 # Search for the copied parent line
-                new_parent_id = line_obj.search(cr, uid, [
-                        ('report_id', '=', new_id),
-                        ('code', '=', line.parent_id.code),
-                    ], context=context)[0]
+                new_parent_id = \
+                    line_obj.search(cr, uid,
+                                    [('report_id', '=', new_id),
+                                     ('code', '=', line.parent_id.code)],
+                                    context=context)[0]
                 # Set the parent
-                line_obj.write(cr, uid, new_line_id, {
-                        'parent_id': new_parent_id,
-                    }, context=context)
+                line_obj.write(cr, uid, new_line_id,
+                               {'parent_id': new_parent_id}, context=context)
         return new_id
 
 
@@ -147,9 +149,10 @@
 
     _columns = {
         'report_id': fields.many2one('account.balance.reporting.template',
-                                       'Template', ondelete='cascade'),
+                                     'Template', ondelete='cascade'),
         'sequence': fields.char('Sequence', size=32, required=False,
-                            help="Lines will be sorted/grouped by this field"),
+                                help="Lines will be sorted/grouped \
+                                      by this field"),
         'css_class': fields.selection(CSS_CLASSES, 'CSS Class', required=False,
                                       help="Style-sheet class"),
         'code': fields.char('Code', size=64, required=True, select=True,
@@ -162,7 +165,8 @@
         'previous_value': fields.text('Fiscal year 2 formula',
                                       help=_VALUE_FORMULA_HELP),
         'negate': fields.boolean('Negate',
-                    help="Negate the value (change the sign of the balance)"),
+                                 help="Negate the value (change the sign \
+                                       of the balance)"),
         'parent_id': fields.many2one('account.balance.reporting.template.line',
                                      'Parent', ondelete='cascade'),
         'child_ids': fields.one2many('account.balance.reporting.template.line',
@@ -170,8 +174,8 @@
     }
 
     _defaults = {
-        'report_id': lambda self, cr, uid, context: context.get(
-                                                        'report_id', None),
+        'report_id': lambda self, cr, uid, context:
+        context.get('report_id', None),
         'negate': False,
         'css_class': 'default',
     }
@@ -192,7 +196,7 @@
             context = {}
         res = []
         for item in self.browse(cr, uid, ids, context=context):
-            res.append((item.id, "[%s] %s" %(item.code, item.name)))
+            res.append((item.id, "[%s] %s" % (item.code, item.name)))
         return res
 
     def name_search(self, cr, uid, name, args=[], operator='ilike',

=== modified file 'account_balance_reporting/account_balance_reporting_view.xml'
--- account_balance_reporting/account_balance_reporting_view.xml	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/account_balance_reporting_view.xml	2014-05-26 16:36:55 +0000
@@ -44,15 +44,22 @@
                                 <group colspan="4">
                                     <field name="company_id" select="1"/>
                                     <field name="template_id" select="1"/>
+                                    <field name="check_periods"/>
+                                    <field name="check_dates"/>
+                                    <field name="level"/>
                                 </group>
                                 <group colspan="4">
                                     <group string="Fiscal year 1" colspan="2">
                                         <field name="current_fiscalyear_id" select="2" colspan="4" nolabel="1"/>
-                                        <field name="current_period_ids" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',current_fiscalyear_id)]"/>
+                                        <field name="current_date_from" colspan="2" attrs="{'invisible':[('check_dates','=',False)]}"/>
+                                        <field name="current_date_to" colspan="2" attrs="{'invisible':[('check_dates','=',False)]}"/>
+                                        <field name="current_period_ids" colspan="4" nolabel="1" attrs="{'invisible':[('check_periods','=',False)]}" domain="[('fiscalyear_id','=',current_fiscalyear_id)]"/>
                                     </group>
                                     <group string="Fiscal year 2" colspan="2">
                                         <field name="previous_fiscalyear_id" colspan="4" nolabel="1"/>
-                                        <field name="previous_period_ids" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',previous_fiscalyear_id)]"/>
+                                        <field name="previous_date_from" colspan="2" attrs="{'invisible':[('check_dates','=',False)]}"/>
+                                        <field name="previous_date_to" colspan="2" attrs="{'invisible':[('check_dates','=',False)]}"/>
+                                        <field name="previous_period_ids" colspan="4" nolabel="1" attrs="{'invisible':[('check_periods','=',False)]}" domain="[('fiscalyear_id','=',previous_fiscalyear_id)]"/>
                                     </group>
                                 </group>
                             </group>
@@ -63,11 +70,11 @@
                             <group colspan="4">
                                 <button name="calculate_action" type="object" string="Calculate" states="draft"/>
                                 <!--
-				<button name="%(wiz_account_balance_reporting_calculate)d" type="action" string="Calculate" states="draft" icon="gtk-execute"/>
-				-->
+                <button name="%(wiz_account_balance_reporting_calculate)d" type="action" string="Calculate" states="draft" icon="gtk-execute"/>
+                -->
                                 <button name="confirm" string="Confirm" states="calc_done" icon="gtk-apply"/>
                                 <button name="cancel" string="Cancel" states="calc_done,done" icon="gtk-cancel"/>
-								<button name="action_recover" string="Draft" type="object" states="canceled" icon="gtk-undo"/>
+                                <button name="action_recover" string="Draft" type="object" states="canceled" icon="gtk-undo"/>
                             </group>
                         </page>
                         <page string="Lines">
@@ -183,14 +190,14 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.balance.reporting</field>
             <field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_balance_reporting_tree"/>
         </record>
 
         <menuitem id="menu_account_balance_reporting"
                 name="Account balance reports"
                 parent="account.menu_finance_legal_statement"/>
-        
+
         <menuitem id="menu_account_balance_reporting_reports"
                 name="Reports"
                 parent="menu_account_balance_reporting"

=== modified file 'account_balance_reporting/i18n/account_balance_reporting.pot'
--- account_balance_reporting/i18n/account_balance_reporting.pot	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/i18n/account_balance_reporting.pot	2014-05-26 16:36:55 +0000
@@ -1,23 +1,23 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account_balance_reporting
+#   * account_balance_reporting
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.5-bzr\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-09-27 08:18:06+0000\n"
-"PO-Revision-Date: 2009-09-22 16:49+0100\n"
-"Last-Translator: Borja López Soilán (Pexego) <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-14 13:03+0000\n"
+"PO-Revision-Date: 2014-05-14 13:03+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
 #. module: account_balance_reporting
-#: field:account.balance.reporting,current_period_ids:0
-msgid "Fiscal year 1 periods"
+#: field:account.balance.reporting,check_dates:0
+msgid "Compute by dates"
 msgstr ""
 
 #. module: account_balance_reporting
@@ -26,8 +26,14 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: field:account.balance.reporting,template_id:0
+#: field:account.balance.reporting.template.line,report_id:0
+msgid "Template"
+msgstr ""
+
+#. module: account_balance_reporting
+#: selection:account.balance.reporting.template,balance_mode:0
+msgid "Debit-Credit, reversed with brackets"
 msgstr ""
 
 #. module: account_balance_reporting
@@ -62,11 +68,21 @@
 msgstr ""
 
 #. module: account_balance_reporting
+#: field:account.balance.reporting,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account_balance_reporting
 #: field:account.balance.reporting.line,notes:0
 msgid "Notes"
 msgstr ""
 
 #. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_print_wizard
+msgid "account.balance.reporting.print.wizard"
+msgstr ""
+
+#. module: account_balance_reporting
 #: view:account.balance.reporting:0
 #: model:ir.actions.act_window,name:account_balance_reporting.action_view_account_balance_reporting
 #: model:ir.ui.menu,name:account_balance_reporting.menu_account_balance_reporting
@@ -93,11 +109,6 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: selection:account.balance.reporting.template,balance_mode:0
-msgid "Debit-Credit, reversed with brakets"
-msgstr ""
-
-#. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,code:0
 msgid "Concept code, may be used on formulas to reference this line"
 msgstr ""
@@ -113,23 +124,12 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template_line
-msgid "account.balance.reporting.template.line"
-msgstr ""
-
-#. module: account_balance_reporting
-#: rml:report_account_balance_reporting.generic:0
-#: rml:report_account_balance_reporting.generic_non_zero:0
+#: report:report_account_balance_reporting.generic:0
+#: report:report_account_balance_reporting.generic_non_zero:0
 msgid "CODE"
 msgstr ""
 
 #. module: account_balance_reporting
-#: field:account.balance.reporting,template_id:0
-#: field:account.balance.reporting.template.line,report_id:0
-msgid "Template"
-msgstr ""
-
-#. module: account_balance_reporting
 #: view:account.balance.reporting:0
 msgid "Parameters"
 msgstr ""
@@ -140,20 +140,15 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: rml:report_account_balance_reporting.generic:0
-#: rml:report_account_balance_reporting.generic_non_zero:0
+#: report:report_account_balance_reporting.generic:0
+#: report:report_account_balance_reporting.generic_non_zero:0
 msgid "NOTES"
 msgstr ""
 
 #. module: account_balance_reporting
 #: view:account.balance.reporting.template.line:0
 msgid "Account balance report template lines"
-msgstr ""
-
-#. module: account_balance_reporting
-#: wizard_view:account_balance_reporting.print_wizard,init:0
-msgid "Report data"
-msgstr ""
+msgstr "
 
 #. module: account_balance_reporting
 #: view:account.balance.reporting:0
@@ -162,7 +157,7 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: wizard_button:account_balance_reporting.print_wizard,init,print:0
+#: view:account.balance.reporting.print.wizard:0
 msgid "Print"
 msgstr ""
 
@@ -191,33 +186,19 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: model:ir.module.module,description:account_balance_reporting.module_meta_information
-msgid "\n"
-"The module allows the user to create account balance reports and templates,\n"
-"comparing the values of 'accounting concepts' between two fiscal years\n"
-"or a set of fiscal periods.\n"
-"\n"
-"Accounting concepts values can be calculated as the sum of some account balances,\n"
-"the sum of its children, other account concepts or constant values.\n"
-"\n"
-"Generated reports are stored as objects on the server,\n"
-"so you can check them anytime later or edit them\n"
-"(to add notes for example) before printing.\n"
-"\n"
-"The module lets the user add new templates of the reports concepts,\n"
-"and associate them a specific \"XML reports\" (OpenERP RML files for example)\n"
-"with the design used when printing.\n"
-"So it is very easy to add predefined country-specific official reports.\n"
-"\n"
-"The user interface has been designed to be as much user-friendly as it can be.\n"
-"\n"
-"Note: It has been designed to meet Spanish/Spain localization needs,\n"
-"but it might be used as a generic accounting report engine.\n"
-"            "
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template_line
+msgid "account.balance.reporting.template.line"
+msgstr ""
+
+#. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting
+msgid "account.balance.reporting"
 msgstr ""
 
 #. module: account_balance_reporting
 #: field:account.balance.reporting.line,report_id:0
+#: view:account.balance.reporting.print.wizard:0
+#: field:account.balance.reporting.print.wizard,report_id:0
 msgid "Report"
 msgstr ""
 
@@ -234,13 +215,12 @@
 
 #. module: account_balance_reporting
 #: field:account.balance.reporting.template,report_xml_id:0
-#: wizard_view:account_balance_reporting.print_wizard,init:0
 msgid "Report design"
 msgstr ""
 
 #. module: account_balance_reporting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:account.balance.reporting.template,balance_mode:0
+msgid "Credit-Debit, reversed with brackets"
 msgstr ""
 
 #. module: account_balance_reporting
@@ -254,6 +234,12 @@
 msgstr ""
 
 #. module: account_balance_reporting
+#: field:account.balance.reporting,current_date_to:0
+#: field:account.balance.reporting,previous_date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: account_balance_reporting
 #: field:account.balance.reporting,calc_date:0
 #: field:account.balance.reporting.line,calc_date:0
 msgid "Calculation date"
@@ -265,6 +251,29 @@
 msgstr ""
 
 #. module: account_balance_reporting
+#: selection:account.balance.reporting,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: account_balance_reporting
+#: view:account.balance.reporting.print.wizard:0
+#: field:account.balance.reporting.print.wizard,report_xml_id:0
+msgid "Design"
+msgstr ""
+
+#. module: account_balance_reporting
+#: sql_constraint:account.balance.reporting.line:0
+#: sql_constraint:account.balance.reporting.template.line:0
+#: code:addons/account_balance_reporting/account_balance_reporting.py:252
+#: code:addons/account_balance_reporting/account_balance_reporting.py:254
+#: code:addons/account_balance_reporting/account_balance_reporting.py:268
+#: code:addons/account_balance_reporting/account_balance_reporting_template.py:183
+#: code:addons/account_balance_reporting/account_balance_reporting_template.py:211
+#, python-format
+msgid "The code must be unique for this report!"
+msgstr ""
+
+#. module: account_balance_reporting
 #: view:account.balance.reporting.template:0
 msgid "Template line"
 msgstr ""
@@ -295,8 +304,9 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+#: field:account.balance.reporting,current_date_from:0
+#: field:account.balance.reporting,previous_date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: account_balance_reporting
@@ -325,11 +335,6 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: selection:account.balance.reporting.template,balance_mode:0
-msgid "Credit-Debit, reversed with brakets"
-msgstr ""
-
-#. module: account_balance_reporting
 #: selection:account.balance.reporting.line,css_class:0
 #: selection:account.balance.reporting.template.line,css_class:0
 msgid "Default"
@@ -361,8 +366,8 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_line
-msgid "account.balance.reporting.line"
+#: field:account.balance.reporting,check_periods:0
+msgid "Compute by periods"
 msgstr ""
 
 #. module: account_balance_reporting
@@ -377,13 +382,13 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting
-msgid "account.balance.reporting"
+#: field:account.balance.reporting,current_period_ids:0
+msgid "Fiscal year 1 periods"
 msgstr ""
 
 #. module: account_balance_reporting
 #: view:account.balance.reporting:0
-#: wizard_button:account_balance_reporting.print_wizard,init,end:0
+#: view:account.balance.reporting.print.wizard:0
 msgid "Cancel"
 msgstr ""
 
@@ -438,6 +443,11 @@
 msgstr ""
 
 #. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template
+msgid "account.balance.reporting.template"
+msgstr ""
+
+#. module: account_balance_reporting
 #: model:ir.ui.menu,name:account_balance_reporting.menu_account_balance_reporting_templates
 msgid "Templates"
 msgstr ""
@@ -482,11 +492,6 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template
-msgid "account.balance.reporting.template"
-msgstr ""
-
-#. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,current_value:0
 #: help:account.balance.reporting.template.line,previous_value:0
 msgid "Value calculation formula: Depending on this formula the final value is calculated as follows:\n"
@@ -499,12 +504,17 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: rml:report_account_balance_reporting.generic:0
-#: rml:report_account_balance_reporting.generic_non_zero:0
+#: report:report_account_balance_reporting.generic:0
+#: report:report_account_balance_reporting.generic_non_zero:0
 msgid "CONCEPT"
 msgstr ""
 
 #. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_line
+msgid "account.balance.reporting.line"
+msgstr ""
+
+#. module: account_balance_reporting
 #: view:account.balance.reporting.line:0
 msgid "Account balance report line"
 msgstr ""
@@ -516,8 +526,8 @@
 msgstr ""
 
 #. module: account_balance_reporting
-#: wizard_view:account_balance_reporting.print_wizard,init:0
-#: model:ir.actions.wizard,name:account_balance_reporting.wiz_account_balance_reporting_print
+#: view:account.balance.reporting.print.wizard:0
+#: model:ir.actions.act_window,name:account_balance_reporting.account_balance_reporting_print_wizard_act_window
 msgid "Print report"
 msgstr ""
 
@@ -526,13 +536,3 @@
 msgid "Account balance report"
 msgstr ""
 
-#. module: account_balance_reporting
-#: model:ir.module.module,shortdesc:account_balance_reporting.module_meta_information
-msgid "Account balance reporting engine"
-msgstr ""
-
-#. module: account_balance_reporting
-#: selection:account.balance.reporting,state:0
-msgid "Canceled"
-msgstr ""
-

=== modified file 'account_balance_reporting/i18n/es.po'
--- account_balance_reporting/i18n/es.po	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/i18n/es.po	2014-05-26 16:36:55 +0000
@@ -1,26 +1,24 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account_balance_reporting
+#   * account_balance_reporting
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-09-27 08:18+0000\n"
-"PO-Revision-Date: 2010-12-13 22:27+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-14 13:03+0000\n"
+"PO-Revision-Date: 2014-05-14 13:03+0000\n"
+"Last-Translator: <>\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: 2012-05-24 11:38+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
 
 #. module: account_balance_reporting
-#: field:account.balance.reporting,current_period_ids:0
-msgid "Fiscal year 1 periods"
-msgstr "Periodos ejercicio fiscal 1"
+#: field:account.balance.reporting,check_dates:0
+msgid "Compute by dates"
+msgstr "Calcular entre fechas"
 
 #. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,css_class:0
@@ -28,9 +26,15 @@
 msgstr "Clase de hoja de estilos"
 
 #. module: account_balance_reporting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
+#: field:account.balance.reporting,template_id:0
+#: field:account.balance.reporting.template.line,report_id:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: account_balance_reporting
+#: selection:account.balance.reporting.template,balance_mode:0
+msgid "Debit-Credit, reversed with brackets"
+msgstr "Debe-Haber, invertidos entre paréntisis"
 
 #. module: account_balance_reporting
 #: selection:account.balance.reporting.template,balance_mode:0
@@ -64,11 +68,21 @@
 msgstr "Calcular informe"
 
 #. module: account_balance_reporting
+#: field:account.balance.reporting,level:0
+msgid "Level"
+msgstr "Nivel"
+
+#. module: account_balance_reporting
 #: field:account.balance.reporting.line,notes:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_print_wizard
+msgid "account.balance.reporting.print.wizard"
+msgstr "account.balance.reporting.print.wizard"
+
+#. module: account_balance_reporting
 #: view:account.balance.reporting:0
 #: model:ir.actions.act_window,name:account_balance_reporting.action_view_account_balance_reporting
 #: model:ir.ui.menu,name:account_balance_reporting.menu_account_balance_reporting
@@ -95,16 +109,9 @@
 msgstr "Ejercicio fiscal 2"
 
 #. module: account_balance_reporting
-#: selection:account.balance.reporting.template,balance_mode:0
-msgid "Debit-Credit, reversed with brakets"
-msgstr "Debe-Haber, inverso con paréntesis"
-
-#. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,code:0
 msgid "Concept code, may be used on formulas to reference this line"
-msgstr ""
-"Código de concepto, puede ser usado en las fórmulas para referenciar esta "
-"línea."
+msgstr "Código de concepto, puede ser usado en las fórmulas para referenciar esta línea."
 
 #. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,sequence:0
@@ -117,23 +124,12 @@
 msgstr "Negar"
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template_line
-msgid "account.balance.reporting.template.line"
-msgstr "account.balance.reporting.template.line"
-
-#. module: account_balance_reporting
-#: rml:report_account_balance_reporting.generic:0
-#: rml:report_account_balance_reporting.generic_non_zero:0
+#: report:report_account_balance_reporting.generic:0
+#: report:report_account_balance_reporting.generic_non_zero:0
 msgid "CODE"
 msgstr "CÓDIGO"
 
 #. module: account_balance_reporting
-#: field:account.balance.reporting,template_id:0
-#: field:account.balance.reporting.template.line,report_id:0
-msgid "Template"
-msgstr "Plantilla"
-
-#. module: account_balance_reporting
 #: view:account.balance.reporting:0
 msgid "Parameters"
 msgstr "Parámetros"
@@ -144,8 +140,8 @@
 msgstr "Confirmar"
 
 #. module: account_balance_reporting
-#: rml:report_account_balance_reporting.generic:0
-#: rml:report_account_balance_reporting.generic_non_zero:0
+#: report:report_account_balance_reporting.generic:0
+#: report:report_account_balance_reporting.generic_non_zero:0
 msgid "NOTES"
 msgstr "NOTAS"
 
@@ -155,18 +151,13 @@
 msgstr "Líneas plantilla informe cuentas anuales"
 
 #. module: account_balance_reporting
-#: wizard_view:account_balance_reporting.print_wizard,init:0
-msgid "Report data"
-msgstr "Datos del informe"
-
-#. module: account_balance_reporting
 #: view:account.balance.reporting:0
 #: field:account.balance.reporting,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: account_balance_reporting
-#: wizard_button:account_balance_reporting.print_wizard,init,print:0
+#: view:account.balance.reporting.print.wizard:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -177,16 +168,12 @@
 
 #. module: account_balance_reporting
 #: help:account.balance.reporting.template,balance_mode:0
-msgid ""
-"Formula calculation mode: Depending on it, the balance is calculated as "
-"follows:\n"
+msgid "Formula calculation mode: Depending on it, the balance is calculated as follows:\n"
 "  Mode 0: debit-credit (default);\n"
 "  Mode 1: debit-credit, credit-debit for accounts in brackets;\n"
 "  Mode 2: credit-debit;\n"
 "  Mode 3: credit-debit, debit-credit for accounts in brackets."
-msgstr ""
-"Modo de cálculo de la fórmula: Dependiendo de éste, el saldo se calcula como "
-"sigue:\n"
+msgstr "Modo de cálculo de la fórmula: Dependiendo de éste, el saldo se calcula como sigue:\n"
 "  Modo 0: debe-haber (por defecto);\n"
 "  Modo 1: debe-haber, haber-debe para las cuentas con paréntesis;\n"
 "  Modo 2: haber-debe;\n"
@@ -203,67 +190,19 @@
 msgstr "Línea de informe"
 
 #. module: account_balance_reporting
-#: model:ir.module.module,description:account_balance_reporting.module_meta_information
-msgid ""
-"\n"
-"The module allows the user to create account balance reports and templates,\n"
-"comparing the values of 'accounting concepts' between two fiscal years\n"
-"or a set of fiscal periods.\n"
-"\n"
-"Accounting concepts values can be calculated as the sum of some account "
-"balances,\n"
-"the sum of its children, other account concepts or constant values.\n"
-"\n"
-"Generated reports are stored as objects on the server,\n"
-"so you can check them anytime later or edit them\n"
-"(to add notes for example) before printing.\n"
-"\n"
-"The module lets the user add new templates of the reports concepts,\n"
-"and associate them a specific \"XML reports\" (OpenERP RML files for "
-"example)\n"
-"with the design used when printing.\n"
-"So it is very easy to add predefined country-specific official reports.\n"
-"\n"
-"The user interface has been designed to be as much user-friendly as it can "
-"be.\n"
-"\n"
-"Note: It has been designed to meet Spanish/Spain localization needs,\n"
-"but it might be used as a generic accounting report engine.\n"
-"            "
-msgstr ""
-"\n"
-"El módulo permite al usuario crear informes y plantillas de balances "
-"contables,\n"
-"comparando los valores de 'conceptos contables' entre dos ejercicios "
-"fiscales\n"
-"o un conjunto de periodos fiscales.\n"
-"\n"
-"Los valores de los conceptos contables pueden ser calculados como la suma de "
-"los saldos de algunas cuentas,\n"
-"la suma de sus hijos, otros conceptos contables o valores constantes.\n"
-"\n"
-"Los informes generados se almacenan como objetos en el servidor,\n"
-"así que se pueden consultar más tarde o editar\n"
-"(para añadir notas por ejemplo) antes de imprimir.\n"
-"\n"
-"El módulo permite al usuario añadir nuevas plantillas de conceptos "
-"fiscales,\n"
-"y asociarles \"informes XML\" (archivos RML de OpenERP por ejemplo) "
-"específicos\n"
-"con el diseño a usar en la impresión.\n"
-"Así que es muy fácil añadir informes oficiales predefinidos específicos de "
-"un país.\n"
-"\n"
-"La interfaz de usuario ha sido diseñada para ser tan amigable como es "
-"posible.\n"
-"\n"
-"Nota: Ha sido diseñado para cubrir las necesidades de la localización "
-"Española/España,\n"
-"pero puede ser usado como un motor de informes contables genérico.\n"
-"            "
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template_line
+msgid "account.balance.reporting.template.line"
+msgstr "account.balance.reporting.template.line"
+
+#. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting
+msgid "account.balance.reporting"
+msgstr "account.balance.reporting"
 
 #. module: account_balance_reporting
 #: field:account.balance.reporting.line,report_id:0
+#: view:account.balance.reporting.print.wizard:0
+#: field:account.balance.reporting.print.wizard,report_id:0
 msgid "Report"
 msgstr "Informe"
 
@@ -280,14 +219,13 @@
 
 #. module: account_balance_reporting
 #: field:account.balance.reporting.template,report_xml_id:0
-#: wizard_view:account_balance_reporting.print_wizard,init:0
 msgid "Report design"
 msgstr "Diseño del informe"
 
 #. module: account_balance_reporting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
+#: selection:account.balance.reporting.template,balance_mode:0
+msgid "Credit-Debit, reversed with brackets"
+msgstr "Haber-Debe, invertido entre paréntisis"
 
 #. module: account_balance_reporting
 #: view:account.balance.reporting.template:0
@@ -300,6 +238,12 @@
 msgstr "Informe balance genérico (sin líneas a cero)"
 
 #. module: account_balance_reporting
+#: field:account.balance.reporting,current_date_to:0
+#: field:account.balance.reporting,previous_date_to:0
+msgid "Date To"
+msgstr "Hasta"
+
+#. module: account_balance_reporting
 #: field:account.balance.reporting,calc_date:0
 #: field:account.balance.reporting.line,calc_date:0
 msgid "Calculation date"
@@ -311,6 +255,29 @@
 msgstr "Periodos ejercicio fiscal 2"
 
 #. module: account_balance_reporting
+#: selection:account.balance.reporting,state:0
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. module: account_balance_reporting
+#: view:account.balance.reporting.print.wizard:0
+#: field:account.balance.reporting.print.wizard,report_xml_id:0
+msgid "Design"
+msgstr "Diseño"
+
+#. module: account_balance_reporting
+#: sql_constraint:account.balance.reporting.line:0
+#: sql_constraint:account.balance.reporting.template.line:0
+#: code:addons/account_balance_reporting/account_balance_reporting.py:252
+#: code:addons/account_balance_reporting/account_balance_reporting.py:254
+#: code:addons/account_balance_reporting/account_balance_reporting.py:268
+#: code:addons/account_balance_reporting/account_balance_reporting_template.py:183
+#: code:addons/account_balance_reporting/account_balance_reporting_template.py:211
+#, python-format
+msgid "The code must be unique for this report!"
+msgstr "¡El código debe ser único para este informe!"
+
+#. module: account_balance_reporting
 #: view:account.balance.reporting.template:0
 msgid "Template line"
 msgstr "Línea de plantilla"
@@ -341,12 +308,10 @@
 msgstr "Borrador"
 
 #. module: account_balance_reporting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: field:account.balance.reporting,current_date_from:0
+#: field:account.balance.reporting,previous_date_from:0
+msgid "Date From"
+msgstr "Desde"
 
 #. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,name:0
@@ -374,11 +339,6 @@
 msgstr "Plantilla de línea"
 
 #. module: account_balance_reporting
-#: selection:account.balance.reporting.template,balance_mode:0
-msgid "Credit-Debit, reversed with brakets"
-msgstr "Haber-Debe, inverso con paréntesis"
-
-#. module: account_balance_reporting
 #: selection:account.balance.reporting.line,css_class:0
 #: selection:account.balance.reporting.template.line,css_class:0
 msgid "Default"
@@ -410,9 +370,9 @@
 msgstr "Modo de saldo"
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_line
-msgid "account.balance.reporting.line"
-msgstr "account.balance.reporting.line"
+#: field:account.balance.reporting,check_periods:0
+msgid "Compute by periods"
+msgstr "Calcular por periodos"
 
 #. module: account_balance_reporting
 #: field:account.balance.reporting.line,code:0
@@ -426,13 +386,13 @@
 msgstr "Realizado"
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting
-msgid "account.balance.reporting"
-msgstr "account.balance.reporting"
+#: field:account.balance.reporting,current_period_ids:0
+msgid "Fiscal year 1 periods"
+msgstr "Periodos ejercicio fiscal 1"
 
 #. module: account_balance_reporting
 #: view:account.balance.reporting:0
-#: wizard_button:account_balance_reporting.print_wizard,init,end:0
+#: view:account.balance.reporting.print.wizard:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -487,6 +447,11 @@
 msgstr "Plantillas informe cuentas anuales"
 
 #. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template
+msgid "account.balance.reporting.template"
+msgstr "account.balance.reporting.template"
+
+#. module: account_balance_reporting
 #: model:ir.ui.menu,name:account_balance_reporting.menu_account_balance_reporting_templates
 msgid "Templates"
 msgstr "Plantillas"
@@ -531,41 +496,35 @@
 msgstr "Valores"
 
 #. module: account_balance_reporting
-#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_template
-msgid "account.balance.reporting.template"
-msgstr "account.balance.reporting.template"
-
-#. module: account_balance_reporting
 #: help:account.balance.reporting.template.line,current_value:0
 #: help:account.balance.reporting.template.line,previous_value:0
-msgid ""
-"Value calculation formula: Depending on this formula the final value is "
-"calculated as follows:\n"
+msgid "Value calculation formula: Depending on this formula the final value is calculated as follows:\n"
 "  Empy template value: sum of (this concept) children values.\n"
 "  Number with decimal point (\"10.2\"): that value (constant).\n"
-"  Account numbers separated by commas (\"430,431,(437)\"): Sum of the "
-"account balances\n"
+"  Account numbers separated by commas (\"430,431,(437)\"): Sum of the account balances\n"
 "    (the sign of the balance depends on the balance mode).\n"
-"  Concept codes separated by \"+\" (\"11000+12000\"): Sum of those concepts "
-"values.\n"
-msgstr ""
-"Fórmula de cálculo del valor: Dependiendo de esta fórmula el valor final se "
-"calcula como sigue:\n"
+"  Concept codes separated by \"+\" (\"11000+12000\"): Sum of those concepts values.\n"
+""
+msgstr "Fórmula de cálculo del valor: Dependiendo de esta fórmula el valor final se calcula como sigue:\n"
 "  Valor vacío: suma de los valores de los hijos (de este concepto).\n"
 "  Número con punto decimal (\"10.2\"): ese número (constante).\n"
-"  Números de cuentas separados por comas (\"430,431,(437)\"): Suma de los "
-"saldos de las cuentas\n"
+"  Números de cuentas separados por comas (\"430,431,(437)\"): Suma de los saldos de las cuentas\n"
 "    (el signo del saldo depende del modo de saldo).\n"
-"  Códigos de conceptos separados por \"+\" (\"11000+12000\"): Suma de los "
-"valores de dichos conceptos.\n"
+"  Códigos de conceptos separados por \"+\" (\"11000+12000\"): Suma de los valores de dichos conceptos.\n"
+""
 
 #. module: account_balance_reporting
-#: rml:report_account_balance_reporting.generic:0
-#: rml:report_account_balance_reporting.generic_non_zero:0
+#: report:report_account_balance_reporting.generic:0
+#: report:report_account_balance_reporting.generic_non_zero:0
 msgid "CONCEPT"
 msgstr "CONCEPTO"
 
 #. module: account_balance_reporting
+#: model:ir.model,name:account_balance_reporting.model_account_balance_reporting_line
+msgid "account.balance.reporting.line"
+msgstr "account.balance.reporting.line"
+
+#. module: account_balance_reporting
 #: view:account.balance.reporting.line:0
 msgid "Account balance report line"
 msgstr "Línea informe cuentas anuales"
@@ -577,8 +536,8 @@
 msgstr "Orden"
 
 #. module: account_balance_reporting
-#: wizard_view:account_balance_reporting.print_wizard,init:0
-#: model:ir.actions.wizard,name:account_balance_reporting.wiz_account_balance_reporting_print
+#: view:account.balance.reporting.print.wizard:0
+#: model:ir.actions.act_window,name:account_balance_reporting.account_balance_reporting_print_wizard_act_window
 msgid "Print report"
 msgstr "Imprimir informe"
 
@@ -587,24 +546,3 @@
 msgid "Account balance report"
 msgstr "Informe cuentas anuales"
 
-#. module: account_balance_reporting
-#: model:ir.module.module,shortdesc:account_balance_reporting.module_meta_information
-msgid "Account balance reporting engine"
-msgstr "Motor de informes de balances contables"
-
-#. module: account_balance_reporting
-#: selection:account.balance.reporting,state:0
-msgid "Canceled"
-msgstr "Cancelado"
-
-#~ msgid "account.balance.report.template.line"
-#~ msgstr "account.balance.report.template.line"
-
-#~ msgid "account.balance.report.line"
-#~ msgstr "account.balance.report.line"
-
-#~ msgid "account.balance.report"
-#~ msgstr "account.balance.report"
-
-#~ msgid "account.balance.report.template"
-#~ msgstr "account.balance.report.template"

=== modified file 'account_balance_reporting/report/__init__.py'
--- account_balance_reporting/report/__init__.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/report/__init__.py	2014-05-26 16:36:55 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP - Account balance reporting engine
@@ -7,8 +6,8 @@
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -16,7 +15,7 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
@@ -24,4 +23,4 @@
 """
 Account balance reporting engine generic reports
 """
-__author__ = "Borja López Soilán (Pexego) - [e-mail]"
\ No newline at end of file
+__author__ = "Borja López Soilán (Pexego) - [e-mail]"

=== modified file 'account_balance_reporting/wizard/__init__.py'
--- account_balance_reporting/wizard/__init__.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/wizard/__init__.py	2014-05-26 16:36:55 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP - Account balance reporting engine
@@ -7,8 +6,8 @@
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -16,7 +15,7 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################

=== modified file 'account_balance_reporting/wizard/wizard_print.py'
--- account_balance_reporting/wizard/wizard_print.py	2014-01-10 10:36:59 +0000
+++ account_balance_reporting/wizard/wizard_print.py	2014-05-26 16:36:55 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP - Account balance reporting engine
@@ -7,8 +6,8 @@
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    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,
@@ -16,7 +15,7 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
@@ -32,12 +31,14 @@
 
 
 class print_wizard(osv.osv_memory):
-    _name='account.balance.reporting.print.wizard'
-    
-    def _get_current_report_id(self, cr, uid, ctx):   
-        rpt_facade = pooler.get_pool(cr.dbname).get('account.balance.reporting')
+    _name = 'account.balance.reporting.print.wizard'
+
+    def _get_current_report_id(self, cr, uid, ctx):
+        pool = pooler.get_pool(cr.dbname)
+        rpt_facade = pool.get('account.balance.reporting')
         report_id = None
-        if ctx.get('active_model') == 'account.balance.reporting' and ctx.get('active_ids') and ctx.get('active_ids')[0]:
+        if ctx.get('active_model') == 'account.balance.reporting' and \
+                ctx.get('active_ids') and ctx.get('active_ids')[0]:
             report_id = ctx.get('active_ids')[0]
             report_ids = rpt_facade.search(cr, uid, [('id', '=', report_id)])
             report_id = report_ids and report_ids[0] or None
@@ -45,7 +46,8 @@
 
     def _get_current_report_xml_id(self, cr, uid, ctx):
         report_id = self._get_current_report_id(cr, uid, ctx)
-        rpt_facade = pooler.get_pool(cr.dbname).get('account.balance.reporting')
+        pool = pooler.get_pool(cr.dbname)
+        rpt_facade = pool.get('account.balance.reporting')
         report = rpt_facade.browse(cr, uid, [report_id])[0]
         report_xml_id = None
         if report.template_id and report.template_id.report_xml_id:
@@ -53,43 +55,36 @@
         return report_xml_id
 
     def print_report(self, cr, uid, ids, context=None):
-        data = self.read(cr,uid,ids)[-1]
-        #rpt_facade_lines = pooler.get_pool(cr.dbname).get('account.balance.reporting.line')
-        #var = data.get('report_id') and data['report_id'][0] or None
-        #report_lines_ids = rpt_facade_lines.search(cr, uid, [('report_id', '=', var)])
-        #print data
-        #print str(data.get('report_id'))
-        #print str(data['report_id'][0])
-        datas ={
-                'ids': [data.get('report_id') and data['report_id'][0] or None],
-                'model':'account.balance.reporting',
-                'form': data
-                }
+        data = self.read(cr, uid, ids)[-1]
+        datas = {'ids': [data.get('report_id') and
+                         data['report_id'][0] or None],
+                 'model': 'account.balance.reporting',
+                 'form': data}
         rpt_facade = pooler.get_pool(cr.dbname).get('ir.actions.report.xml')
         report_xml = None
         if data.get('report_xml_id'):
             report_xml_id = data['report_xml_id']
-            report_xml_ids = rpt_facade.search(cr, uid, [('id', '=', report_xml_id[0])])
+            report_xml_ids = rpt_facade.search(cr, uid,
+                                               [('id', '=', report_xml_id[0])])
             report_xml_id = report_xml_ids and report_xml_ids[0] or None
             if report_xml_id:
                 report_xml = rpt_facade.browse(cr, uid, [report_xml_id])[0]
             if report_xml:
                 return {
-                    'type' : 'ir.actions.report.xml',
-                    'report_name' : report_xml.report_name,
-                    'datas' : datas #{'ids': [data.get('report_id') and data['report_id'][0] or None]},
+                    'type': 'ir.actions.report.xml',
+                    'report_name': report_xml.report_name,
+                    'datas': datas
                 }
-        return { 'type': 'ir.actions.act_window_close' }
-        
+        return {'type': 'ir.actions.act_window_close'}
+
     _columns = {
-        'report_id' : fields.many2one('account.balance.reporting', "Report"),
+        'report_id': fields.many2one('account.balance.reporting', "Report"),
         'report_xml_id': fields.many2one('ir.actions.report.xml', "Design"),
     }
-    
+
     _defaults = {
         'report_id': _get_current_report_id,
         'report_xml_id': _get_current_report_xml_id
     }
 
 print_wizard()
-