Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IMP] correct/add reference field in financial reports

pull/7/merge
Matthieu Dietrich 2014-04-09 10:47:47 +02:00
parent 64032c29ce
commit 1c687c8d4a
4 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
account_financial_report_webkit/report/templates/account_report_general_ledger.mako
View File

@ -82,7 +82,7 @@
cumul_balance_curr = 0.0 cumul_balance_curr = 0.0
%> %>
<div class="act_as_table list_table" style="margin-top: 10px;"> <div class="act_as_table list_table" style="margin-top: 10px;">
<div class="act_as_caption account_title"> <div class="act_as_caption account_title">
${account.code} - ${account.name} ${account.code} - ${account.name}
</div> </div>
@ -93,15 +93,17 @@
## period ## period
<div class="act_as_cell" style="width: 50px;">${_('Period')}</div> <div class="act_as_cell" style="width: 50px;">${_('Period')}</div>
## move ## move
<div class="act_as_cell" style="width: 60px;">${_('Entry')}</div> <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
## journal ## journal
<div class="act_as_cell" style="width: 70px;">${_('Journal')}</div> <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
## account code ## account code
<div class="act_as_cell" style="width: 65px;">${_('Account')}</div> <div class="act_as_cell" style="width: 65px;">${_('Account')}</div>
## partner ## partner
<div class="act_as_cell" style="width: 120px;">${_('Partner')}</div> <div class="act_as_cell" style="width: 140px;">${_('Partner')}</div>
## move reference
<div class="act_as_cell" style="width: 140px;">${_('Reference')}</div>
## label ## label
<div class="act_as_cell" style="width: 200px;">${_('Label')}</div> <div class="act_as_cell" style="width: 160px;">${_('Label')}</div>
## counterpart ## counterpart
<div class="act_as_cell" style="width: 100px;">${_('Counter part')}</div> <div class="act_as_cell" style="width: 100px;">${_('Counter part')}</div>
## debit ## debit
@ -140,6 +142,8 @@
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## partner ## partner
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## move reference
<div class="act_as_cell"></div>
## label ## label
<div class="act_as_cell">${_('Initial Balance')}</div> <div class="act_as_cell">${_('Initial Balance')}</div>
## counterpart ## counterpart
@ -184,6 +188,8 @@
<div class="act_as_cell">${account.code}</div> <div class="act_as_cell">${account.code}</div>
## partner ## partner
<div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div> <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
## move reference
<div class="act_as_cell">${line.get('lref') or ''}</div>
## label ## label
<div class="act_as_cell">${label}</div> <div class="act_as_cell">${label}</div>
## counterpart ## counterpart
@ -206,8 +212,8 @@
<div class="act_as_table list_table"> <div class="act_as_table list_table">
<div class="act_as_row labels" style="font-weight: bold;"> <div class="act_as_row labels" style="font-weight: bold;">
## date ## date
<div class="act_as_cell first_column" style="width: 350px;">${account.code} - ${account.name}</div> <div class="act_as_cell first_column" style="width: 615px;">${account.code} - ${account.name}</div>
<div class="act_as_cell" style="width: 365px;">${_("Cumulated Balance on Account")}</div> <div class="act_as_cell" style="width: 260px;">${_("Cumulated Balance on Account")}</div>
## debit ## debit
<div class="act_as_cell amount" style="width: 75px;">${ formatLang(cumul_debit) | amount }</div> <div class="act_as_cell amount" style="width: 75px;">${ formatLang(cumul_debit) | amount }</div>
## credit ## credit

20
account_financial_report_webkit/report/templates/account_report_partners_ledger.mako
View File

