clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00343
lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit into lp:openerp-costa-rica
Ronald Rubi has proposed merging lp:~rr.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/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit/+merge/132586
Fix comparation in report l10n_cr_account_financial_webkit
--
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_financial_report_webkit/+merge/132586
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-07-26 15:36:07 +0000
+++ l10n_cr_account_financial_report_webkit/i18n/es_CR.po 2012-11-01 16:12:23 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-12 00:52+0000\n"
-"PO-Revision-Date: 2012-07-12 00:52+0000\n"
+"POT-Creation-Date: 2012-10-31 20:48+0000\n"
+"PO-Revision-Date: 2012-10-31 20:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -251,6 +251,11 @@
msgstr ""
#. module: l10n_cr_account_financial_report_webkit
+#: report:addons/l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako:25
+msgid "None Filter"
+msgstr "Ningún Filtro"
+
+#. module: l10n_cr_account_financial_report_webkit
#: field:account.balances,comp0_period_to:0
#: field:account.balances,comp1_period_to:0
#: field:account.balances,comp2_period_to:0
@@ -501,6 +506,12 @@
msgstr "Reporte Financiero de Cuenta"
#. module: l10n_cr_account_financial_report_webkit
+#: selection:account.balances,filter:0
+#: selection:conciliation.bank.webkit,filter:0
+msgid "No Filters"
+msgstr "Sin Filtros"
+
+#. module: l10n_cr_account_financial_report_webkit
#: 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
=== modified file 'l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako'
--- l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako 2012-07-02 16:56:47 +0000
+++ l10n_cr_account_financial_report_webkit/report/l10n_cr_account_financial_report.mako 2012-11-01 16:12:23 +0000
@@ -10,7 +10,7 @@
${css}
</style>
</head>
-<body>
+<body>
<div style="font-size: 25px; font-weight: bold; text-align: center; align=center;">${ data['form']['account_report_id'][1] }</div>
<div class="act_as_table data_table">
<div class="act_as_row labels">
@@ -19,8 +19,10 @@
<div class="act_as_cell">
%if filter_form(data) == 'filter_date':
${_('Dates Filter')}
- %else:
+ %elif filter_form(data) == 'filter_period':
${_('Periods Filter')}
+ %else:
+ ${_('None Filter')}
%endif
</div>
</div>
@@ -28,16 +30,21 @@
<div class="act_as_cell">${ get_account(data) }</div>
<div class="act_as_cell">${ get_fiscalyear(data) if get_fiscalyear(data) else '-' }</div>
<div class="act_as_cell">
- ${_('From:')}
%if filter_form(data) == 'filter_date':
+ ${_('From:')}
${formatLang(get_start_date(data), date=True) if get_start_date(data) else u'' }
- %else:
+ %elif filter_form(data) == 'filter_period':
+ ${_('From:')}
${ get_start_period(data) if get_start_period(data) else u''}
+ %else:
+ ${ '-' }
%endif
- ${_('To:')}
+
%if filter_form(data) == 'filter_date':
+ ${_('To:')}
${ formatLang(get_end_date(data), date=True) if get_end_date(data) else u'' }
- %else:
+ %elif filter_form(data) == 'filter_period':
+ ${_('To:')}
${get_end_period(data) if get_end_period(data) else u'' }
%endif
</div>
@@ -52,18 +59,18 @@
<div class="act_as_row labels" style="font-weight: bold; font-size: 11x; vertical-align: right;">
%if data['form']['debit_credit'] == 1:
<div class="act_as_cell first_column" style="width: 200px; vertical-align: right; align:right;">${_('Name')}</div>
- <div class="act_as_cell" style="width: 100px; vertical-align: right; align:right;">${_('Debit')}</div>
- <div class="act_as_cell" style="width: 100px; vertical-align: right; align:right;">${_('Credit')}</div>
- <div class="act_as_cell" style="width: 100px; vertical-align: right; align:right;">${_('Balance')}</div>
+ <div class="act_as_cell amount" style="width: 100px; vertical-align: right; align:right;">${_('Debit')}</div>
+ <div class="act_as_cell amount" style="width: 100px; vertical-align: right; align:right;">${_('Credit')}</div>
+ <div class="act_as_cell amount" style="width: 100px; vertical-align: right; align:right;">${_('Balance')}</div>
%endif
%if not data['form']['enable_filter'] and not data['form']['debit_credit']:
<div class="act_as_cell first_column" style="width: 200px; vertical-align: right; align:right;">${_('Name')}</div>
- <div class="act_as_cell" style="width: 100px; vertical-align: right; align:right;">${_('Balance')}</div>
+ <div class="act_as_cell amount" style="width: 100px; vertical-align: right; align:right;">${_('Balance')}</div>
%endif
%if data['form']['enable_filter'] == 1 and not data['form']['debit_credit']:
<div class="act_as_cell first_column" style="width: 200px; vertical-align: right; align:right;">${_('Name')}</div>
- <div class="act_as_cell" style="width: 100px; vertical-align: right; align:right;">${_('Balance')}</div>
- <div class="act_as_cell" style="width: 100px; vertical-align: right; align:right;">${_(data['form']['label_filter'])}</div>
+ <div class="act_as_cell amount" style="width: 100px; vertical-align: right; align:right;">${_('Balance')}</div>
+ <div class="act_as_cell amount" style="width: 100px; vertical-align: right; align:right;">${_(data['form']['label_filter'])}</div>
%endif
</div>
</div>
@@ -79,61 +86,63 @@
%if line['level'] > 0:
<div class="act_as_cell" style="padding-left:${line['level']*10}px">
%if bold:
- <div class="act_as_cell" ><b>${line['name']}</b></div>
+ <div class="act_as_cell" ><b>${_(line['name'])}</b></div>
%else:
- <div class="act_as_cell" >${line['name']}</div>
+ <div class="act_as_cell" >${_(line['name'])}</div>
%endif
</div>
- <div class="act_as_cell amount" >${line['debit']}</div>
- <div class="act_as_cell amount" >${line['credit']}</div>
- <div class="act_as_cell amount" >${line['balance']}</div>
+ <div class="act_as_cell amount" >${_(line['debit'])}</div>
+ <div class="act_as_cell amount" >${_(line['credit'])}</div>
+ <div class="act_as_cell amount" >${_(line['balance'])}</div>
%else:
%if bold:
- <div class="act_as_cell" ><b>${line['name']}</b></div>
+ <div class="act_as_cell" ><b>${_(line['name'])}</b></div>
%else:
- <div class="act_as_cell" >${line['name']}</div>
+ <div class="act_as_cell" >${_(line['name'])}</div>
%endif
- <div class="act_as_cell amount" >${line['debit']}</div>
- <div class="act_as_cell amount" >${line['credit']}</div>
- <div class="act_as_cell amount" >${line['balance']}</div>
+ <div class="act_as_cell amount" >${_(line['debit'])}</div>
+ <div class="act_as_cell amount" >${_(line['credit'])}</div>
+ <div class="act_as_cell amount" >${_(line['balance'])}</div>
%endif
%endif
%if not data['form']['enable_filter'] and not data['form']['debit_credit']:
%if line['level'] > 0:
<div class="act_as_cell" style="padding-left:${line['level']*10}px">
%if bold:
- <div class="act_as_cell" ><b>${line['name']}</b></div>
+ <div class="act_as_cell" ><b>${_(line['name'])}</b></div>
%else:
- <div class="act_as_cell" >${line['name']}</div>
+ <div class="act_as_cell" >${_(line['name'])}</div>
%endif
</div>
- <div class="act_as_cell amount" >${line['balance']}</div>
+ <div class="act_as_cell amount" >${_(line['balance'])}</div>
%else:
%if bold:
- <div class="act_as_cell" ><b>${line['name']}</b></div>
+ <div class="act_as_cell" ><b>${_(line['name'])}</b></div>
%else:
- <div class="act_as_cell" >${line['name']}</div>
+ <div class="act_as_cell" >${_(line['name'])}</div>
%endif
- <div class="act_as_cell amount" >${line['balance']}</div>
+ <div class="act_as_cell amount" >${_(line['balance'])}</div>
%endif
%endif
%if data['form']['enable_filter'] == 1 and not data['form']['debit_credit']:
%if line['level'] > 0:
<div class="act_as_cell" style="padding-left:${line['level']*10}px">
%if bold:
- <div class="act_as_cell" ><b>${line['name']}</b></div>
+ <div class="act_as_cell" ><b>${_(line['name'])}</b></div>
%else:
- <div class="act_as_cell" >${line['name']}</div>
+ <div class="act_as_cell" >${_(line['name'])}</div>
%endif
</div>
- <div class="act_as_cell amount" >${line['balance']}</div>
+ <div class="act_as_cell amount" >${_(line['balance'])}</div>
+ <div class="act_as_cell amount" >${_(line['balance_cmp'])}</div>
%else:
%if bold:
- <div class="act_as_cell" ><b>${line['name']}</b></div>
+ <div class="act_as_cell" ><b>${_(line['name'])}</b></div>
%else:
- <div class="act_as_cell">${line['name']}</div>
+ <div class="act_as_cell">${_(line['name'])}</div>
%endif
- <div class="act_as_cell amount" >${line['balance']}</div>
+ <div class="act_as_cell amount" >${_(line['balance'])}</div>
+ <div class="act_as_cell amount" >${_(line['balance_cmp'])}</div>
%endif
%endif
</div>
Follow ups
