clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00180
lp:~as.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit into lp:openerp-costa-rica/6.1
Armando Soto Rodríguez has proposed merging lp:~as.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit into lp:openerp-costa-rica/6.1.
Requested reviews:
CLEARCORP drivers (clearcorp-drivers)
For more details, see:
https://code.launchpad.net/~as.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit/+merge/110157
[FIX] Removed colums in payroll_report.mako
[FIX] Added translations
[ADD] Added account_bank_balances report
--
https://code.launchpad.net/~as.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit/+merge/110157
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.
=== modified file 'l10n_cr_account_financial_report_webkit/__openerp__.py'
--- l10n_cr_account_financial_report_webkit/__openerp__.py 2012-06-04 14:27:42 +0000
+++ l10n_cr_account_financial_report_webkit/__openerp__.py 2012-06-13 20:11:20 +0000
@@ -90,6 +90,8 @@
'update_xml': ['account_move_line_view.xml',
'data/financial_webkit_header.xml',
'report/report.xml',
+ 'wizard/account_bank_balances_wizard_view.xml',
+ 'report_menus.xml'
],
'test': [],
'active': False,
=== modified file 'l10n_cr_account_financial_report_webkit/i18n/es_CR.po'
--- l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-06-05 19:51:03 +0000
+++ l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-06-13 20:11:20 +0000
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 21:58+0000\n"
-"PO-Revision-Date: 2012-06-02 21:58+0000\n"
+"POT-Creation-Date: 2012-06-13 17:11+0000\n"
+"PO-Revision-Date: 2012-06-13 17:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,29 +17,11 @@
"Plural-Forms: \n"
#. 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:31
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:28
-msgid "Chart of Account"
-msgstr "Plan Contable"
-
-
-#. module: 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
+#: field:account.balances,account_ids:0
msgid "Filter on accounts"
msgstr "Filtro en las cuentas"
@@ -59,7 +41,7 @@
#. modules: l10n_cr_account_financial_report_webkit, 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:230
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:226
msgid "Cumulated Balance on Account"
msgstr "Saldo Acumulado en la Cuenta"
@@ -68,13 +50,15 @@
msgid "Activate Centralization"
msgstr "Activar Centralización"
-#. module: account_financial_report_webkit
+#. 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
+#: 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"
@@ -84,9 +68,10 @@
msgid "Misc."
msgstr "Misc."
-#. module: account_financial_report_webkit
+#. 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:114
msgid "Periods Filter:"
msgstr "Filtro por Períodos:"
@@ -106,15 +91,16 @@
#: 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 "Balance de Sumas y Saldos"
+msgstr "Trial Balance Webkit"
-#. module: account_financial_report_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
+#: field:account.balances,company_id:0
msgid "Company"
msgstr "Compañía"
@@ -128,13 +114,14 @@
msgid "Account / Partner Name"
msgstr "Cuenta / Nombre de Empresa"
-#. module: account_financial_report_webkit
+#. 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
+#: field:account.balances,journal_ids:0
msgid "Journals"
msgstr "Asientos"
@@ -154,10 +141,11 @@
msgid "Receivable and Payable Accounts"
msgstr "Cuentas por Cobrar y por Pagar"
-#. module: account_financial_report_webkit
+#. 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:156
msgid "Account"
msgstr "Cuenta"
@@ -168,19 +156,25 @@
msgstr "BALANCE DE SUMAS Y SALDOS"
#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:120
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:115
msgid "Due Date"
-msgstr "Fecha de Vencimiento"
+msgstr "Due Date"
-#. module: account_financial_report_webkit
+#. 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
+#: view:account.balances:0
msgid "Print only"
msgstr "Imprimir sólo"
+#. 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: account_financial_report_webkit
#: model:ir.model,name:account_financial_report_webkit.model_partner_balance_webkit
msgid "Partner Balance Report"
@@ -194,6 +188,11 @@
msgid "Webkit render"
msgstr "Webkit render"
+#. 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: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:165
#, python-format
@@ -205,8 +204,9 @@
msgid "Trial Balance Report"
msgstr "Informe de sumas y saldos"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:117
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:154
msgid "Code"
msgstr "Código"
@@ -217,9 +217,15 @@
msgstr "Libro Mayor de Empresa"
#. 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
+#: field:account.balances,display_account:0
msgid "Display Accounts"
msgstr "Mostrar Cuentas"
@@ -247,12 +253,12 @@
#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit
#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit
msgid "General Ledger Webkit"
-msgstr "Libro Mayor Webkit"
+msgstr "Libro Mayor"
#. 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:118
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:118
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:113
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:118
msgid "Rec."
msgstr "Rec."
@@ -267,8 +273,9 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:39
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:34
+#: 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_report_open_invoices.mako:37
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:34
msgid "Periods Filter"
msgstr "Filtro por Períodos"
@@ -289,8 +296,10 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:39
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:166
+#: 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_partners_ledger.mako:39
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:166
msgid "Initial Balance"
msgstr "Saldo Inicial"
@@ -315,31 +324,43 @@
msgid "Displayed Accounts"
msgstr "Cuentas Mostradas"
+#. 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/templates/l10n_cr_account_report_open_invoices.mako:114
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:114
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:109
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:114
msgid "Partner"
msgstr "Empresa"
-#. module: account_financial_report_webkit
+#. 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
+#: help:account.balances,chart_account_id:0
msgid "Select Charts of Accounts"
msgstr "Seleccione los Planes Contables"
-#. module: account_financial_report_webkit
+#. 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
+#: field:account.balances,filter:0
msgid "Filter by"
msgstr "Filtrar por"
@@ -353,24 +374,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:114
#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:123
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:131
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:135
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:126
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:135
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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:116
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:116
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:111
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:116
msgid "Label"
msgstr "Etiqueta"
-#. module: account_financial_report_webkit
+#. 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
+#: 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."
@@ -380,8 +402,9 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:122
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:126
+#: 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_report_open_invoices.mako:117
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:126
msgid "Debit"
msgstr "Débito"
@@ -391,18 +414,19 @@
msgid "Please set a header in company settings"
msgstr "Por favor, establecer un encabezado en la configuración de la compañía"
-#. module: account_financial_report_webkit
+#. 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
+#: view:account.balances:0
msgid "Time Filters"
msgstr "Filtros de Tiempo"
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:224
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:195
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:191
msgid "Cumulated Balance on Partner"
msgstr "Saldo acumulado en empresa"
@@ -410,7 +434,7 @@
#: 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 "Balance de Empresa Webkit"
+msgstr "Estado de Cuenta de Empresa"
#. module: account_financial_report_webkit
#: help:open.invoices.webkit,until_date:0
@@ -429,7 +453,7 @@
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:42
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:40
msgid "Clearance Date"
msgstr "Fecha de Liquidación"
@@ -438,22 +462,44 @@
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: account_financial_report_webkit
+#. 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"
#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:257
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:300
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:257
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:300
msgid "Saldo"
msgstr "Saldo"
-#. module: account_financial_report_webkit
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:114
+msgid "')}</div>\n"
+" <div class=\"act_as_cell amount\">${move_line.currency_id.symbol} ${formatLang(total_debit_curr)}</div>\n"
+" <div class=\"act_as_cell amount\">${move_line.currency_id.symbol} ${formatLang(total_credit_curr)}</div>\n"
+" %else:\n"
+" <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\">${_('"
+msgstr "')}</div>\n"
+" <div class=\"act_as_cell amount\">${move_line.currency_id.symbol} ${formatLang(total_debit_curr)}</div>\n"
+" <div class=\"act_as_cell amount\">${move_line.currency_id.symbol} ${formatLang(total_credit_curr)}</div>\n"
+" %else:\n"
+" <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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:116
msgid "Fiscal Year :"
msgstr "Año Fiscal :"
@@ -462,6 +508,11 @@
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
@@ -492,7 +543,13 @@
msgid "Dates : "
msgstr "Fechas : "
-#. module: account_financial_report_webkit
+#. 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
@@ -508,6 +565,10 @@
#: field:trial.balance.webkit,comp1_period_to:0
#: field:trial.balance.webkit,comp2_period_to:0
#: field:trial.balance.webkit,period_to:0
+#: 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
msgid "End Period"
msgstr "Período Final"
@@ -522,17 +583,18 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:43
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:37
+#: 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:41
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:37
msgid "Accounts Filter"
msgstr "Filtro por Cuentas"
#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:128
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:128
msgid "Manual Move"
msgstr "Movimiento Manual"
-#. module: account_financial_report_webkit
+#. 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
@@ -545,20 +607,25 @@
#: selection:trial.balance.webkit,comp1_filter:0
#: selection:trial.balance.webkit,comp2_filter:0
#: selection:trial.balance.webkit,filter:0
+#: selection:account.balances,comp0_filter:0
+#: selection:account.balances,comp1_filter:0
+#: selection:account.balances,comp2_filter:0
+#: selection:account.balances,filter:0
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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:67
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:60
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:65
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:60
msgid "Custom Filter"
msgstr "Filtro Personalizado"
-#. module: account_financial_report_webkit
+#. 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:112
msgid "Dates Filter:"
msgstr "Filtro por Fechas:"
@@ -567,10 +634,11 @@
msgid "Fiscal Year : "
msgstr "Año Fiscal : "
-#. module: account_financial_report_webkit
+#. 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 movements"
msgstr "Con movimientos"
@@ -581,6 +649,7 @@
#: constraint:partner.balance.webkit:0
#: constraint:partners.ledger.webkit:0
#: constraint:trial.balance.webkit:0
+#: constraint:account.balances: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."
@@ -589,8 +658,8 @@
#. 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:126
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:130
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:121
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:130
msgid "Cumul. Bal."
msgstr "Bal. Acumul."
@@ -599,7 +668,8 @@
#: 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/templates/l10n_cr_account_report_partners_ledger.mako:23
+#: 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_partners_ledger.mako:23
msgid "Computed"
msgstr "Procesado"
@@ -649,7 +719,7 @@
"You can not define children to an account with internal type different of \"View\"! "
msgstr "¡Error de configuración! "
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: field:account.common.balance.report,comp0_date_from:0
#: field:account.common.balance.report,comp1_date_from:0
#: field:account.common.balance.report,comp2_date_from:0
@@ -665,6 +735,10 @@
#: field:trial.balance.webkit,comp1_date_from:0
#: field:trial.balance.webkit,comp2_date_from:0
#: field:trial.balance.webkit,date_from:0
+#: 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
msgid "Start Date"
msgstr "Fecha de Inicio"
@@ -673,7 +747,8 @@
#: 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/templates/l10n_cr_account_report_partners_ledger.mako:23
+#: 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_partners_ledger.mako:23
msgid "Opening Entries"
msgstr "Apuntes de Apertura"
@@ -689,6 +764,11 @@
msgid "Level %s"
msgstr "Nivel %s"
+#. 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."
@@ -706,31 +786,53 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:23
+#: 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_partners_ledger.mako:23
msgid "No"
msgstr "No"
-#. module: account_financial_report_webkit
+#. 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"
+
+#. 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
#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:107
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:119
msgid "Initial Balance:"
msgstr "Balance Inicial:"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: 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
+#: 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
+#: 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 "
+
#. 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:110
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:110
-msgid "Entry"
-msgstr "Apunte"
+#: 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:partner.balance.webkit,comp0_filter:0
+#: selection:partner.balance.webkit,comp1_filter:0
+#: selection:partner.balance.webkit,comp2_filter:0
+#: selection:trial.balance.webkit,comp0_filter:0
+#: selection:trial.balance.webkit,comp1_filter:0
+#: selection:trial.balance.webkit,comp2_filter:0
+#: 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
@@ -779,6 +881,11 @@
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/l10n_cr_account_report_partner_balance.mako:111
+msgid "SALDO"
+msgstr "SALDO"
+
#. module: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:165
#, python-format
@@ -803,8 +910,12 @@
#: selection:trial.balance.webkit,comp1_filter:0
#: selection:trial.balance.webkit,comp2_filter:0
#: selection:trial.balance.webkit,filter:0
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:106
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:106
+#: 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:101
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:106
msgid "Date"
msgstr "Fecha"
@@ -830,6 +941,7 @@
#: constraint:partner.balance.webkit:0
#: constraint:partners.ledger.webkit:0
#: constraint:trial.balance.webkit:0
+#: 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."
@@ -842,10 +954,11 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:57
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:51
+#: 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_report_open_invoices.mako:55
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:51
msgid "To:"
-msgstr "Para:"
+msgstr "Hasta:"
#. module: account_financial_report_webkit
#: sql_constraint:account.account:0
@@ -859,7 +972,7 @@
msgid "Open Invoices"
msgstr "Facturas Pendientes"
-#. module: account_financial_report_webkit
+#. 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:82
#: selection:general.ledger.webkit,target_move:0
@@ -867,15 +980,17 @@
#: 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 Posted Entries"
msgstr "Todos los apuntes publicados"
-#. module: account_financial_report_webkit
+#. 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:109
#, python-format
msgid "Comparison %s"
msgstr "Comparación %s"
@@ -887,13 +1002,14 @@
msgid "No accounts to print."
msgstr "No hay cuentas para imprimir."
-#. module: account_financial_report_webkit
+#. 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
+#: help:account.balances,fiscalyear_id:0
msgid "Keep empty for all open fiscal year"
msgstr "Mantenga vacío para todos los años fiscales abiertos"
@@ -908,18 +1024,20 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:124
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:124
+#: 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_report_open_invoices.mako:119
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:124
msgid "Credit"
msgstr "Crédito"
-#. module: account_financial_report_webkit
+#. 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
+#: selection:account.balances,filter:0
msgid "No Filters"
msgstr "Sin Filtros"
@@ -930,10 +1048,16 @@
msgid "Error"
msgstr "Error"
-#. module: account_financial_report_webkit
+#. 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 "Account Balances Report"
+
+#. 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
msgid "Balance"
msgstr "Balance"
@@ -942,19 +1066,21 @@
msgid "Counter part"
msgstr "Contraparte"
-#. module: account_financial_report_webkit
+#. 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:192
msgid "% Difference"
msgstr "% Diferencia"
-#. module: account_financial_report_webkit
+#. 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
+#: 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)."
@@ -978,10 +1104,11 @@
msgid "Centralized Entries"
msgstr "Apuntes Centralizados"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: view:general.ledger.webkit:0
#: view:partner.balance.webkit:0
#: view:trial.balance.webkit:0
+#: view:account.balances:0
msgid "Accounts Filters"
msgstr "Filtros de Cuentas"
@@ -991,8 +1118,9 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:37
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:32
+#: 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_report_open_invoices.mako:35
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:32
msgid "Dates Filter"
msgstr "Filtro por Fechas"
@@ -1008,7 +1136,7 @@
msgid "With transactions or non zero balance"
msgstr "With transactions or non zero balance"
-#. module: account_financial_report_webkit
+#. 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
@@ -1026,20 +1154,29 @@
#: selection:trial.balance.webkit,comp1_filter:0
#: selection:trial.balance.webkit,comp2_filter:0
#: selection:trial.balance.webkit,filter:0
+#: 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
msgid "Periods"
msgstr "Períodos"
#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:120
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:120
msgid "Invoice"
msgstr "Factura"
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.actions.report.xml,name:l10n_cr_account_financial_report_webkit.l10n_cr_partner_balance
+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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:129
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:133
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:124
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:133
msgid "Curr. Balance"
msgstr "Balance Act."
@@ -1052,7 +1189,7 @@
#: code:addons/account_financial_report_webkit/report/common_reports.py:416
#, python-format
msgid "Invalid query mode"
-msgstr "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
@@ -1066,6 +1203,11 @@
msgid "All accounts"
msgstr "Todas las cuentas"
+#. 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: 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."
@@ -1074,8 +1216,8 @@
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:93
#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:102
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:108
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:108
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:103
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:108
msgid "Period"
msgstr "Período"
@@ -1085,16 +1227,31 @@
msgid "No valid filter"
msgstr "No hay filtro válido"
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.actions.report.xml,name:l10n_cr_account_financial_report_webkit.account_report_account_balances_webkit
+msgid "Account Balances Webkit"
+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"
+
#. 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:149
+msgid "En el caso de que hayan monedas extranjeras el Saldo Total se calculó según el cambio de moneda del día "
+msgstr "En el caso de que hayan monedas extranjeras el Saldo Total se calculó según el cambio de moneda del dí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:97
#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:106
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:112
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:112
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:107
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:112
msgid "Journal"
msgstr "Asiento"
@@ -1123,10 +1280,36 @@
msgid "PROFIT AND LOSS"
msgstr "PÉRDIDAS Y GANANCIAS"
-#. module: account_financial_report_webkit
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:148
+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
+#: 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_report_open_invoices.mako:31
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:28
+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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:191
msgid "Difference"
msgstr "Diferencia"
@@ -1143,8 +1326,10 @@
#: field:partner.balance.webkit,target_move:0
#: field:partners.ledger.webkit,target_move:0
#: field:trial.balance.webkit,target_move:0
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:44
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:38
+#: 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:42
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:38
msgid "Target Moves"
msgstr "Movimientos Destino"
@@ -1155,12 +1340,13 @@
#: 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:51
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:45
+#: 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_report_open_invoices.mako:49
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:45
msgid "From:"
-msgstr "De:"
+msgstr "Desde:"
-#. module: account_financial_report_webkit
+#. 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
@@ -1176,10 +1362,14 @@
#: field:trial.balance.webkit,comp1_date_to:0
#: field:trial.balance.webkit,comp2_date_to:0
#: field:trial.balance.webkit,date_to:0
+#: 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
msgid "End Date"
msgstr "Fecha Final"
-#. module: account_financial_report_webkit
+#. 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
@@ -1195,6 +1385,10 @@
#: field:trial.balance.webkit,comp1_period_from:0
#: field:trial.balance.webkit,comp2_period_from:0
#: field:trial.balance.webkit,period_from:0
+#: 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
msgid "Start Period"
msgstr "Período Inicial"
@@ -1252,13 +1446,21 @@
#: selection:trial.balance.webkit,comp2_filter:0
#: field:trial.balance.webkit,comp2_fiscalyear_id:0
#: field:trial.balance.webkit,fiscalyear_id:0
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:32
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:29
+#: selection:account.balances,comp0_filter:0
+#: field:account.balances,comp0_fiscalyear_id:0
+#: selection:account.balances,comp1_filter:0
+#: field:account.balances,comp1_fiscalyear_id:0
+#: selection:account.balances,comp2_filter:0
+#: 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_report_open_invoices.mako:32
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:29
msgid "Fiscal Year"
msgstr "Año Fiscal"
#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:122
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:122
msgid "Payments"
msgstr "Pagos"
@@ -1268,18 +1470,13 @@
msgid "Yes"
msgstr "Sí"
-#. module: 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:partner.balance.webkit,comp0_filter:0
-#: selection:partner.balance.webkit,comp1_filter:0
-#: selection:partner.balance.webkit,comp2_filter:0
-#: selection:trial.balance.webkit,comp0_filter:0
-#: selection:trial.balance.webkit,comp1_filter:0
-#: selection:trial.balance.webkit,comp2_filter:0
-msgid "No Comparison"
-msgstr "Sin Comparació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:95
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:105
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:110
+msgid "Entry"
+msgstr "Apunte"
#. module: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/general_ledger.py:64
@@ -1298,7 +1495,7 @@
msgid "Partners Filter"
msgstr "Filtro de Empresa"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: selection:account.common.balance.report,display_account:0
#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:61
#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:75
@@ -1307,9 +1504,16 @@
#: selection:general.ledger.webkit,display_account:0
#: selection:partner.balance.webkit,display_account:0
#: selection:trial.balance.webkit,display_account:0
+#: selection:account.balances,display_account:0
+#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:98
msgid "All"
msgstr "Todos"
+#. 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: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/profit_loss.py:46
#, python-format
@@ -1318,8 +1522,8 @@
#. 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
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_open_invoices.mako:101
-#: report:addons/l10n_cr_account_financial_report_webkit/report/templates/l10n_cr_account_report_partners_ledger.mako:101
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:96
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:101
msgid "No Partner"
msgstr "No hay Empresa"
@@ -1336,7 +1540,7 @@
msgid "PARTNER LEDGER"
msgstr "LIBRO MAYOR DE EMPRESA"
-#. module: account_financial_report_webkit
+#. 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
@@ -1344,16 +1548,27 @@
#: 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:55
+msgid "Fecha de Vencimiento"
+msgstr "Fecha de Vencimiento"
+
#. module: account_financial_report_webkit
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr "¡Valor haber o debe erróneo en el asiento contable!"
-#. module: account_financial_report_webkit
+#. 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 "
+
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: field:account.common.balance.report,comp0_filter:0
#: field:account.common.balance.report,comp1_filter:0
#: field:account.common.balance.report,comp2_filter:0
@@ -1363,6 +1578,9 @@
#: field:trial.balance.webkit,comp0_filter:0
#: field:trial.balance.webkit,comp1_filter:0
#: field:trial.balance.webkit,comp2_filter:0
+#: field:account.balances,comp0_filter:0
+#: field:account.balances,comp1_filter:0
+#: field:account.balances,comp2_filter:0
msgid "Compare By"
msgstr "Comparar por"
=== modified file 'l10n_cr_account_financial_report_webkit/report/__init__.py'
--- l10n_cr_account_financial_report_webkit/report/__init__.py 2012-06-08 19:54:27 +0000
+++ l10n_cr_account_financial_report_webkit/report/__init__.py 2012-06-13 20:11:20 +0000
@@ -1,3 +1,4 @@
from . import l10n_cr_partners_ledger
from . import l10n_cr_open_invoices
from . import l10n_cr_partner_balance
+from . import account_bank_balances
=== added file 'l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako'
--- l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako 2012-06-13 20:11:20 +0000
@@ -0,0 +1,312 @@
+<!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">
+ .account_level_1 {
+ text-transform: uppercase;
+ font-size: 15px;
+ background-color:#F0F0F0;
+ }
+
+ .account_level_2 {
+ font-size: 12px;
+ background-color:#F0F0F0;
+ }
+
+ .regular_account_type {
+ font-weight: normal;
+ }
+
+ .view_account_type {
+ font-weight: bold;
+ }
+
+ .account_level_consol {
+ font-weight: normal;
+ font-style: italic;
+ }
+
+ ${css}
+
+ .list_table .act_as_row {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ font-size:10px;
+ }
+ </style>
+ </head>
+ <body>
+ <%!
+ def amount(text):
+ return text.replace('-', '‑') # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers)
+ %>
+
+ <%setLang(user.context_lang)%>
+
+ <%
+ initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}
+ filter_type = ''
+ filter_data = []
+ %>
+
+ <div class="act_as_table data_table">
+ <div class="act_as_row labels" style="font-weight: bold;">
+ <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 class="act_as_cell">${_('Accounts Filter')}</div>
+ <div class="act_as_cell">${_('Target Moves')}</div>
+ <div class="act_as_cell">${_('Initial Balance')}</div>
+ </div>
+ <div class="act_as_row">
+ <div class="act_as_cell">${ chart_account.name }</div>
+ <div class="act_as_cell">${ fiscalyear.name if fiscalyear else '-' }</div>
+ <div class="act_as_cell">
+ ${_('From:')}
+ %if filter_form(data) == 'filter_date':
+ ${formatLang(start_date, date=True) if start_date else u'' }
+ <%
+ filter_data.append(start_date)
+ filter_type = 'filter_date'
+ %>
+ %elif filter_form(data) == 'filter_period':
+ ${start_period.name if start_period else u''}
+ <%
+ filter_data.append(start_period)
+ filter_type = 'filter_period'
+ %>
+ %endif
+ ${_('To:')}
+ %if filter_form(data) == 'filter_date':
+ ${ formatLang(stop_date, date=True) if stop_date else u'' }
+ <% filter_data.append(stop_date) %>
+ %elif filter_form(data) == 'filter_period':
+ ${stop_period.name if stop_period else u'' }
+ <% filter_data.append(stop_period) %>
+ %endif
+ </div>
+ <div class="act_as_cell">
+ %if accounts(data):
+ ${', '.join([account.code for account in accounts(data)])}
+ %else:
+ ${_('All')}
+ %endif
+ </div>
+ <div class="act_as_cell">${ display_target_move(data) }</div>
+ <div class="act_as_cell">${ initial_balance_text[initial_balance_mode] }</div>
+ </div>
+ </div>
+
+ %for index, params in enumerate(comp_params):
+ <div class="act_as_table data_table">
+ <div class="act_as_row">
+ <div class="act_as_cell">${_('Comparison %s') % (index + 1,)} (${"C%s" % (index + 1,)})</div>
+ <div class="act_as_cell">
+ %if params['comparison_filter'] == 'filter_date':
+ ${_('Dates Filter:')} ${formatLang(params['start'], date=True) } - ${formatLang(params['stop'], date=True) }
+ %elif params['comparison_filter'] == 'filter_period':
+ ${_('Periods Filter:')} ${params['start'].name} - ${params['stop'].name}
+ %else:
+ ${_('Fiscal Year :')} ${params['fiscalyear'].name}
+ %endif
+ </div>
+ <div class="act_as_cell">${_('Initial Balance:')} ${ initial_balance_text[params['initial_balance_mode']] }</div>
+ </div>
+ </div>
+ %endfor
+
+
+ <%
+ last_child_consol_ids = []
+ last_level = False
+
+ bank_accounts = get_bank_accounts(cr, uid, objects)
+ accounts_currency = accounts_by_currency(cr, uid, bank_accounts)
+ total_balance = 0.0
+
+ %>
+ %for currency in accounts_currency:
+ <%
+ total_tefs_curr = 0.0
+ total_checks_curr = 0.0
+ total_deposit_curr = 0.0
+ total_debit_curr = 0.0
+ total_credit_curr = 0.0
+ account_balance = 0.0
+ total_balance_curr = 0.0
+ total_inital_balance_curr = 0.0
+ %>
+ %if currency[0] != None:
+ <div class="account_title bg" style="margin-top: 20px; font-size: 12px; width: 700px;">${_('Account Bank Balance in ')} ${currency[0]}</div>
+ %else:
+ <div class="account_title bg" style="margin-top: 20px; font-size: 12px; width: 700px;">${_('Account Bank Balance in ')} ${company.currency_id.name}</div>
+ %endif
+ <div class="act_as_table list_table" style="margin-top: 10px;">
+ <div class="act_as_thead">
+ <div class="act_as_row labels" style="font-weight: bold;">
+ ## code
+ <div class="act_as_cell first_column" style="width: 40px;">${_('Code')}</div>
+ ## account name
+ <div class="act_as_cell" style="width: 80px;">${_('Account')}</div>
+ %if comparison_mode == 'no_comparison':
+ %if initial_balance_mode:
+ ## initial balance
+ <div class="act_as_cell amount" style="width: 50px;">${_('Initial Balance')}</div>
+ %endif
+ ## TEFS
+ <div class="act_as_cell amount" style="width: 50px;">${_('Transfers')}</div>
+ ## Checks
+ <div class="act_as_cell amount" style="width: 50px;">${_('Checks')}</div>
+ ## Deposit
+ <div class="act_as_cell amount" style="width: 50px;">${_('Deposit')}</div>
+ ## debit
+ <div class="act_as_cell amount" style="width: 50px;">${_('Debit')}</div>
+ ## credit
+ <div class="act_as_cell amount" style="width: 50px;">${_('Credit')}</div>
+ %endif
+ ## balance
+ <div class="act_as_cell amount" style="width: 50px;">
+ %if comparison_mode == 'no_comparison' or not fiscalyear:
+ ${_('Balance')}
+ %else:
+ ${_('Balance %s') % (fiscalyear.name,)}
+ %endif
+ </div>
+ %if comparison_mode in ('single', 'multiple'):
+ %for index in range(nb_comparison):
+ <div class="act_as_cell amount" style="width: 50px;">
+ %if comp_params[index]['comparison_filter'] == 'filter_year' and comp_params[index].get('fiscalyear', False):
+ ${_('Balance %s') % (comp_params[index]['fiscalyear'].name,)}
+ %else:
+ ${_('Balance C%s') % (index + 1,)}
+ %endif
+ </div>
+ %if comparison_mode == 'single': ## no diff in multiple comparisons because it shows too data
+ <div class="act_as_cell amount" style="width: 50px;">${_('Difference')}</div>
+ <div class="act_as_cell amount" style="width: 50px;">${_('% Difference')}</div>
+ %endif
+ %endfor
+ %endif
+ </div>
+ </div>
+
+ <div class="act_as_tbody">
+ %for account in sorted(currency[1], key=lambda account: account.name):
+ <%
+ move_lines = get_move_lines_account(cr, uid, filter_type, filter_data, account)
+
+ if currency[0] != None:
+ debit = get_debit_account(cr, uid, move_lines, account.currency_id.name)
+ credit = get_credit_account(cr, uid, move_lines, account.currency_id.name)
+ deposit = get_deposit_account(cr, uid, move_lines, account.currency_id.name, account)
+ tefs = get_tefs_account(cr, uid, move_lines, account.currency_id.name, account)
+ checks = get_checks_account(cr, uid, move_lines, account.currency_id.name, account)
+ else:
+ debit = get_debit_account(cr, uid, move_lines, company.currency_id.name)
+ credit = get_credit_account(cr, uid, move_lines, company.currency_id.name)
+ deposit = get_deposit_account(cr, uid, move_lines, company.currency_id.name, account)
+ tefs = get_tefs_account(cr, uid, move_lines, company.currency_id.name, account)
+ checks = get_checks_account(cr, uid, move_lines, company.currency_id.name, account)
+
+ total_tefs_curr += tefs
+ total_checks_curr += checks
+ total_deposit_curr += deposit
+ total_debit_curr += debit
+ total_credit_curr += credit
+ account_balance = debit - credit
+ total_balance_curr += account_balance
+ total_inital_balance_curr += account.init_balance
+
+ if not account.to_display:
+ continue
+
+ comparisons = account.comparisons
+
+ if account.id in last_child_consol_ids:
+ # current account is a consolidation child of the last account: use the level of last account
+ level = last_level
+ level_class = "account_level_consol"
+ else:
+ # current account is a not a consolidation child: use its own level
+ level = account.level or 0
+ level_class = "account_level_%s" % (level,)
+ last_child_consol_ids = [child_consol_id.id for child_consol_id in account.child_consol_ids]
+ last_level = account.level
+ %>
+
+ <div class="act_as_row lines ${level_class} ${"%s_account_type" % (account.type,)}">
+ ## code
+ <div class="act_as_cell first_column">${account.code}</div>
+ ## account name
+ <div class="act_as_cell">${account.name}</div>
+ %if comparison_mode == 'no_comparison':
+ %if initial_balance_mode:
+ ## opening balance
+ <div class="act_as_cell amount">${formatLang(account.init_balance) | amount}</div>
+ %endif
+ ## TEFS
+ <div class="act_as_cell amount">${formatLang(tefs) | amount}</div>
+ ## checks
+ <div class="act_as_cell amount">${formatLang(checks) | amount}</div>
+ ## deposit
+ <div class="act_as_cell amount">${formatLang(deposit) | amount}</div>
+ ## debit
+ <div class="act_as_cell amount">${formatLang(debit) | amount}</div>
+ ## credit
+ <div class="act_as_cell amount">${formatLang(credit) | amount}</div>
+ %endif
+ ## balance
+ <div class="act_as_cell amount">${formatLang(account_balance) | amount}</div>
+
+ %if comparison_mode in ('single', 'multiple'):
+ %for comp_account in comparisons:
+ <div class="act_as_cell amount">${formatLang(comp_account['balance']) | amount}</div>
+ %if comparison_mode == 'single': ## no diff in multiple comparisons because it shows too data
+ <div class="act_as_cell amount">${formatLang(comp_account['diff']) | amount}</div>
+ <div class="act_as_cell amount">
+ %if comp_account['percent_diff'] is False:
+ ${ '-' }
+ %else:
+ ${int(round(comp_account['percent_diff'])) | amount} %
+ %endif
+ </div>
+ %endif
+ %endfor
+ %endif
+ </div>
+ %endfor
+ </div>
+ <div class="act_as_tfoot">
+ <div class="act_as_row labels" style="font-weight: bold; font-size: 11x">
+ <div class="act_as_cell first_column">${_('Total')}</div>
+ <div class="act_as_cell">${' '}</div>
+ %if currency[0] != None:
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_inital_balance_curr)}</div>
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_tefs_curr)}</div>
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_checks_curr)}</div>
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_deposit_curr)}</div>
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_debit_curr)}</div>
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_credit_curr)}</div>
+ <div class="act_as_cell amount">${account.currency_id.symbol}${formatLang(total_balance_curr)}</div>
+ %else:
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_inital_balance_curr)}</div>
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_tefs_curr)}</div>
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_checks_curr)}</div>
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_deposit_curr)}</div>
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_debit_curr)}</div>
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_credit_curr)}</div>
+ <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(total_balance_curr)}</div>
+ %endif
+ </div>
+ </div>
+ </div>
+ %endfor
+
+ </body>
+</html>
=== added file 'l10n_cr_account_financial_report_webkit/report/account_bank_balances.py'
--- l10n_cr_account_financial_report_webkit/report/account_bank_balances.py 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/report/account_bank_balances.py 2012-06-13 20:11:20 +0000
@@ -0,0 +1,201 @@
+# -*- 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 report import report_sxw
+from tools.translate import _
+import pooler
+from datetime import datetime
+
+from openerp.addons.account_financial_report_webkit.report.trial_balance import TrialBalanceWebkit
+from openerp.addons.account_financial_report_webkit.report.webkit_parser_header_fix import HeaderFooterTextWebKitParser
+
+def sign(number):
+ return cmp(number, 0)
+
+class account_bank_balances(TrialBalanceWebkit):
+
+ def __init__(self, cursor, uid, name, context):
+ super(account_bank_balances, self).__init__(cursor, uid, name, context=context)
+ self.pool = pooler.get_pool(self.cr.dbname)
+ self.cursor = self.cr
+ self.localcontext.update({
+ 'get_bank_accounts': self.get_bank_accounts,
+ 'accounts_by_currency': self.accounts_by_currency,
+ 'get_move_lines_account':self.get_move_lines_account,
+ 'get_type_move_line':self.get_type_move_line,
+ 'get_debit_account':self.get_debit_account,
+ 'get_credit_account':self.get_credit_account,
+ 'get_deposit_account':self.get_deposit_account,
+ 'get_tefs_account':self.get_tefs_account,
+ 'get_checks_account':self.get_checks_account,
+ })
+
+ def get_bank_accounts(self, cr, uid, objects):
+ bank_accounts = []
+ for account in objects:
+ account_usertype_id = account.user_type.id
+ account_account_type_id = self.pool.get('account.account.type').search(cr, uid, [('name', '=' ,'Banco Saldo Real')])[0]
+ if account_usertype_id == account_account_type_id:
+ bank_accounts.append(account)
+ return bank_accounts
+
+ def accounts_by_currency(self, cr, uid, accounts):
+ currency_names_list = []
+ accounts_for_currency = []
+ all_accounts_by_currency = []
+
+ for current_account in accounts:
+ current_name = current_account.currency_id.name
+ if current_name not in currency_names_list:
+ currency_names_list.append(current_name)
+
+ for current_name in currency_names_list:
+ account_currency = []
+ for current_account in accounts:
+ if current_account.currency_id.name == current_name:
+ account_currency.append(current_account)
+ accounts_for_currency.append(account_currency)
+
+ i = 0
+ for current_name in currency_names_list:
+ tup_temp = (current_name, accounts_for_currency[i])
+ all_accounts_by_currency.append(tup_temp)
+ i += 1
+
+ return all_accounts_by_currency
+
+ def get_move_lines_account(self, cr, uid, filter_type, filter_data, account):
+ if filter_type == '':
+ move_lines_id = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', account.id)])
+ move_lines = self.pool.get('account.move.line').browse(cr, uid, move_lines_id)
+ else:
+ if filter_type == 'filter_period':
+ periods_ids = self.pool.get('account.period').search(cr, uid, [('date_start', '>=', filter_data[0].date_start), ('date_stop', '<=', filter_data[1].date_stop)])
+ move_lines_id = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', account.id)])
+ all_move_lines = self.pool.get('account.move.line').browse(cr, uid, move_lines_id)
+ move_lines = []
+ for move_line in all_move_lines:
+ period_id = move_line.period_id.id
+ if period_id in periods_ids:
+ move_lines.append(move_line)
+ elif filter_type == 'filter_date':
+ move_lines_id = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', account.id), ('date', '>=', filter_data[0]), ('date', '<=', filter_data[1])])
+ move_lines = self.pool.get('account.move.line').browse(cr, uid, move_lines_id)
+
+
+ return move_lines
+
+ def get_type_move_line(self, cr, uid, move_line):
+ voucher_line_id = self.pool.get('account.voucher.line').search(cr, uid, [('move_line_id', '=', move_line.id)])
+ voucher_line = self.pool.get('account.voucher.line').browse(cr, uid, voucher_line_id)
+ voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_line.voucher_id)
+
+ type_move_line = voucher.type
+ return type_move_line
+
+ def get_debit_account(self, cr, uid, move_lines, currency):
+ debit = 0.0
+
+ for move_line in move_lines:
+ if currency == 'CRC':
+ debit += move_line.debit
+ elif move_line.amount_currency > 0:
+ debit += move_line.amount_currency
+
+ return debit
+
+ def get_credit_account(self, cr, uid, move_lines, currency):
+ credit = 0.0
+
+ for move_line in move_lines:
+ if currency == 'CRC':
+ credit += move_line.credit
+ elif move_line.amount_currency < 0:
+ credit += move_line.amount_currency*-1
+
+ return credit
+
+ def get_deposit_account(self, cr, uid, move_lines, currency, account):
+ deposit = 0.0
+
+ all_voucher_line_id = self.pool.get('account.voucher.line').search(cr, uid, [('account_id', '=', account.id)])
+ all_voucher_line = self.pool.get('account.voucher.line').browse(cr, uid, all_voucher_line_id)
+
+ for move_line in move_lines:
+ for voucher_line in all_voucher_line:
+ if move_line.id == voucher_line.move_line_id:
+ if currency == 'CRC':
+ deposit += move_line.debit
+ elif move_line.amount_currency > 0:
+ deposit += move_line.amount_currency
+
+ return deposit
+
+ def get_tefs_account(self, cr, uid, move_lines, currency, account):
+ tefs = 0.0
+
+ all_voucher_line_id = self.pool.get('account.voucher.line').search(cr, uid, [('account_id', '=', account.id)])
+ all_voucher_line = self.pool.get('account.voucher.line').browse(cr, uid, all_voucher_line_id)
+ vouchers = self.pool.get('account.voucher').browse(cr, uid, all_voucher_line_id)
+
+ journal_TEF = self.pool.get('account.journal').search(cr, uid, [('code', 'like', 'TEF')])
+
+ for move_line in move_lines:
+ for voucher_line in all_voucher_line:
+ if move_line.id == voucher_line.move_line_id:
+ for voucher in vouchers:
+ if voucher.journal_id in journal_TEF:
+ if currency == 'CRC':
+ tefs += move_line.credit
+ elif move_line.amount_currency > 0:
+ tefs += move_line.amount_currency*-1
+
+ return tefs
+
+ def get_checks_account(self, cr, uid, move_lines, currency, account):
+ checks = 0.0
+
+ all_voucher_line_id = self.pool.get('account.voucher.line').search(cr, uid, [('account_id', '=', account.id)])
+ all_voucher_line = self.pool.get('account.voucher.line').browse(cr, uid, all_voucher_line_id)
+ vouchers = self.pool.get('account.voucher').browse(cr, uid, all_voucher_line_id)
+
+ journal_CK = self.pool.get('account.journal').search(cr, uid, [('code', 'like', 'CK')])
+
+ for move_line in move_lines:
+ for voucher_line in all_voucher_line:
+ if move_line.id == voucher_line.move_line_id:
+ for voucher in vouchers:
+ if voucher.journal_id in journal_CK:
+ if currency == 'CRC':
+ checks += move_line.credit
+ elif move_line.amount_currency > 0:
+ checks += move_line.amount_currency*-1
+
+ return checks
+
+HeaderFooterTextWebKitParser(
+ 'report.l10n_cr_account_financial_report_webkit.account.account_report_account_bank_balances_webkit',
+ 'account.account',
+ 'addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako',
+ parser=account_bank_balances)
+
+
=== modified file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_partner_balance.py'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_partner_balance.py 2012-06-08 19:54:27 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_partner_balance.py 2012-06-13 20:11:20 +0000
@@ -1,3 +1,25 @@
+# -*- 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/>.
+#
+##############################################################################
+
import time
import pooler
from report import report_sxw
=== modified file 'l10n_cr_account_financial_report_webkit/report/report.xml'
--- l10n_cr_account_financial_report_webkit/report/report.xml 2012-06-08 19:54:27 +0000
+++ l10n_cr_account_financial_report_webkit/report/report.xml 2012-06-13 20:11:20 +0000
@@ -34,8 +34,23 @@
<field name="webkit_header" ref="financial_landscape_header"/>
</record>
- <report auto="False" id="l10n_cr_partner_balance" model="res.partner"
- name="l10n.cr.partner.balance.layout_ccorp" file="l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako" string="Estado de Cuenta" report_type="webkit"/>
+ <report auto="False" id="l10n_cr_partner_balance" model="res.partner"
+ name="l10n.cr.partner.balance.layout_ccorp" file="l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako" string="Estado de Cuenta" report_type="webkit"/>
+
+ <record id="l10n_cr_account_financial_report_webkit.account_report_account_balances_webkit" model="ir.actions.report.xml">
+ <field name="report_type">webkit</field>
+ <field name="report_name">l10n_cr_account_financial_report_webkit.account.account_report_account_bank_balances_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.account</field>
+ <field name="type">ir.actions.report.xml</field>
+ <field name="name">Account Balances Webkit</field>
+ <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>
</data>
</openerp>
=== modified file 'l10n_cr_account_financial_report_webkit/report_menus.xml'
--- l10n_cr_account_financial_report_webkit/report_menus.xml 2012-06-01 19:28:10 +0000
+++ l10n_cr_account_financial_report_webkit/report_menus.xml 2012-06-13 20:11:20 +0000
@@ -2,14 +2,17 @@
<openerp>
<data>
-
- <menuitem icon="STOCK_PRINT" name="Partner Ledger"
+ <!-- <menuitem icon="STOCK_PRINT" name="Partner Ledger"
parent="account.next_id_22" action="action_account_partners_ledger_menu_webkit"
groups="account.group_account_manager,account.group_account_user" id="account.menu_account_partner_ledger"/>
<menuitem icon="STOCK_PRINT" name="Open Invoices"
parent="account.next_id_22" action="action_account_open_invoices_menu_webkit"
- groups="account.group_account_manager,account.group_account_user" id="menu_account_open_invoices"/>
+ groups="account.group_account_manager,account.group_account_user" id="menu_account_open_invoices"/> -->
+
+ <menuitem icon="STOCK_PRINT" name="Account Bank Balances"
+ parent="account.final_accounting_reports" action="action_account_balances_menu_webkit"
+ groups="account.group_account_manager,account.group_account_user" id="account_financial_report_webkit.menu_Account_Balances_report"/>
</data>
</openerp>
=== modified file 'l10n_cr_account_financial_report_webkit/wizard/__init__.py'
--- l10n_cr_account_financial_report_webkit/wizard/__init__.py 2012-06-01 19:28:10 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/__init__.py 2012-06-13 20:11:20 +0000
@@ -20,4 +20,5 @@
from . import partners_ledger_wizard
from . import open_invoices_wizard
+from . import account_bank_balances_wizard
#from . import account_report_profit_loss_wizard
=== added file 'l10n_cr_account_financial_report_webkit/wizard/account_bank_balances_wizard.py'
--- l10n_cr_account_financial_report_webkit/wizard/account_bank_balances_wizard.py 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/account_bank_balances_wizard.py 2012-06-13 20:11:20 +0000
@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Author: Guewen Baconnier
+# Copyright Camptocamp SA 2011
+#
+# 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 osv
+
+
+class AccountBalancesWizard(osv.osv_memory):
+ """Will launch trial balance report and pass required args"""
+
+ _inherit = "trial.balance.webkit"
+ _name = "account.balances"
+ _description = "Account Bank Balances Report"
+
+ def _print_report(self, cursor, uid, ids, data, context=None):
+ context = context or {}
+ # we update form with display account value
+ data = self.pre_print_report(cursor, uid, ids, data, context=context)
+
+ return {'type': 'ir.actions.report.xml',
+ 'report_name': 'l10n_cr_account_financial_report_webkit.account.account_report_account_bank_balances_webkit',
+ 'datas': data}
+
+AccountBalancesWizard()
=== added file 'l10n_cr_account_financial_report_webkit/wizard/account_bank_balances_wizard_view.xml'
--- l10n_cr_account_financial_report_webkit/wizard/account_bank_balances_wizard_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/account_bank_balances_wizard_view.xml 2012-06-13 20:11:20 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <!-- inheriting views from more than 2 differents inherited models like
+ account.balances.webkit -> account.common.balance.report -> account.common.account.report
+ is not supported so we have to copy paste the same view for account balances, balance sheet, profit & loss
+ -->
+
+
+ <record id="account_balances_view_webkit" model="ir.ui.view">
+ <field name="name">Account Bank Balances</field>
+ <field name="model">account.balances</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="account.account_common_report_view"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/label[@string='']" position="replace">
+ <separator string="Account Bank Balance" colspan="4"/>
+ <label nolabel="1" colspan="4" string="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"/>
+ </xpath>
+ <field name="chart_account_id" position='attributes'>
+ <attribute name="colspan">4</attribute>
+ </field>
+ <page name="filters" position="after">
+ <page string="Accounts Filters" name="accounts">
+ <separator string="Print only" colspan="4"/>
+ <field name="account_ids" colspan="4" nolabel="1" domain="[('type', '=', 'view')]">
+ <tree>
+ <field name="code"/>
+ <field name="name"/>
+ <field name="type"/>
+ <field name="company_id"/>
+ </tree>
+ </field>
+ </page>
+ <page name="placeholder"/>
+ </page>
+ <page name="journal_ids" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </page>
+ <page name="filters" position="attributes">
+ <attribute name="string">Time Filters</attribute>
+ </page>
+ <field name="period_from" position="attributes">
+ <attribute name="domain">[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]</attribute>
+ </field>
+ <field name="period_to" position="attributes">
+ <attribute name="domain">[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]</attribute>
+ </field>
+ <field name="fiscalyear_id" position="attributes">
+ <attribute name="attrs">{'required': [('filter', '=', 'filter_opening')]}</attribute>
+ </field>
+ </data>
+ </field>
+ </record>
+
+ <record id="action_account_balances_menu_webkit" model="ir.actions.act_window">
+ <field name="name">Action Account Bank Balances</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">account.balances</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="account_balances_view_webkit"/>
+ <field name="target">new</field>
+ </record>
+
+
+ <record model="ir.values" id="action_account_balances_values_webkit">
+ <field name="model_id" ref="account.model_account_account"/>
+ <field name="object" eval="1"/>
+ <field name="name">Account Balances</field>
+ <field name="key2">client_print_multi</field>
+ <field name="value"
+ eval="'ir.actions.act_window,' +str(ref('action_account_balances_menu_webkit'))"/>
+ <field name="key">action</field>
+ <field name="model">account.account</field>
+ </record>
+ </data>
+</openerp>
=== modified file 'l10n_cr_hr_payroll/report/payroll_report.mako'
--- l10n_cr_hr_payroll/report/payroll_report.mako 2012-05-23 15:29:34 +0000
+++ l10n_cr_hr_payroll/report/payroll_report.mako 2012-06-13 20:11:20 +0000
@@ -66,13 +66,11 @@
<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: 250px; vertical-align: middle">${_('Nombre')}</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>
<div class="act_as_cell amount" style="width: 40px;">${_('Hrs.')}<br />${_('Ext')}</div>
- <div class="act_as_cell amount" style="width: 40px;">${_('Hrs.')}<br />${_('Dob')}</div>
<div class="act_as_cell amount">${_('Ingr.')}<br />${_('Normal')}</div>
<div class="act_as_cell amount">${_('Ingr.')}<br />${_('Extra')}</div>
- <div class="act_as_cell amount">${_('Ingr.')}<br />${_('Doble')}</div>
<div class="act_as_cell amount">${_('Otros')}<br />${_('Ingr.')}</div>
<div class="act_as_cell amount">${_('Salario')}<br />${_('Bruto')}</div>
<div class="act_as_cell amount">${_('Deducc.')}<br />${_('CCSS/BP')}</div>
@@ -86,23 +84,19 @@
%for slip in sorted(department[1], key=lambda slip: slip.employee_id.name):
<div class="act_as_row lines">
## cedula
- <div class="act_as_cell first_column" style="width: 80px;">${slip.employee_id.identification_id or ''}</div>
+ <div class="act_as_cell first_column" style="width: 85px;">${slip.employee_id.identification_id or ''}</div>
## nombre
<div class="act_as_cell">${slip.employee_id.name or '0'}</div>
## nh
<div class="act_as_cell amount">${get_hn(slip.worked_days_line_ids) or '0'}</div>
## eh
<div class="act_as_cell amount">${get_he(slip.worked_days_line_ids) or '0'}</div>
- ## ef
- <div class="act_as_cell amount">${get_fe(slip.worked_days_line_ids) or '0'}</div>
## basic
<div class="act_as_cell amount">${formatLang(get_basic(slip.line_ids)) or '0'}</div>
## exs
<div class="act_as_cell amount">${formatLang(get_exs(slip.line_ids)) or '0'}</div>
- ## fes
- <div class="act_as_cell amount">${formatLang(get_fes(slip.line_ids)) or '0'}</div>
## otros
- <div class="act_as_cell amount">${ '0'}</div>
+ <div class="act_as_cell amount">${ '0.00'}</div>
## gross
<div class="act_as_cell amount ">${formatLang(get_gross(slip.line_ids)) or '0'}</div>
## ccss
@@ -110,7 +104,7 @@
## RENTA
<div class="act_as_cell amount">${formatLang(get_rent(slip.line_ids)) or '0'}</div>
## otros
- <div class="act_as_cell amount">${ '0'}</div>
+ <div class="act_as_cell amount">${ '0.00'}</div>
## NETOS
<div class="act_as_cell amount">${formatLang(get_net(slip.line_ids)) or '0'}</div>
<%
@@ -149,15 +143,13 @@
<div class="act_as_cell">${total_emp_dep} Empleados</div>
<div class="act_as_cell amount">${total_hn_dep}</div>
<div class="act_as_cell amount">${total_he_dep}</div>
- <div class="act_as_cell amount">${total_fe_dep}</div>
<div class="act_as_cell amount">${formatLang(total_basic_dep)}</div>
<div class="act_as_cell amount">${formatLang(total_exs_dep)}</div>
- <div class="act_as_cell amount">${formatLang(total_fes_dep)}</div>
- <div class="act_as_cell amount">${_('0')}</div>
+ <div class="act_as_cell amount">${_('0.00')}</div>
<div class="act_as_cell amount">${formatLang(total_gross_dep)}</div>
<div class="act_as_cell amount">${formatLang(total_ccss_dep)}</div>
<div class="act_as_cell amount">${formatLang(total_rent_dep)}</div>
- <div class="act_as_cell amount">${_('0')}</div>
+ <div class="act_as_cell amount">${_('0.00')}</div>
<div class="act_as_cell amount">${formatLang(total_net_dep)}</div>
</div>
</div>
@@ -169,18 +161,16 @@
<div class="act_as_tfoot">
<div class="act_as_row labels" style="font-weight: bold; font-size: 11px;">
<div class="act_as_cell first_column" style="width: 85px; font-size: 12px; text-align: left">${_('TOTAL GENERAL')}</div>
- <div class="act_as_cell" style="width: 250px;">${total_emp} Empleados</div>
+ <div class="act_as_cell" style="width: 230px;">${total_emp} Empleados</div>
<div class="act_as_cell amount" style="width: 40px;">${total_hn}</div>
<div class="act_as_cell amount" style="width: 40px;">${total_he}</div>
- <div class="act_as_cell amount" style="width: 40px;">${total_fe}</div>
<div class="act_as_cell amount">${formatLang(total_basic)}</div>
<div class="act_as_cell amount">${formatLang(total_exs)}</div>
- <div class="act_as_cell amount">${formatLang(total_fes)}</div>
- <div class="act_as_cell amount">${_('0')}</div>
+ <div class="act_as_cell amount">${_('0.00')}</div>
<div class="act_as_cell amount">${formatLang(total_gross)}</div>
<div class="act_as_cell amount">${formatLang(total_ccss)}</div>
<div class="act_as_cell amount">${formatLang(total_rent)}</div>
- <div class="act_as_cell amount">${_('0')}</div>
+ <div class="act_as_cell amount">${_('0.00')}</div>
<div class="act_as_cell amount">${formatLang(total_net)}</div>
</div>
</div>
Follow ups