@ -67,7 +67,7 @@
<div class="act_as_cell">${ initial_balance_text[initial_balance_mode] }</div> <div class="act_as_cell">${ initial_balance_text[initial_balance_mode] }</div>
</div> </div>
</div> </div>
%for account in objects: %for account in objects:
%if account.ledger_lines or account.init_balance: %if account.ledger_lines or account.init_balance:
<% <%
@ -102,13 +102,15 @@
## period ## period
<div class="act_as_cell" style="width: 70px;">${_('Period')}</div> <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
## move ## move
<div class="act_as_cell" style="width: 70px;">${_('Entry')}</div> <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
## journal ## journal
<div class="act_as_cell" style="width: 70px;">${_('Journal')}</div> <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
## partner ## partner
<div class="act_as_cell" style="width: 60px;">${_('Partner')}</div> <div class="act_as_cell" style="width: 100px;">${_('Partner')}</div>
## move reference
<div class="act_as_cell" style="width: 60px;">${_('Reference')}</div>
## label ## label
<div class="act_as_cell" style="width: 310px;">${_('Label')}</div> <div class="act_as_cell" style="width: 280px;">${_('Label')}</div>
## reconcile ## reconcile
<div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div> <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
## debit ## debit
@ -150,6 +152,8 @@
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## partner ## partner
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## move reference
<div class="act_as_cell"></div>
## label ## label
<div class="act_as_cell" >${_('Initial Balance')}</div> <div class="act_as_cell" >${_('Initial Balance')}</div>
## reconcile ## reconcile
@ -191,6 +195,8 @@
<div class="act_as_cell">${line.get('jcode') or ''}</div> <div class="act_as_cell">${line.get('jcode') or ''}</div>
## partner ## partner
<div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div> <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
## move reference
<div class="act_as_cell">${line.get('lref') or ''}</div>
## label ## label
<div class="act_as_cell">${label}</div> <div class="act_as_cell">${label}</div>
## reconcile ## reconcile
@ -221,6 +227,8 @@
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## partner ## partner
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## move reference
<div class="act_as_cell"></div>
## label ## label
<div class="act_as_cell">${_('Cumulated Balance on Partner')}</div> <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
## reconcile ## reconcile
@ -254,9 +262,9 @@
<div class="act_as_table list_table" style="margin-top:5px;"> <div class="act_as_table list_table" style="margin-top:5px;">
<div class="act_as_row labels" style="font-weight: bold; font-size: 12px;"> <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
<div class="act_as_cell first_column" style="width: 320px;">${account.code} - ${account.name}</div> <div class="act_as_cell first_column" style="width: 450px;">${account.code} - ${account.name}</div>
## label ## label
<div class="act_as_cell" style="width: 390px;">${_("Cumulated Balance on Account")}</div> <div class="act_as_cell" style="width: 360px;">${_("Cumulated Balance on Account")}</div>
## debit ## debit
<div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div> <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
## credit ## credit

20
account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html
View File

