clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00227
lp:~as.clearcorp/openerp-costa-rica/6.1-l10n_account_financial_report_webkit into lp:openerp-costa-rica
Armando Soto Rodríguez has proposed merging lp:~as.clearcorp/openerp-costa-rica/6.1-l10n_account_financial_report_webkit into lp:openerp-costa-rica.
Requested reviews:
CLEARCORP drivers (clearcorp-drivers)
For more details, see:
https://code.launchpad.net/~as.clearcorp/openerp-costa-rica/6.1-l10n_account_financial_report_webkit/+merge/114059
[FIX] Record created on l10n_cr_account_financial_report.py
[FIX] Inherit in the open_invoices_wizard.py fixed
[FIX] Format of the conciliation_bank.mako fixed
--
https://code.launchpad.net/~as.clearcorp/openerp-costa-rica/6.1-l10n_account_financial_report_webkit/+merge/114059
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_account_financial_report_webkit/__openerp__.py'
--- l10n_cr_account_financial_report_webkit/__openerp__.py 2012-07-04 23:20:05 +0000
+++ l10n_cr_account_financial_report_webkit/__openerp__.py 2012-07-09 22:19:17 +0000
@@ -33,11 +33,11 @@
'init_xml': [],
'demo_xml' : [],
'update_xml': ['account_move_line_view.xml',
- 'data/financial_webkit_header.xml',
'report/report.xml',
'wizard/account_bank_balances_wizard_view.xml',
+ 'wizard/l10n_cr_partners_ledger_wizard_view.xml',
'wizard/l10n_cr_open_invoices_wizard_view.xml',
- 'wizard/l10n_cr_partners_ledger_wizard_view.xml',
+ 'data/financial_webkit_header.xml',
'report_menus.xml',
'account_view.xml',
],
=== modified file 'l10n_cr_account_financial_report_webkit/i18n/es_CR.po'
--- l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-07-04 23:20:05 +0000
+++ l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-07-09 22:19:17 +0000
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-04 20:35+0000\n"
-"PO-Revision-Date: 2012-07-04 20:35+0000\n"
+"POT-Creation-Date: 2012-07-09 20:33+0000\n"
+"PO-Revision-Date: 2012-07-09 20:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,18 @@
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:192
+msgid "')}</div>\n"
+" <div class=\"act_as_cell amount\" style=\"width: 115px;\">${_('"
+msgstr "')}</div>\n"
+" <div class=\"act_as_cell amount\" style=\"width: 115px;\">${_('"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:40
+msgid "Bank Balance"
+msgstr "Saldo de Banco"
+
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: field:account.common.balance.report,account_ids:0
#: field:general.ledger.webkit,account_ids:0
@@ -35,7 +47,6 @@
#: view:general.ledger.webkit:0
#: view:open.invoices.webkit:0
#: view:partners.ledger.webkit:0
-#: view:open.invoices.webkit:0
#: view:partners.ledger.webkit:0
msgid "Layout Options"
msgstr "Opciones de Diseño"
@@ -61,7 +72,7 @@
#: 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"
+msgstr "Saldo %s"
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: view:account.move.line:0
@@ -94,6 +105,16 @@
msgid "Trial Balance Webkit"
msgstr "Trial Balance Webkit"
+#. module: l10n_cr_account_financial_report_webkit
+#: help:open.invoices.webkit,debit_credit:0
+msgid "This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison"
+msgstr "This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:45
+msgid "Credits"
+msgstr "Créditos"
+
#. 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
@@ -102,6 +123,7 @@
#: field:partners.ledger.webkit,company_id:0
#: field:trial.balance.webkit,company_id:0
#: field:account.balances,company_id:0
+#: field:conciliation.bank.webkit,company_id:0
msgid "Company"
msgstr "Compañía"
@@ -123,21 +145,22 @@
#: field:partners.ledger.webkit,journal_ids:0
#: field:trial.balance.webkit,journal_ids:0
#: field:account.balances,journal_ids:0
+#: field:conciliation.bank.webkit,journal_ids:0
msgid "Journals"
-msgstr "Asientos"
+msgstr "Diarios"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: help:general.ledger.webkit,amount_currency:0
-#: help:open.invoices.webkit,amount_currency:0
#: help:partners.ledger.webkit,amount_currency:0
+#: help:conciliation.bank.webkit,amount_currency:0
msgid "It adds the currency column"
msgstr "Agrega la columna de moneda"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/common_reports.py:75
-#: selection:open.invoices.webkit,result_selection:0
#: selection:partner.balance.webkit,result_selection:0
#: selection:partners.ledger.webkit,result_selection:0
+#: selection:conciliation.bank.webkit,result_selection:0
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "Cuentas por Cobrar y por Pagar"
@@ -147,16 +170,35 @@
#: 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:65
#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_account_account
msgid "Account"
msgstr "Cuenta"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:44
+msgid "Debits"
+msgstr "Débitos"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:199
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:201
+msgid "')}</div>\n"
+" <div class=\"act_as_cell\" style=\"width: 70px;\">${_('"
+msgstr "')}</div>\n"
+" <div class=\"act_as_cell\" style=\"width: 70px;\">${_('"
+
#. module: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/trial_balance.py:42
#, python-format
msgid "TRIAL BALANCE"
msgstr "BALANCE DE SUMAS Y SALDOS"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:55
+msgid "Due Date"
+msgstr "Fecha de Vencimiento"
+
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: view:general.ledger.webkit:0
#: view:open.invoices.webkit:0
@@ -201,7 +243,7 @@
#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit
#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partners_ledger_webkit
msgid "Partner Ledger Webkit"
-msgstr "Partner Ledger Webkit"
+msgstr "Libro Mayor de Empresa"
#. module: account_financial_report_webkit
#: model:ir.ui.menu,name:account_financial_report_webkit.menu_Account_Balances_report
@@ -221,17 +263,26 @@
msgid "Unallocated"
msgstr "Sin asignar"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:184
+msgid "')}</div>\n"
+" ## journal\n"
+" <div class=\"act_as_cell\" style=\"width: 70px;\">${_('"
+msgstr "')}</div>\n"
+" ## journal\n"
+" <div class=\"act_as_cell\" style=\"width: 70px;\">${_('"
+
#. module: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:123
#, python-format
msgid "Webkit raise an error"
msgstr "Webkit generó un error"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/common_reports.py:71
-#: selection:open.invoices.webkit,result_selection:0
#: selection:partner.balance.webkit,result_selection:0
#: selection:partners.ledger.webkit,result_selection:0
+#: selection:conciliation.bank.webkit,result_selection:0
#, python-format
msgid "Receivable Accounts"
msgstr "Cuentas por Cobrar"
@@ -240,12 +291,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 "General Ledger 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/l10n_cr_account_report_open_invoices.mako:126
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:149
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:148
msgid "Rec."
msgstr "Rec."
@@ -267,8 +318,9 @@
#: 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/account_bank_balances.mako:60
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:23
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:34
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:36
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:34
msgid "Periods Filter"
msgstr "Filtro por Períodos"
@@ -292,7 +344,8 @@
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:65
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:160
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:39
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:41
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:39
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:187
msgid "Initial Balance"
msgstr "Saldo Inicial"
@@ -306,12 +359,6 @@
msgid "General Ledger Report"
msgstr "Informe del libro mayor"
-#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
-#: constraint:open.invoices.webkit:0
-#: constraint:open.invoices.webkit:0
-msgid "Clearance date must be the very last date of the last period or later."
-msgstr "Fecha de Liquidación debe ser la última fecha del último período o después de este."
-
#. module: account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:48
msgid "Displayed Accounts"
@@ -330,8 +377,9 @@
#. 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/conciliation_bank.mako:67
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:122
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:145
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:144
msgid "Partner"
msgstr "Empresa"
@@ -343,6 +391,7 @@
#: help:partners.ledger.webkit,chart_account_id:0
#: help:trial.balance.webkit,chart_account_id:0
#: help:account.balances,chart_account_id:0
+#: help:conciliation.bank.webkit,chart_account_id:0
msgid "Select Charts of Accounts"
msgstr "Seleccione los Planes Contables"
@@ -354,6 +403,8 @@
#: field:partners.ledger.webkit,filter:0
#: field:trial.balance.webkit,filter:0
#: field:account.balances,filter:0
+#: field:conciliation.bank.webkit,filter:0
+#: field:open.invoices.webkit,filter_cmp:0
msgid "Filter by"
msgstr "Filtrar por"
@@ -369,18 +420,24 @@
#: 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/l10n_cr_account_report_open_invoices.mako:143
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:166
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:165
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/conciliation_bank.mako:75
#: 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:147
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:146
msgid "Label"
msgstr "Etiqueta"
+#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,label_filter:0
+msgid "Column Label"
+msgstr "Columna Etiqueta"
+
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: help:account.common.balance.report,account_ids:0
#: help:general.ledger.webkit,account_ids:0
@@ -397,9 +454,11 @@
#: 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/account_bank_balances.mako:169
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:83
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:55
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:134
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:57
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:157
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:156
msgid "Debit"
msgstr "Débito"
@@ -431,21 +490,6 @@
msgstr "Partner Balance Webkit"
#. module: account_financial_report_webkit
-#: help:open.invoices.webkit,until_date:0
-msgid "The clearance date is essentially a tool used for debtors provisionning calculation.\n"
-"\n"
-"By default, this date is equal to the the end date (ie: 31/12/2011 if you select fy 2011).\n"
-"\n"
-"By amending the clearance date, you will be, for instance, able to answer the question : 'based on my last year end debtors open invoices, which invoices are still unpaid today (today is my clearance date)?'\n"
-""
-msgstr "The clearance date is essentially a tool used for debtors provisionning calculation.\n"
-"\n"
-"By default, this date is equal to the the end date (ie: 31/12/2011 if you select fy 2011).\n"
-"\n"
-"By amending the clearance date, you will be, for instance, able to answer the question : 'based on my last year end debtors open invoices, which invoices are still unpaid today (today is my clearance date)?'\n"
-""
-
-#. module: account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42
msgid "Clearance Date"
msgstr "Fecha de Liquidación"
@@ -471,8 +515,8 @@
#. module: l10n_cr_account_financial_report_webkit
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:300
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:359
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:325
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:384
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:333
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:398
msgid "Saldo"
msgstr "Saldo"
@@ -498,11 +542,6 @@
msgid "Fiscal Year :"
msgstr "Año Fiscal :"
-#. module: account_financial_report_webkit
-#: view:open.invoices.webkit:0
-msgid "This report allows you to print or generate a pdf of your open invoices per partner with details of all your payable/receivable account. Exclude full reconciled journal items."
-msgstr "Este informe le permite imprimir o generar un pdf de sus facturas pendientes por empresa con todos los ddetalles de todas sus cuentas por pagar/cobrar. Excluir asientos reconciliados."
-
#. module: l10n_cr_account_financial_report_webkit
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:163
msgid "Transfers"
@@ -514,6 +553,11 @@
msgid "Must be in include_opening, exclude_opening"
msgstr "Must be in include_opening, exclude_opening"
+#. module: l10n_cr_account_financial_report_webkit
+#: help:open.invoices.webkit,label_filter:0
+msgid "This label will be displayed on report to show the balance computed for the given comparison filter."
+msgstr "This label will be displayed on report to show the balance computed for the given comparison filter."
+
#. module: account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:43
#: code:addons/account_financial_report_webkit/wizard/balance_common.py:151
@@ -564,6 +608,8 @@
#: field:account.balances,comp1_period_to:0
#: field:account.balances,comp2_period_to:0
#: field:account.balances,period_to:0
+#: field:conciliation.bank.webkit,period_to:0
+#: field:open.invoices.webkit,period_to_cmp:0
msgid "End Period"
msgstr "Período Final"
@@ -580,13 +626,13 @@
#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:61
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:63
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:37
-#: 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:37
msgid "Accounts Filter"
msgstr "Filtro por Cuentas"
#. module: l10n_cr_account_financial_report_webkit
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:136
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:159
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:158
msgid "Manual Move"
msgstr "Movimiento Manual"
@@ -614,7 +660,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:60
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:72
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:70
msgid "Custom Filter"
msgstr "Filtro Personalizado"
@@ -646,6 +692,8 @@
#: constraint:partners.ledger.webkit:0
#: constraint:trial.balance.webkit:0
#: constraint:account.balances:0
+#: constraint:accounting.report:0
+#: constraint:conciliation.bank.webkit: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."
@@ -654,8 +702,9 @@
#. 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/conciliation_bank.mako:85
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:138
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:161
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:160
msgid "Cumul. Bal."
msgstr "Bal. Acumul."
@@ -666,7 +715,7 @@
#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:23
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:21
msgid "Computed"
msgstr "Procesado"
@@ -683,11 +732,11 @@
msgid "of"
msgstr "de"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/common_reports.py:73
-#: selection:open.invoices.webkit,result_selection:0
#: selection:partner.balance.webkit,result_selection:0
#: selection:partners.ledger.webkit,result_selection:0
+#: selection:conciliation.bank.webkit,result_selection:0
#, python-format
msgid "Payable Accounts"
msgstr "Cuentas por Pagar"
@@ -697,7 +746,6 @@
#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_open_invoices_webkit
#: model:ir.model,name:account_financial_report_webkit.model_open_invoices_webkit
#: code:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_open_invoices.py:55
-#: model:ir.actions.act_window,name:l10n_cr_account_financial_report_webkit.action_account_open_invoices_menu_webkit
#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_open_invoices_webkit
#, python-format
msgid "Open Invoices Report"
@@ -740,6 +788,8 @@
#: field:account.balances,comp1_date_from:0
#: field:account.balances,comp2_date_from:0
#: field:account.balances,date_from:0
+#: field:conciliation.bank.webkit,date_from:0
+#: field:open.invoices.webkit,date_from_cmp:0
msgid "Start Date"
msgstr "Fecha de Inicio"
@@ -750,7 +800,7 @@
#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:23
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:21
msgid "Opening Entries"
msgstr "Apuntes de Apertura"
@@ -776,11 +826,6 @@
msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period."
msgstr "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period."
-#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,group_by_currency:0
-msgid "Group Partner by currency"
-msgstr "Agrupar Empresa por tipo de moneda"
-
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
@@ -790,7 +835,7 @@
#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:47
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:23
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:23
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:21
msgid "No"
msgstr "No"
@@ -841,10 +886,10 @@
msgid "Last reconciliation date"
msgstr "Última fecha de la reconciliación"
-#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,partner_ids:0
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: field:partner.balance.webkit,partner_ids:0
#: field:partners.ledger.webkit,partner_ids:0
+#: field:conciliation.bank.webkit,partner_ids:0
msgid "Filter on partner"
msgstr "Filtro por empresa"
@@ -865,6 +910,11 @@
msgid "Periods : "
msgstr "Períodos : "
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.actions.report.xml,name:l10n_cr_account_financial_report_webkit.conciliation_bank
+msgid "Conciliacion de Bancos"
+msgstr "Conciliacion de Bancos"
+
#. module: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/partner_balance.py:40
#, python-format
@@ -876,10 +926,15 @@
msgid "Company must be the same for its related account and period."
msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
-#. module: account_financial_report_webkit
-#: help:open.invoices.webkit,partner_ids:0
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:60
+msgid "Move Lines"
+msgstr "Líneas de Asiento"
+
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: help:partner.balance.webkit,partner_ids:0
#: help:partners.ledger.webkit,partner_ids:0
+#: help:conciliation.bank.webkit,partner_ids:0
msgid "Only selected partners will be printed. Leave empty to print all partners."
msgstr "Sólo las empresas seleccionadas serán impresas. Dejar en blanco para imprimir todas las empresas."
@@ -916,9 +971,12 @@
#: 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/conciliation_bank.mako:69
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:114
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:53
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:137
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:136
+#: selection:conciliation.bank.webkit,filter:0
+#: selection:open.invoices.webkit,filter_cmp:0
msgid "Date"
msgstr "Fecha"
@@ -935,8 +993,7 @@
#. module: l10n_cr_account_financial_report_webkit
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:74
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:76
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:86
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:88
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:92
msgid "Accounts in "
msgstr "Cuentas en "
@@ -949,12 +1006,11 @@
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: constraint:account.common.balance.report:0
#: constraint:general.ledger.webkit:0
-#: constraint:open.invoices.webkit:0
#: constraint:partner.balance.webkit:0
#: constraint:partners.ledger.webkit:0
#: constraint:trial.balance.webkit:0
#: constraint:account.balances:0
-#: constraint:open.invoices.webkit:0
+#: constraint:conciliation.bank.webkit:0
#: constraint:partners.ledger.webkit:0
msgid "When no Fiscal year is selected, you must choose to filter by periods or by date."
msgstr "Cuando no se selecciona ningún año fiscal, se debe elegir para filtrar por períodos o por fecha."
@@ -967,11 +1023,17 @@
#: 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/account_bank_balances.mako:85
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:37
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:51
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:61
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:59
msgid "To:"
msgstr "Hasta:"
+#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr "Display Debit/Credit Columns"
+
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: sql_constraint:account.account:0
#: sql_constraint:account.account:0
@@ -994,6 +1056,7 @@
#: selection:partners.ledger.webkit,target_move:0
#: selection:trial.balance.webkit,target_move:0
#: selection:account.balances,target_move:0
+#: selection:conciliation.bank.webkit,target_move:0
#, python-format
msgid "All Posted Entries"
msgstr "Todos los apuntes publicados"
@@ -1023,6 +1086,8 @@
#: help:partners.ledger.webkit,fiscalyear_id:0
#: help:trial.balance.webkit,fiscalyear_id:0
#: help:account.balances,fiscalyear_id:0
+#: help:conciliation.bank.webkit,fiscalyear_id:0
+#: help:open.invoices.webkit,fiscalyear_id_cmp:0
msgid "Keep empty for all open fiscal year"
msgstr "Mantenga vacío para todos los años fiscales abiertos"
@@ -1038,12 +1103,19 @@
#: 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/account_bank_balances.mako:171
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:81
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:56
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:132
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:56
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:155
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:154
msgid "Credit"
msgstr "Crédito"
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.actions.report.xml,name:l10n_cr_account_financial_report_webkit.l10n_cr_account_financial_report
+msgid "Account Financial Report"
+msgstr "Reporte Financiero de Cuenta"
+
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: selection:account.common.balance.report,filter:0
#: selection:general.ledger.webkit,filter:0
@@ -1052,6 +1124,8 @@
#: selection:partners.ledger.webkit,filter:0
#: selection:trial.balance.webkit,filter:0
#: selection:account.balances,filter:0
+#: selection:conciliation.bank.webkit,filter:0
+#: selection:open.invoices.webkit,filter_cmp:0
msgid "No Filters"
msgstr "Sin Filtros"
@@ -1072,9 +1146,12 @@
#: 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
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:57
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:61
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:65
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partner_balance.mako:111
msgid "Balance"
-msgstr "Saldo"
+msgstr "Balance"
#. module: account_financial_report_webkit
#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103
@@ -1091,14 +1168,22 @@
#. 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
+#: help:conciliation.bank.webkit,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)."
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:188
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:190
+msgid "')}</div>\n"
+" <div class=\"act_as_cell amount\" style=\"width: 100px;\">${_('"
+msgstr "')}</div>\n"
+" <div class=\"act_as_cell amount\" style=\"width: 100px;\">${_('"
+
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: constraint:account.account:0
#: constraint:account.account:0
@@ -1135,8 +1220,9 @@
#: 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/account_bank_balances.mako:58
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:21
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:32
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:34
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:32
msgid "Dates Filter"
msgstr "Filtro por Fechas"
@@ -1174,13 +1260,16 @@
#: selection:account.balances,comp1_filter:0
#: selection:account.balances,comp2_filter:0
#: selection:account.balances,filter:0
+#: selection:conciliation.bank.webkit,filter:0
+#: selection:open.invoices.webkit,filter_cmp:0
#, python-format
msgid "Periods"
msgstr "Períodos"
#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:77
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:128
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:151
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:150
msgid "Invoice"
msgstr "Factura"
@@ -1193,7 +1282,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:141
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:164
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:163
msgid "Curr. Balance"
msgstr "Balance Act."
@@ -1220,16 +1309,27 @@
msgid "All accounts"
msgstr "Todas las cuentas"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:42
+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."
msgstr "La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. Debería eliminar la moneda secundaria de la cuenta o asignar al diario una vista multi-moneda"
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_accounting_report
+msgid "Accounting Report"
+msgstr "Informe de contabilidad"
+
#. 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/conciliation_bank.mako:71
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:116
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:139
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:138
msgid "Period"
msgstr "Período"
@@ -1259,25 +1359,42 @@
msgid "Currency to show in the reports."
msgstr "Moneda para mostrar en los reportes."
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:41
+msgid "Conciled Balance"
+msgstr "Saldo Conciliado"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:444
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:446
+msgid "Total for Accounts in "
+msgstr "Total para Cuentas en "
+
+#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,enable_filter:0
+msgid "Enable Comparison"
+msgstr "Enable Comparison"
+
#. 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/conciliation_bank.mako:73
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:120
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:143
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:142
msgid "Journal"
-msgstr "Asiento"
+msgstr "Diario"
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: field:general.ledger.webkit,amount_currency:0
-#: field:open.invoices.webkit,amount_currency:0
#: field:partners.ledger.webkit,amount_currency:0
+#: field:conciliation.bank.webkit,amount_currency:0
msgid "With Currency"
msgstr "Con Moneda"
-#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,result_selection:0
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: field:partner.balance.webkit,result_selection:0
#: field:partners.ledger.webkit,result_selection:0
+#: field:conciliation.bank.webkit,result_selection:0
msgid "Partner's"
msgstr "Tipo de Cuentas"
@@ -1286,6 +1403,11 @@
msgid "This report allows you to print or generate a pdf of your general ledger with details of all your account journals"
msgstr "Este informe le permite imprimir o generar un PDF de su libro mayor con detalles de sus asientos contables"
+#. module: l10n_cr_account_financial_report_webkit
+#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_conciliation_bank_webkit
+msgid "Conciliation Bank Report"
+msgstr "Reporte de Conciliación de Bancos"
+
#. module: account_financial_report_webkit
#: code:addons/account_financial_report_webkit/report/profit_loss.py:39
#, python-format
@@ -1312,8 +1434,10 @@
#: 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_financial_report.mako:17
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:28
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:30
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:28
+#: field:conciliation.bank.webkit,chart_account_id:0
msgid "Chart of Account"
msgstr "Plan Contable"
@@ -1341,7 +1465,8 @@
#: field:account.balances,target_move:0
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:64
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:38
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:40
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:38
+#: field:conciliation.bank.webkit,target_move:0
msgid "Target Moves"
msgstr "Movimientos Destino"
@@ -1353,8 +1478,9 @@
#: 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/account_bank_balances.mako:71
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:31
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:45
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:47
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:45
msgid "From:"
msgstr "Desde:"
@@ -1378,6 +1504,8 @@
#: field:account.balances,comp1_date_to:0
#: field:account.balances,comp2_date_to:0
#: field:account.balances,date_to:0
+#: field:conciliation.bank.webkit,date_to:0
+#: field:open.invoices.webkit,date_to_cmp:0
msgid "End Date"
msgstr "Fecha Final"
@@ -1401,13 +1529,28 @@
#: field:account.balances,comp1_period_from:0
#: field:account.balances,comp2_period_from:0
#: field:account.balances,period_from:0
+#: field:conciliation.bank.webkit,period_from:0
+#: field:open.invoices.webkit,period_from_cmp:0
msgid "Start Period"
msgstr "Período Inicial"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:54
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:60
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:64
+msgid "Name"
+msgstr "Nombre"
+
#. module: account_financial_report_webkit
-#: field:open.invoices.webkit,until_date:0
-msgid "Clearance date"
-msgstr "Fecha de Liquidación"
+#: view:open.invoices.webkit:0
+msgid "This report allows you to print or generate a pdf of your open invoices per partner with details of all your payable/receivable account. Exclude full reconciled journal items."
+msgstr "Este informe le permite imprimir o generar un pdf de sus facturas pendientes por empresa con todos los ddetalles de todas sus cuentas por pagar/cobrar. Excluir asientos reconciliados."
+
+#. module: l10n_cr_account_financial_report_webkit
+#: field:conciliation.bank.webkit,bank_account_ids:0
+#: help:conciliation.bank.webkit,bank_account_ids:0
+msgid "Bank Account"
+msgstr "Cuenta Bancaria"
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: model:ir.model,name:account_financial_report_webkit.model_partners_ledger_webkit
@@ -1461,14 +1604,24 @@
#: field:account.balances,comp2_fiscalyear_id:0
#: field:account.balances,fiscalyear_id:0
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:55
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:18
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:29
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:31
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:29
+#: field:conciliation.bank.webkit,fiscalyear_id:0
+#: field:open.invoices.webkit,fiscalyear_id_cmp:0
msgid "Fiscal Year"
msgstr "Año Fiscal"
#. module: l10n_cr_account_financial_report_webkit
+#: field:open.invoices.webkit,account_report_id:0
+msgid "Account Reports"
+msgstr "Reportes Contables"
+
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:43
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:79
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:130
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:153
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:152
msgid "Payments"
msgstr "Pagos"
@@ -1487,7 +1640,7 @@
#: 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:118
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:141
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:140
msgid "Entry"
msgstr "Apunte"
@@ -1538,7 +1691,7 @@
#. 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/l10n_cr_account_report_open_invoices.mako:109
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:126
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:131
msgid "No Partner"
msgstr "No hay Empresa"
@@ -1556,6 +1709,15 @@
msgid "PARTNER LEDGER"
msgstr "LIBRO MAYOR DE EMPRESA"
+#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:180
+msgid "')}</div>\n"
+" ## period\n"
+" <div class=\"act_as_cell\" style=\"width: 70px;\">${_('"
+msgstr "')}</div>\n"
+" ## period\n"
+" <div class=\"act_as_cell\" style=\"width: 70px;\">${_('"
+
#. 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
@@ -1565,15 +1727,11 @@
#: selection:partners.ledger.webkit,target_move:0
#: selection:trial.balance.webkit,target_move:0
#: selection:account.balances,target_move:0
+#: selection:conciliation.bank.webkit,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 "Due Date"
-msgstr "Fecha de Vencimiento"
-
#. module: account_financial_report_webkit
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
@@ -1581,6 +1739,8 @@
#. module: l10n_cr_account_financial_report_webkit
#: report:addons/l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako:287
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:46
+#: report:addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako:198
msgid "Total"
msgstr "Total"
@@ -1600,8 +1760,3 @@
msgid "Compare By"
msgstr "Comparar por"
-#. module: l10n_cr_account_financial_report_webkit
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:132
-msgid "Initial Balance: "
-msgstr "Saldo Inicial: "
-
=== modified file 'l10n_cr_account_financial_report_webkit/report/__init__.py'
--- l10n_cr_account_financial_report_webkit/report/__init__.py 2012-06-29 18:12:43 +0000
+++ l10n_cr_account_financial_report_webkit/report/__init__.py 2012-07-09 22:19:17 +0000
@@ -3,3 +3,4 @@
import l10n_cr_partner_balance
import account_bank_balances
import l10n_cr_account_financial_report
+import conciliation_bank
=== added file 'l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako'
--- l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako 2012-07-09 22:19:17 +0000
@@ -0,0 +1,234 @@
+<html>
+ <head>
+ <style type="text/css">
+ ${css}
+
+ .list_table .act_as_row {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ font-size:10px;
+ }
+
+ .account_line {
+ font-weight: bold;
+ font-size: 15px;
+ background-color:#F0F0F0;
+ }
+
+ .account_line .act_as_cell {
+ height: 30px;
+ vertical-align: bottom;
+ }
+
+ </style>
+ </head>
+<body class = "data">
+ %for account in objects :
+ <%
+ bank_accounts = get_bank_accounts(cr, uid, account.id, context)
+ bank_balance = get_bank_balance(cr, uid, bank_accounts, context)
+ %>
+ <%setLang(user.context_lang)%>
+
+ <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div>
+ <div style="font-size: 25px; font-weight: bold; text-align: center;"> Conciliación de Bancos</div>
+ <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${account.name}</div>
+ </br></br>
+
+ <div class="act_as_table data_table" style="margin-top:30px; width: 180px;">
+ <div class="act_as_row labels">
+ <div class="act_as_cell" style = "text-align: left; width: 90px;">${_('Bank Balance')}</br>
+ ${_('Conciled Balance')}</br>
+ ${_('Cobros')}</br>
+ ${_('Payments')}</br>
+ ${_('Debits')}</br>
+ ${_('Credits')}</br>
+ ${_('Total')}</br>
+ </div>
+ <div class="act_as_cell" style = "text-align: left; width: 90px;">${formatLang(bank_balance[0])}</br>
+ ${formatLang(bank_balance[0])}</br>
+ ${formatLang(bank_balance[1])}</br>
+ ${formatLang(bank_balance[2])}</br>
+ ${formatLang(bank_balance[3])}</br>
+ ${formatLang(bank_balance[4])}</br>
+ <% total = bank_balance[0] + bank_balance[1] + bank_balance[2] + bank_balance[3] + bank_balance[4]%>
+ ${formatLang(total)}
+ </div>
+ </div>
+ </div>
+
+ <div class="account_title bg" style="width: 100%; margin-top: 15px; font-size: 12px;">${_('Move Lines')}</div>
+ <div class="act_as_table list_table" style="margin-top: 5px;">
+ <div class="act_as_thead">
+ <div class="act_as_row labels">
+ ## Account
+ <div class="act_as_cell first_column" style="width: 160px;">${_('Account')}</div>
+ ## Partner
+ <div class="act_as_cell" style="width: 160px;">${_('Partner')}</div>
+ ## date
+ <div class="act_as_cell" style="width: 70px;">${_('Date')}</div>
+ ## period
+ <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
+ ## journal
+ <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
+ ## label
+ <div class="act_as_cell" style="width: 250px;">${_('Label')}</div>
+ ## Invoices
+ <div class="act_as_cell amount" style="width: 100px;">${_('Invoice')}</div>
+ ## credit
+ <div class="act_as_cell amount" style="width: 100px;">${_('Payments')}</div>
+ ## debit
+ <div class="act_as_cell amount" style="width: 100px;">${_('Credit')}</div>
+ ## Payments
+ <div class="act_as_cell amount" style="width: 100px;">${_('Debit')}</div>
+ ## balance cumulated
+ <div class="act_as_cell amount" style="width: 115px;">${_('Cumul. Bal.')}</div>
+ </div>
+ </div>
+ <div class="act_as_tbody">
+ <%
+ total_invoice = 0.0
+ total_payment = 0.0
+ total_debit = 0.0
+ total_credit = 0.0
+ accumulated_balance = 0.0
+ accumulated_balance_curr = 0.0
+ total_accumulated_balance = 0.0
+ %>
+ %for bank_account in bank_accounts:
+ <%move_lines = [] %>
+ %if bank_account.user_type.name != 'Banco Saldo Real':
+ <% move_lines = get_move_lines(cr, uid, bank_account.id, context=None) %>
+
+ %for line in move_lines:
+ <%
+ invoice_amount = 0.0
+ payment_amount = 0.0
+ credit_amount = 0.0
+ debit_amount = 0.0
+
+ amount = get_amount(cr, uid, line, bank_account.currency_id.id)
+ %>
+ <div class="act_as_row lines">
+ ## Account
+ <div class="act_as_cell first_column">${line.account_id.name}</div>
+ ## Partner
+ <div class="act_as_cell">${line.partner_id.name}</div>
+ ## date
+ <div class="act_as_cell">${formatLang(line.date, date=True)}</div>
+ ## period
+ <div class="act_as_cell">${line.period_id.name}</div>
+ ## journal
+ <div class="act_as_cell">${line.journal_id.name}</div>
+ ## label
+ <div class="act_as_cell">${line.name}</div>
+ ## Invoice
+ <div class="act_as_cell amount">
+ %if amount[0] == 'invoice':
+ <%
+ invoice_amount = amount[1]
+ total_invoice += invoice_amount
+ %>
+ ${ formatLang(invoice_amount or 0.0) }
+ %else:
+ ${'0.0'}
+ %endif
+ %if amount[2] != None and amount[0] == 'invoice':
+ ${' ('}${ formatLang(amount[2]) }${')'}
+ %endif
+ </div>
+ ## Payment
+ <div class="act_as_cell amount">
+ %if amount[0] == 'payment':
+ <%
+ payment_amount = amount[1]
+ total_payment += payment_amount
+ %>
+ ${ formatLang(payment_amount or 0.0) }
+ %else:
+ ${'0.0'}
+ %endif
+ %if amount[2] != None and amount[0] == 'payment':
+ ${' ('}${ formatLang(amount[2]) }${')'}
+ %endif
+ </div>
+ ## Credit
+ <div class="act_as_cell amount">
+ %if amount[0] == 'credit':
+ <%
+ credit_amount = amount[1]
+ total_credit += credit_amount
+ %>
+ ${ formatLang(credit_amount or 0.0) }
+ %else:
+ ${'0.0'}
+ %endif
+ %if amount[2] != None and amount[0] == 'credit':
+ ${' ('}${ formatLang(amount[2]) }${')'}
+ %endif
+ </div>
+ ## Debit
+ <div class="act_as_cell amount">
+ %if amount[0] == 'debit':
+ <%
+ debit_amount = amount[1]
+ total_debit += debit_amount
+ %>
+ ${ formatLang(debit_amount or 0.0) }
+ %else:
+ ${'0.0'}
+ %endif
+ %if amount[2] != None and amount[0] == 'debit':
+ ${' ('}${ formatLang(amount[2]) }${')'}
+ %endif
+ </div>
+ ## balance cumulated
+ <%
+ accumulated_balance = (invoice_amount+payment_amount+credit_amount+debit_amount) or 0.0
+ total_accumulated_balance += accumulated_balance
+ %>
+ <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(total_accumulated_balance) }</div>
+ </div>
+ %endfor
+ %endif
+ %endfor
+ <div class="act_as_table list_table" style="margin-top:5px;">
+ <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
+ ## label
+ <div class="act_as_cell" style="width: 160px;">${_("Total")}</div>
+ <div class="act_as_cell" style="width: 160px;">${_('')}</div>
+ <div class="act_as_cell" style="width: 70px;">${_('')}</div>
+ <div class="act_as_cell" style="width: 70px;">${_('')}</div>
+ <div class="act_as_cell" style="width: 70px;">${_('')}</div>
+ <div class="act_as_cell" style="width: 250px;">${_('')}</div>
+ %if account.currency_id.id != False:
+ ## invoice
+ <div class="act_as_cell amount" style="width: 100px;">${account.currency_id.symbol} ${formatLang(total_invoice)}</div>
+ ## payment
+ <div class="act_as_cell amount" style="width: 100px;">${account.currency_id.symbol} ${formatLang(total_payment)}</div>
+ ## credit
+ <div class="act_as_cell amount" style="width: 100px;">${account.currency_id.symbol} ${formatLang(total_credit)}</div>
+ ## debit
+ <div class="act_as_cell amount" style="width: 100px;">${account.currency_id.symbol} ${formatLang(total_debit)}</div>
+ ## balance cumulated
+ <div class="act_as_cell amount" style="width: 115px;">${account.currency_id.symbol} ${formatLang(total_accumulated_balance)}</div>
+ %else:
+ ## invoice
+ <div class="act_as_cell amount" style="width: 100px;">${company.currency_id.symbol} ${formatLang(total_invoice)}</div>
+ ## payment
+ <div class="act_as_cell amount" style="width: 100px;">${company.currency_id.symbol} ${formatLang(total_payment)}</div>
+ ## credit
+ <div class="act_as_cell amount" style="width: 100px;">${company.currency_id.symbol} ${formatLang(total_credit)}</div>
+ ## debit
+ <div class="act_as_cell amount" style="width: 100px;">${company.currency_id.symbol} ${formatLang(total_debit)}</div>
+ ## balance cumulated
+ <div class="act_as_cell amount" style="width: 115px;">${company.currency_id.symbol} ${formatLang(total_accumulated_balance)}</div>
+ %endif
+ </div>
+ </div>
+ </div>
+ </div>
+ %endfor
+
+</body>
+</html>
=== added file 'l10n_cr_account_financial_report_webkit/report/conciliation_bank.py'
--- l10n_cr_account_financial_report_webkit/report/conciliation_bank.py 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/report/conciliation_bank.py 2012-07-09 22:19:17 +0000
@@ -0,0 +1,158 @@
+# -*- 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
+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
+
+
+class conciliation_bank(report_sxw.rml_parse):
+
+ def __init__(self, cr, uid, name, context):
+ super(conciliation_bank, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ 'cr' : cr,
+ 'uid': uid,
+ 'get_amount': self.get_amount,
+ 'get_move_lines': self.get_move_lines,
+ 'get_bank_accounts': self.get_bank_accounts,
+ 'get_bank_balance': self.get_bank_balance,
+ })
+
+ def get_amount(self,cr, uid, account_move_line, currency):
+ account_obj = self.pool.get('account.account').browse(cr,uid,account_move_line.account_id.id)
+
+ obj_invoice = self.pool.get('account.invoice')
+ invoice_search = obj_invoice.search(cr,uid,[('move_id','=',account_move_line.move_id.id)])
+ invoice = None
+ if invoice_search != []:
+ invoice = obj_invoice.browse(cr,uid,invoice_search[0])
+
+ obj_voucher = self.pool.get('account.voucher')
+ voucher_search = obj_voucher.search(cr,uid,[('move_id','=',account_move_line.move_id.id)])
+
+ voucher = None
+ if voucher_search != []:
+ voucher = obj_voucher.browse(cr,uid,voucher_search[0])
+
+ res = ('none', 0.0, 0.0)
+
+ amount = 0.0
+ if currency != False:
+ amount = account_move_line.amount_currency
+ else:
+ if account_move_line.debit != 0.0 :
+ amount = account_move_line.debit
+ elif account_move_line.credit != 0.0 :
+ amount = account_move_line.credit * -1
+
+ # Invoices
+ if invoice:
+ if invoice.type == 'out_invoice': # Customer Invoice
+ res = ('invoice', amount)
+ elif invoice.type == 'in_invoice': # Supplier Invoice
+ res = ('invoice', amount)
+ elif invoice.type == 'in_refund': # Debit Note
+ res = ('debit', amount)
+ elif invoice.type == 'out_refund': # Credit Note
+ res = ('credit', amount)
+ # Vouchers
+ elif voucher:
+ if voucher.type == 'payment': # Payment
+ res = ('payment', amount)
+ elif voucher.type == 'sale': # Invoice
+ res = ('invoice', amount)
+ elif voucher.type == 'receipt': # Payment
+ res = ('payment', amount)
+ # Debit o Credit
+ else:
+ if amount > 0.0:
+ res = ('debit', amount)
+ else:
+ res = ('credit', amount)
+
+
+ if res[1] == None or (currency != None and res[1] == 0.0):
+ secundary_amount = (account_move_line.debit != 0.0) and account_move_line.debit or account_move_line.credit
+ res = (res[0], 0.0, secundary_amount)
+ else:
+ res = (res[0], res[1], None)
+
+ return res
+
+ def get_move_lines(self, cr, uid, account_id, context=None):
+ obj_move = self.pool.get('account.move.line')
+ obj_search = obj_move.search(cr, uid, [('account_id','=',account_id),('reconcile_id','=',False)])
+ move_lines = obj_move.browse(cr, uid, obj_search)
+
+ return move_lines
+
+ def get_bank_accounts(self, cr, uid, account_id, context=None):
+ account_ids = self.pool.get('account.account').search(cr, uid, [('parent_id','=',account_id)])
+ accounts = self.pool.get('account.account').browse(cr, uid, account_ids)
+
+ return accounts
+
+ def get_bank_balance(self, cr, uid, accounts, context=None):
+ total_debit = 0.0
+ total_credit = 0.0
+ total_invoice = 0.0
+ total_payment = 0.0
+ result = []
+
+ for account in accounts:
+ user_type = account.user_type.name
+ if user_type == 'Banco Saldo Real':
+ move_lines = self.get_move_lines(cr, uid, account.id, context)
+ for move_line in move_lines:
+ amount = self.get_amount(cr, uid, move_line, account.currency_id.id)
+ if amount[0] == 'invoice':
+ total_invoice += amount[1]
+ elif amount[0] == 'payment':
+ total_payment += amount[1]
+ elif amount[0] == 'credit':
+ total_credit += amount[1]
+ elif amount[0] == 'debit':
+ total_debit += amount[1]
+
+ bank_balance = total_debit + total_credit + total_invoice + total_payment
+
+ result.append(bank_balance)
+ result.append(total_invoice)
+ result.append(total_payment)
+ result.append(total_debit)
+ result.append(total_credit)
+
+ return result
+
+report_sxw.report_sxw(
+ 'report.l10n.cr.conciliation.bank.layout_ccorp',
+ 'account.account',
+ 'addons/l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako',
+ parser=conciliation_bank)
+
=== modified file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.py'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.py 2012-07-04 23:19:11 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.py 2012-07-09 22:19:17 +0000
@@ -45,7 +45,9 @@
self.context = context
#the parameters are the report name and module name
-report_sxw.report_sxw( 'report.account_financial_report_webkit', 'account.financial.report',
- 'addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako', parser = l10n_cr_account_financial_report_parser, header = 'internal' )
+report_sxw.report_sxw( 'report.account_financial_report_webkit.account.account_financial_report_webkit',
+ 'account.account',
+ 'addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako',
+ parser = l10n_cr_account_financial_report_parser)
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'l10n_cr_account_financial_report_webkit/report/report.xml'
--- l10n_cr_account_financial_report_webkit/report/report.xml 2012-06-29 18:12:43 +0000
+++ l10n_cr_account_financial_report_webkit/report/report.xml 2012-07-09 22:19:17 +0000
@@ -36,6 +36,9 @@
<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="conciliation_bank" model="account.account"
+ name="l10n.cr.conciliation.bank.layout_ccorp" file="l10n_cr_account_financial_report_webkit/report/conciliation_bank.mako" string="Conciliacion de Bancos" 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>
@@ -51,21 +54,21 @@
<field name="report_file">l10n_cr_account_financial_report_webkit/report/account_bank_balances.mako</field>
<field name="webkit_header" ref="financial_portrait_header"/>
</record>
- <!--
- <record id="l10n_cr_account_financial_report" model="ir.actions.report.xml">
+
+ <record id="l10n_cr_account_financial_report" model="ir.actions.report.xml">
<field name="report_type">webkit</field>
- <field name="report_name">account_financial_report_webkit</field>
+ <field name="report_name">account_financial_report_webkit.account.account_financial_report_webkit</field>
<field eval="[(6,0,[])]" name="groups_id"/>
<field eval="0" name="multi"/>
<field eval="0" name="auto"/>
<field eval="1" name="header"/>
- <field name="model">account.financial.report</field>
+ <field name="model">account.account</field>
<field name="type">ir.actions.report.xml</field>
<field name="name">Account Financial Report</field>
- <field name="report_rml">l10n_cr_account_financial_report_webkit/report/account_financial_report.mako</field>
- <field name="report_file">l10n_cr_account_financial_report_webkit/report/account_financial_report.mako</field>
+ <field name="report_rml">l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako</field>
+ <field name="report_file">l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako</field>
<field name="webkit_header" ref="financial_landscape_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-13 20:01:31 +0000
+++ l10n_cr_account_financial_report_webkit/report_menus.xml 2012-07-09 22:19:17 +0000
@@ -13,6 +13,10 @@
<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"/>
-
+ <!--
+ <menuitem icon="STOCK_PRINT" name="Conciliation Bank"
+ parent="account.next_id_22" action="action_conciliation_bank_menu_webkit"
+ groups="account.group_account_manager,account.group_account_user" id="menu_conciliation_bank"/>
+ -->
</data>
</openerp>
=== modified file 'l10n_cr_account_financial_report_webkit/wizard/__init__.py'
--- l10n_cr_account_financial_report_webkit/wizard/__init__.py 2012-07-04 23:19:11 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/__init__.py 2012-07-09 22:19:17 +0000
@@ -25,3 +25,4 @@
import open_invoices_wizard
import account_bank_balances_wizard
import l10n_cr_account_financial_report_wizard
+import conciliation_bank_wizard
=== added file 'l10n_cr_account_financial_report_webkit/wizard/conciliation_bank_wizard.py'
--- l10n_cr_account_financial_report_webkit/wizard/conciliation_bank_wizard.py 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/conciliation_bank_wizard.py 2012-07-09 22:19:17 +0000
@@ -0,0 +1,44 @@
+# -*- 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
+
+from osv import fields, osv
+
+
+class l10n_cr_ConciliationBankWizard(osv.osv_memory):
+
+ _inherit = "partners.ledger.webkit"
+ _name = "conciliation.bank.webkit"
+ _description = "Conciliation Bank Report"
+
+ _columns = {
+ 'bank_account_ids': fields.many2one('account.account', 'Bank Account', domain="[('user_type','==','bank_view')]", help="Bank Account"),
+ }
+
+ 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': 'account_financial_report_webkit.account.account_report_partners_ledger_webkit',
+ 'datas': data}
=== added file 'l10n_cr_account_financial_report_webkit/wizard/conciliation_bank_wizard.xml'
--- l10n_cr_account_financial_report_webkit/wizard/conciliation_bank_wizard.xml 1970-01-01 00:00:00 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/conciliation_bank_wizard.xml 2012-07-09 22:19:17 +0000
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <record id="conciliation_bank_view_webkit" model="ir.ui.view">
+ <field name="name">Conciliation Bank</field>
+ <field name="model">conciliation.bank.webkit</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="Conciliation Bank" colspan="4"/>
+ <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account"/>
+ </xpath>
+ <field name="chart_account_id" position='attributes'>
+ <attribute name="colspan">4</attribute>
+ </field>
+ <xpath expr="//field[@name='target_move']" position="after">
+ <field name="result_selection" colspan="4"/>
+ </xpath>
+ <page name="filters" position="attributes">
+ <attribute name="string">Time Filters</attribute>
+ </page>
+ <page name="journal_ids" position="attributes">
+ <attribute name="invisible">True</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>
+ </data>
+ </field>
+ </record>
+
+ <record id="action_conciliation_bank_menu_webkit" model="ir.actions.act_window">
+ <field name="name">Conciliation Bank</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">conciliation.bank.webkit</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="conciliation_bank_view_webkit"/>
+ <field name="target">new</field>
+ </record>
+
+ <record model="ir.values" id="action_account_conciliation_bank_values_webkit">
+ <field name="model_id" ref="account.model_account_account"/>
+ <field name="object" eval="1"/>
+ <field name="name">Conciliation Bank</field>
+ <field name="key2">client_print_multi</field>
+ <field name="value"
+ eval="'ir.actions.act_window,' +str(ref('action_conciliation_bank_menu_webkit'))"/>
+ <field name="key">action</field>
+ <field name="model">account.account</field>
+ </record>
+
+ </data>
+</openerp>
=== modified file 'l10n_cr_account_financial_report_webkit/wizard/l10n_cr_account_financial_report_wizard.py'
--- l10n_cr_account_financial_report_webkit/wizard/l10n_cr_account_financial_report_wizard.py 2012-06-29 18:12:43 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/l10n_cr_account_financial_report_wizard.py 2012-07-09 22:19:17 +0000
@@ -31,7 +31,7 @@
data['form'].update( self.read( cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter'], context = context )[0] )
return {
'type': 'ir.actions.report.xml',
- 'report_name': 'account_financial_report_webkit',
+ 'report_name': 'account_financial_report_webkit.account.account_financial_report_webkit',
'datas': data,
}
=== modified file 'l10n_cr_account_financial_report_webkit/wizard/open_invoices_wizard.py'
--- l10n_cr_account_financial_report_webkit/wizard/open_invoices_wizard.py 2012-06-29 18:12:43 +0000
+++ l10n_cr_account_financial_report_webkit/wizard/open_invoices_wizard.py 2012-07-09 22:19:17 +0000
@@ -26,7 +26,7 @@
class l10n_cr_AccountReportOpenInvoicesWizard(osv.osv_memory):
"""Will launch partner ledger report and pass required args"""
- _inherit = "accounting.report"
+ _inherit = "open.invoices.webkit"
_name = "open.invoices.webkit"
_description = "Open Invoices Report"
Follow ups
