Merge lp:~rafael-valle-z/openerp-spain/openerp-spain-xls-reports into lp:~openerp-spain-team/openerp-spain/6.1

[Rafael Valle]

Añadidos 3 módulos:
- account_financial_report_web: Corrige algunos problemas con el cliente web
- report_general_ledger_xls: Permite generar el Libro Mayor en Excel
- report_cumulative_general_ledger_xls: Permite generar el Libro Mayor Acumulado en Excel

Probado en la versión 6.1

[Alberto Garcia (Factor Libre) (agarcia-flibre)]

Es una propuesta nuestra de Factor Libre como comentamos en la lista.

review: Approve

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

review: Approve

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

Probados y funcionan perfectamente.

Tenéis pensado o estáis haciendo lo mismo para Sumas y Saldos y Balance de situación?

Si no lo estáis haciendo, me puedo encargar del primero a partir del desarrollo que ya habéis hecho.

Saludos

[Alberto Garcia (Factor Libre) (agarcia-flibre)]

Buenas. Pensaba que ya lo habíamos hecho el merge. De momento no hemos hecho para los que comentas. Pero sería lo mas idoneo.

[Pedro Manuel Baeza (pedro.baeza)]

Tened en cuenta que para la v7 en el repositorio account-financial-report hay un módulo para exportar los informes financieros en XLS, para por si os sirve de inspiración o complementarlo si falta algo.

Un saludo.

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

Los módulos que indica Pedro, también están en la 6.1 y son más completos, tiene sumas y saldos y informes de diarios. Para la 6.0 no hay nada.

Saludos

=== added directory 'account_financial_report_web'
=== added file 'account_financial_report_web/__init__.py'
--- account_financial_report_web/__init__.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_financial_report_web/__openerp__.py'
--- account_financial_report_web/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/__openerp__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Factor Libre.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name": "Account Financial Report Web",
+    "version": "0.1",
+    "author": "Factor Libre",
+    "category": "Others",
+    "website": "http://www.factorlibre.com",
+    "description": "Update Account Financial Report (Factor Libre Project)",
+    "depends": ["base", "account_financial_report"],
+    "init_xml": [],
+    "update_xml": ["account_report_report.xml","account_report_wizard.xml",],
+    "active": False,
+    "installable": True,
+}

=== added file 'account_financial_report_web/account_report_report.xml'
--- account_financial_report_web/account_report_report.xml	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/account_report_report.xml	2014-01-29 11:51:34 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data >
+
+	# Report full account balance
+    <report
+            id="account_balance_full3"
+            string="**Full account balance"
+            model="account.account"
+            name="account.balance.full3"
+            rml="fl_account_financial_report/report/account_balance_full.rml"
+			header="False"
+			auto="False"
+			menu="False"/>
+
+  </data>
+</openerp>

=== added file 'account_financial_report_web/account_report_wizard.xml'
--- account_financial_report_web/account_report_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/account_report_wizard.xml	2014-01-29 11:51:34 +0000
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data >
+        <record id="account_balance_full_report_form3" model="ir.ui.view">
+            <field name="name">account.balance.full.report.form3</field>
+            <field name="model">fl.account.balance.full.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Full Account Balance2">
+                    <field name="company_id" on_change="onchange_company_id(company_id)"/>
+                    <newline/>
+                    <group colspan="4">
+                    <separator string="Accounts to include" colspan="4"/>
+                        <field name="account_list" nolabel="1" colspan="4" domain="[('company_id','=',company_id)]"/>
+                        <field name="display_account" required="True"/>
+                        <field name="display_account_level" required="True" />
+                    </group>
+                    <group colspan="4">
+                        <separator string="Period" colspan="4"/>
+                        <field name="fiscalyear"/>
+                        <newline/>
+                        <field name="state" required="True"/>
+                        <newline/>
+                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                                <separator string="Date Filter" colspan="4"/>
+                                <field name="date_from"/>
+                                <field name="date_to"/>
+                            </group>
+                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                                <separator string="Filter on Periods" colspan="4"/>
+                                <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
+                            </group>
+                        </group>
+                    </group>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="print_report" string="Get Balance" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_balance_full_xml_report3" model="ir.actions.act_window">
+            <field name="name">**Full account balance3</field>
+            <field name="res_model">fl.account.balance.full.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_balance_full_report_form3"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="account_financial_report.menu_account_balance_full_report" action="action_balance_full_xml_report3"
+            parent="account.menu_finance_generic_reporting" icon="STOCK_PRINT"
+            name="**Full account balance" sequence="100"/>
+        
+        <record id="account_general_ledger_cumulative_report_form2" model="ir.ui.view">
+            <field name="name">account.general.ledger.cumulative.report.form2</field>
+            <field name="model">fl.account.general.ledger.cumulative.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="General ledger">
+                    <field name="states" invisible="1"/>
+                    <newline/>
+                    <group string="Select parent account" attrs="{'invisible':[('states','!=','account_selection')]}"  width="700">
+                        <field name="account_list" colspan="4" nolabel="1" attrs="{'required':[('states','=','account_selection')]}"/>
+                        <newline/>
+                        <button special="cancel" colspan="2" string="Cancel" icon="gtk-cancel"/>
+                        <button name="step1" colspan="2" string="Next" type="object" icon="gtk-go-forward"/>
+                    </group>
+                    <newline/>
+                    <group string="Select Date-Period" attrs="{'invisible':[('states','!=','checktype')]}"  width="700" >
+                        <field name="company_id" colspan="4" attrs="{'required':[('states','=','checktype')]}"/>
+                        <newline/>
+                        <field name="fiscalyear"/>
+                        <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+                        <newline/>
+
+                        <field name="display_account" attrs="{'required':[('states','=','checktype')]}"/>
+                        <field name="sortbydate" attrs="{'required':[('states','=','checktype')]}"/>
+                        <field name="landscape"/>
+                        <field name="amount_currency"/>
+                        <field name="initial_balance"/>  
+                        <newline/>
+                        <separator string="Filters" colspan="4"/>
+                        <field name="state" required="True"/>
+                        <newline/>
+                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                                <separator string="Date Filter" colspan="4"/>
+                                <field name="date_from"/>
+                                <field name="date_to"/>
+                            </group>
+                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                                <separator string="Filter on Periods" colspan="4"/>
+                                <field name="periods" colspan="4" nolabel="1"/>
+                            </group>
+                        </group>
+                        <button special="cancel" colspan="2" string="Cancel" icon="gtk-cancel"/>
+                        <button name="prints" colspan="2" string="Print Report" type="object" icon="gtk-print"/> 
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_general_ledger_cumulative_xml_report2" model="ir.actions.act_window">
+            <field name="name">**Cumulative general ledger</field>
+            <field name="res_model">fl.account.general.ledger.cumulative.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_general_ledger_cumulative_report_form2"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="account_financial_report.menu_account_general_ledger_cumulative_report" action="action_general_ledger_cumulative_xml_report2"
+            parent="account.menu_finance_generic_reporting" icon="STOCK_PRINT"
+            name="**Cumulative general ledger" sequence="100"/>
+  </data>
+</openerp>

=== added directory 'account_financial_report_web/i18n'
=== added file 'account_financial_report_web/i18n/es.po'
--- account_financial_report_web/i18n/es.po	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/i18n/es.po	2014-01-29 11:51:34 +0000
@@ -0,0 +1,367 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* fl_account_financial_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-18 10:38+0000\n"
+"PO-Revision-Date: 2013-06-18 10:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,state:0
+#: selection:fl.account.general.ledger.cumulative.report,state:0
+msgid "By Period"
+msgstr "Por periodo"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+msgid "Full Account Balance2"
+msgstr "Balance de sumas y saldos"
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Select parent account"
+msgstr "Seleccione cuenta"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,sortbydate:0
+msgid "Sort by"
+msgstr "Ordenar por"
+
+#. module: fl_account_financial_report
+#: model:ir.model,name:fl_account_financial_report.model_fl_account_balance_full_report
+msgid "fl.account.balance.full.report"
+msgstr "fl.account.balance.full.report"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/report/general_ledger.py:344
+#: code:addons/fl_account_financial_report/report/general_ledger_landscape.py:348
+#, python-format
+msgid "Initial balance"
+msgstr "Balance inicial"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,initial_balance:0
+msgid "Show initial balances"
+msgstr "Mostrar balance inicial"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Date Filter"
+msgstr "Filtro por fecha"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,states:0
+msgid "State"
+msgstr "Estado"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,display_account:0
+msgid "Display accounts "
+msgstr "Mostrar cuentas "
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Print Report"
+msgstr "Imprimir informe"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:227
+#, python-format
+msgid "Date to must be set between %s and %s"
+msgstr "La fecha debe ser entre %s y %s"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/report/general_ledger.py:283
+#: code:addons/fl_account_financial_report/report/general_ledger_landscape.py:287
+#, python-format
+msgid "SI: "
+msgstr "SI: "
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,date_from:0
+#: field:fl.account.general.ledger.cumulative.report,date_from:0
+msgid "Start date"
+msgstr "Fecha de inicio"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Filter on Periods"
+msgstr "Filtro por periodos"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.general.ledger.cumulative.report,sortbydate:0
+msgid "Movement"
+msgstr "movimiento"
+
+#. module: fl_account_financial_report
+#: model:ir.model,name:fl_account_financial_report.model_fl_account_balance_full_report2
+msgid "fl.account.balance.full.report2"
+msgstr "fl.account.balance.full.report2"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:102
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:165
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,periods:0
+#: field:fl.account.general.ledger.cumulative.report,periods:0
+msgid "Periods"
+msgstr "Periodos"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,company_id:0
+#: field:fl.account.general.ledger.cumulative.report,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "(Keep empty for all open fiscal years)"
+msgstr "(Mantener vacio para mostrar todos los ejercicios fiscales abiertos)"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,state:0
+#: selection:fl.account.general.ledger.cumulative.report,state:0
+msgid "No Filter"
+msgstr "Sin filtro"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.general.ledger.cumulative.report,display_account:0
+msgid "With balance is not equal to 0"
+msgstr "Con balance diferente a 0"
+
+#. module: fl_account_financial_report
+#: model:ir.model,name:fl_account_financial_report.model_account_balance_full_report
+msgid "account.balance.full.report"
+msgstr "account.balance.full.report"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.general.ledger.cumulative.report,sortbydate:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,amount_currency:0
+msgid "With Currency"
+msgstr "Mostrar divisa"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+msgid "Accounts to include"
+msgstr "Cuentas a incluir"
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "General ledger"
+msgstr "Libro mayor"
+
+#. module: fl_account_financial_report
+#: help:fl.account.balance.full.report,display_account_level:0
+msgid "Display accounts up to this level (0 to show all)"
+msgstr "Mostrar cuentas hasta este nivel de profundidad (0 para mostrar todas)"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,display_account:0
+#: selection:fl.account.general.ledger.cumulative.report,display_account:0
+msgid "With movements"
+msgstr "Con movimientos"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,account_list:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: fl_account_financial_report
+#: model:ir.actions.report.xml,name:fl_account_financial_report.account_balance_full3
+msgid "**Full account balance"
+msgstr "**Balance de sumas y saldos"
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,state:0
+#: selection:fl.account.general.ledger.cumulative.report,state:0
+msgid "By Date and Period"
+msgstr "Por fecha y periodo"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,account_list:0
+msgid "Root accounts"
+msgstr "Cuentas raiz"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/report/general_ledger.py:282
+#: code:addons/fl_account_financial_report/report/general_ledger_landscape.py:286
+#, python-format
+msgid "CI: "
+msgstr "CI: "
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Select Date-Period"
+msgstr "Seleccionar fecha y periodo"
+
+#. module: fl_account_financial_report
+#: help:fl.account.general.ledger.cumulative.report,fiscalyear:0
+msgid "Keep empty for all open fiscal year"
+msgstr "Mantener vacio para mostrar todos los ejercicios fiscales abiertos"
+
+#. module: fl_account_financial_report
+#: help:fl.account.balance.full.report,periods:0
+#: help:fl.account.general.ledger.cumulative.report,periods:0
+msgid "All periods in the fiscal year if empty"
+msgstr "Todos los periodos del ejercicio fiscal si no tiene contenido"
+
+#. module: fl_account_financial_report
+#: model:ir.actions.act_window,name:fl_account_financial_report.action_balance_full_xml_report3
+msgid "**Full account balance3"
+msgstr "**Balance sumas y saldos"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+msgid "Get Balance"
+msgstr "Obtener Balance"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/report/general_ledger.py:285
+#: code:addons/fl_account_financial_report/report/general_ledger_landscape.py:289
+#, python-format
+msgid "SR: "
+msgstr "SR: "
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,state:0
+#: selection:fl.account.general.ledger.cumulative.report,state:0
+msgid "By Date"
+msgstr "By Date"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:165
+#, python-format
+msgid "La interseccion entre el periodo y fecha es vacio"
+msgstr "La interseccion entre el periodo y fecha es vacio"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,display_account:0
+msgid "With balance"
+msgstr "Con balance"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.general.ledger.cumulative.report,states:0
+msgid "Check Type"
+msgstr "Check Type"
+
+#. module: fl_account_financial_report
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Next"
+msgstr "Next"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:112
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:116
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:227
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:229
+#, python-format
+msgid "UserError"
+msgstr "UserError"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,date_to:0
+#: field:fl.account.general.ledger.cumulative.report,date_to:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.balance.full.report,display_account:0
+#: selection:fl.account.general.ledger.cumulative.report,display_account:0
+msgid "All"
+msgstr "Todo"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/wizard/wizard_account_balance_report.py:229
+#, python-format
+msgid "Date not in a defined fiscal year"
+msgstr "La fecha no se encuentra en un ejercicio fiscal definido"
+
+#. module: fl_account_financial_report
+#: model:ir.actions.act_window,name:fl_account_financial_report.action_general_ledger_cumulative_xml_report2
+msgid "**Cumulative general ledger"
+msgstr "**Libro mayor acumulado"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,state:0
+#: field:fl.account.general.ledger.cumulative.report,state:0
+msgid "Date/Period Filter"
+msgstr "Filtro fecha/periodo"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+msgid "Period"
+msgstr "Periodo"
+
+#. module: fl_account_financial_report
+#: model:ir.model,name:fl_account_financial_report.model_fl_account_general_ledger_cumulative_report
+msgid "fl.account.general.ledger.cumulative.report"
+msgstr "fl.account.general.ledger.cumulative.report"
+
+#. module: fl_account_financial_report
+#: code:addons/fl_account_financial_report/report/general_ledger.py:284
+#: code:addons/fl_account_financial_report/report/general_ledger_landscape.py:288
+#, python-format
+msgid "OR: "
+msgstr "OR: "
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,fiscalyear:0
+#: field:fl.account.general.ledger.cumulative.report,fiscalyear:0
+msgid "Fiscal year"
+msgstr "Ejercicio fiscal"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,landscape:0
+msgid "Landscape Mode"
+msgstr "Modo apaisado"
+
+#. module: fl_account_financial_report
+#: field:fl.account.general.ledger.cumulative.report,display_account:0
+msgid "Display accounts"
+msgstr "Mostrar cuentas"
+
+#. module: fl_account_financial_report
+#: field:fl.account.balance.full.report,display_account_level:0
+msgid "Up to level"
+msgstr "Hasta el nivel"
+
+#. module: fl_account_financial_report
+#: view:fl.account.balance.full.report:0
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: fl_account_financial_report
+#: help:fl.account.balance.full.report,fiscalyear:0
+msgid "Keep empty to use all open fiscal years to compute the balance"
+msgstr "Dejarlo vacio para usar todos los ejercicios fiscales abiertos para calcular el balance"
+
+#. module: fl_account_financial_report
+#: selection:fl.account.general.ledger.cumulative.report,states:0
+msgid "Account Selection"
+msgstr "Selección de cuenta"
+