@ -10,8 +10,8 @@
%for partner_name, p_id, p_ref, p_name in account.partners_order: %for partner_name, p_id, p_ref, p_name in account.partners_order:
<div class="account_title bg" style="width: 1080px; margin-top: <div class="account_title bg" style="width: 1080px; margin-top:
20px; font-size: 12px;">${account.code} - ${account.name} -- ${partner_name or _('No Partner')} </div> 20px; font-size: 12px;">${account.code} - ${account.name} -- ${partner_name or _('No Partner')} </div>
%for curr, grouped_lines in account.grouped_ledger_lines.get(p_id, []): %for curr, grouped_lines in account.grouped_ledger_lines.get(p_id, []):
<% <%
@ -21,7 +21,7 @@
cumul_balance_curr = 0.0 cumul_balance_curr = 0.0
part_cumul_balance = 0.0 part_cumul_balance = 0.0
part_cumul_balance_curr = 0.0 part_cumul_balance_curr = 0.0
%> %>
<div class="act_as_table list_table" style="margin-top: 5px;"> <div class="act_as_table list_table" style="margin-top: 5px;">
<div class="act_as_caption account_title"> <div class="act_as_caption account_title">
@ -34,13 +34,13 @@
## period ## period
<div class="act_as_cell" style="width: 70px;">${_('Period')}</div> <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
## move ## move
<div class="act_as_cell" style="width: 70px;">${_('Entry')}</div> <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
## journal ## journal
<div class="act_as_cell" style="width: 50px;">${_('Journal')}</div> <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
## move reference ## move reference
<div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div> <div class="act_as_cell" style="width: 100px;">${_('Reference')}</div>
## label ## label
<div class="act_as_cell" style="width: 200px;">${_('Label')}</div> <div class="act_as_cell" style="width: 180px;">${_('Label')}</div>
## reconcile ## reconcile
<div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div> <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
## maturity ## maturity
@ -115,6 +115,8 @@
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## journal ## journal
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## move reference
<div class="act_as_cell"></div>
## label ## label
<div class="act_as_cell">${_('Cumulated Balance on Partner')}</div> <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
## reconcile ## reconcile
@ -148,9 +150,9 @@
%endfor %endfor
<div class="act_as_table list_table" style="margin-top:5px;"> <div class="act_as_table list_table" style="margin-top:5px;">
<div class="act_as_row labels" style="font-weight: bold; font-size: 12px;"> <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
<div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div> <div class="act_as_cell first_column" style="width: 450px;">${account.code} - ${account.name}</div>
## label ## label
<div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div> <div class="act_as_cell" style="width: 320px;">${_("Cumulated Balance on Account")}</div>
## debit ## debit
<div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div> <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
## credit ## credit

20
account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html
View File

@ -9,7 +9,7 @@
%> %>
<div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div> <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
%for partner_name, p_id, p_ref, p_name in account.partners_order: %for partner_name, p_id, p_ref, p_name in account.partners_order:
<% <%
total_debit = 0.0 total_debit = 0.0
@ -18,7 +18,7 @@
cumul_balance_curr = 0.0 cumul_balance_curr = 0.0
part_cumul_balance = 0.0 part_cumul_balance = 0.0
part_cumul_balance_curr = 0.0 part_cumul_balance_curr = 0.0
%> %>
<div class="act_as_table list_table" style="margin-top: 5px;"> <div class="act_as_table list_table" style="margin-top: 5px;">
<div class="act_as_caption account_title"> <div class="act_as_caption account_title">
@ -31,15 +31,15 @@
## period ## period
<div class="act_as_cell" style="width: 70px;">${_('Period')}</div> <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
## move ## move
<div class="act_as_cell" style="width: 70px;">${_('Entry')}</div> <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
## journal ## journal
<div class="act_as_cell" style="width: 50px;">${_('Journal')}</div> <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
## partner ## partner
<div class="act_as_cell" style="width: 60px;">${_('Partner')}</div> <div class="act_as_cell" style="width: 120px;">${_('Partner')}</div>
## move reference ## move reference
<div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div> <div class="act_as_cell" style="width: 100px;">${_('Reference')}</div>
## label ## label
<div class="act_as_cell" style="width: 255px;">${_('Label')}</div> <div class="act_as_cell" style="width: 180px;">${_('Label')}</div>
## reconcile ## reconcile
<div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div> <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
## maturity ## maturity
@ -122,6 +122,8 @@
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## partner ## partner
<div class="act_as_cell"></div> <div class="act_as_cell"></div>
## move reference
<div class="act_as_cell"></div>
## label ## label
<div class="act_as_cell">${_('Cumulated Balance on Partner')}</div> <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
## reconcile ## reconcile
@ -156,9 +158,9 @@
%endfor %endfor
<div class="act_as_table list_table" style="margin-top:5px;"> <div class="act_as_table list_table" style="margin-top:5px;">
<div class="act_as_row labels" style="font-weight: bold; font-size: 12px;"> <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
<div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div> <div class="act_as_cell first_column" style="width: 520px;">${account.code} - ${account.name}</div>
## label ## label
<div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div> <div class="act_as_cell" style="width: 320px;">${_("Cumulated Balance on Account")}</div>
## debit ## debit
<div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div> <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
## credit ## credit