clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00199
lp:~as.clearcorp/openerp-costa-rica/6.1-l10n_cr_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_cr_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_cr_account_financial_report_webkit/+merge/113090
[ADD] Added get_initial_balance method in l10n_cr_partners_ledger.py
[FIX] Added Initial Balance in l10n_cr_account_report_partners_ledger.mako
--
https://code.launchpad.net/~as.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit/+merge/113090
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_account_financial_report_webkit/i18n/es_CR.po'
--- l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-06-22 20:40:49 +0000
+++ l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-07-02 18:46:21 +0000
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-22 15:57+0000\n"
-"PO-Revision-Date: 2012-06-22 15:57+0000\n"
+"POT-Creation-Date: 2012-07-02 17:01+0000\n"
+"PO-Revision-Date: 2012-07-02 17:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -249,12 +249,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"
+msgstr "General Ledger Webkit"
#. 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:126
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:148
msgid "Rec."
msgstr "Rec."
@@ -271,7 +271,7 @@
#: 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_report_open_invoices.mako:34
-#: 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:36
msgid "Periods Filter"
msgstr "Filtro por Períodos"
@@ -295,7 +295,7 @@
#: 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:39
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:41
msgid "Initial Balance"
msgstr "Saldo Inicial"
@@ -307,7 +307,7 @@
#. module: account_financial_report_webkit
#: model:ir.model,name:account_financial_report_webkit.model_general_ledger_webkit
msgid "General Ledger Report"
-msgstr "Informe de Libro Mayor"
+msgstr "Informe del libro mayor"
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: constraint:open.invoices.webkit:0
@@ -334,7 +334,7 @@
#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99
#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:108
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:122
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:122
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:144
msgid "Partner"
msgstr "Empresa"
@@ -372,7 +372,7 @@
#: 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:143
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:165
msgid "Curr."
msgstr "Curr."
@@ -380,7 +380,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:124
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:124
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:146
msgid "Label"
msgstr "Etiqueta"
@@ -401,7 +401,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:134
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:134
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:156
msgid "Debit"
msgstr "Débito"
@@ -430,7 +430,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 "Partner Balance Webkit"
+msgstr "Estado de Cuenta"
#. module: account_financial_report_webkit
#: help:open.invoices.webkit,until_date:0
@@ -473,8 +473,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:297
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:356
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:319
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:378
msgid "Saldo"
msgstr "Saldo"
@@ -582,15 +582,15 @@
#: 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:37
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:39
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:136
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:158
msgid "Manual Move"
-msgstr "Manual Move"
+msgstr "Movimiento Manual"
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: selection:account.common.balance.report,comp0_filter:0
@@ -616,7 +616,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:60
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:72
msgid "Custom Filter"
msgstr "Filtro Personalizado"
@@ -657,7 +657,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:138
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:138
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:160
msgid "Cumul. Bal."
msgstr "Bal. Acumul."
@@ -919,7 +919,7 @@
#: selection:account.balances,comp2_filter:0
#: selection:account.balances,filter:0
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:114
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:114
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:136
msgid "Date"
msgstr "Fecha"
@@ -936,12 +936,13 @@
#. 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:74
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.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
msgid "Accounts in "
msgstr "Cuentas en "
-#. module: account_financial_report_webkit
+#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
+#: view:account.move.line:0
#: view:account.move.line:0
msgid "Internal Note"
msgstr "Nota interna"
@@ -968,7 +969,7 @@
#: 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_report_open_invoices.mako:51
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:51
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:61
msgid "To:"
msgstr "Hasta:"
@@ -982,7 +983,7 @@
#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices
#: view:open.invoices.webkit:0
msgid "Open Invoices"
-msgstr "Facturas Pendientes"
+msgstr "Open Invoices"
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: selection:account.common.balance.report,target_move:0
@@ -1038,7 +1039,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:132
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:132
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:154
msgid "Credit"
msgstr "Crédito"
@@ -1132,7 +1133,7 @@
#: 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_report_open_invoices.mako:32
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:32
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:34
msgid "Dates Filter"
msgstr "Filtro por Fechas"
@@ -1176,7 +1177,7 @@
#. module: l10n_cr_account_financial_report_webkit
#: 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:128
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:150
msgid "Invoice"
msgstr "Factura"
@@ -1189,7 +1190,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:141
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:163
msgid "Curr. Balance"
msgstr "Balance Act."
@@ -1230,7 +1231,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:116
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:116
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:138
msgid "Period"
msgstr "Período"
@@ -1264,7 +1265,7 @@
#: 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/l10n_cr_account_report_open_invoices.mako:120
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:120
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:142
msgid "Journal"
msgstr "Asiento"
@@ -1314,7 +1315,7 @@
#: 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:28
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:28
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:30
msgid "Chart of Account"
msgstr "Plan Contable"
@@ -1342,7 +1343,7 @@
#: 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:38
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:40
msgid "Target Moves"
msgstr "Movimientos Destino"
@@ -1355,7 +1356,7 @@
#: 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_report_open_invoices.mako:45
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:45
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:47
msgid "From:"
msgstr "Desde:"
@@ -1410,11 +1411,6 @@
msgid "Clearance date"
msgstr "Fecha de Liquidación"
-#. module: l10n_cr_account_financial_report_webkit
-#: view:account.move.line:0
-msgid "Narration"
-msgstr "Redacción"
-
#. modules: l10n_cr_account_financial_report_webkit, account_financial_report_webkit
#: model:ir.model,name:account_financial_report_webkit.model_partners_ledger_webkit
#: model:ir.model,name:l10n_cr_account_financial_report_webkit.model_partners_ledger_webkit
@@ -1468,13 +1464,13 @@
#: 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:29
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:29
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:31
msgid "Fiscal Year"
msgstr "Año Fiscal"
#. module: l10n_cr_account_financial_report_webkit
#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_open_invoices.mako:130
-#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:130
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:152
msgid "Payments"
msgstr "Pagos"
@@ -1488,7 +1484,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:118
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:140
msgid "Entry"
msgstr "Apunte"
@@ -1538,7 +1534,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:109
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako:125
msgid "No Partner"
msgstr "No hay Empresa"
@@ -1600,3 +1596,8 @@
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:131
+msgid "Initial Balance: "
+msgstr "Saldo Inicial: "
+
=== modified file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako 2012-06-21 23:21:28 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako 2012-07-02 18:46:21 +0000
@@ -21,6 +21,8 @@
<%
initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}
+ filter_type = ''
+ filter_data = []
%>
<div class="act_as_table data_table">
@@ -45,14 +47,24 @@
${_('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'
+ %>
%else:
${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) %>
%else:
${stop_period.name if stop_period else u'' }
+ <% filter_data.append(stop_period) %>
%endif
</div>
<div class="act_as_cell">
@@ -103,10 +115,20 @@
part_cumul_balance = 0.0
part_cumul_balance_curr = 0.0
+
+ part_cumul_balance = account.init_balance.get(p_id, {}).get('init_balance') or 0.0
+ init_balance = 0.0
+ init_balance = get_initial_balance(cr, uid, p_id, account, filter_type, filter_data, fiscal_year, currency[0])
%>
<div class="act_as_table list_table" style="margin-top: 5px;">
<div class="act_as_caption account_title">
- ${ get_partner_name(cr, uid, partner_name, p_id, p_ref, p_name) or _('No Partner')}
+ ${ get_partner_name(cr, uid, partner_name, p_id, p_ref, p_name) or _('No Partner')}<br />
+ %if (currency[0] != None):
+ <% currency_symbol = get_currency_symbol(cr, uid, account.currency_id.id) %>
+ %else:
+ <% currency_symbol = get_currency_symbol(cr, uid, company.currency_id.id) %>
+ %endif
+ ${_('Initial Balance: ')} ${currency_symbol}${formatLang(init_balance)}
</div>
<div class="act_as_thead">
<div class="act_as_row labels">
@@ -160,8 +182,7 @@
#cumul_balance_curr += part_cumul_balance_curr
%>
%endif
-
-
+
%for line in account.ledger_lines.get(p_id, []):
<%
label_elements = [line.get('lname') or '']
@@ -268,7 +289,7 @@
%endif
</div>
## balance cumulated
- <% cumul_balance = (invoice_amount+payment_amount+credit_amount+debit_amount+MM_amount) or 0.0 %>
+ <% cumul_balance = (init_balance+invoice_amount+payment_amount+credit_amount+debit_amount+MM_amount) or 0.0 %>
<div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) }</div>
%if amount_currency(data):
## currency balance
@@ -279,7 +300,8 @@
<% last_line_currency = line.get('currency_id') %>
</div>
<%
- total_cumul_balance = total_invoice + total_payment + total_debit + total_credit + total_manual_move
+ #total_cumul_balance = total_invoice + total_payment + total_debit + total_credit + total_manual_move
+ total_cumul_balance += cumul_balance
%>
%endfor
<div class="act_as_row lines labels">
=== modified file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_partners_ledger.py'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_partners_ledger.py 2012-06-21 23:21:28 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_partners_ledger.py 2012-07-02 18:46:21 +0000
@@ -43,6 +43,7 @@
'get_partner_name': self.get_partner_name,
'get_accounts_by_curr': self.get_accounts_by_curr,
'get_currency_symbol': self.get_currency_symbol,
+ 'get_initial_balance': self.get_initial_balance,
})
def get_accounts_by_curr(self, cr, uid, objects):
@@ -142,8 +143,38 @@
currency = self.pool.get('res.currency').browse(cr,uid,currency_id)
return currency.symbol
+
+ def get_initial_balance(self, cr, uid, partner, account, filter_type, filter_data, fiscal_year, currency, context=None):
+ date_start = ''
+ initial_balance = 0.0
+
+ if filter_type == '':
+ date_start = fiscal_year.date_start
+ move_lines_id = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', account.id), ('partner_id', '=', partner), ('period_id.fiscalyear_id.date_start', '<', date_start), ('reconcile_id', '=', False)], context=context)
+ else:
+ if filter_type == 'filter_period':
+ date_start = filter_data[0].date_start
+ move_lines_id = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', account.id), ('partner_id', '=', partner), ('period_id.date_start', '<', date_start), ('reconcile_id', '=', False)], context=context)
+ elif filter_type == 'filter_date':
+ date_start = filter_data[0]
+ move_lines_id = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', account.id), ('partner_id', '=', partner), ('date', '<', date_start), ('reconcile_id', '=', False)], context=context)
+
+ move_lines = self.pool.get('account.move.line').browse(cr, uid, move_lines_id)
+
+ amount = 0.0
+ for move_line in move_lines:
+ if currency != None:
+ amount = move_line.amount_currency
+ else:
+ if move_line.debit != 0.0 :
+ amount = move_line.debit
+ elif move_line.credit != 0.0 :
+ amount = move_line.credit * -1
+ initial_balance += amount
+
+ return initial_balance
HeaderFooterTextWebKitParser('report.account_financial_report_webkit.account.account_report_partners_ledger_webkit',
'account.account',
'addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_report_partners_ledger.mako',
- parser=l10n_cr_PartnersLedgerWebkit)
+ parser=l10n_cr_PartnersLedgerWebkit)
\ No newline at end of file
Follow ups