=== added directory 'account_financial_report_web/report'
=== added file 'account_financial_report_web/report/__init__.py'
--- account_financial_report_web/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/report/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2009 Factor Libre (http://factorlibre.com) All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import account_balance
+import general_ledger
+import general_ledger_landscape
+import rml_parse
+

=== added file 'account_financial_report_web/report/account_balance.py'
--- account_financial_report_web/report/account_balance.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/report/account_balance.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,314 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import xml
+import copy
+from operator import itemgetter
+import time
+import datetime
+from report import report_sxw
+from tools import config
+#import decimal_precision as dp
+
+#import sys
+
+class account_balance(report_sxw.rml_parse):
+    _name = "report.account.balance.full2"
+    
+
+    def __init__(self, cr, uid, name, context):
+        super(account_balance, self).__init__(cr, uid, name, context)
+        self.sum_debit = 0.00
+        self.sum_credit = 0.00
+        self.sum_balance = 0.00
+        self.sum_debit_fy = 0.00
+        self.sum_credit_fy = 0.00
+        self.sum_balance_fy = 0.00
+        self.date_lst = []
+        self.date_lst_string = ''
+        self.localcontext.update({
+            'time': time,
+            'lines': self.lines,
+            'get_fiscalyear_text': self.get_fiscalyear_text,
+            'get_periods_and_date_text': self.get_periods_and_date_text,
+        })
+        self.context = context
+
+
+
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+
+        if (data['model'] == 'ir.ui.menu'):
+            new_ids = data['form']['account_list']
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        super(account_balance, self).set_context(objects, data, new_ids, report_type=report_type)
+
+    def get_fiscalyear_text(self, form):
+        """
+        Returns the fiscal year text used on the report.
+        """
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        fiscalyear = None
+
+        if form.get('fiscalyear'):
+
+            fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'][0])
+
+            return fiscalyear.name or fiscalyear.code
+        else:
+            fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, fiscalyear_obj.find(self.cr, self.uid))
+            return "%s*" % (fiscalyear.name or fiscalyear.code)
+
+
+    def get_periods_and_date_text(self, form):
+        """
+        Returns the text with the periods/dates used on the report.
+        """
+        period_obj = self.pool.get('account.period')
+        periods_str = None
+        fiscalyear_id = form['fiscalyear'] or fiscalyear_obj.find(self.cr, self.uid)
+        period_ids = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear_id[0]),('special','=',False)])
+        if form['state'] in ['byperiod', 'all']:
+            period_ids = form['periods']
+        periods_str = ', '.join([period.name or period.code for period in period_obj.browse(self.cr, self.uid, period_ids)])
+
+        dates_str = None
+        if form['state'] in ['bydate', 'all']:
+            dates_str = self.formatLang(form['date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' '
+
+        if periods_str and dates_str:
+            return "%s / %s" % (periods_str, dates_str)
+        elif periods_str:
+            return "%s" % periods_str
+        elif dates_str:
+            return "%s" % dates_str
+        else:
+            return ''
+
+
+    def lines(self, form, ids={}, done=None, level=0):
+        """
+        Returns all the data needed for the report lines
+        (account info plus debit/credit/balance in the selected period
+        and the full year)
+        """
+
+        if not ids:
+            ids = self.ids
+        if not ids:
+            return []
+        if not done:
+            done = {}
+        if form.has_key('account_list') and form['account_list']:
+            account_ids = form['account_list']
+            del form['account_list']
+        res = {}
+        result_acc = []
+        accounts_levels = {}
+        account_obj = self.pool.get('account.account')
+        period_obj = self.pool.get('account.period')
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+
+        # Get the fiscal year
+        fiscalyear = None
+        if form.get('fiscalyear'):
+            fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'][0])
+        else:
+            fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, fiscalyear_obj.find(self.cr, self.uid))
+
+        #
+        # Get the accounts
+        #
+        child_ids = account_obj._get_children_and_consol(self.cr, self.uid, account_ids, self.context)
+        if child_ids:
+            account_ids = child_ids
+
+        #
+        # Calculate the FY Balance.
+        # (from full fiscal year without closing periods)
+        #
+        ctx = self.context.copy()
+
+        if form.get('fiscalyear'):
+            # Use only the current fiscal year
+            ctx['fiscalyear'] = fiscalyear.id
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),'|',('special','=',False),('date_stop','<',fiscalyear.date_stop)])
+        else:
+            # Use all the open fiscal years
+            open_fiscalyear_ids = fiscalyear_obj.search(self.cr, self.uid, [('state','=','draft')])
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','in',open_fiscalyear_ids),'|',('special','=',False),('date_stop','<',fiscalyear.date_stop)])
+
+        fy_balance = {}
+        for acc in account_obj.read(self.cr, self.uid, account_ids, ['balance'], ctx):
+            fy_balance[acc['id']] = acc['balance']
+
+        #
+        # Calculate the FY Debit/Credit
+        # (from full fiscal year without opening or closing periods)
+        #
+        ctx = self.context.copy()
+        ctx['fiscalyear'] = fiscalyear.id
+        ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',False)])
+
+        fy_debit = {}
+        fy_credit = {}
+        for acc in account_obj.read(self.cr, self.uid, account_ids, ['debit','credit','balance'], ctx):
+            fy_debit[acc['id']] = acc['debit']
+            fy_credit[acc['id']] = acc['credit']
+
+        #
+        # Calculate the period Debit/Credit
+        # (from the selected period or all the non special periods in the fy)
+        #
+        ctx = self.context.copy()
+        """tx['state'] = form['context'].get('state','all')"""
+        ctx['fiscalyear'] = fiscalyear.id
+        ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',False)])
+        if form['state'] in ['byperiod', 'all']:
+            ctx['periods'] = form['periods']
+        if form['state'] in ['bydate', 'all']:
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] = form['date_to']
+
+        accounts = account_obj.read(self.cr, self.uid, account_ids, ['type','code','name','debit','credit','balance','parent_id'], ctx)
+        # In some versions of OpenERP server, the order of the read records differs from the order of the ids of the records
+        accounts.sort(lambda x,y: cmp(x['code'], y['code']))
+
+        #
+        # Calculate the period initial Balance
+        # (fy balance minus the balance from the start of the selected period
+        #  to the end of the year)
+        #
+        ctx = self.context.copy()
+        """ctx['state'] = form['context'].get('state','all')"""
+        ctx['fiscalyear'] = fiscalyear.id
+        ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',False)])
+        if form['state'] in ['byperiod', 'all']:
+            ctx['periods'] = form['periods']    
+            date_start = min([period.date_start for period in period_obj.browse(self.cr, self.uid, ctx['periods'])])
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_start','>=',date_start),('special','=',False)])
+        if form['state'] in ['bydate', 'all']:
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] = fiscalyear.date_stop
+
+        period_balanceinit = {}
+        for acc in account_obj.read(self.cr, self.uid, account_ids, ['balance'], ctx):
+            period_balanceinit[acc['id']] = fy_balance[acc['id']] - acc['balance']
+
+        #
+        # Generate the report lines (checking each account)
+        #
+        decimal_precision_obj = self.pool.get('decimal.precision')
+        ids = decimal_precision_obj.search(self.cr, self.uid, [('name', '=', 'Account')])
+        digits = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
+        #print >>sys.stderr, 'digits',digits
+
+        for account in accounts:
+            account_id = account['id']
+
+            if account_id in done:
+                continue
+
+            done[account_id] = 1
+
+            #
+            # Calculate the account level
+            #
+            parent_id = account['parent_id']
+            if parent_id:
+                if isinstance(parent_id, tuple):
+                    parent_id = parent_id[0]
+                account_level = accounts_levels.get(parent_id, 0) + 1
+            else:
+                account_level = level
+            accounts_levels[account_id] = account_level
+
+            #
+            # Check if we need to include this level
+            #
+            if not form['display_account_level'] or account_level <= form['display_account_level']:
+                #
+                # Copy the account values
+                #
+                res = {
+                        'id' : account_id,
+                        'type' : account['type'],
+                        'code': account['code'],
+                        'name': account['name'],
+                        'level': account_level,
+                        'balanceinit': period_balanceinit[account_id],
+                        'debit': account['debit'],
+                        'credit': account['credit'],
+                        'balance': period_balanceinit[account_id]+account['balance'],
+                        'balanceinit_fy': fy_balance[account_id]-fy_debit[account_id]+fy_credit[account_id],
+                        'debit_fy': fy_debit[account_id],
+                        'credit_fy': fy_credit[account_id],
+                        'balance_fy': fy_balance[account_id],
+                        'parent_id': account['parent_id'],
+                        'bal_type': '',
+                    }
+
+                #
+                # Round the values to zero if needed (-0.000001 ~= 0)
+                #
+                res['balance'] = round(res['balance'],digits)
+                res['balance_fy'] = round(res['balance_fy'],digits)
+                res['balanceinit'] = round(res['balanceinit'],digits)
+                res['balanceinit_fy'] = round(res['balanceinit_fy'],digits)
+                res['debit'] = round(res['debit'],digits)
+                res['credit'] = round(res['credit'],digits)
+                #if abs(res['balance']) < 0.5 * 10**-int(config['price_accuracy']):
+                #    res['balance'] = 0.0
+                #if abs(res['balance_fy']) < 0.5 * 10**-int(config['price_accuracy']):
+                #    res['balance_fy'] = 0.0
+                #if abs(res['balanceinit']) < 0.5 * 10**-int(config['price_accuracy']):
+                #    res['balanceinit'] = 0.0
+                #if abs(res['balanceinit_fy']) < 0.5 * 10**-int(config['price_accuracy']):
+                #    res['balanceinit_fy'] = 0.0
+
+                #
+                # Check whether we must include this line in the report or not
+                #
+                if form['display_account'] == 'bal_mouvement' and account['parent_id']:
+                    # Include accounts with movements
+                    if res['balance'] <> 0.0 \
+                            or res['debit'] <> 0.0 \
+                            or res['credit'] <> 0.0:
+                #    if abs(res['balance']) >= 0.5 * 10**-int(config['price_accuracy']) \
+                #            or abs(res['credit']) >= 0.5 * 10**-int(config['price_accuracy']) \
+                #            or abs(res['debit']) >= 0.5 * 10**-int(config['price_accuracy']):
+                        result_acc.append(res)
+                elif form['display_account'] == 'bal_solde' and account['parent_id']:
+                    # Include accounts with balance
+                    #if abs(res['balance']) >= 0.5 * 10**-int(config['price_accuracy']):
+                    if res['balance'] <> 0.0 :
+                        result_acc.append(res)
+                else:
+                    # Include all accounts
+                    result_acc.append(res)
+        return result_acc
+
+report_sxw.report_sxw('report.account.balance.full2', 'account.account', 'addons/account_financial_report/report/account_balance_full.rml', parser=account_balance, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_financial_report_web/report/general_ledger.py'
--- account_financial_report_web/report/general_ledger.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/report/general_ledger.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,412 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (c) 2005-2006 CamptoCamp
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from tools import config
+from tools.translate import _
+import rml_parse
+
+class general_ledger(rml_parse.rml_parse):
+    _name = 'report.account.general.ledger.cumulative2'
+
+    def set_context(self, objects, data, ids, report_type = None):
+        self.get_context_date_period(data['form'])
+        new_ids = []
+        if (data['model'] == 'account.account'):
+            new_ids = ids
+        else:
+            new_ids = data['form']['account_list']
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        super(general_ledger, self).set_context(objects, data, new_ids, report_type)
+
+
+    def __init__(self, cr, uid, name, context):
+        super(general_ledger, self).__init__(cr, uid, name, context=context)
+        self.query = ""    # SQL query to get account moves for given date or period
+        self.min_date = "" # Min date of the given date or period
+        self.ctx = {}      # Context for given date or period
+        self.ctxfy = {}    # Context from the date start or first period of the fiscal year
+        self.child_ids = ""
+        self.tot_currency = 0.0
+        self.balance_accounts = {}
+        self.localcontext.update( {
+            'time': time,
+            'lines': self.lines,
+            'sum_debit_account': self._sum_debit_account,
+            'sum_credit_account': self._sum_credit_account,
+            'sum_balance_account': self._sum_balance_account,
+            'get_children_accounts': self.get_children_accounts,
+            'sum_currency_amount_account': self._sum_currency_amount_account,
+            'get_fiscalyear':self.get_fiscalyear,
+            'get_periods':self.get_periods,
+        })
+        self.context = context
+
+
+    def get_fiscalyear(self, form):
+        res=[]
+        if form.has_key('fiscalyear'):
+            fisc_id = form['fiscalyear'][0]
+            if not (fisc_id):
+                return ''
+            self.cr.execute("SELECT name FROM account_fiscalyear WHERE id = %s" , (int(fisc_id),))
+            res=self.cr.fetchone()
+        return res and res[0] or ''
+
+
+    def get_periods(self, form):
+        result=''
+        if form.has_key('periods') and form['periods']:
+            period_ids = ",".join([str(x) for x in form['periods'] if x])
+            self.cr.execute("SELECT name FROM account_period WHERE id in (%s)" % (period_ids))
+            res = self.cr.fetchall()
+            len_res = len(res) 
+            for r in res:
+                if (r == res[len_res-1]):
+                    result+=r[0]+". "
+                else:
+                    result+=r[0]+", "
+        elif form.has_key('date_from') and form.has_key('date_to'):
+            result = self.formatLang(form['date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' '
+        else:
+            fy_obj = self.pool.get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear'][0])
+            res = fy_obj.period_ids
+            len_res = len(res)
+            for r in res:
+                if r == res[len_res-1]:
+                    result+=r.name+". "
+                else:
+                    result+=r.name+", "
+            
+        return str(result and result[:-1]) or ''
+
+
+    def _calc_contrepartie(self, cr, uid, ids, context={}):
+        result = {}
+        #for id in ids:
+        #    result.setdefault(id, False)
+        for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
+            # For avoid long text in the field we will limit it to 5 lines
+            #
+            result[account_line.id] = ' '
+            num_id_move = str(account_line.move_id.id)
+            num_id_line = str(account_line.id)
+            account_id = str(account_line.account_id.id)
+            # search the basic account
+            # We have the account ID we will search all account move line from now until this time
+            # We are in the case of we are on the top of the account move Line
+            cr.execute("SELECT distinct(ac.code) as code_rest,ac.name as name_rest "\
+                "FROM account_account AS ac, account_move_line mv "\
+                "WHERE ac.id = mv.account_id and mv.move_id = " + num_id_move + " and mv.account_id <> " + account_id )
+            res_mv = cr.dictfetchall()
+            # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line
+            if (len(res_mv) >=1):
+                concat = ''
+                rup_id = 0
+                for move_rest in res_mv:
+                    concat = concat + move_rest['code_rest'] + '|'
+                    result[account_line.id] = concat
+                    if rup_id >5:
+                        # we need to stop the computing and to escape but before we will add "..."
+                        result[account_line.id] = concat + '...'
+                        break
+                    rup_id+=1
+        return result
+
+
+    def get_context_date_period(self, form):
+        date_min = period_min = False
+
+        # ctx: Context for the given date or period
+        ctx = self.context.copy()
+        if 'fiscalyear' in form and form['fiscalyear']:
+            ctx['fiscalyear'] = form['fiscalyear'][0]
+        if form['state'] in ['byperiod', 'all']:
+            ctx['periods'] = form['periods']
+        if form['state'] in ['bydate', 'all']:
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] = form['date_to']
+        if 'periods' not in ctx:
+            ctx['periods'] = []
+        self.ctx = ctx
+        print ctx
+        self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx)
+        # ctxfy: Context from the date start / first period of the fiscal year
+        ctxfy = ctx.copy()
+        ctxfy['periods'] = ctx['periods'][:]
+
+        if form['state'] in ['byperiod', 'all'] and len(ctx['periods']):
+            self.cr.execute("""SELECT id, date_start, fiscalyear_id
+                FROM account_period
+                WHERE date_start = (SELECT min(date_start) FROM account_period WHERE id in (%s))"""
+                % (','.join([str(x) for x in ctx['periods']])))
+            res = self.cr.dictfetchone()
+            period_min = res['date_start']
+            self.cr.execute("""SELECT id
+                FROM account_period
+                WHERE fiscalyear_id in (%s) AND date_start < '%s'"""
+                % (res['fiscalyear_id'], res['date_start']))
+            ids = filter(None, map(lambda x:x[0], self.cr.fetchall()))
+            ctxfy['periods'].extend(ids)
+
+        if form['state'] in ['bydate', 'all']:
+            self.cr.execute("""SELECT date_start
+                FROM account_fiscalyear
+                WHERE '%s' BETWEEN date_start AND date_stop""" % (ctx['date_from']))
+            res = self.cr.dictfetchone()
+            ctxfy['date_from'] = res['date_start']
+            date_min = form['date_from']
+
+        if form['state'] == 'none' or (form['state'] == 'byperiod' and not len(ctx['periods'])):
+            if 'fiscalyear' in form and form['fiscalyear']:
+                sql = """SELECT id, date_start
+                    FROM account_period
+                    WHERE fiscalyear_id in (%s)
+                    ORDER BY date_start""" % (ctx['fiscalyear'])
+            else:
+                sql = """SELECT id, date_start
+                    FROM account_period
+                    WHERE fiscalyear_id in (SELECT id FROM account_fiscalyear WHERE state='draft')
+                    ORDER BY date_start"""
+            self.cr.execute(sql)
+            res = self.cr.dictfetchall()
+            period_min = res[0]['date_start']
+            ids = filter(None, map(lambda x:x['id'], res))
+            ctxfy['periods'] = ids
+        self.ctxfy = ctxfy
+
+        if not period_min:
+            self.min_date = date_min
+        elif not date_min:
+            self.min_date = period_min
+        else:
+            # If period and date are given, the maximum of the min dates is choosed
+            if period_min < date_min:
+                self.min_date = date_min
+            else:
+                self.min_date = period_min
+
+
+    def get_children_accounts(self, account, form):
+        move_line_obj = self.pool.get('account.move.line')
+        account_obj = self.pool.get('account.account')
+        invoice_obj = self.pool.get('account.invoice')
+        self.child_ids = account_obj.search(self.cr, self.uid, [('parent_id', 'child_of', form['account_list'])])
+        res = []
+        ctx = self.ctx.copy()
+        if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
+            ctx['consolidate_childs'] = True
+            ctx['account_id'] = account.id
+        ids_acc = account_obj.search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])], context=ctx)
+        for child_id in ids_acc:
+            child_account = account_obj.browse(self.cr, self.uid, child_id)
+            balance_account = self._sum_balance_account(child_account,form)
+            self.balance_accounts[child_account.id] = balance_account
+            if form['display_account'] == 'bal_mouvement':
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(self.cr, self.uid,
+                    [('account_id','=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    res.append(child_account)
+            elif form['display_account'] == 'bal_solde':
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(self.cr, self.uid,
+                    [('account_id','=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    if balance_account <> 0.0:
+                        res.append(child_account)
+            else:
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(self.cr, self.uid,
+                    [('account_id','>=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    res.append(child_account)
+        ##
+        if not len(res):
+            return [account]
+        else:
+            ## We will now compute initial balance
+            for move in res:
+                sql_balance_init = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit "\
+                    "FROM account_move_line l "\
+                    "WHERE l.account_id = " + str(move.id) +  " AND %s" % (self.query)
+                self.cr.execute(sql_balance_init)
+                resultat = self.cr.dictfetchall()
+                if resultat[0] :
+                    if resultat[0]['sum_debit'] == None:
+                        sum_debit = 0
+                    else:
+                        sum_debit = resultat[0]['sum_debit']
+                    if resultat[0]['sum_credit'] == None:
+                        sum_credit = 0
+                    else:
+                        sum_credit = resultat[0]['sum_credit']
+
+                    move.init_credit = sum_credit
+                    move.init_debit = sum_debit
+                else:
+                    move.init_credit = 0
+                    move.init_debit = 0
+        return res
+
+
+    def lines(self, account, form):
+        inv_types = {
+                'out_invoice': _('CI: '),
+                'in_invoice': _('SI: '),
+                'out_refund': _('OR: '),
+                'in_refund': _('SR: '),
+                }
+
+        self.query
+
+        if form['sortbydate'] == 'sort_date':
+            sorttag = 'l.date'
+        else:
+            sorttag = 'j.code'
+        sql = """
+            SELECT l.id, l.date, j.code, c.symbol AS currency_code, l.amount_currency, l.ref, l.name , l.debit, l.credit, l.period_id
+                    FROM account_move_line as l
+                       LEFT JOIN res_currency c on (l.currency_id=c.id)
+                          JOIN account_journal j on (l.journal_id=j.id)
+                             AND account_id = %%s
+                             AND %s
+                               ORDER by %s""" % (self.query, sorttag)
+        self.cr.execute(sql % account.id)
+
+        res = self.cr.dictfetchall()
+        move_line_obj = self.pool.get('account.move.line')
+        account_obj = self.pool.get('account.account')
+        invoice_obj = self.pool.get('account.invoice')
+
+        # Balance from init fiscal year to last date given by the user
+        accounts = account_obj.read(self.cr, self.uid, [account.id], ['balance'], self.ctxfy)
+        sum = accounts[0]['balance']
+
+        for l in reversed(res):
+            line = move_line_obj.browse(self.cr, self.uid, l['id'])
+            l['move'] = line.move_id.name_split
+            self.cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id))
+            tmpres = self.cr.dictfetchall()
+            if len(tmpres) > 0 :
+                inv = invoice_obj.browse(self.cr, self.uid, tmpres[0]['id'])
+                l['ref'] = inv_types[inv.type] + ': '+str(inv.number)
+            if line.partner_id :
+                l['partner'] = line.partner_id.name
+            else :
+                l['partner'] = ''
+            l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']]
+
+            # Cumulative balance update
+            l['progress'] = sum
+            sum = sum - l['debit'] + l ['credit']
+
+            # Modification of currency amount
+            if (l['credit'] > 0):
+                if l['amount_currency'] != None:
+                    l['amount_currency'] = abs(l['amount_currency']) * -1
+            if l['amount_currency'] != None:
+                self.tot_currency = self.tot_currency + l['amount_currency']
+
+        decimal_precision_obj = self.pool.get('decimal.precision')
+        ids = decimal_precision_obj.search(self.cr, self.uid, [('name', '=', 'Account')])
+        digits = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
+
+        #if abs(sum) > 10**-int(config['price_accuracy']) and form['initial_balance']:
+        if round(sum,digits) <> 0.0  and form['initial_balance']:
+            res.insert(0, {
+                'date': self.min_date,
+                'name': _('Initial balance'),
+                'progress': sum,
+                'partner': '',
+                'move': '',
+                'ref': '',
+                'debit': '',
+                'credit': '',
+                'amount_currency': '',
+                'currency_code': '',
+                'code': '',
+                'line_corresp': '',
+            })
+
+        return res
+
+
+    def _sum_debit_account(self, account, form):
+        self.cr.execute("SELECT sum(debit) "\
+                "FROM account_move_line l "\
+                "WHERE l.account_id = %s AND %s " % (account.id, self.query))
+        sum_debit = self.cr.fetchone()[0] or 0.0
+        return sum_debit
+
+
+    def _sum_credit_account(self, account, form):
+        self.cr.execute("SELECT sum(credit) "\
+                "FROM account_move_line l "\
+                "WHERE l.account_id = %s AND %s " % (account.id, self.query))
+        sum_credit = self.cr.fetchone()[0] or 0.0
+        return sum_credit
+
+
+    def _sum_balance_account(self, account, form):
+        # Balance from init fiscal year to last date given by the user
+        accounts = self.pool.get('account.account').read(self.cr, self.uid, [account.id], ['balance'], self.ctxfy)
+        sum_balance = accounts[0]['balance']
+        return sum_balance
+
+
+    def _set_get_account_currency_code(self, account_id):
+        self.cr.execute("SELECT c.symbol as code "\
+                "FROM res_currency c, account_account as ac "\
+                "WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
+        result = self.cr.fetchone()
+        if result:
+            self.account_currency = result[0]
+        else:
+            self.account_currency = False
+
+
+    def _sum_currency_amount_account(self, account, form):
+        self._set_get_account_currency_code(account.id)
+        self.cr.execute("SELECT sum(l.amount_currency) "\
+                "FROM account_move_line as l, res_currency as rc "\
+                "WHERE l.currency_id = rc.id AND l.account_id= %s AND %s" % (account.id, self.query))
+        total = self.cr.fetchone()
+        if self.account_currency:
+            return_field = str(total[0]) + self.account_currency
+            return return_field
+        else:
+            currency_total = self.tot_currency = 0.0
+            return currency_total
+
+
+report_sxw.report_sxw('report.account.general.ledger.cumulative2', 'account.account', 'addons/account_financial_report/report/general_ledger.rml', parser=general_ledger, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_financial_report_web/report/general_ledger_landscape.py'
--- account_financial_report_web/report/general_ledger_landscape.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/report/general_ledger_landscape.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,413 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (c) 2005-2006 CamptoCamp
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+
+import time
+from report import report_sxw
+from tools.translate import _
+import rml_parse
+
+
+class general_ledger_landscape(rml_parse.rml_parse):
+    _name = 'report.account.general.ledger.cumulative.landscape2'
+
+    def set_context(self, objects, data, ids, report_type = None):
+        self.get_context_date_period(data['form'])
+        new_ids = []
+        if (data['model'] == 'account.account'):
+            new_ids = ids
+        else:
+            new_ids = data['form']['account_list']
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        super(general_ledger_landscape, self).set_context(objects, data, new_ids, report_type)
+
+
+    def __init__(self, cr, uid, name, context):
+        super(general_ledger_landscape, self).__init__(cr, uid, name, context=context)
+        self.query = ""    # SQL query to get account moves for given date or period
+        self.min_date = "" # Min date of the given date or period
+        self.ctx = {}      # Context for given date or period
+        self.ctxfy = {}    # Context from the date start or first period of the fiscal year
+        self.child_ids = ""
+        self.tot_currency = 0.0
+        self.balance_accounts = {}
+        self.localcontext.update( {
+            'time': time,
+            'lines': self.lines,
+            'sum_debit_account': self._sum_debit_account,
+            'sum_credit_account': self._sum_credit_account,
+            'sum_balance_account': self._sum_balance_account,
+            'get_children_accounts': self.get_children_accounts,
+            'sum_currency_amount_account': self._sum_currency_amount_account,
+            'get_fiscalyear':self.get_fiscalyear,
+            'get_periods':self.get_periods,
+        })
+        self.context = context
+
+
+    def get_fiscalyear(self, form):
+        res=[]
+        if form.has_key('fiscalyear'):
+            fisc_id = form['fiscalyear'][0]
+            if not (fisc_id):
+                return ''
+            self.cr.execute("SELECT name FROM account_fiscalyear WHERE id = %s" , (int(fisc_id),))
+            res=self.cr.fetchone()
+        return res and res[0] or ''
+
+
+    def get_periods(self, form):
+        result=''
+        if form.has_key('periods') and form['periods']:
+            period_ids = ",".join([str(x) for x in form['periods']if x])
+            self.cr.execute("SELECT name FROM account_period WHERE id in (%s)" % (period_ids))
+            res = self.cr.fetchall()
+            len_res = len(res) 
+            for r in res:
+                if (r == res[len_res-1]):
+                    result+=r[0]+". "
+                else:
+                    result+=r[0]+", "
+        elif form.has_key('date_from') and form.has_key('date_to'):
+            result = self.formatLang(form['date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' '
+        else:
+            fy_obj = self.pool.get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear'])
+            res = fy_obj.period_ids
+            len_res = len(res)
+            for r in res:
+                if r == res[len_res-1]:
+                    result+=r.name+". "
+                else:
+                    result+=r.name+", "
+            
+        return str(result and result[:-1]) or ''
+
+
+    def _calc_contrepartie(self, cr, uid, ids, context={}):
+        result = {}
+        #for id in ids:
+        #    result.setdefault(id, False)
+
+        for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
+            # For avoid long text in the field we will limit it to 5 lines
+            #
+            result[account_line.id] = ' '
+            num_id_move = str(account_line.move_id.id)
+            num_id_line = str(account_line.id)
+            account_id = str(account_line.account_id.id)
+            # search the basic account
+            # We have the account ID we will search all account move line from now until this time
+            # We are in the case of we are on the top of the account move Line
+            cr.execute("SELECT distinct(ac.code) as code_rest,ac.name as name_rest "\
+                "FROM account_account AS ac, account_move_line mv "\
+                "WHERE ac.id = mv.account_id and mv.move_id = " + num_id_move + " and mv.account_id <> " + account_id )
+            res_mv = cr.dictfetchall()
+            # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line
+            if (len(res_mv) >=1):
+                concat = ''
+                rup_id = 0
+                for move_rest in res_mv:
+                    concat = concat + move_rest['code_rest'] + '|'
+                    result[account_line.id] = concat
+                    if rup_id >5:
+                        # we need to stop the computing and to escape but before we will add "..."
+                        result[account_line.id] = concat + '...'
+                        break
+                    rup_id+=1
+        return result
+
+
+    def get_context_date_period(self, form):
+        date_min = period_min = False
+
+        # ctx: Context for the given date or period
+        ctx = self.context.copy()
+        if 'fiscalyear' in form and form['fiscalyear']:
+            ctx['fiscalyear'] = form['fiscalyear'][0]
+        if form['state'] in ['byperiod', 'all']:
+            ctx['periods'] = form['periods']
+        if form['state'] in ['bydate', 'all']:
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] = form['date_to']
+        if 'periods' not in ctx:
+            ctx['periods'] = []
+        self.ctx = ctx
+        self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx)
+
+        # ctxfy: Context from the date start / first period of the fiscal year
+        ctxfy = ctx.copy()
+        ctxfy['periods'] = ctx['periods'][:]
+
+        if form['state'] in ['byperiod', 'all'] and len(ctx['periods']):
+            self.cr.execute("""SELECT id, date_start, fiscalyear_id
+                FROM account_period
+                WHERE date_start = (SELECT min(date_start) FROM account_period WHERE id in (%s))"""
+                % (','.join([str(x) for x in ctx['periods']])))
+            res = self.cr.dictfetchone()
+            period_min = res['date_start']
+            self.cr.execute("""SELECT id
+                FROM account_period
+                WHERE fiscalyear_id in (%s) AND date_start < '%s'"""
+                % (res['fiscalyear_id'], res['date_start']))
+            ids = filter(None, map(lambda x:x[0], self.cr.fetchall()))
+            ctxfy['periods'].extend(ids)
+
+        if form['state'] in ['bydate', 'all']:
+            self.cr.execute("""SELECT date_start
+                FROM account_fiscalyear
+                WHERE '%s' BETWEEN date_start AND date_stop""" % (ctx['date_from']))
+            res = self.cr.dictfetchone()
+            ctxfy['date_from'] = res['date_start']
+            date_min = form['date_from']
+
+        if form['state'] == 'none' or (form['state'] == 'byperiod' and not len(ctx['periods'])):
+            if 'fiscalyear' in form and form['fiscalyear']:
+                sql = """SELECT id, date_start
+                    FROM account_period
+                    WHERE fiscalyear_id in (%s)
+                    ORDER BY date_start""" % (ctx['fiscalyear'])
+            else:
+                sql = """SELECT id, date_start
+                    FROM account_period
+                    WHERE fiscalyear_id in (SELECT id FROM account_fiscalyear WHERE state='draft')
+                    ORDER BY date_start"""
+            self.cr.execute(sql)
+            res = self.cr.dictfetchall()
+            period_min = res[0]['date_start']
+            ids = filter(None, map(lambda x:x['id'], res))
+            ctxfy['periods'] = ids
+        self.ctxfy = ctxfy
+
+        if not period_min:
+            self.min_date = date_min
+        elif not date_min:
+            self.min_date = period_min
+        else:
+            # If period and date are given, the maximum of the min dates is choosed
+            if period_min < date_min:
+                self.min_date = date_min
+            else:
+                self.min_date = period_min
+
+
+    def get_children_accounts(self, account, form):
+        move_line_obj = self.pool.get('account.move.line')
+        account_obj = self.pool.get('account.account')
+        invoice_obj = self.pool.get('account.invoice')
+        self.child_ids = account_obj.search(self.cr, self.uid, [('parent_id', 'child_of', form['account_list'])])
+
+        res = []
+        ctx = self.ctx.copy()
+        if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
+            ctx['consolidate_childs'] = True
+            ctx['account_id'] = account.id
+        ids_acc = account_obj.search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])], context=ctx)
+        for child_id in ids_acc:
+            child_account = account_obj.browse(self.cr, self.uid, child_id)
+            balance_account = self._sum_balance_account(child_account,form)
+            self.balance_accounts[child_account.id] = balance_account
+            if form['display_account'] == 'bal_mouvement':
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(self.cr, self.uid,
+                    [('account_id','=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    res.append(child_account)
+            elif form['display_account'] == 'bal_solde':
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(self.cr, self.uid,
+                    [('account_id','=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    if balance_account <> 0.0:
+                        res.append(child_account)
+            else:
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(self.cr, self.uid,
+                    [('account_id','>=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    res.append(child_account)
+        ##
+        if not len(res):
+            return [account]
+        else:
+            ## We will now compute initial balance
+            for move in res:
+                sql_balance_init = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit "\
+                    "FROM account_move_line l "\
+                    "WHERE l.account_id = " + str(move.id) +  " AND %s" % (self.query)
+                self.cr.execute(sql_balance_init)
+                resultat = self.cr.dictfetchall()
+                if resultat[0] :
+                    if resultat[0]['sum_debit'] == None:
+                        sum_debit = 0
+                    else:
+                        sum_debit = resultat[0]['sum_debit']
+                    if resultat[0]['sum_credit'] == None:
+                        sum_credit = 0
+                    else:
+                        sum_credit = resultat[0]['sum_credit']
+
+                    move.init_credit = sum_credit
+                    move.init_debit = sum_debit
+                else:
+                    move.init_credit = 0
+                    move.init_debit = 0
+        return res
+
+
+    def lines(self, account, form):
+        inv_types = {
+                'out_invoice': _('CI: '),
+                'in_invoice': _('SI: '),
+                'out_refund': _('OR: '),
+                'in_refund': _('SR: '),
+                }
+
+        if form['sortbydate'] == 'sort_date':
+            sorttag = 'l.date'
+        else:
+            sorttag = 'j.code'
+        sql = """
+            SELECT l.id, l.date, j.code, c.symbol AS currency_code, l.amount_currency, l.ref, l.name , l.debit, l.credit, l.period_id
+                    FROM account_move_line as l
+                       LEFT JOIN res_currency c on (l.currency_id=c.id)
+                          JOIN account_journal j on (l.journal_id=j.id)
+                             AND account_id = %%s
+                             AND %s
+                               ORDER by %s""" % (self.query, sorttag)
+        self.cr.execute(sql % account.id)
+
+        res = self.cr.dictfetchall()
+        move_line_obj = self.pool.get('account.move.line')
+        account_obj = self.pool.get('account.account')
+        invoice_obj = self.pool.get('account.invoice')
+
+        # Balance from init fiscal year to last date given by the user
+        accounts = account_obj.read(self.cr, self.uid, [account.id], ['balance'], self.ctxfy)
+        sum = accounts[0]['balance']
+
+        for l in reversed(res):
+            line = move_line_obj.browse(self.cr, self.uid, l['id'])
+            l['move'] = line.move_id.name_split
+            self.cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id))
+            tmpres = self.cr.dictfetchall()
+            if len(tmpres) > 0 :
+                inv = invoice_obj.browse(self.cr, self.uid, tmpres[0]['id'])
+                l['ref'] = inv_types[inv.type] + ': '+str(inv.number)
+            if line.partner_id :
+                l['partner'] = line.partner_id.name
+            else :
+                l['partner'] = ''
+            l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']]
+
+            # Cumulative balance update
+            l['progress'] = sum
+            sum = sum - (l['debit'] or 0) + (l['credit'] or 0)
+
+            # Modification of currency amount
+            if (l['credit'] > 0):
+                if l['amount_currency'] != None:
+                    l['amount_currency'] = abs(l['amount_currency']) * -1
+            if l['amount_currency'] != None:
+                self.tot_currency = self.tot_currency + l['amount_currency']
+
+        decimal_precision_obj = self.pool.get('decimal.precision')
+        ids = decimal_precision_obj.search(self.cr, self.uid, [('name', '=', 'Account')])
+        digits = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
+
+        #if abs(sum) > 10**-int(config['price_accuracy']) and form['initial_balance']:
+        if round(sum,digits) <> 0.0  and form['initial_balance']:
+            res.insert(0, {
+                'date': self.min_date,
+                'name': _('Initial balance'),
+                'progress': sum,
+                'partner': '',
+                'move': '',
+                'ref': '',
+                'debit': '',
+                'credit': '',
+                'amount_currency': '',
+                'currency_code': '',
+                'code': '',
+                'line_corresp': '',
+            })
+
+        return res
+
+
+    def _sum_debit_account(self, account, form):
+        self.cr.execute("SELECT sum(debit) "\
+                "FROM account_move_line l "\
+                "WHERE l.account_id = %s AND %s " % (account.id, self.query))
+        sum_debit = self.cr.fetchone()[0] or 0.0
+        return sum_debit
+
+
+    def _sum_credit_account(self, account, form):
+        self.cr.execute("SELECT sum(credit) "\
+                "FROM account_move_line l "\
+                "WHERE l.account_id = %s AND %s " % (account.id, self.query))
+        sum_credit = self.cr.fetchone()[0] or 0.0
+        return sum_credit
+
+
+    def _sum_balance_account(self, account, form):
+        # Balance from init fiscal year to last date given by the user
+        accounts = self.pool.get('account.account').read(self.cr, self.uid, [account.id], ['balance'], self.ctxfy)
+        sum_balance = accounts[0]['balance']
+        return sum_balance
+
+
+    def _set_get_account_currency_code(self, account_id):
+        self.cr.execute("SELECT c.symbol as code "\
+                "FROM res_currency c, account_account as ac "\
+                "WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
+        result = self.cr.fetchone()
+        if result:
+            self.account_currency = result[0]
+        else:
+            self.account_currency = False
+
+
+    def _sum_currency_amount_account(self, account, form):
+        self._set_get_account_currency_code(account.id)
+        self.cr.execute("SELECT sum(l.amount_currency) "\
+                "FROM account_move_line as l, res_currency as rc "\
+                "WHERE l.currency_id = rc.id AND l.account_id= %s AND %s" % (account.id, self.query))
+        total = self.cr.fetchone()
+        if self.account_currency:
+            return_field = str(total[0]) + self.account_currency
+            return return_field
+        else:
+            currency_total = self.tot_currency = 0.0
+            return currency_total
+
+
+report_sxw.report_sxw('report.account.general.ledger.cumulative.landscape2', 'account.account', 'addons/account_financial_report/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_financial_report_web/report/rml_parse.py'
--- account_financial_report_web/report/rml_parse.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/report/rml_parse.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,172 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import re
+import sys
+
+
+class rml_parse(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        self.localcontext.update({
+            'comma_me': self.comma_me,
+            'format_date': self._get_and_change_date_format_for_swiss,
+            'strip_name' : self._strip_name,
+            'explode_name' : self._explode_name,
+        })
+
+    def comma_me(self,amount):
+        if not amount:
+            amount = 0.0
+        if  type(amount) is float :
+            amount = str('%.2f'%amount)
+        else :
+            amount = str(amount)
+        if (amount == '0'):
+             return ' '
+        orig = amount
+        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
+        if orig == new:
+            return new
+        else:
+            return self.comma_me(new)
+    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
+        ellipsis = ellipsis or ''
+        try:
+            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
+        except Exception, e:
+            return False
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, '...')
+            
+    def _get_and_change_date_format_for_swiss (self,date_to_format):
+        date_formatted=''
+        if date_to_format:
+            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+        return date_formatted
+    
+    def _explode_name(self,chaine,length):
+        # We will test if the size is less then account
+        full_string = ''
+        if (len(str(chaine)) <= length):
+            return chaine
+        #
+        else:
+            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
+            rup = 0
+            for carac in chaine:
+                rup = rup + 1
+                if rup == length:
+                    full_string = full_string + '\n'
+                    full_string = full_string + carac
+                    rup = 0
+                else:
+                    full_string = full_string + carac
+            
+        return full_string
+    
+    def makeAscii(self,str):
+        try:
+            Stringer = str.encode("utf-8")
+        except UnicodeDecodeError:
+            try:
+                Stringer = str.encode("utf-16")
+            except UnicodeDecodeError:
+                Stringer = str
+            else:
+                return Stringer
+        else:
+            return Stringer
+        return Stringer
+    def explode_this(self,chaine,length):
+        #chaine = self.repair_string(chaine)
+        chaine = rstrip(chaine)
+        ast = list(chaine)
+        i = length
+        while i <= len(ast):
+            ast.insert(i,'\n')
+            i = i + length
+        chaine = str("".join(ast))
+        return chaine
+    def repair_string(self,chaine):
+        ast = list(chaine)
+        UnicodeAst = []
+        _previouslyfound = False
+        i = 0
+        while i < len(ast):
+            elem = ast[i]
+            try:
+                Stringer = elem.encode("utf-8")
+            except UnicodeDecodeError:
+                to_reencode = elem + ast[i+1]
+                Good_char = to_reencode.decode('utf-8')
+                UnicodeAst.append(Good_char)
+                i += i +2
+            else:
+                UnicodeAst.append(elem)
+                i += i + 1
+            
+        
+        return "".join(UnicodeAst)
+        
+    def ReencodeAscii(self,str):
+        try:
+            Stringer = str.decode("ascii")
+        except UnicodeEncodeError:
+            return str.encode("ascii")
+        except UnicodeDecodeError:
+            return str.encode("ascii")
+        
+        else:
+            return Stringer
+
+
+    # def _add_header(self, node):
+    #     rml_head = tools.file_open('specific_param/report/header/corporate_rml_header_ch.rml').read()
+    #     head_dom = xml.dom.minidom.parseString(rml_head)
+    #     #for frame in head_dom.getElementsByTagName('frame'):
+    #     #    frame.parentNode.removeChild(frame)
+    #     node2 = head_dom.documentElement
+    #     for tag in node2.childNodes:
+    #         if tag.nodeType==tag.ELEMENT_NODE:
+    #             found = self._find_node(node, tag.localName)
+    #     #        rml_frames = found.getElementsByTagName('frame')
+    #             if found:
+    #                 if tag.hasAttribute('position') and (tag.getAttribute('position')=='inside'):
+    #                     found.appendChild(tag)
+    #                 else:
+    #                     found.parentNode.replaceChild(tag, found)
+    #     #        for frame in rml_frames:
+    #     #            tag.appendChild(frame)
+    #    return True
+
+
+

=== added directory 'account_financial_report_web/wizard'
=== added file 'account_financial_report_web/wizard/__init__.py'
--- account_financial_report_web/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/wizard/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2009 Factor Libre (http://factorlibre.com) All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard_account_balance_report
+

=== added file 'account_financial_report_web/wizard/wizard_account_balance_report.py'
--- account_financial_report_web/wizard/wizard_account_balance_report.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_web/wizard/wizard_account_balance_report.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,244 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+import report
+from osv import osv, fields
+from tools.translate import _
+
+class fl_account_balance_full_report(osv.osv_memory):
+
+    _name = 'fl.account.balance.full.report'
+    _columns = {
+
+        'company_id': fields.many2one('res.company','Company',required=True),
+        'account_list':fields.many2many('account.account', 'balance_full_account_rel2', 'balance_id','account_id','Root accounts', required=True),
+        'state':fields.selection((('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')),
+                   'Date/Period Filter'),
+        'fiscalyear':fields.many2one('account.fiscalyear', 'Fiscal year', required=True, help='Keep empty to use all open fiscal years to compute the balance'),
+        'periods':fields.many2many('account.period', 'balance_full_period_rel2', 'balance_id','period_id', 'Periods', help='All periods in the fiscal year if empty'),
+        'display_account':fields.selection((('bal_all','All'),('bal_solde', 'With balance'),('bal_mouvement','With movements')),'Display accounts '),
+        'display_account_level':fields.integer('Up to level', help='Display accounts up to this level (0 to show all)'),
+        'date_from':fields.date('Start date',required=True),
+        'date_to':fields.date('End date',required=True),
+    }
+    _defaults = {
+        'date_from': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_to': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': lambda *a:'none',
+        'display_account_level': lambda *a: 0,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
+        'fiscalyear': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid),
+        'display_account': lambda *a:'bal_all',
+    }
+
+    def onchange_company_id(self,cr,uid,ids,company_id,context=None):
+        if context is None:
+            context = {}
+        context['company_id']=company_id
+        res = {'value':{}}
+        
+        if not company_id:
+            return res
+            
+        cur_id = self.pool.get('res.company').browse(cr,uid,company_id,context=context).currency_id.id
+        fy_id = self.pool.get('account.fiscalyear').find(cr, uid,context=context)
+        res['value'].update({'fiscalyear':fy_id})
+        res['value'].update({'account_list':[]})
+        res['value'].update({'periods':[]})
+        return res
+
+    def _get_defaults(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+           company_id = user.company_id.id
+        else:
+           company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+        data['form']['company_id'] = company_id
+        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+        data['form']['context'] = context
+        return data['form']
+
+
+    def _check_state(self, cr, uid, data, context=None):
+
+        if context is None:
+            context = {}
+        if data['form']['state'] == 'bydate':
+           self._check_date(cr, uid, data, context)
+        return data['form']
+    
+    def _check_date(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+            
+        if data['form']['date_from'] > data['form']['date_to']:
+            raise osv.except_osv(_('Error !'),('La fecha final debe ser mayor a la inicial'))
+        
+        sql = """SELECT f.id, f.date_start, f.date_stop
+            FROM account_fiscalyear f
+            WHERE '%s' = f.id """%(data['form']['fiscalyear'][0])
+        cr.execute(sql)
+        res = cr.dictfetchall()
+
+        if res:
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_from'] < res[0]['date_start']):
+                raise osv.except_osv(_('UserError'),'Las fechas deben estar entre %s y %s' % (res[0]['date_start'], res[0]['date_stop']))
+            else:
+                return 'report'
+        else:
+            raise osv.except_osv(_('UserError'),'No existe periodo fiscal')
+
+    def period_span(self, cr, uid, ids, fy_id, context=None):
+        if context is None:
+            context = {}
+        ap_obj = self.pool.get('account.period')
+        fy_id = fy_id and type(fy_id) in (list,tuple) and fy_id[0] or fy_id
+        if not ids:
+            #~ No hay periodos
+            return ap_obj.search(cr, uid, [('fiscalyear_id','=',fy_id),('special','=',False)],order='date_start asc')
+        
+        ap_brws = ap_obj.browse(cr, uid, ids, context=context)
+        date_start = min([period.date_start for period in ap_brws])
+        date_stop = max([period.date_stop for period in ap_brws])
+        return ap_obj.search(cr, uid, [('fiscalyear_id','=',fy_id),('special','=',False),('date_start','>=',date_start),('date_stop','<=',date_stop)],order='date_start asc')
+        
+
+    def print_report(self, cr, uid, ids, data, context=None):
+
+        if context is None:
+            context = {}
+            
+        data = {}
+        data['ids'] = context.get('active_ids', [])
+        data['model'] = context.get('active_model', 'ir.ui.menu')
+        data['form'] = self.read(cr, uid, ids[0])
+        if data['form']['state'] == 'byperiod':
+            del data['form']['date_from']
+            del data['form']['date_to']
+
+            data['form']['periods'] = self.period_span(cr, uid, data['form']['periods'], data['form']['fiscalyear'])
+
+        elif data['form']['state'] == 'bydate':
+            self._check_date(cr, uid, data)
+            del data['form']['periods']
+        elif data['form']['state'] == 'none':
+            del data['form']['date_from']
+            del data['form']['date_to']
+            del data['form']['periods']
+        else:
+            self._check_date(cr, uid, data)
+            lis2 = str(data['form']['periods']).replace("[","(").replace("]",")")
+            sqlmm = """select min(p.date_start) as inicio, max(p.date_stop) as fin 
+            from account_period p 
+            where p.id in %s"""%lis2
+            cr.execute(sqlmm)
+            minmax = cr.dictfetchall()
+            if minmax:
+                if (data['form']['date_to'] < minmax[0]['inicio']) or (data['form']['date_from'] > minmax[0]['fin']):
+                    raise osv.except_osv(_('Error !'),_('La interseccion entre el periodo y fecha es vacio'))
+
+        return {'type': 'ir.actions.report.xml', 'report_name': 'account.balance.full2', 'datas': data}
+
+fl_account_balance_full_report()
+
+class fl_account_general_ledger_cumulative_report(osv.osv_memory):
+
+
+    _name = 'fl.account.general.ledger.cumulative.report'
+    _columns = {
+        'account_list': fields.many2many('account.account', 'general_ledger_cumulative_rel_2', 'ledger_cumulative_id', 'account_id', 'Account'),
+        'company_id': fields.many2one('res.company', 'Company'),
+        'state': fields.selection((('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')),'Date/Period Filter'),
+        'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'periods':fields.many2many('account.period', 'general_ledger_cumulative_period_rel2', 'ledger_cumulative_id','period_id', 'Periods', help='All periods in the fiscal year if empty'),
+
+        'sortbydate':fields.selection((('sort_date','Date'),('sort_mvt','Movement')),'Sort by'),
+        'display_account': fields.selection((('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')), 'Display accounts'),
+
+        'landscape':fields.boolean('Landscape Mode'),
+        'initial_balance':fields.boolean('Show initial balances'),
+        'amount_currency':fields.boolean('With Currency'),
+        'date_from':fields.date('Start date',required=True),
+        'date_to':fields.date('End date',required=True),
+        'states': fields.selection((('account_selection','Account Selection'),('checktype','Check Type')), 'State'),
+
+
+
+    }
+
+    def _init_states(self, cr, uid, context=None):
+        return 'account_selection'
+
+    def step1(self, cr, uid, ids, context):
+        data={'states': 'checktype'}
+        user=self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            company_id = user.company_id.id
+        else:
+            company_id = self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+        data['company_id']=company_id
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        data['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+        self.write(cr, uid, ids, data)
+
+    def prints(self, cr, uid, ids, context):
+
+        if context is None:
+            context = {}
+            
+        data = {}
+        data['ids'] = context.get('active_ids', [])
+        data['model'] = context.get('active_model', 'ir.ui.menu')
+        data['form'] = self.read(cr, uid, ids[0])
+        if data['form']['state'] == 'bydate':
+            sql = """SELECT f.id, f.date_start, f.date_stop
+                FROM account_fiscalyear f
+                WHERE '%s' between f.date_start and f.date_stop """ % (data['form']['date_from'])
+            cr.execute(sql)
+            res = cr.dictfetchall()
+            if res:
+                if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
+                        raise  wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
+            else:
+                raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
+        if data['form']['landscape']== True:
+            return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger.cumulative.landscape2', 'datas': data}
+        else:
+            return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger.cumulative2', 'datas': data}
+
+    _defaults = {
+        'date_from': lambda *a: time.strftime('%Y-01-01'),
+        'date_to': lambda *a: time.strftime('%Y-%m-%d'),
+        'states': lambda self,cr,uid,c: self._init_states(cr, uid, context=c),
+        'state' : lambda *a:'none',
+    }
+
+fl_account_general_ledger_cumulative_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'report_cumulative_general_ledger_xls'
=== added file 'report_cumulative_general_ledger_xls/__init__.py'
--- report_cumulative_general_ledger_xls/__init__.py	1970-01-01 00:00:00 +0000
+++ report_cumulative_general_ledger_xls/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,29 @@
+##############################################################################
+#
+# Copyright (c) 2014 Factor Libre S.L. (http://www.factorlibre.com) All Rights Reserved.
+#                  
+# Developer Rafael Valle       
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard

=== added file 'report_cumulative_general_ledger_xls/__openerp__.py'
--- report_cumulative_general_ledger_xls/__openerp__.py	1970-01-01 00:00:00 +0000
+++ report_cumulative_general_ledger_xls/__openerp__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Factor Libre S.L (<http://www.factorlibre.com>).
+#    Developer Rafael Valle
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+	"name" : "Report cumulative general ledger xls",
+	"description": """Allows get cumulative general ledger in xls""",
+	"version" : "1.0",
+	"author" : "Factor Libre S.L",
+	"category" : "Accounting",
+	"module": "",
+	"website": "http://www.factorlibre.com/",
+	"depends" : ["account","account_financial_report","account_financial_report_web"],
+	"init_xml" : [],
+	"update_xml" : [
+		"wizard/cumulative_general_ledger_xls_view.xml",
+	],
+	"demo_xml" : [],
+	"active": False,
+	"installable": True
+}

=== added directory 'report_cumulative_general_ledger_xls/i18n'
=== added file 'report_cumulative_general_ledger_xls/i18n/es.mo'
Binary files report_cumulative_general_ledger_xls/i18n/es.mo	1970-01-01 00:00:00 +0000 and report_cumulative_general_ledger_xls/i18n/es.mo	2014-01-29 11:51:34 +0000 differ
=== added file 'report_cumulative_general_ledger_xls/i18n/es.po'
--- report_cumulative_general_ledger_xls/i18n/es.po	1970-01-01 00:00:00 +0000
+++ report_cumulative_general_ledger_xls/i18n/es.po	2014-01-29 11:51:34 +0000
@@ -0,0 +1,72 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* report_cumulative_general_ledger_xls
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-20130627-233424\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-29 10:42+0000\n"
+"PO-Revision-Date: 2014-01-29 11:44+0100\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"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: report_cumulative_general_ledger_xls
+#: field:fl.account.general.ledger.cumulative.report,export_file:0
+msgid "Export File"
+msgstr "Fichero generado"
+
+#. module: report_cumulative_general_ledger_xls
+#: code:addons/report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py:231
+#, python-format
+msgid "CI: "
+msgstr "CI: "
+
+#. module: report_cumulative_general_ledger_xls
+#: model:ir.model,name:report_cumulative_general_ledger_xls.model_fl_account_general_ledger_cumulative_report
+msgid "fl.account.general.ledger.cumulative.report"
+msgstr "fl.account.general.ledger.cumulative.report"
+
+#. module: report_cumulative_general_ledger_xls
+#: field:fl.account.general.ledger.cumulative.report,name:0
+msgid "Filename"
+msgstr "Nombre de Fichero"
+
+#. module: report_cumulative_general_ledger_xls
+#: code:addons/report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py:233
+#, python-format
+msgid "OR: "
+msgstr "OR: "
+
+#. module: report_cumulative_general_ledger_xls
+#: code:addons/report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py:234
+#, python-format
+msgid "SR: "
+msgstr "SR: "
+
+#. module: report_cumulative_general_ledger_xls
+#: code:addons/report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py:232
+#, python-format
+msgid "SI: "
+msgstr "SI: "
+
+#. module: report_cumulative_general_ledger_xls
+#: code:addons/report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py:293
+#, python-format
+msgid "Initial balance"
+msgstr "Balance Inicial"
+
+#. module: report_cumulative_general_ledger_xls
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "XLS"
+msgstr "XLS"
+
+#. module: report_cumulative_general_ledger_xls
+#: view:fl.account.general.ledger.cumulative.report:0
+msgid "Export XLS"
+msgstr "Generar XLS"

=== added directory 'report_cumulative_general_ledger_xls/wizard'
=== added file 'report_cumulative_general_ledger_xls/wizard/__init__.py'
--- report_cumulative_general_ledger_xls/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ report_cumulative_general_ledger_xls/wizard/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Rafael Valle (Factor Libre S.L) (<http://factorlibre.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import cumulative_general_ledger
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+

=== added file 'report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py'
--- report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py	1970-01-01 00:00:00 +0000
+++ report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,434 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Factor Libre.
+#    Developer Rafael Valle       
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time, dateutil, dateutil.tz
+from datetime import date, datetime
+
+import cStringIO
+import base64
+from xlwt import *
+import pooler
+from osv import osv, fields
+from tools.translate import _
+import logging
+_logger = logging.getLogger(__name__)
+
+class fl_account_general_ledger_cumulative_report(osv.osv_memory):
+    _inherit = "fl.account.general.ledger.cumulative.report"
+
+    
+
+    _columns = {
+        'name': fields.char('Filename', size=64, readonly=True),
+        'export_file': fields.binary('Export File', readonly=True),
+    }
+    
+
+
+    
+
+    
+    def get_fiscalyear(self, cr, uid, form):
+        res=[]
+        if form.has_key('fiscalyear'):
+            fisc_id = form['fiscalyear'][0]
+            if not (fisc_id):
+                return ''
+            cr.execute("SELECT name FROM account_fiscalyear WHERE id = %s" , (int(fisc_id),))
+            res=cr.fetchone()
+        return res and res[0] or ''
+
+    
+    def get_periods(self, cr, uid, form):
+        result=''
+        if form.has_key('periods') and form['periods']:
+            period_ids = ",".join([str(x) for x in form['periods'] if x])
+            self.cr.execute("SELECT name FROM account_period WHERE id in (%s)" % (period_ids))
+            res = self.cr.fetchall()
+            len_res = len(res) 
+            for r in res:
+                if (r == res[len_res-1]):
+                    result+=r[0]+". "
+                else:
+                    result+=r[0]+", "
+        elif form.has_key('date_from') and form.has_key('date_to'):
+            result = form['date_from'] + ' - ' + form['date_to'] + ' '
+        else:
+            fy_obj = self.pool.get('account.fiscalyear').browse(cr,uid,form['fiscalyear'][0])
+            res = fy_obj.period_ids
+            len_res = len(res)
+            for r in res:
+                if r == res[len_res-1]:
+                    result+=r.name+". "
+                else:
+                    result+=r.name+", "
+            
+        return str(result and result[:-1]) or ''
+
+
+
+    def _sum_balance_account(self, cr, uid, account, form, ctxfy):
+        # Balance from init fiscal year to last date given by the user
+        accounts = self.pool.get('account.account').read(cr, uid, [account.id], ['balance'], ctxfy)
+        sum_balance = accounts[0]['balance']
+        return sum_balance
+
+
+    def _sum_debit_account(self, cr, uid, account, form, query):
+        cr.execute("SELECT sum(debit) "\
+                "FROM account_move_line l "\
+                "WHERE l.account_id = %s AND %s " % (account.id, query))
+        sum_debit = cr.fetchone()[0] or 0.0
+        return sum_debit
+
+
+    def _sum_credit_account(self, cr, uid, account, form, query):
+        cr.execute("SELECT sum(credit) "\
+                "FROM account_move_line l "\
+                "WHERE l.account_id = %s AND %s " % (account.id, query))
+        sum_credit = cr.fetchone()[0] or 0.0
+        return sum_credit
+
+    
+    def _calc_contrepartie(self, cr, uid, ids, context={}):
+        result = {}
+        #for id in ids:
+        #    result.setdefault(id, False)
+        for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
+            # For avoid long text in the field we will limit it to 5 lines
+            #
+            result[account_line.id] = ' '
+            num_id_move = str(account_line.move_id.id)
+            num_id_line = str(account_line.id)
+            account_id = str(account_line.account_id.id)
+            # search the basic account
+            # We have the account ID we will search all account move line from now until this time
+            # We are in the case of we are on the top of the account move Line
+            cr.execute("SELECT distinct(ac.code) as code_rest,ac.name as name_rest "\
+                "FROM account_account AS ac, account_move_line mv "\
+                "WHERE ac.id = mv.account_id and mv.move_id = " + num_id_move + " and mv.account_id <> " + account_id )
+            res_mv = cr.dictfetchall()
+            # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line
+            if (len(res_mv) >=1):
+                concat = ''
+                rup_id = 0
+                for move_rest in res_mv:
+                    concat = concat + move_rest['code_rest'] + '|'
+                    result[account_line.id] = concat
+                    if rup_id >5:
+                        # we need to stop the computing and to escape but before we will add "..."
+                        result[account_line.id] = concat + '...'
+                        break
+                    rup_id+=1
+        return result
+
+    def get_children_accounts(self, cr, uid, account, form, query, ctx, context=None):
+        balance_accounts = {}
+        move_line_obj = self.pool.get('account.move.line')
+        account_obj = self.pool.get('account.account')
+        invoice_obj = self.pool.get('account.invoice')
+        child_ids = account_obj.search(cr, uid, [('parent_id', 'child_of', form['account_list'])])
+        res = []
+        ctx = ctx.copy()
+        if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
+            ctx['consolidate_childs'] = True
+            ctx['account_id'] = account.id
+        ids_acc = account_obj.search(cr, uid,[('parent_id', 'child_of', [account.id])], context=ctx)
+        for child_id in ids_acc:
+            child_account = account_obj.browse(cr, uid, child_id)
+            balance_account = self._sum_balance_account( cr, uid, child_account, form, {})
+            balance_accounts[child_account.id] = balance_account
+            if form['display_account'] == 'bal_mouvement':
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(cr, uid,
+                    [('account_id','=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    res.append(child_account)
+            elif form['display_account'] == 'bal_solde':
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(cr, uid,
+                    [('account_id','=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    if balance_account <> 0.0:
+                        res.append(child_account)
+            else:
+                if child_account.type != 'view' \
+                and len(move_line_obj.search(cr, uid,
+                    [('account_id','>=',child_account.id)],
+                    context=ctx)) <> 0 :
+                    res.append(child_account)
+        ##
+        if not len(res):
+            return [account]
+        else:
+            ## We will now compute initial balance
+            for move in res:
+                sql_balance_init = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit "\
+                    "FROM account_move_line l "\
+                    "WHERE l.account_id = " + str(move.id) +  " AND %s" % (query)
+                cr.execute(sql_balance_init)
+                resultat = cr.dictfetchall()
+                if resultat[0] :
+                    if resultat[0]['sum_debit'] == None:
+                        sum_debit = 0
+                    else:
+                        sum_debit = resultat[0]['sum_debit']
+                    if resultat[0]['sum_credit'] == None:
+                        sum_credit = 0
+                    else:
+                        sum_credit = resultat[0]['sum_credit']
+
+                    move.init_credit = sum_credit
+                    move.init_debit = sum_debit
+                else:
+                    move.init_credit = 0
+                    move.init_debit = 0
+        return res
+
+
+
+    def lines(self, cr, uid, account, form, query, ctxfy):
+        tot_currency = 0.0
+        date_min = period_min = False
+        date_min = form['date_from']
+
+        #dates
+        if not period_min:
+            min_date = date_min
+        elif not date_min:
+            min_date = period_min
+        else:
+            # If period and date are given, the maximum of the min dates is choosed
+            if period_min < date_min:
+                min_date = date_min
+            else:
+                min_date = period_min        
+
+
+
+
+        print query
+        inv_types = {
+                'out_invoice': _('CI: '),
+                'in_invoice': _('SI: '),
+                'out_refund': _('OR: '),
+                'in_refund': _('SR: '),
+                }
+
+        if form['sortbydate'] == 'sort_date':
+            sorttag = 'l.date'
+        else:
+            sorttag = 'j.code'
+        sql = """
+            SELECT l.id, l.date, j.code, c.symbol AS currency_code, l.amount_currency, l.ref, l.name , l.debit, l.credit, l.period_id
+                    FROM account_move_line as l
+                       LEFT JOIN res_currency c on (l.currency_id=c.id)
+                          JOIN account_journal j on (l.journal_id=j.id)
+                             AND account_id = %%s
+                             AND %s
+                               ORDER by %s""" % (query, sorttag)
+        cr.execute(sql % account.id)
+
+        res = cr.dictfetchall()
+        move_line_obj = self.pool.get('account.move.line')
+        account_obj = self.pool.get('account.account')
+        invoice_obj = self.pool.get('account.invoice')
+
+        # Balance from init fiscal year to last date given by the user
+        accounts = account_obj.read(cr, uid, [account.id], ['balance'], ctxfy)
+        sum = accounts[0]['balance']
+
+        for l in reversed(res):
+            line = move_line_obj.browse(cr, uid, l['id'])
+            l['move'] = line.move_id.name_split
+            cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id))
+            tmpres = cr.dictfetchall()
+            if len(tmpres) > 0 :
+                inv = invoice_obj.browse(cr, uid, tmpres[0]['id'])
+                l['ref'] = inv_types[inv.type] + ': '+str(inv.number)
+            if line.partner_id :
+                l['partner'] = line.partner_id.name
+            else :
+                l['partner'] = ''
+            l['line_corresp'] = self._calc_contrepartie(cr,uid,[l['id']])[l['id']]
+
+            # Cumulative balance update
+            l['progress'] = sum
+            sum = sum - l['debit'] + l ['credit']
+
+            # Modification of currency amount
+            if (l['credit'] > 0):
+                if l['amount_currency'] != None:
+                    l['amount_currency'] = abs(l['amount_currency']) * -1
+            if l['amount_currency'] != None:
+                tot_currency = tot_currency + l['amount_currency']
+
+        decimal_precision_obj = self.pool.get('decimal.precision')
+        ids = decimal_precision_obj.search(cr, uid, [('name', '=', 'Account')])
+        digits = decimal_precision_obj.browse(cr, uid, ids)[0].digits
+
+        #if abs(sum) > 10**-int(config['price_accuracy']) and form['initial_balance']:
+        if round(sum,digits) <> 0.0  and form['initial_balance']:
+            res.insert(0, {
+                'date': self.min_date,
+                'name': _('Initial balance'),
+                'progress': sum,
+                'partner': '',
+                'move': '',
+                'ref': '',
+                'debit': '',
+                'credit': '',
+                'amount_currency': '',
+                'currency_code': '',
+                'code': '',
+                'line_corresp': '',
+            })
+
+        return res
+
+
+    
+
+    def get_report_file_xls(self, cr, uid, ids, context=None):
+        
+        if context is None:
+            context = {}
+
+        data=self.prints(cr, uid, ids, context)
+        print data
+
+
+        #vals context
+        ctx2 = data['datas']['form'].get('used_context',{}).copy()
+        tot_currency = 0.0
+        sortby = data['datas']['form'].get('sortby', 'sort_date')
+
+        ctx = context.copy()
+        if 'fiscalyear' in data['datas']['form'] and data['datas']['form']['fiscalyear']:
+            ctx['fiscalyear'] = data['datas']['form']['fiscalyear'][0]
+        if data['datas']['form']['state'] in ['byperiod', 'all']:
+            ctx['periods'] = data['datas']['form']['periods']
+        if data['datas']['form']['state'] in ['bydate', 'all']:
+            ctx['date_from'] = data['datas']['form']['date_from']
+            ctx['date_to'] = data['datas']['form']['date_to']
+        if 'periods' not in ctx:
+            ctx['periods'] = []
+            ctx = ctx
+        
+        ctxfy = ctx.copy()
+        ctxfy['periods'] = ctx['periods'][:]
+
+        #-----------------------------------------
+
+        query = self.pool.get('account.move.line')._query_get(cr, uid, context=ctx)
+
+        
+        user = self.pool.get('res.users').browse(cr, uid, uid, context = context)
+        
+        user_tz = dateutil.tz.gettz(user.context_tz)
+        utc_tz = dateutil.tz.tzutc()
+       
+
+        excel_temp = cStringIO.StringIO()
+        w = Workbook(encoding='utf-8', style_compression=2)
+        ws = w.add_sheet('Hoja 1')
+
+        #styles
+        style_headers1 = XFStyle()
+        # font
+        font = Font()
+        font.bold = True
+        style_headers1.font = font
+        # borders
+        borders = Borders()
+        borders.bottom = Borders.DASHED
+        style_headers1.borders = borders
+
+        style_bold = XFStyle()
+        # font
+        font = Font()
+        font.bold = True
+        style_bold.font = font
+        
+
+        # Header definition
+        ws.write_merge(0, 0, 0, 11,'LIBRO MAYOR ACUMULADO',style=style_headers1)
+
+
+        #Main Headers
+        ws.write(1,0,'Año Fiscal', style=style_headers1)
+        ws.write(2,0,'Periodos', style=style_headers1)
+
+
+        
+        ws.write(1,1,self.get_fiscalyear(cr,uid,data['datas']['form']))
+        ws.write(2,1,self.get_periods(cr,uid,data['datas']['form']))
+
+
+        #Table headers
+    
+        ws.write(6,0,'Fecha', style=style_headers1)
+        ws.write(6,1,'Asiento', style=style_headers1)
+        ws.write(6,2,'Empresa', style=style_headers1)
+        ws.write(6,3,'Ref', style=style_headers1)
+        ws.write(6,4,'Debe', style=style_headers1)
+        ws.write(6,5,'Haber', style=style_headers1)
+        ws.write(6,6,'Balance', style=style_headers1)
+
+
+        row=7
+        #Children accounts
+
+        for account_id in data['datas']['form']['account_list']:
+            acc_obj=self.pool.get('account.account').browse(cr,uid,account_id)
+            for a in self.get_children_accounts(cr, uid, acc_obj, data['datas']['form'], query, ctx, context):
+                ws.write(row,0,a.code+' '+a.name, style=style_bold)
+                ws.write(row,4,self._sum_debit_account(cr, uid, a, data['datas']['form'], query), style=style_bold)
+                ws.write(row,5,self._sum_credit_account(cr, uid, a, data['datas']['form'], query), style=style_bold)
+                ws.write(row,6,self._sum_balance_account( cr, uid, a, data['datas']['form'], ctxfy), style=style_bold) 
+                row=row+1
+                
+                #lines children
+                for a_line in self.lines(cr, uid, a, data['datas']['form'], query, ctxfy):
+
+                    #format date
+                    ldated=datetime.strptime(a_line['date'], '%Y-%m-%d')
+
+                    ws.write(row,0,ldated.strftime('%d/%m/%Y'))
+                    ws.write(row,1,a_line['move'])
+                    ws.write(row,2,a_line['partner'])
+                    ws.write(row,3,a_line['ref'])
+                    ws.write(row,4,a_line['debit'])
+                    ws.write(row,5,a_line['credit'])
+                    ws.write(row,6,a_line['progress'])
+                    row=row+1
+
+        w.save(excel_temp)
+        out=base64.encodestring(excel_temp.getvalue())
+        excel_temp.close()
+        file_time = datetime.now(user_tz).strftime('%Y-%m-%d_%H%M')
+
+
+        return self.write(cr, uid, ids, { 'export_file': out, 'name': 'Libro_Mayor_Acumulado_%s.xls' % (file_time)})
+
+fl_account_general_ledger_cumulative_report()
+

=== added file 'report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger_xls_view.xml'
--- report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger_xls_view.xml	1970-01-01 00:00:00 +0000
+++ report_cumulative_general_ledger_xls/wizard/cumulative_general_ledger_xls_view.xml	2014-01-29 11:51:34 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_general_ledger_cumulative_report_view_xls" model="ir.ui.view">
+            <field name="name">account general ledger cumulative report XLS</field>
+            <field name="model">fl.account.general.ledger.cumulative.report</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_financial_report_web.account_general_ledger_cumulative_report_form2" />
+            <field name="arch" type="xml">
+            <data>
+
+            <field name="initial_balance" position="after">
+                <newline/>
+               <separator string="XLS" colspan="4"/>
+                    <field name="name" invisible="1"/>
+                    <field name="export_file" filename="name" />
+                    <button icon="gtk-print" name="get_report_file_xls" string="Export XLS" type="object" colspan="2" default_focus="1"/>
+
+            </field>
+            </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'report_general_ledger_xls'
=== added file 'report_general_ledger_xls/__init__.py'
--- report_general_ledger_xls/__init__.py	1970-01-01 00:00:00 +0000
+++ report_general_ledger_xls/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,29 @@
+##############################################################################
+#
+# Copyright (c) 2014 Factor Libre S.L. (http://www.factorlibre.com) All Rights Reserved.
+#                  
+# Developer Rafael Valle       
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard

=== added file 'report_general_ledger_xls/__openerp__.py'
--- report_general_ledger_xls/__openerp__.py	1970-01-01 00:00:00 +0000
+++ report_general_ledger_xls/__openerp__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Factor Libre S.L (<http://www.factorlibre.com>).
+#    Developer Rafael Valle
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+	"name" : "report general ledger xls",
+	"description": """Allows get general ledger in xls""",
+	"version" : "1.0",
+	"author" : "Factor Libre S.L",
+	"category" : "Generic Modules",
+	"module": "",
+	"website": "http://www.factorlibre.com/",
+	"depends" : ["account"],
+	"init_xml" : [],
+	"update_xml" : [
+		"wizard/account_report_ledger_xls_view.xml",
+	],
+	"demo_xml" : [],
+	"active": False,
+	"installable": True
+}

=== added directory 'report_general_ledger_xls/i18n'
=== added file 'report_general_ledger_xls/i18n/es.mo'
Binary files report_general_ledger_xls/i18n/es.mo	1970-01-01 00:00:00 +0000 and report_general_ledger_xls/i18n/es.mo	2014-01-29 11:51:34 +0000 differ
=== added file 'report_general_ledger_xls/i18n/es.po'
--- report_general_ledger_xls/i18n/es.po	1970-01-01 00:00:00 +0000
+++ report_general_ledger_xls/i18n/es.po	2014-01-29 11:51:34 +0000
@@ -0,0 +1,63 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* fl_report_general_ledger_xls
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-20130627-233424\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-17 10:06+0000\n"
+"PO-Revision-Date: 2014-01-17 11:07+0100\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"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: fl_report_general_ledger_xls
+#: constraint:account.report.general.ledger:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+"El ejercicio fiscal, periodos y árbol de cuentas escogido deben pertenecer a "
+"la misma compañía."
+
+#. module: fl_report_general_ledger_xls
+#: field:account.report.general.ledger,export_file:0
+msgid "Export File"
+msgstr "Fichero"
+
+#. module: fl_report_general_ledger_xls
+#: code:addons/fl_report_general_ledger_xls/wizard/account_report_general_ledger.py:69
+#, python-format
+msgid "All Posted Entries"
+msgstr "All Posted Entries"
+
+#. module: fl_report_general_ledger_xls
+#: field:account.report.general.ledger,name:0
+msgid "Filename"
+msgstr "Nombre de fichero"
+
+#. module: fl_report_general_ledger_xls
+#: model:ir.model,name:fl_report_general_ledger_xls.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: fl_report_general_ledger_xls
+#: view:account.report.general.ledger:0
+msgid "XLS"
+msgstr "XLS"
+
+#. module: fl_report_general_ledger_xls
+#: code:addons/fl_report_general_ledger_xls/wizard/account_report_general_ledger.py:68
+#, python-format
+msgid "All Entries"
+msgstr "All Entries"
+
+#. module: fl_report_general_ledger_xls
+#: view:account.report.general.ledger:0
+msgid "Export XLS"
+msgstr "Generar XLS"

=== added directory 'report_general_ledger_xls/wizard'
=== added file 'report_general_ledger_xls/wizard/__init__.py'
--- report_general_ledger_xls/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ report_general_ledger_xls/wizard/__init__.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Rafael Valle (Factor Libre S.L) (<http://factorlibre.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_report_general_ledger
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+

=== added file 'report_general_ledger_xls/wizard/account_report_general_ledger.py'
--- report_general_ledger_xls/wizard/account_report_general_ledger.py	1970-01-01 00:00:00 +0000
+++ report_general_ledger_xls/wizard/account_report_general_ledger.py	2014-01-29 11:51:34 +0000
@@ -0,0 +1,407 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Factor Libre.
+#    Developer Rafael Valle       
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time, dateutil, dateutil.tz
+from datetime import date, datetime
+
+import cStringIO
+import base64
+from xlwt import *
+import pooler
+from osv import osv, fields
+from tools.translate import _
+import logging
+_logger = logging.getLogger(__name__)
+
+class account_report_general_ledger(osv.osv_memory):
+    _inherit = "account.report.general.ledger"
+
+    
+
+    _columns = {
+        'name': fields.char('Filename', size=64, readonly=True),
+        'export_file': fields.binary('Export File', readonly=True),
+    }
+    
+
+
+    def _get_account(self, cr, uid, data):
+        if data.get('form', False) and data['form'].get('chart_account_id', False):
+            return pooler.get_pool(cr.dbname).get('account.account').browse(cr, uid, data['form']['chart_account_id']).name
+        return ''
+
+    
+    def _get_fiscalyear(self, cr, uid, data):
+        if data.get('form', False) and data['form'].get('fiscalyear_id', False):
+            return pooler.get_pool(cr.dbname).get('account.fiscalyear').browse(cr, uid, data['form']['fiscalyear_id']).name
+        return ''
+
+    def _get_journal(self, cr, uid, data):
+        codes = []
+        if data.get('form', False) and data['form'].get('journal_ids', False):
+            cr.execute('select code from account_journal where id IN %s',(tuple(data['form']['journal_ids']),))
+            codes = ','.join([x for x, in cr.fetchall()])
+        return codes
+
+    def _get_target_move(self, cr, uid, data):
+        if data.get('form', False) and data['form'].get('target_move', False):
+            if data['form']['target_move'] == 'all':
+                return _('All Entries')
+            return _('All Posted Entries')
+        return ''
+
+
+
+
+    def _sum_balance_account(self, cr, uid, account, query, target_move, init_balance):
+        if account.type == 'view':
+            return account.balance
+        move_state = ['draft','posted']
+        if target_move == 'posted':
+            move_state = ['posted','']
+        cr.execute('SELECT (sum(debit) - sum(credit)) as tot_balance \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ query +' '
+                ,(account.id, tuple(move_state)))
+        sum_balance = cr.fetchone()[0] or 0.0
+        if init_balance:
+            cr.execute('SELECT (sum(debit) - sum(credit)) as tot_balance \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
+            # Add initial balance to the result
+            sum_balance += cr.fetchone()[0] or 0.0
+        return sum_balance
+
+
+    def _sum_credit_account(self, cr, uid, account, target_move, init_balance, query, init_query):
+        if account.type == 'view':
+            return account.credit
+        move_state = ['draft','posted']
+        if target_move == 'posted':
+            move_state = ['posted','']
+        cr.execute('SELECT sum(credit) \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ query +' '
+                ,(account.id, tuple(move_state)))
+        sum_credit = cr.fetchone()[0] or 0.0
+        if init_balance:
+            cr.execute('SELECT sum(credit) \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ init_query +' '
+                    ,(account.id, tuple(move_state)))
+            # Add initial balance to the result
+            sum_credit += cr.fetchone()[0] or 0.0
+        return sum_credit
+
+    def _sum_debit_account(self, cr, uid, account, target_move, init_balance, query, init_query):
+        if account.type == 'view':
+            return account.debit
+        move_state = ['draft','posted']
+        if target_move == 'posted':
+            move_state = ['posted','']
+        cr.execute('SELECT sum(debit) \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ query +' '
+                ,(account.id, tuple(move_state)))
+        sum_debit = cr.fetchone()[0] or 0.0
+        if init_balance:
+            cr.execute('SELECT sum(debit) \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ init_query +' '
+                    ,(account.id, tuple(move_state)))
+            # Add initial balance to the result
+            sum_debit += cr.fetchone()[0] or 0.0
+        return sum_debit
+
+    def get_children_accounts(self, cr, uid, account, data, context):
+        res = []
+        
+        ctx2 = data['form'].get('used_context',{}).copy()
+        query = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=data['form'].get('used_context',{}))
+        sold_accounts = {}
+        display_account = data['form']['display_account']        
+        target_move = data['form'].get('target_move', 'all')
+        init_balance = data['form'].get('initial_balance', True)
+        if init_balance:
+            ctx2.update({'initial_bal': True})
+        init_query = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=ctx2)
+
+        account=self.pool.get('account.account').browse(cr,uid,account)
+        currency_obj = self.pool.get('res.currency')
+        ids_acc = self.pool.get('account.account')._get_children_and_consol(cr, uid, account.id)
+        currency = account.currency_id and account.currency_id or account.company_id.currency_id
+        for child_account in self.pool.get('account.account').browse(cr, uid, ids_acc, context=context):
+            sql = """
+                SELECT count(id)
+                FROM account_move_line AS l
+                WHERE %s AND l.account_id = %%s
+            """ % (query)
+            cr.execute(sql, (child_account.id,))
+            num_entry = cr.fetchone()[0] or 0
+            sold_account = self._sum_balance_account(cr, uid, child_account, query, target_move, init_balance)
+            sold_accounts[child_account.id] = sold_account
+            if display_account == 'movement':
+                if child_account.type != 'view' and num_entry <> 0:
+                    res.append(child_account)
+            elif display_account == 'not_zero':
+                if child_account.type != 'view' and num_entry <> 0:
+                    if not currency_obj.is_zero(cr, uid, currency, sold_account):
+                        res.append(child_account)
+            else:
+                res.append(child_account)
+        if not res:
+            return [account]
+        return res
+
+    
+    
+    def _get_period(self, cr, uid, move):
+        if move:
+            acc_move_ids=self.pool.get('account.move').search(cr, uid, [('name','=',move)])
+            if acc_move_ids:
+                acc_move_obj=self.pool.get('account.move').browse(cr, uid, acc_move_ids[0])
+                if acc_move_obj.period_id:
+                    return acc_move_obj.period_id.name
+        return ''
+
+
+    def lines(self, cr, uid, account, sortby, tot_currency, target_move, init_balance, query, init_query):
+        """ Return all the account_move_line of account with their account code counterparts """
+        move_state = ['draft','posted']
+        if target_move == 'posted':
+            move_state = ['posted', '']
+        # First compute all counterpart strings for every move_id where this account appear.
+        # Currently, the counterpart info is used only in landscape mode
+        sql = """
+            SELECT m1.move_id,
+                array_to_string(ARRAY(SELECT DISTINCT a.code
+                                          FROM account_move_line m2
+                                          LEFT JOIN account_account a ON (m2.account_id=a.id)
+                                          WHERE m2.move_id = m1.move_id
+                                          AND m2.account_id<>%%s), ', ') AS counterpart
+                FROM (SELECT move_id
+                        FROM account_move_line l
+                        LEFT JOIN account_move am ON (am.id = l.move_id)
+                        WHERE am.state IN %s and %s AND l.account_id = %%s GROUP BY move_id) m1
+        """% (tuple(move_state), query)
+        cr.execute(sql, (account.id, account.id))
+        counterpart_res = cr.dictfetchall()
+        counterpart_accounts = {}
+        for i in counterpart_res:
+            counterpart_accounts[i['move_id']] = i['counterpart']
+        del counterpart_res
+
+        # Then select all account_move_line of this account
+        if sortby == 'sort_journal_partner':
+            sql_sort='j.code, p.name, l.move_id'
+        else:
+            sql_sort='l.date, l.move_id'
+        sql = """
+            SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
+            m.name AS move_name, m.id AS mmove_id,per.code as period_code,
+            c.symbol AS currency_code,
+            i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
+            p.name AS partner_name
+            FROM account_move_line l
+            JOIN account_move m on (l.move_id=m.id)
+            LEFT JOIN res_currency c on (l.currency_id=c.id)
+            LEFT JOIN res_partner p on (l.partner_id=p.id)
+            LEFT JOIN account_invoice i on (m.id =i.move_id)
+            LEFT JOIN account_period per on (per.id=l.period_id)
+            JOIN account_journal j on (l.journal_id=j.id)
+            WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s
+        """ %(query, tuple(move_state), sql_sort)
+        cr.execute(sql, (account.id,))
+        res_lines = cr.dictfetchall()
+        res_init = []
+        if res_lines and init_balance:
+            #FIXME: replace the label of lname with a string translatable
+            sql = """
+                SELECT 0 AS lid, '' AS ldate, '' AS lcode, COALESCE(SUM(l.amount_currency),0.0) AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, '' AS lperiod_id, '' AS lpartner_id,
+                '' AS move_name, '' AS mmove_id, '' AS period_code,
+                '' AS currency_code,
+                NULL AS currency_id,
+                '' AS invoice_id, '' AS invoice_type, '' AS invoice_number,
+                '' AS partner_name
+                FROM account_move_line l
+                LEFT JOIN account_move m on (l.move_id=m.id)
+                LEFT JOIN res_currency c on (l.currency_id=c.id)
+                LEFT JOIN res_partner p on (l.partner_id=p.id)
+                LEFT JOIN account_invoice i on (m.id =i.move_id)
+                JOIN account_journal j on (l.journal_id=j.id)
+                WHERE %s AND m.state IN %s AND l.account_id = %%s
+            """ %(init_query, tuple(move_state))
+            cr.execute(sql, (account.id,))
+            res_init = cr.dictfetchall()
+        res = res_init + res_lines
+        account_sum = 0.0
+        for l in res:
+            l['move'] = l['move_name'] != '/' and l['move_name'] or ('*'+str(l['mmove_id']))
+            l['partner'] = l['partner_name'] or ''
+            account_sum += l['debit'] - l['credit']
+            l['progress'] = account_sum
+            l['line_corresp'] = l['mmove_id'] == '' and ' ' or counterpart_accounts[l['mmove_id']].replace(', ',',')
+            # Modification of amount Currency
+            if l['credit'] > 0:
+                if l['amount_currency'] != None:
+                    l['amount_currency'] = abs(l['amount_currency']) * -1
+            if l['amount_currency'] != None:
+                tot_currency = tot_currency + l['amount_currency']
+        return res
+
+    def get_report_file_xls(self, cr, uid, ids, context=None):
+        
+        if context is None:
+            context = {}
+
+        data=self.check_report(cr, uid, ids, context)
+
+        #vals context
+        ctx2 = data['datas']['form'].get('used_context',{}).copy()
+        tot_currency = 0.0
+        sortby = data['datas']['form'].get('sortby', 'sort_date')
+        query = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=data['datas']['form'].get('used_context',{}))
+        sold_accounts = {}
+        display_account = data['datas']['form']['display_account']        
+        target_move = data['datas']['form'].get('target_move', 'all')
+        init_balance = data['datas']['form'].get('initial_balance', True)
+        if init_balance:
+            ctx2.update({'initial_bal': True})
+        init_query = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=ctx2)
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context = context)
+        
+        user_tz = dateutil.tz.gettz(user.context_tz)
+        utc_tz = dateutil.tz.tzutc()
+       
+
+        excel_temp = cStringIO.StringIO()
+        w = Workbook(encoding='utf-8', style_compression=2)
+        ws = w.add_sheet('Hoja 1')
+
+        #styles
+        style_headers1 = XFStyle()
+        # font
+        font = Font()
+        font.bold = True
+        style_headers1.font = font
+        # borders
+        borders = Borders()
+        borders.bottom = Borders.DASHED
+        style_headers1.borders = borders
+
+        style_bold = XFStyle()
+        # font
+        font = Font()
+        font.bold = True
+        style_bold.font = font
+        
+
+        # Header definition
+        ws.write_merge(0, 0, 0, 11,'LIBRO MAYOR',style=style_headers1)
+
+
+        #Main Headers
+        ws.write(1,0,'Plan Contable', style=style_headers1)
+        ws.write(2,0,'Ejercicio Fiscal', style=style_headers1)
+        ws.write(3,0,'Diarios', style=style_headers1)
+        ws.write(4,0,'Movimientos destino', style=style_headers1)
+
+        ws.write(1,1,self._get_account(cr,uid,data['datas']))
+        ws.write(2,1,self._get_fiscalyear(cr,uid,data['datas']))
+        ws.write(3,1,self._get_journal(cr,uid,data['datas']))
+        ws.write(4,1,self._get_target_move(cr,uid,data['datas']))
+
+
+        #Table headers
+    
+        ws.write(6,0,'Fecha', style=style_headers1)
+        ws.write(6,1,'Periodo', style=style_headers1)
+        ws.write(6,2,'Libro', style=style_headers1)
+        ws.write(6,3,'Empresa', style=style_headers1)
+        ws.write(6,4,'Ref', style=style_headers1)
+        ws.write(6,5,'Asiento', style=style_headers1)
+        ws.write(6,6,'Etiqueta Asiento', style=style_headers1)
+        ws.write(6,7,'Contrapartida', style=style_headers1)
+        ws.write(6,8,'Debe', style=style_headers1)
+        ws.write(6,9,'Haber', style=style_headers1)
+        ws.write(6,10,'Saldo Pendiente', style=style_headers1)
+        ws.write(6,11,'Divisa', style=style_headers1)
+
+        row=7
+        #Children accounts
+        for a in self.get_children_accounts(cr, uid, data['datas']['form']['chart_account_id'],data['datas'], context):
+            ws.write(row,0,a.code+' '+a.name, style=style_bold)
+            ws.write(row,8,self._sum_debit_account(cr, uid, a, target_move, init_balance, query, init_query), style=style_bold)
+            ws.write(row,9,self._sum_credit_account(cr, uid, a, target_move, init_balance, query, init_query), style=style_bold)
+            #ws.write(row,10,self._sum_balance_account(cr, uid, a, query, target_move, init_balance))       
+            row=row+1
+            
+            #lines children
+            for a_line in self.lines(cr, uid, a, sortby, tot_currency, target_move, init_balance, query, init_query):
+
+                #format date
+                ldated=datetime.strptime(a_line['ldate'], '%Y-%m-%d')
+
+                ws.write(row,0,ldated.strftime('%d/%m/%Y'))
+                ws.write(row,1,self._get_period(cr, uid, a_line['move']))
+                ws.write(row,2,a_line['lcode'])
+                ws.write(row,3,a_line['partner_name'])
+                ws.write(row,4,a_line['lref'])
+                ws.write(row,5,a_line['move'])
+                ws.write(row,6,a_line['lname'])
+                ws.write(row,7,a_line['line_corresp'])
+                ws.write(row,8,a_line['debit'])
+                ws.write(row,9,a_line['credit'])
+                ws.write(row,10,a_line['progress'])
+                ws.write(row,11,a_line['currency_code'] or '')
+                row=row+1
+
+        w.save(excel_temp)
+        out=base64.encodestring(excel_temp.getvalue())
+        excel_temp.close()
+        file_time = datetime.now(user_tz).strftime('%Y-%m-%d_%H%M')
+
+
+        return self.write(cr, uid, ids, {'state': 'export', 'export_file': out, 'name': 'Libro_Mayor_%s.xls' % (file_time)})
+
+account_report_general_ledger()
+

=== added file 'report_general_ledger_xls/wizard/account_report_ledger_xls_view.xml'
--- report_general_ledger_xls/wizard/account_report_ledger_xls_view.xml	1970-01-01 00:00:00 +0000
+++ report_general_ledger_xls/wizard/account_report_ledger_xls_view.xml	2014-01-29 11:51:34 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_report_general_ledger_view_xls" model="ir.ui.view">
+            <field name="name">Account report general ledger XLS</field>
+            <field name="model">account.report.general.ledger</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.account_common_report_view" />
+            <field name="arch" type="xml">
+            <data>
+
+            <xpath expr="/form/notebook/page[@name='journal_ids']" position="after">
+               <page string="XLS">
+                    <field name="name" invisible="1"/>
+                    <field name="export_file" filename="name" />
+	                <newline/>
+                    <button icon="gtk-print" name="get_report_file_xls" string="Export XLS" type="object" colspan="2" default_focus="1"/>
+               </page>
+            </xpath>
+            </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>