clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-costa-rica/l10n_cr_account_finacial_report_webkit into lp:openerp-costa-rica.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/l10n_cr_account_finacial_report_webkit/+merge/113464

Creating profit and loss reports, general ledger and balance sheet in webkit. It removes the report with rml
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/l10n_cr_account_finacial_report_webkit/+merge/113464
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.

=== modified file 'l10n_cr_account_financial_report_webkit/__init__.py'
--- l10n_cr_account_financial_report_webkit/__init__.py	2012-07-03 21:28:44 +0000
+++ l10n_cr_account_financial_report_webkit/__init__.py	2012-07-04 21:58:18 +0000
@@ -18,6 +18,11 @@
 #
 ##############################################################################
 import account
+<<<<<<< TREE
 from . import wizard
 from . import report
 from . import account_account
+=======
+import wizard
+import report
+>>>>>>> MERGE-SOURCE

=== modified file 'l10n_cr_account_financial_report_webkit/__openerp__.py'
--- l10n_cr_account_financial_report_webkit/__openerp__.py	2012-07-03 21:28:44 +0000
+++ l10n_cr_account_financial_report_webkit/__openerp__.py	2012-07-04 21:58:18 +0000
@@ -23,68 +23,13 @@
 
 {
     'name': 'Webkit based extended report financial report',
-    'description': """
-This module replace the following standard openerp financial reports :
- - General ledger
- - Trial Balance (simple or comparative view)
- - Partner ledger
- - Partner balance
- - Open invoices report
-
-
-Main improvements per report:
-
- * The General ledger: details of all entries posted in your books sorted by account.
-  - Filter by account in the wizard (no need to go to the Chart of account to do this anymore) or by view account (the report will display all regular children account) ie: you can select all P&L accounts.
-  - The report will now print only account with movements OR with a balance not null. No more endless report with accounts with no data. (field: display account is hidden)
-  - initial balance calculation on the fly if no open entry posted
-  - Thanks to a new checkbox in account form, you will have possibility to centralize any accounts you like. ie: you do not want to see all entries posted under the account ‘VAT on sales’ ; you will only see aggregated amounts by periods.
-  - Counterpart account displayed for each transaction (3 accounts max.) to ease searching.
-  - Better ergonomy on the wizard: important information at the top, filters in the middle, options at the bottom or separate tab, more specific filtering on a other tabs. No more unique wizard layout for all financial reports (ie: we have removed the journal tab for the GL report)
-  - improved report style
-
- * The partner ledger: details of entries relative to payable & receivable accounts posted in your books sorted by account and partner.
-  - Filter by partner now possible
-  - Now you can see accounts then Partner with subtotals for each account allowing you to check you data with trial balance and partner balance for instance & accounts are ordered the same way than in the Chart of account
-  - period have been added (date only is uncompleted since date can be outside period)
-  - Reconciliation code added
-  - subtotal by account
-  - alpha sorting (same in partner balance)
-
- * Open invoice report : other version of the partner ledger showing unreconciled / partially reconcies entries
-(added on the 20/01/2012)
-  - Possibility to print unreconciled transactions only at any date in the past (thanks to the brand-new field: last_rec_date which calculated the last move line reconciled date). No more pain to get open invoices at the last closing date.
-  - no initial balance calculated because the report shows open invoices from previous years.
-
- * The Trial balance: list of account with balances
-  - you can either see the column : Initial balance , debit, credit , end balance or compare balances over 4 periods of your choice
-  - You can select the filter opening to get the opening trial balance only
-  - If you create a extra virtual charts (using consolidated account) of account for your P&L and your balance sheet , you can print your statutory accounts (with comparision over years for ex.)
-  - If you compare 2 periods, you will get differences in value and % also
-
- * The Partner balance: list of account with balances
-  - subtotal by account & partner
-  - alpha sorting (same in partner balance)
-
-Limitations:
-In order to run properly this module make sure you have installed the librairie ‘wkhtmltopdf’ for the pdf rendering (this library path must be added to you company settings).
-
-Initial balances in these reports are based either on opening entry posted in the opening period or calculated on the fly. So make sure, your past accounting opening entries are in a opening period.
-Initials balances are not calculated when using date filter (since a date can be outside its logical period and IB could be different by date Vs IB by period)
-The opening period is assumed to be the 01.01 of the year with an opening flag and the first period of the year must starts also the 01.01
-
-Totals for amount in currencies are affective if the partner belong to an account with a secondary currency.
-
-html headers and footers are deactivated for these reports because of an issue of wkhtmltopdf : http://code.google.com/p/wkhtmltopdf/issues/detail?id=656
-Instead, the header and footer are created as text with arguments passed to wkhtmltopdf. The texts are defined inside the report classes.
-
-""",
+    'description': "",
     'version': '1.0',
     'author': 'CLEARCORP S.A.',
     'category': 'Finance',
     'website': "http://clearcorp.co.cr";,
     'images': [],
-    'depends': ['account_financial_report_webkit', ],
+    'depends': ['account_financial_report_webkit', 'account' ],
     'init_xml': [],
     'demo_xml' : [],
     'update_xml': ['account_move_line_view.xml',

=== modified file 'l10n_cr_account_financial_report_webkit/i18n/es_CR.po'
--- l10n_cr_account_financial_report_webkit/i18n/es_CR.po	2012-07-04 20:52:00 +0000
+++ l10n_cr_account_financial_report_webkit/i18n/es_CR.po	2012-07-04 21:58:18 +0000
@@ -1,14 +1,18 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
 #	* l10n_cr_account_financial_report_webkit
-#	* account_financial_report_webkit
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-07-04 20:35+0000\n"
 "PO-Revision-Date: 2012-07-04 20:35+0000\n"
+=======
+"POT-Creation-Date: 2012-07-02 17:02+0000\n"
+"PO-Revision-Date: 2012-07-02 17:02+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,157 +20,70 @@
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,account_ids:0
-#: field:general.ledger.webkit,account_ids:0
-#: field:partner.balance.webkit,account_ids:0
-#: field:trial.balance.webkit,account_ids:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,account_ids:0
 msgid "Filter on accounts"
 msgstr "Filtro en las cuentas"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:424
-#, python-format
-msgid "Please set a valid time filter"
-msgstr "Por favor, establecer un filtro de tiempo válido"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: view:general.ledger.webkit:0
-#: view:open.invoices.webkit:0
-#: view:partners.ledger.webkit:0
+#. module: l10n_cr_account_financial_report_webkit
 #: view:open.invoices.webkit:0
 #: view:partners.ledger.webkit:0
 msgid "Layout Options"
-msgstr "Opciones de Diseño"
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:203
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:258
-msgid "Cumulated Balance on Account"
-msgstr "Saldo Acumulado en la Cuenta"
-
-#. module: account_financial_report_webkit
-#: field:general.ledger.webkit,centralize:0
-msgid "Activate Centralization"
-msgstr "Activar Centralización"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:154
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:161
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:120
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:127
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:135
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:142
+msgstr "Opciones de diseño"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:178
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:185
 msgid "Balance %s"
 msgstr "Balance %s"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: view:account.move.line:0
+#. module: l10n_cr_account_financial_report_webkit
 #: view:account.move.line:0
 msgid "Misc."
 msgstr "Misc."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:92
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:102
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:114
 msgid "Periods Filter:"
 msgstr "Filtro por Períodos:"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:170
-#, python-format
-msgid "No header defined for this Webkit report!"
-msgstr "No existe un encabezado definido para este informe Webkit!"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:189
-#, python-format
-msgid "Filter has to be in filter date, period, or none"
-msgstr "Filtro tiene que estar en filtro de fecha , período, o ninguno"
-
-#. module: account_financial_report_webkit
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit
-#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_trial_balance_webkit
-msgid "Trial Balance Webkit"
-msgstr "Trial Balance Webkit"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,company_id:0
-#: field:general.ledger.webkit,company_id:0
-#: field:open.invoices.webkit,company_id:0
-#: field:partner.balance.webkit,company_id:0
-#: field:partners.ledger.webkit,company_id:0
-#: field:trial.balance.webkit,company_id:0
+#. module: l10n_cr_account_financial_report_webkit
+#: help:open.invoices.webkit,debit_credit:0
+msgid "This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison"
+msgstr "Esta opción le permite obtener más detalles acerca de su la manera que sus saldos se calculan. Debido a que es consumming espacio, no se permite usarlo mientras se hace una comparación"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: account_financial_report_webkit
-#: view:partner.balance.webkit:0
-msgid "This report is an analysis done by a partner, It is a PDF report containing one line per partner representing the cumulative credit balance"
-msgstr "Este informe es un análisis realizado por una empresa, es un informe en PDF que contiene una línea por cada empresa que representa el saldo acumulado de crédito"
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:138
-msgid "Account / Partner Name"
-msgstr "Cuenta / Nombre de Empresa"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,journal_ids:0
-#: field:general.ledger.webkit,journal_ids:0
-#: field:open.invoices.webkit,journal_ids:0
-#: field:partner.balance.webkit,journal_ids:0
-#: field:partners.ledger.webkit,journal_ids:0
-#: field:trial.balance.webkit,journal_ids:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,journal_ids:0
 msgid "Journals"
 msgstr "Asientos"
 
-#. module: account_financial_report_webkit
-#: help:general.ledger.webkit,amount_currency:0
-#: help:open.invoices.webkit,amount_currency:0
-#: help:partners.ledger.webkit,amount_currency:0
-msgid "It adds the currency column"
-msgstr "Agrega la columna de moneda"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:75
-#: selection:open.invoices.webkit,result_selection:0
-#: selection:partner.balance.webkit,result_selection:0
-#: selection:partners.ledger.webkit,result_selection:0
-#, python-format
-msgid "Receivable and Payable Accounts"
-msgstr "Cuentas por Cobrar y por Pagar"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:104
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:119
-#: model:ir.model,name:account_financial_report_webkit.model_account_account
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:119
+msgid "Initial Balance:"
+msgstr "Balance Inicial:"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:54
+msgid "Detalle"
+msgstr "Detalle"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:156
 #: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_account_account
 msgid "Account"
 msgstr "Cuenta"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/trial_balance.py:42
-#, python-format
-msgid "TRIAL BALANCE"
-msgstr "BALANCE DE SUMAS Y SALDOS"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: view:general.ledger.webkit:0
-#: view:open.invoices.webkit:0
-#: view:partner.balance.webkit:0
-#: view:partners.ledger.webkit:0
-#: view:trial.balance.webkit:0
+#. module: l10n_cr_account_financial_report_webkit
 #: view:account.balances:0
 msgid "Print only"
 msgstr "Imprimir sólo"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: model:ir.model,name:account_financial_report_webkit.model_partner_balance_webkit
 msgid "Partner Balance Report"
@@ -202,20 +119,24 @@
 #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partners_ledger_webkit
 msgid "Partner Ledger Webkit"
 msgstr "Partner Ledger Webkit"
-
-#. module: account_financial_report_webkit
-#: model:ir.ui.menu,name:account_financial_report_webkit.menu_Account_Balances_report
-msgid "Account Bank Balances"
-msgstr "Saldo de Cuentas de Banco"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,display_account:0
-#: field:partner.balance.webkit,display_account:0
-#: field:trial.balance.webkit,display_account:0
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:57
+msgid "Pagos"
+msgstr "Pagos"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.actions.act_window,name:l10n_cr_account_financial_report_webkit.action_account_partners_ledger_menu_webkit
+msgid "Partner Ledger"
+msgstr "Libro Mayor de Empresa"
+>>>>>>> MERGE-SOURCE
+
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,display_account:0
 msgid "Display Accounts"
 msgstr "Mostrar Cuentas"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:192
 msgid "Unallocated"
@@ -244,11 +165,19 @@
 
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:112
+=======
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:126
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:149
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:125
+>>>>>>> MERGE-SOURCE
 msgid "Rec."
 msgstr "Rec."
 
+<<<<<<< TREE
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: constraint:account.account:0
 #: constraint:account.account:0
@@ -266,36 +195,33 @@
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:46
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:34
 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:58
+=======
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:60
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:23
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:34
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:36
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:33
+>>>>>>> MERGE-SOURCE
 msgid "Periods Filter"
 msgstr "Filtro por Períodos"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:313
-#, python-format
-msgid "No period found"
-msgstr "No se encontró el período"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:38
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:139
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:52
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:142
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:39
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:153
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:50
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:108
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:63
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:123
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:65
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:160
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:39
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:41
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:38
+>>>>>>> MERGE-SOURCE
 msgid "Initial Balance"
 msgstr "Saldo Inicial"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: constraint:account.move.line:0
 msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
@@ -317,153 +243,83 @@
 msgid "Displayed Accounts"
 msgstr "Cuentas Mostradas"
 
+=======
+>>>>>>> MERGE-SOURCE
 #. module: l10n_cr_account_financial_report_webkit
 #: model:ir.actions.act_window,name:l10n_cr_account_financial_report_webkit.action_account_balances_menu_webkit
 msgid "Action Account Bank Balances"
 msgstr "Saldo de Cuentas de Banco"
 
 #. module: l10n_cr_account_financial_report_webkit
-#: view:account.balances:0
-msgid "This report allows you to print or generate a pdf of your account bank balance allowing you to quickly check the balance of each of your accounts in a single report"
-msgstr "Este informe le permite imprimir o generar un pdf del saldo de cuentas de banco que le permite comprobar rápidamente el balance de cada una de sus cuentas en un único informe"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:108
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:122
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:145
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:121
+>>>>>>> MERGE-SOURCE
 msgid "Partner"
 msgstr "Empresa"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: help:account.common.balance.report,chart_account_id:0
-#: help:general.ledger.webkit,chart_account_id:0
-#: help:open.invoices.webkit,chart_account_id:0
-#: help:partner.balance.webkit,chart_account_id:0
-#: help:partners.ledger.webkit,chart_account_id:0
-#: help:trial.balance.webkit,chart_account_id:0
+#. module: l10n_cr_account_financial_report_webkit
 #: help:account.balances,chart_account_id:0
 msgid "Select Charts of Accounts"
 msgstr "Seleccione los Planes Contables"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,filter:0
-#: field:general.ledger.webkit,filter:0
-#: field:open.invoices.webkit,filter:0
-#: field:partner.balance.webkit,filter:0
-#: field:partners.ledger.webkit,filter:0
-#: field:trial.balance.webkit,filter:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,filter:0
+#: field:open.invoices.webkit,filter_cmp:0
 msgid "Filter by"
 msgstr "Filtrar por"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:48
-#: view:partners.ledger.webkit:0
-#: model:ir.actions.act_window,name:l10n_cr_account_financial_report_webkit.action_account_partners_ledger_menu_webkit
-#, python-format
-msgid "Partner Ledger"
-msgstr "Libro Mayor de Empresa"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:114
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:123
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:143
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:166
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:142
+>>>>>>> MERGE-SOURCE
 msgid "Curr."
 msgstr "Curr."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:101
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:110
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:124
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:147
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:123
+>>>>>>> MERGE-SOURCE
 msgid "Label"
 msgstr "Etiqueta"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: help:account.common.balance.report,account_ids:0
-#: help:general.ledger.webkit,account_ids:0
-#: help:partner.balance.webkit,account_ids:0
-#: help:trial.balance.webkit,account_ids:0
+#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,label_filter:0
+msgid "Column Label"
+msgstr "Etiqueta de columna"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: help:account.balances,account_ids:0
 msgid "Only selected accounts will be printed. Leave empty to print all accounts."
 msgstr "Sólo las cuentas seleccionadas se imprimirán. Dejar en blanco para imprimir todas las cuentas."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:105
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:145
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:114
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:111
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:126
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:169
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:55
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:134
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:57
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:157
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:133
+>>>>>>> MERGE-SOURCE
 msgid "Debit"
 msgstr "Débito"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:171
-#, python-format
-msgid "Please set a header in company settings"
-msgstr "Por favor, establecer un encabezado en la configuración de la compañía"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: view:general.ledger.webkit:0
-#: view:open.invoices.webkit:0
-#: view:partner.balance.webkit:0
-#: view:partners.ledger.webkit:0
-#: view:trial.balance.webkit:0
+#. module: l10n_cr_account_financial_report_webkit
 #: view:account.balances:0
 msgid "Time Filters"
 msgstr "Filtros de Tiempo"
 
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:224
-msgid "Cumulated Balance on Partner"
-msgstr "Saldo acumulado en empresa"
-
-#. module: account_financial_report_webkit
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit
-#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partner_balance_webkit
-msgid "Partner Balance Webkit"
-msgstr "Partner Balance Webkit"
-
-#. module: account_financial_report_webkit
-#: help:open.invoices.webkit,until_date:0
-msgid "The clearance date is essentially a tool used for debtors provisionning calculation.\n"
-"\n"
-"By default, this date is equal to the the end date (ie: 31/12/2011 if you select fy 2011).\n"
-"\n"
-"By amending the clearance date, you will be, for instance, able to answer the question : 'based on my last year end debtors open invoices, which invoices are still unpaid today (today is my clearance date)?'\n"
-""
-msgstr "The clearance date is essentially a tool used for debtors provisionning calculation.\n"
-"\n"
-"By default, this date is equal to the the end date (ie: 31/12/2011 if you select fy 2011).\n"
-"\n"
-"By amending the clearance date, you will be, for instance, able to answer the question : 'based on my last year end debtors open invoices, which invoices are still unpaid today (today is my clearance date)?'\n"
-""
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42
-msgid "Clearance Date"
-msgstr "Fecha de Liquidación"
-
-#. module: account_financial_report_webkit
-#: view:partners.ledger.webkit:0
-msgid "This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account"
-msgstr "Este informe le permite imprimir o generar un PDF de su libro mayor de empresa con los detalles de todas sus cuentas por pagar/cobrar"
-
 #. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:165
-msgid "Checks"
-msgstr "Cheques"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,display_account:0
-#: selection:partner.balance.webkit,display_account:0
-#: selection:trial.balance.webkit,display_account:0
 #: selection:account.balances,display_account:0
 msgid "With balance is not equal to 0"
 msgstr "Con el balance no es igual a 0"
@@ -471,8 +327,13 @@
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:300
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:359
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:325
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:384
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:296
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:355
+>>>>>>> MERGE-SOURCE
 msgid "Saldo"
 msgstr "Saldo"
 
@@ -491,118 +352,61 @@
 "                <div class=\"act_as_cell\" style=\"width: 250px;  vertical-align: middle\">${company.currency_id.symbol} ${formatLang(total_balance_curr)}</div>\n"
 "                <div class=\"act_as_cell\">${_('"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:94
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:104
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:116
 msgid "Fiscal Year :"
 msgstr "Año Fiscal :"
 
-#. module: account_financial_report_webkit
-#: view:open.invoices.webkit:0
-msgid "This report allows you to print or generate a pdf of your open invoices per partner with details of all your payable/receivable account. Exclude full reconciled journal items."
-msgstr "Este informe le permite imprimir o generar un pdf de sus facturas pendientes por empresa con todos los ddetalles de todas sus cuentas por pagar/cobrar. Excluir asientos reconciliados."
-
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:163
 msgid "Transfers"
 msgstr "Transferencias"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:416
-#, python-format
-msgid "Must be in include_opening, exclude_opening"
-msgstr "Must be in include_opening, exclude_opening"
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:43
-#: code:addons/account_financial_report_webkit/wizard/balance_common.py:151
-#, python-format
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:136
-msgid "Code / Ref"
-msgstr "Código / Ref"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/trial_balance.py:49
-#: view:trial.balance.webkit:0
-#, python-format
-msgid "Trial Balance"
-msgstr "Balance de sumas y saldos"
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:87
-msgid "Dates : "
-msgstr "Fechas : "
-
-#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:146
-#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:148
-msgid "Account Bank Balance in "
-msgstr "Saldo de Cuentas de Banco en "
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,comp0_period_to:0
-#: field:account.common.balance.report,comp1_period_to:0
-#: field:account.common.balance.report,comp2_period_to:0
-#: field:account.common.balance.report,period_to:0
-#: field:general.ledger.webkit,period_to:0
-#: field:open.invoices.webkit,period_to:0
-#: field:partner.balance.webkit,comp0_period_to:0
-#: field:partner.balance.webkit,comp1_period_to:0
-#: field:partner.balance.webkit,comp2_period_to:0
-#: field:partner.balance.webkit,period_to:0
-#: field:partners.ledger.webkit,period_to:0
-#: field:trial.balance.webkit,comp0_period_to:0
-#: field:trial.balance.webkit,comp1_period_to:0
-#: field:trial.balance.webkit,comp2_period_to:0
-#: field:trial.balance.webkit,period_to:0
+#. module: l10n_cr_account_financial_report_webkit
+#: help:open.invoices.webkit,label_filter:0
+msgid "This label will be displayed on report to show the balance computed for the given comparison filter."
+msgstr "Esta etiqueta se mostrará en el informe para mostrar el saldo calculado para el filtro de comparación dado."
+
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_account_balances
+msgid "Account Bank Balances Report"
+msgstr "Informe saldos bancarios de cuentas"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,comp0_period_to:0
 #: field:account.balances,comp1_period_to:0
 #: field:account.balances,comp2_period_to:0
 #: field:account.balances,period_to:0
+#: field:open.invoices.webkit,period_to_cmp:0
 msgid "End Period"
 msgstr "Período Final"
 
-#. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_common_balance_report
-msgid "Common Balance Report"
-msgstr "Informe de Balance Común"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:36
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:43
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:49
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:37
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:61
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:63
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:37
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:39
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:36
+>>>>>>> MERGE-SOURCE
 msgid "Accounts Filter"
 msgstr "Filtro por Cuentas"
 
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:136
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:159
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:135
+>>>>>>> MERGE-SOURCE
 msgid "Manual Move"
+<<<<<<< TREE
 msgstr "Movimiento Manual"
+=======
+msgstr "Movimiento manual"
+>>>>>>> MERGE-SOURCE
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,comp0_filter:0
-#: selection:account.common.balance.report,comp1_filter:0
-#: selection:account.common.balance.report,comp2_filter:0
-#: selection:account.common.balance.report,filter:0
-#: selection:partner.balance.webkit,comp0_filter:0
-#: selection:partner.balance.webkit,comp1_filter:0
-#: selection:partner.balance.webkit,comp2_filter:0
-#: selection:partner.balance.webkit,filter:0
-#: selection:trial.balance.webkit,comp0_filter:0
-#: selection:trial.balance.webkit,comp1_filter:0
-#: selection:trial.balance.webkit,comp2_filter:0
-#: selection:trial.balance.webkit,filter:0
+#. module: l10n_cr_account_financial_report_webkit
 #: selection:account.balances,comp0_filter:0
 #: selection:account.balances,comp1_filter:0
 #: selection:account.balances,comp2_filter:0
@@ -610,92 +414,66 @@
 msgid "Opening Only"
 msgstr "Sólo Apertura"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:67
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:60
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:60
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:72
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:59
+>>>>>>> MERGE-SOURCE
 msgid "Custom Filter"
 msgstr "Filtro Personalizado"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:90
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:100
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:112
 msgid "Dates Filter:"
 msgstr "Filtro por Fechas:"
 
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:91
-msgid "Fiscal Year : "
-msgstr "Año Fiscal : "
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:74
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:76
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:73
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:75
+msgid "Accounts in "
+msgstr "Cuentas en "
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,display_account:0
-#: selection:partner.balance.webkit,display_account:0
-#: selection:trial.balance.webkit,display_account:0
+#. module: l10n_cr_account_financial_report_webkit
 #: selection:account.balances,display_account:0
 msgid "With movements"
 msgstr "Con movimientos"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: constraint:account.common.balance.report:0
-#: constraint:general.ledger.webkit:0
-#: constraint:open.invoices.webkit:0
-#: constraint:partner.balance.webkit:0
-#: constraint:partners.ledger.webkit:0
-#: constraint:trial.balance.webkit:0
+#. module: l10n_cr_account_financial_report_webkit
 #: constraint:account.balances:0
+#: constraint:accounting.report:0
 #: constraint:open.invoices.webkit:0
 #: constraint:partners.ledger.webkit:0
 msgid "The fiscalyear, periods or chart of account chosen have to belong to the same company."
 msgstr "El año fiscal, períodos o plan contable elegidos deben pertenecer a la misma compañía."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:118
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:138
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:161
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:137
+>>>>>>> MERGE-SOURCE
 msgid "Cumul. Bal."
 msgstr "Bal. Acumul."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:23
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:22
 msgid "Computed"
 msgstr "Procesado"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/general_ledger.py:64
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:75
-#: code:addons/account_financial_report_webkit/report/partner_balance.py:63
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:64
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:68
-#: code:addons/account_financial_report_webkit/report/trial_balance.py:64
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:68
+#. module: l10n_cr_account_financial_report_webkit
 #: code:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_open_invoices.py:64
 #, python-format
 msgid "of"
 msgstr "de"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:73
-#: selection:open.invoices.webkit,result_selection:0
-#: selection:partner.balance.webkit,result_selection:0
-#: selection:partners.ledger.webkit,result_selection:0
-#, python-format
-msgid "Payable Accounts"
-msgstr "Cuentas por Pagar"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:60
-#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_open_invoices_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_open_invoices_webkit
+#. module: l10n_cr_account_financial_report_webkit
 #: code:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_open_invoices.py:55
 #: model:ir.actions.act_window,name:l10n_cr_account_financial_report_webkit.action_account_open_invoices_menu_webkit
 #: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_open_invoices_webkit
@@ -703,6 +481,7 @@
 msgid "Open Invoices Report"
 msgstr "Reporte de Facturas Pendientes"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: field:account.account,centralized:0
 msgid "Centralized"
@@ -736,64 +515,35 @@
 #: field:trial.balance.webkit,comp1_date_from:0
 #: field:trial.balance.webkit,comp2_date_from:0
 #: field:trial.balance.webkit,date_from:0
+=======
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: field:account.balances,comp0_date_from:0
 #: field:account.balances,comp1_date_from:0
 #: field:account.balances,comp2_date_from:0
 #: field:account.balances,date_from:0
+#: field:open.invoices.webkit,date_from_cmp:0
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
-#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:23
-msgid "Opening Entries"
-msgstr "Apuntes de Apertura"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/general_ledger.py:40
-#, python-format
-msgid "GENERAL LEDGER"
-msgstr "LIBRO MAYOR"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/wizard/profit_loss_wizard.py:129
-#, python-format
-msgid "Level %s"
-msgstr "Nivel %s"
+#. module: l10n_cr_account_financial_report_webkit
+#: selection:account.balances,target_move:0
+msgid "All Entries"
+msgstr "Todos los Apuntes"
 
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:167
 msgid "Deposit"
 msgstr "Depositos"
 
-#. module: account_financial_report_webkit
-#: help:account.account,centralized:0
-msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period."
-msgstr "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period."
-
-#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,group_by_currency:0
-msgid "Group Partner by currency"
-msgstr "Agrupar Empresa por tipo de moneda"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:23
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:22
 msgid "No"
 msgstr "No"
 
+<<<<<<< TREE
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:97
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94
@@ -811,11 +561,25 @@
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:163
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:129
 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:144
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:154
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:53
+msgid "Fecha"
+msgstr "Fecha"
+
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:187
 msgid "Balance C%s"
 msgstr "Balance C%s"
 
 #. module: l10n_cr_account_financial_report_webkit
+<<<<<<< TREE
 #: field:account.account,report_currency_id:0
 msgid "Report Currency"
 msgstr "Moneda de reportes"
@@ -830,59 +594,26 @@
 #: selection:trial.balance.webkit,comp0_filter:0
 #: selection:trial.balance.webkit,comp1_filter:0
 #: selection:trial.balance.webkit,comp2_filter:0
+=======
+>>>>>>> MERGE-SOURCE
 #: selection:account.balances,comp0_filter:0
 #: selection:account.balances,comp1_filter:0
 #: selection:account.balances,comp2_filter:0
 msgid "No Comparison"
 msgstr "Sin Comparación"
 
-#. module: account_financial_report_webkit
-#: field:account.move.line,last_rec_date:0
-msgid "Last reconciliation date"
-msgstr "Última fecha de la reconciliación"
-
-#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,partner_ids:0
-#: field:partner.balance.webkit,partner_ids:0
-#: field:partners.ledger.webkit,partner_ids:0
-msgid "Filter on partner"
-msgstr "Filtro por empresa"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/general_ledger.py:47
-#: view:general.ledger.webkit:0
-#, python-format
-msgid "General Ledger"
-msgstr "Libro Mayor"
-
-#. module: account_financial_report_webkit
-#: view:trial.balance.webkit:0
-msgid "This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"
-msgstr "Este informe le permite imprimir o generar un pdf del balance de sumas y saldos que le permite comprobar rápidamente el balance de cada una de sus cuentas en un único informe"
-
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:89
-msgid "Periods : "
-msgstr "Períodos : "
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/partner_balance.py:40
-#, python-format
-msgid "PARTNER BALANCE"
-msgstr "BALANCE DE EMPRESA"
-
-#. module: account_financial_report_webkit
-#: constraint:account.move.line:0
-msgid "Company must be the same for its related account and period."
-msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
-
-#. module: account_financial_report_webkit
-#: help:open.invoices.webkit,partner_ids:0
-#: help:partner.balance.webkit,partner_ids:0
-#: help:partners.ledger.webkit,partner_ids:0
-msgid "Only selected partners will be printed. Leave empty to print all partners."
-msgstr "Sólo las empresas seleccionadas serán impresas. Dejar en blanco para imprimir todas las empresas."
-
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:165
+msgid "Checks"
+msgstr "Cheques"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:146
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:148
+msgid "Account Bank Balance in "
+msgstr "Saldo de Cuentas de Banco en "
+
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:165
 #, python-format
@@ -912,27 +643,31 @@
 #: selection:trial.balance.webkit,comp1_filter:0
 #: selection:trial.balance.webkit,comp2_filter:0
 #: selection:trial.balance.webkit,filter:0
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:111
+msgid "SALDO"
+msgstr "SALDO"
+
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: selection:account.balances,comp0_filter:0
 #: selection:account.balances,comp1_filter:0
 #: selection:account.balances,comp2_filter:0
 #: selection:account.balances,filter:0
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:114
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:53
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:137
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:113
+#: selection:open.invoices.webkit,filter_cmp:0
+>>>>>>> MERGE-SOURCE
 msgid "Date"
 msgstr "Fecha"
 
-#. module: account_financial_report_webkit
-#: help:general.ledger.webkit,centralize:0
-msgid "Uncheck to display all the details of centralized accounts."
-msgstr "Desactive la opción para mostrar todos los detalles de las cuentas centralizadas."
-
-#. module: account_financial_report_webkit
-#: constraint:account.move.line:0
-msgid "You can not create journal items on an account of type view."
-msgstr "No puede crear asientos en una cuenta de tipo vista"
-
 #. module: l10n_cr_account_financial_report_webkit
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:74
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:76
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:86
@@ -942,36 +677,31 @@
 
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: view:account.move.line:0
+=======
+>>>>>>> MERGE-SOURCE
 #: view:account.move.line:0
 msgid "Internal Note"
 msgstr "Nota interna"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: constraint:account.common.balance.report:0
-#: constraint:general.ledger.webkit:0
-#: constraint:open.invoices.webkit:0
-#: constraint:partner.balance.webkit:0
-#: constraint:partners.ledger.webkit:0
-#: constraint:trial.balance.webkit:0
+#. module: l10n_cr_account_financial_report_webkit
 #: constraint:account.balances:0
-#: constraint:open.invoices.webkit:0
 #: constraint:partners.ledger.webkit:0
 msgid "When no Fiscal year is selected, you must choose to filter by periods or by date."
 msgstr "Cuando no se selecciona ningún año fiscal, se debe elegir para filtrar por períodos o por fecha."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:50
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:57
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:64
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:51
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:62
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:75
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:85
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:37
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:51
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:61
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:50
+>>>>>>> MERGE-SOURCE
 msgid "To:"
 msgstr "Hasta:"
 
+<<<<<<< TREE
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: sql_constraint:account.account:0
 #: sql_constraint:account.account:0
@@ -993,112 +723,82 @@
 #: selection:partner.balance.webkit,target_move:0
 #: selection:partners.ledger.webkit,target_move:0
 #: selection:trial.balance.webkit,target_move:0
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr "Display Debit/Credit Columns"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: view:account.balances:0
+msgid "Account Bank Balance"
+msgstr "Saldo de Cuentas de Banco"
+
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: selection:account.balances,target_move:0
-#, python-format
 msgid "All Posted Entries"
 msgstr "Todos los apuntes publicados"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:87
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:84
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:97
-#: code:addons/account_financial_report_webkit/wizard/balance_common.py:144
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:109
-#, python-format
 msgid "Comparison %s"
 msgstr "Comparación %s"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:127
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102
-#, python-format
-msgid "No accounts to print."
-msgstr "No hay cuentas para imprimir."
+#. module: l10n_cr_account_financial_report_webkit
+#: selection:account.balances,display_account:0
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:98
+msgid "All"
+msgstr "Todos"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: help:account.common.balance.report,fiscalyear_id:0
-#: help:general.ledger.webkit,fiscalyear_id:0
-#: help:open.invoices.webkit,fiscalyear_id:0
-#: help:partner.balance.webkit,fiscalyear_id:0
-#: help:partners.ledger.webkit,fiscalyear_id:0
-#: help:trial.balance.webkit,fiscalyear_id:0
+#. module: l10n_cr_account_financial_report_webkit
 #: help:account.balances,fiscalyear_id:0
+#: help:open.invoices.webkit,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
 msgstr "Mantenga vacío para todos los años fiscales abiertos"
 
-#. module: account_financial_report_webkit
-#: help:account.move.line,last_rec_date:0
-msgid "the date of the last reconciliation (full or partial) account move line"
-msgstr "La fecha de la última reconciliación (total o parcial) de la línea de movimiento de la cuenta "
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:107
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:147
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:116
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:113
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:128
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:171
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:56
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:132
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:56
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:155
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:131
+>>>>>>> MERGE-SOURCE
 msgid "Credit"
 msgstr "Crédito"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,filter:0
-#: selection:general.ledger.webkit,filter:0
-#: selection:open.invoices.webkit,filter:0
-#: selection:partner.balance.webkit,filter:0
-#: selection:partners.ledger.webkit,filter:0
-#: selection:trial.balance.webkit,filter:0
+#. module: l10n_cr_account_financial_report_webkit
 #: selection:account.balances,filter:0
+#: selection:open.invoices.webkit,filter_cmp:0
 msgid "No Filters"
 msgstr "Sin Filtros"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:127
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102
-#, python-format
-msgid "Error"
-msgstr "Error"
-
 #. module: l10n_cr_account_financial_report_webkit
-#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_account_balances
-msgid "Account Balances Report"
-msgstr "Reporte de Saldo de Cuentas de Banco"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:152
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:118
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:133
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:176
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:111
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:57
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:61
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:65
+>>>>>>> MERGE-SOURCE
 msgid "Balance"
 msgstr "Saldo"
 
-#. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103
-msgid "Counter part"
-msgstr "Contraparte"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:168
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:134
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:149
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:192
 msgid "% Difference"
 msgstr "% Diferencia"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: help:account.common.balance.report,filter:0
-#: help:open.invoices.webkit,filter:0
-#: help:partner.balance.webkit,filter:0
-#: help:partners.ledger.webkit,filter:0
-#: help:trial.balance.webkit,filter:0
+#. module: l10n_cr_account_financial_report_webkit
 #: help:account.balances,filter:0
 msgid "Filter by date : no opening balance will be displayed. (opening balance can only be calculated based on period to be correct)."
 msgstr "Filtrar por fecha: ningún balance abierto será mostrado. (saldo inicial sólo se puede calcular en función del período que es correcto)."
 
+<<<<<<< TREE
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: constraint:account.account:0
 #: constraint:account.account:0
@@ -1124,63 +824,47 @@
 #: view:general.ledger.webkit:0
 #: view:partner.balance.webkit:0
 #: view:trial.balance.webkit:0
+=======
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: view:account.balances:0
-msgid "Accounts Filters"
-msgstr "Filtros de Cuentas"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:31
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:37
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:44
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:32
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:56
+msgid "This report allows you to print or generate a pdf of your account bank balance allowing you to quickly check the balance of each of your accounts in a single report"
+msgstr "Este informe le permite imprimir o generar un pdf del saldo de cuentas de banco que le permite comprobar rápidamente el balance de cada una de sus cuentas en un único informe"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:116
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:115
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:58
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:21
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:32
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:34
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:31
+>>>>>>> MERGE-SOURCE
 msgid "Dates Filter"
 msgstr "Filtro por Fechas"
 
-#. module: account_financial_report_webkit
-#: constraint:account.move.line:0
-msgid "You can not create journal items on closed account."
-msgstr "No puede crear asientos en cuentas cerradas"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:64
-#: selection:general.ledger.webkit,display_account:0
-#, python-format
-msgid "With transactions or non zero balance"
-msgstr "With transactions or non zero balance"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,comp0_filter:0
-#: selection:account.common.balance.report,comp1_filter:0
-#: selection:account.common.balance.report,comp2_filter:0
-#: selection:account.common.balance.report,filter:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45
-#: code:addons/account_financial_report_webkit/wizard/balance_common.py:156
-#: selection:general.ledger.webkit,filter:0
-#: selection:open.invoices.webkit,filter:0
-#: selection:partner.balance.webkit,comp0_filter:0
-#: selection:partner.balance.webkit,comp1_filter:0
-#: selection:partner.balance.webkit,comp2_filter:0
-#: selection:partner.balance.webkit,filter:0
-#: selection:partners.ledger.webkit,filter:0
-#: selection:trial.balance.webkit,comp0_filter:0
-#: selection:trial.balance.webkit,comp1_filter:0
-#: selection:trial.balance.webkit,comp2_filter:0
-#: selection:trial.balance.webkit,filter:0
+#. module: l10n_cr_account_financial_report_webkit
 #: selection:account.balances,comp0_filter:0
 #: selection:account.balances,comp1_filter:0
 #: selection:account.balances,comp2_filter:0
 #: selection:account.balances,filter:0
-#, python-format
+#: selection:open.invoices.webkit,filter_cmp:0
 msgid "Periods"
 msgstr "Períodos"
 
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:128
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:151
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:127
+>>>>>>> MERGE-SOURCE
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1189,37 +873,24 @@
 msgid "Estado de Cuenta"
 msgstr "Estado de Cuenta"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:112
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:121
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:141
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:164
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:140
+>>>>>>> MERGE-SOURCE
 msgid "Curr. Balance"
 msgstr "Balance Act."
 
-#. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_move_line
-msgid "Journal Items"
-msgstr "Apuntes contables"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:416
-#, python-format
-msgid "Invalid query mode"
-msgstr "Modo de consulta inválido"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:188
-#, python-format
-msgid "Unsuported filter"
-msgstr "Filtro no soportado"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:62
-#, python-format
-msgid "All accounts"
-msgstr "Todas las cuentas"
-
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:22
+msgid "Opening Entries"
+msgstr "Apuntes de Apertura"
+
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: constraint:account.move.line:0
 msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
@@ -1238,6 +909,17 @@
 #, python-format
 msgid "No valid filter"
 msgstr "No hay filtro válido"
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:56
+msgid "Cobros"
+msgstr "Cobros"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_accounting_report
+msgid "Accounting Report"
+msgstr "Informe de contabilidad"
+>>>>>>> MERGE-SOURCE
 
 #. module: l10n_cr_account_financial_report_webkit
 #: model:ir.actions.report.xml,name:l10n_cr_account_financial_report_webkit.account_report_account_balances_webkit
@@ -1245,165 +927,101 @@
 msgstr "Saldo de Cuentas de Banco"
 
 #. module: l10n_cr_account_financial_report_webkit
-#: view:account.balances:0
-msgid "Account Bank Balance"
-msgstr "Saldo de Cuentas de Banco"
+#: field:open.invoices.webkit,account_report_id:0
+msgid "Account Reports"
+msgstr "Account Reports"
 
-#. module: account_financial_report_webkit
-#: view:open.invoices.webkit:0
-msgid "Clearance Analysis Options"
-msgstr "Opciones de Análisis de Liquidación"
+#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,enable_filter:0
+msgid "Enable Comparison"
+msgstr "Enable Comparison"
 
 #. module: l10n_cr_account_financial_report_webkit
 #: help:account.account,report_currency_id:0
 msgid "Currency to show in the reports."
 msgstr "Moneda para mostrar en los reportes."
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:97
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:106
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:120
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:143
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:119
+>>>>>>> MERGE-SOURCE
 msgid "Journal"
 msgstr "Asiento"
 
-#. module: account_financial_report_webkit
-#: field:general.ledger.webkit,amount_currency:0
-#: field:open.invoices.webkit,amount_currency:0
-#: field:partners.ledger.webkit,amount_currency:0
-msgid "With Currency"
-msgstr "Con Moneda"
-
-#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,result_selection:0
-#: field:partner.balance.webkit,result_selection:0
-#: field:partners.ledger.webkit,result_selection:0
-msgid "Partner's"
-msgstr "Tipo de Cuentas"
-
-#. module: account_financial_report_webkit
-#: view:general.ledger.webkit:0
-msgid "This report allows you to print or generate a pdf of your general ledger with details of all your account journals"
-msgstr "Este informe le permite imprimir o generar un PDF de su libro mayor con detalles de sus asientos contables"
-
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:39
-#, python-format
-msgid "PROFIT AND LOSS"
-msgstr "PÉRDIDAS Y GANANCIAS"
+#. module: l10n_cr_account_financial_report_webkit
+#: view:account.balances:0
+msgid "Accounts Filters"
+msgstr "Filtros de Cuentas"
 
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:149
 msgid "Nota: "
 msgstr "Nota: "
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,chart_account_id:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:27
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:33
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:40
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:28
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:39
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:52
-#: field:general.ledger.webkit,chart_account_id:0
-#: field:open.invoices.webkit,chart_account_id:0
-#: field:partner.balance.webkit,chart_account_id:0
-#: field:partners.ledger.webkit,chart_account_id:0
-#: field:trial.balance.webkit,chart_account_id:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,chart_account_id:0
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:54
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:17
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:28
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:30
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:27
+>>>>>>> MERGE-SOURCE
 msgid "Chart of Account"
 msgstr "Plan Contable"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:167
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:133
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:148
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:191
 msgid "Difference"
 msgstr "Diferencia"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,target_move:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:44
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:51
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62
-#: field:general.ledger.webkit,target_move:0
-#: field:open.invoices.webkit,target_move:0
-#: field:partner.balance.webkit,target_move:0
-#: field:partners.ledger.webkit,target_move:0
-#: field:trial.balance.webkit,target_move:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,target_move:0
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:64
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:38
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:40
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:37
+>>>>>>> MERGE-SOURCE
 msgid "Target Moves"
 msgstr "Movimientos Destino"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:44
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:51
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:58
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:45
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:56
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:69
+#. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:71
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:31
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:45
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:47
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:44
+>>>>>>> MERGE-SOURCE
 msgid "From:"
 msgstr "Desde:"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,comp0_date_to:0
-#: field:account.common.balance.report,comp1_date_to:0
-#: field:account.common.balance.report,comp2_date_to:0
-#: field:account.common.balance.report,date_to:0
-#: field:general.ledger.webkit,date_to:0
-#: field:open.invoices.webkit,date_to:0
-#: field:partner.balance.webkit,comp0_date_to:0
-#: field:partner.balance.webkit,comp1_date_to:0
-#: field:partner.balance.webkit,comp2_date_to:0
-#: field:partner.balance.webkit,date_to:0
-#: field:partners.ledger.webkit,date_to:0
-#: field:trial.balance.webkit,comp0_date_to:0
-#: field:trial.balance.webkit,comp1_date_to:0
-#: field:trial.balance.webkit,comp2_date_to:0
-#: field:trial.balance.webkit,date_to:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,comp0_date_to:0
 #: field:account.balances,comp1_date_to:0
 #: field:account.balances,comp2_date_to:0
 #: field:account.balances,date_to:0
+#: field:open.invoices.webkit,date_to_cmp:0
 msgid "End Date"
 msgstr "Fecha Final"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: field:account.common.balance.report,comp0_period_from:0
-#: field:account.common.balance.report,comp1_period_from:0
-#: field:account.common.balance.report,comp2_period_from:0
-#: field:account.common.balance.report,period_from:0
-#: field:general.ledger.webkit,period_from:0
-#: field:open.invoices.webkit,period_from:0
-#: field:partner.balance.webkit,comp0_period_from:0
-#: field:partner.balance.webkit,comp1_period_from:0
-#: field:partner.balance.webkit,comp2_period_from:0
-#: field:partner.balance.webkit,period_from:0
-#: field:partners.ledger.webkit,period_from:0
-#: field:trial.balance.webkit,comp0_period_from:0
-#: field:trial.balance.webkit,comp1_period_from:0
-#: field:trial.balance.webkit,comp2_period_from:0
-#: field:trial.balance.webkit,period_from:0
+#. module: l10n_cr_account_financial_report_webkit
 #: field:account.balances,comp0_period_from:0
 #: field:account.balances,comp1_period_from:0
 #: field:account.balances,comp2_period_from:0
 #: field:account.balances,period_from:0
+#: field:open.invoices.webkit,period_from_cmp:0
 msgid "Start Period"
 msgstr "Período Inicial"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: field:open.invoices.webkit,until_date:0
 msgid "Clearance date"
@@ -1411,48 +1029,21 @@
 
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: model:ir.model,name:account_financial_report_webkit.model_partners_ledger_webkit
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:54
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:60
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:64
+msgid "Name"
+msgstr "Name"
+
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_partners_ledger_webkit
 msgid "Partner Ledger Report"
-msgstr "Reporte de Libro Mayor de Empresa"
-
-#. module: account_financial_report_webkit
-#: view:open.invoices.webkit:0
-#: view:partner.balance.webkit:0
-#: view:partners.ledger.webkit:0
-msgid "Partners Filters"
-msgstr "Filtros de Empresas"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,comp0_filter:0
-#: field:account.common.balance.report,comp0_fiscalyear_id:0
-#: selection:account.common.balance.report,comp1_filter:0
-#: field:account.common.balance.report,comp1_fiscalyear_id:0
-#: selection:account.common.balance.report,comp2_filter:0
-#: field:account.common.balance.report,comp2_fiscalyear_id:0
-#: field:account.common.balance.report,fiscalyear_id:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:28
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:34
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:41
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:29
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:40
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:53
-#: field:general.ledger.webkit,fiscalyear_id:0
-#: field:open.invoices.webkit,fiscalyear_id:0
-#: selection:partner.balance.webkit,comp0_filter:0
-#: field:partner.balance.webkit,comp0_fiscalyear_id:0
-#: selection:partner.balance.webkit,comp1_filter:0
-#: field:partner.balance.webkit,comp1_fiscalyear_id:0
-#: selection:partner.balance.webkit,comp2_filter:0
-#: field:partner.balance.webkit,comp2_fiscalyear_id:0
-#: field:partner.balance.webkit,fiscalyear_id:0
-#: field:partners.ledger.webkit,fiscalyear_id:0
-#: selection:trial.balance.webkit,comp0_filter:0
-#: field:trial.balance.webkit,comp0_fiscalyear_id:0
-#: selection:trial.balance.webkit,comp1_filter:0
-#: field:trial.balance.webkit,comp1_fiscalyear_id:0
-#: selection:trial.balance.webkit,comp2_filter:0
-#: field:trial.balance.webkit,comp2_fiscalyear_id:0
-#: field:trial.balance.webkit,fiscalyear_id:0
+msgstr "Partner Ledger Report"
+
+#. module: l10n_cr_account_financial_report_webkit
 #: selection:account.balances,comp0_filter:0
 #: field:account.balances,comp0_fiscalyear_id:0
 #: selection:account.balances,comp1_filter:0
@@ -1461,17 +1052,28 @@
 #: field:account.balances,comp2_fiscalyear_id:0
 #: field:account.balances,fiscalyear_id:0
 #: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:55
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:18
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:29
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:31
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:28
+#: field:open.invoices.webkit,fiscalyear_id_cmp:0
+>>>>>>> MERGE-SOURCE
 msgid "Fiscal Year"
 msgstr "Año Fiscal"
 
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:130
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:153
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:129
+>>>>>>> MERGE-SOURCE
 msgid "Payments"
 msgstr "Pagos"
 
+<<<<<<< TREE
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:150
 msgid "In the event of any foreign currencies the Total Balance was calculated according to the exchange rate of the day "
@@ -1486,24 +1088,25 @@
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104
+=======
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:118
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:141
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:117
+>>>>>>> MERGE-SOURCE
 msgid "Entry"
 msgstr "Apunte"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/general_ledger.py:64
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:75
-#: code:addons/account_financial_report_webkit/report/partner_balance.py:63
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:64
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:68
-#: code:addons/account_financial_report_webkit/report/trial_balance.py:64
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:68
+#. module: l10n_cr_account_financial_report_webkit
 #: code:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_open_invoices.py:64
 #, python-format
 msgid "Page"
 msgstr "Página"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:50
 msgid "Partners Filter"
@@ -1537,43 +1140,41 @@
 
 #. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:95
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:46
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:48
+msgid "Estado de Cuenta en "
+msgstr "Estado de Cuenta en "
+
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:109
+<<<<<<< TREE
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:126
+=======
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:108
+>>>>>>> MERGE-SOURCE
 msgid "No Partner"
 msgstr "No hay Empresa"
 
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:53
+#. module: l10n_cr_account_financial_report_webkit
 #: code:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_open_invoices.py:49
 #, python-format
 msgid "OPEN INVOICES REPORT"
 msgstr "REPORTE DE FACTURAS PENDIENTES"
 
-#. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:41
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:58
-#, python-format
-msgid "PARTNER LEDGER"
-msgstr "LIBRO MAYOR DE EMPRESA"
-
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: selection:account.common.balance.report,target_move:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:84
-#: selection:general.ledger.webkit,target_move:0
-#: selection:open.invoices.webkit,target_move:0
-#: selection:partner.balance.webkit,target_move:0
-#: selection:partners.ledger.webkit,target_move:0
-#: selection:trial.balance.webkit,target_move:0
-#: selection:account.balances,target_move:0
-#, python-format
-msgid "All Entries"
-msgstr "Todos los Apuntes"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:133
+msgid "SAlDO TOTAL en "
+msgstr "SAlDO TOTAL en "
 
 #. module: l10n_cr_account_financial_report_webkit
 #: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:55
 msgid "Due Date"
 msgstr "Fecha de Vencimiento"
 
+<<<<<<< TREE
 #. module: account_financial_report_webkit
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
@@ -1594,6 +1195,14 @@
 #: field:trial.balance.webkit,comp0_filter:0
 #: field:trial.balance.webkit,comp1_filter:0
 #: field:trial.balance.webkit,comp2_filter:0
+=======
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:287
+msgid "Total"
+msgstr "Total"
+
+#. module: l10n_cr_account_financial_report_webkit
+>>>>>>> MERGE-SOURCE
 #: field:account.balances,comp0_filter:0
 #: field:account.balances,comp1_filter:0
 #: field:account.balances,comp2_filter:0

=== modified file 'l10n_cr_account_financial_report_webkit/report/__init__.py'
--- l10n_cr_account_financial_report_webkit/report/__init__.py	2012-06-13 20:01:31 +0000
+++ l10n_cr_account_financial_report_webkit/report/__init__.py	2012-07-04 21:58:18 +0000
@@ -1,4 +1,5 @@
-from . import l10n_cr_partners_ledger
-from . import l10n_cr_open_invoices
-from . import l10n_cr_partner_balance
-from . import account_bank_balances
+import l10n_cr_partners_ledger
+import l10n_cr_open_invoices
+import l10n_cr_partner_balance
+import account_bank_balances
+import l10n_cr_account_financial_report

=== added file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako	2012-07-04 21:58:18 +0000
@@ -0,0 +1,144 @@
+<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+<head>
+   <style type="text/css">
+        .overflow_ellipsis {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+        ${css}
+    </style>
+</head>
+<body>      
+    <div style="font-size: 25px; font-weight: bold; text-align: center; align=center;">${ data['form']['account_report_id'][1] }</div>
+    <div class="act_as_table data_table">
+        <div class="act_as_row labels">
+            <div class="act_as_cell">${_('Chart of Account')}</div>
+            <div class="act_as_cell">${_('Fiscal Year')}</div>
+            <div class="act_as_cell">
+                %if filter_form(data) == 'filter_date':
+                    ${_('Dates Filter')}
+                %else:
+                    ${_('Periods Filter')}
+                %endif
+            </div>
+        </div>
+        <div class="act_as_row">
+            <div class="act_as_cell">${ get_account(data) }</div>
+            <div class="act_as_cell">${ get_fiscalyear(data) if get_fiscalyear(data) else '-' }</div>
+            <div class="act_as_cell">
+                ${_('From:')}
+                %if filter_form(data) == 'filter_date':
+                    ${formatLang(get_start_date(data), date=True) if get_start_date(data) else u'' }
+                %else:
+                    ${ get_start_period(data) if  get_start_period(data) else u''}
+                %endif
+                ${_('To:')}
+                %if filter_form(data) == 'filter_date':
+                    ${ formatLang(get_end_date(data), date=True) if get_end_date(data) else u'' }
+                %else:
+                    ${get_end_period(data) if get_end_period(data) else u'' }
+                %endif
+            </div>
+        </div>
+    </div>
+    <%
+    get_lines_report = get_lines(data)
+    %>
+    <div class="" style="margin-top: 20px; font-size: 14px; width: 1080px;"></div>      
+    <div class="act_as_table list_table">
+        <div class="act_as_thead" style="vertical-align: right;">
+            <div class="act_as_row labels" style="font-weight: bold; font-size: 11x; vertical-align: right;">
+                %if data['form']['debit_credit'] == 1: 
+                    <div class="act_as_cell first_column" style="width: 200px;  vertical-align: right; align:right;">${_('Name')}</div>                
+                    <div class="act_as_cell" style="width: 100px;  vertical-align: right; align:right;">${_('Debit')}</div>
+                    <div class="act_as_cell" style="width: 100px;  vertical-align: right; align:right;">${_('Credit')}</div>
+                    <div class="act_as_cell" style="width: 100px;  vertical-align: right; align:right;">${_('Balance')}</div>
+                %endif
+                %if not data['form']['enable_filter'] and not data['form']['debit_credit']:
+                    <div class="act_as_cell first_column" style="width: 200px;  vertical-align: right; align:right;">${_('Name')}</div>  
+                    <div class="act_as_cell" style="width: 100px;  vertical-align: right; align:right;">${_('Balance')}</div>
+                %endif
+                %if data['form']['enable_filter'] == 1 and not data['form']['debit_credit']:
+                    <div class="act_as_cell first_column" style="width: 200px;  vertical-align: right; align:right;">${_('Name')}</div>  
+                    <div class="act_as_cell" style="width: 100px;  vertical-align: right; align:right;">${_('Balance')}</div>
+                    <div class="act_as_cell" style="width: 100px;  vertical-align: right; align:right;">${_(data['form']['label_filter'])}</div>
+                %endif
+            </div>
+        </div>        
+        <div class="act_as_tbody">
+            %for line in get_lines_report:
+                %if ((line['type'] == 'account' and line['account_type'] == 'account') or line['type'] == 'report'):
+                    <%bold = True%>
+                %else:
+                    <%bold = False%>
+                %endif
+            <div class="act_as_row lines"> 
+                %if data['form']['debit_credit'] == 1:
+                    %if line['level'] > 0:
+                        <div class="act_as_cell" style="padding-left:${line['level']*10}px">
+                        %if bold: 
+                            <div class="act_as_cell" ><b>${line['name']}</b></div>
+                        %else:
+                            <div class="act_as_cell" >${line['name']}</div>
+                        %endif
+                        </div>
+                        <div class="act_as_cell amount" >${line['debit']}</div>
+                        <div class="act_as_cell amount" >${line['credit']}</div>
+                        <div class="act_as_cell amount" >${line['balance']}</div>                         
+                    %else:                         
+                        %if bold: 
+                            <div class="act_as_cell" ><b>${line['name']}</b></div>
+                        %else:
+                            <div class="act_as_cell" >${line['name']}</div>
+                        %endif
+                        <div class="act_as_cell amount" >${line['debit']}</div>
+                        <div class="act_as_cell amount" >${line['credit']}</div>
+                        <div class="act_as_cell amount" >${line['balance']}</div>  
+                    %endif
+                %endif
+                %if not data['form']['enable_filter'] and not data['form']['debit_credit']:
+                    %if line['level'] > 0: 
+                        <div class="act_as_cell" style="padding-left:${line['level']*10}px">
+                            %if bold: 
+                                <div class="act_as_cell" ><b>${line['name']}</b></div>
+                            %else:
+                                <div class="act_as_cell" >${line['name']}</div>
+                            %endif
+                        </div>
+                        <div class="act_as_cell amount" >${line['balance']}</div>
+                    %else:
+                        %if bold: 
+                            <div class="act_as_cell" ><b>${line['name']}</b></div>
+                        %else:
+                            <div class="act_as_cell" >${line['name']}</div>
+                        %endif
+                        <div class="act_as_cell amount" >${line['balance']}</div>
+                    %endif
+                %endif
+                %if data['form']['enable_filter'] == 1 and not data['form']['debit_credit']:
+                    %if line['level'] > 0:
+                        <div class="act_as_cell" style="padding-left:${line['level']*10}px">
+                            %if bold: 
+                                <div class="act_as_cell" ><b>${line['name']}</b></div>
+                            %else:
+                                <div class="act_as_cell" >${line['name']}</div>
+                            %endif
+                        </div>
+                        <div class="act_as_cell amount" >${line['balance']}</div>                            
+                    %else:
+                        %if bold: 
+                            <div class="act_as_cell" ><b>${line['name']}</b></div>
+                        %else:
+                            <div class="act_as_cell">${line['name']}</div>
+                        %endif
+                        <div class="act_as_cell amount" >${line['balance']}</div>    
+                    %endif
+                %endif 
+            </div>
+            %endfor  
+        </div>
+    </div>
+</body>
+</html>

=== added file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.py'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.py	2012-07-04 21:58:18 +0000
@@ -0,0 +1,48 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from report import report_sxw
+from account_financial_report_webkit.report.common_reports import CommonReportHeaderWebkit
+from account.report.account_financial_report import report_account_common
+
+class l10n_cr_account_financial_report_parser(report_sxw.rml_parse,CommonReportHeaderWebkit):
+
+    def __init__( self, cr, uid, name, context = None ):
+        super(l10n_cr_account_financial_report_parser, self).__init__(cr, uid, name, context=context)
+        account = report_account_common(cr,uid,name,context=context)
+       
+        self.localcontext.update( {           
+            'get_lines': account.get_lines,
+            'filter_form': self._get_filter,
+            'get_fiscalyear': self._get_fiscalyear,
+            'get_account': self._get_account,
+            'get_start_period': self.get_start_period,
+            'get_end_period': self.get_end_period,
+            'get_filter': self._get_filter,
+            'get_start_date':self._get_start_date,
+            'get_end_date':self._get_end_date,
+        })        
+        self.context = context        
+    
+#the parameters are the report name and module name 
+report_sxw.report_sxw( 'report.account_financial_report_webkit', 'account.financial.report',
+                       'addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako', parser = l10n_cr_account_financial_report_parser, header = 'internal' )
+
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako	2012-07-03 21:28:44 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako	2012-07-04 21:58:18 +0000
@@ -7,7 +7,6 @@
                 overflow: hidden;
                 white-space: nowrap;
             }
-
             ${css}
         </style>
     </head>

=== modified file 'l10n_cr_account_financial_report_webkit/report/report.xml'
--- l10n_cr_account_financial_report_webkit/report/report.xml	2012-06-13 20:01:31 +0000
+++ l10n_cr_account_financial_report_webkit/report/report.xml	2012-07-04 21:58:18 +0000
@@ -50,7 +50,22 @@
              <field name="report_rml">l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako</field>
              <field name="report_file">l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako</field>
              <field name="webkit_header" ref="financial_portrait_header"/>
-         </record> 
-
+         </record>
+         <!--
+         <record id="l10n_cr_account_financial_report" model="ir.actions.report.xml">
+             <field name="report_type">webkit</field>
+             <field name="report_name">account_financial_report_webkit</field>
+             <field eval="[(6,0,[])]" name="groups_id"/>
+             <field eval="0" name="multi"/>
+             <field eval="0" name="auto"/>
+             <field eval="1" name="header"/>
+             <field name="model">account.financial.report</field>
+             <field name="type">ir.actions.report.xml</field>
+             <field name="name">Account Financial Report</field>
+             <field name="report_rml">l10n_cr_account_financial_report_webkit/report/account_financial_report.mako</field>
+             <field name="report_file">l10n_cr_account_financial_report_webkit/report/account_financial_report.mako</field>
+             <field name="webkit_header" ref="financial_landscape_header"/>
+         </record>
+         -->
     </data>
 </openerp>

=== modified file 'l10n_cr_account_financial_report_webkit/wizard/__init__.py'
--- l10n_cr_account_financial_report_webkit/wizard/__init__.py	2012-06-13 20:01:31 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/__init__.py	2012-07-04 21:58:18 +0000
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 
-from . import partners_ledger_wizard
-from . import open_invoices_wizard
-from . import account_bank_balances_wizard
-#from . import account_report_profit_loss_wizard
+import partners_ledger_wizard
+import open_invoices_wizard
+import account_bank_balances_wizard
+import l10n_cr_account_financial_report_wizard

=== added file 'l10n_cr_account_financial_report_webkit/wizard/l10n_cr_account_financial_report_wizard.py'
--- l10n_cr_account_financial_report_webkit/wizard/l10n_cr_account_financial_report_wizard.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/l10n_cr_account_financial_report_wizard.py	2012-07-04 21:58:18 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class l10n_cr_AccountFinancialReportWizard( osv.osv_memory ):
+
+    _inherit = "accounting.report"
+    _name = "accounting.report"
+
+    def _print_report( self, cr, uid, ids, data, context = None ):
+        data['form'].update( self.read( cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter'], context = context )[0] )
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account_financial_report_webkit',
+            'datas': data,
+        }
+
+

=== modified file 'l10n_cr_account_financial_report_webkit/wizard/open_invoices_wizard.py'
--- l10n_cr_account_financial_report_webkit/wizard/open_invoices_wizard.py	2012-06-05 20:10:55 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/open_invoices_wizard.py	2012-07-04 21:58:18 +0000
@@ -26,7 +26,7 @@
 class l10n_cr_AccountReportOpenInvoicesWizard(osv.osv_memory):
     """Will launch partner ledger report and pass required args"""
 
-    _inherit = "open.invoices.webkit"
+    _inherit = "accounting.report"
     _name = "open.invoices.webkit"
     _description = "Open Invoices Report"
 

=== modified file 'l10n_cr_hr_payroll/report/payroll_report.mako'
--- l10n_cr_hr_payroll/report/payroll_report.mako	2012-06-13 20:01:31 +0000
+++ l10n_cr_hr_payroll/report/payroll_report.mako	2012-07-04 21:58:18 +0000
@@ -63,8 +63,8 @@
 		    %>
 		    <div class="account_title bg" style="margin-top: 20px; font-size: 12px; width: 1080px;">${department[0]}</div>
 		    <div class="act_as_table list_table">
-		    <div class="act_as_thead">
-			<div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
+                <div class="act_as_thead">
+                    <div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
 			    <div class="act_as_cell first_column" style="width: 85px;  vertical-align: middle">${_('Cedula')}</div>
 			    <div class="act_as_cell" style="width: 230px;  vertical-align: middle">${_('Nombre')}</div>
 			    <div class="act_as_cell amount" style="width: 40px;">${_('Hrs.')}<br />${_('Nor')}</div>