OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[FIX]account_financial_report_webkit: Open Invoices Report: fix wrong xmlid in report definition, removed useless import of addons in template, hasattr cannot be used on browse object - replaced by 'field' in browse_object

pull/7/merge
Jacques-Etienne Baudoux 11 years ago
parent
a80926d9c9
commit
09c73a6177
2 changed files with 2 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      account_financial_report_webkit/report/report.xml
  2. 3
      account_financial_report_webkit/report/templates/account_report_open_invoices.mako

2
account_financial_report_webkit/report/report.xml
View File

@ -124,7 +124,7 @@
<field name="report_rml">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field> <field name="report_rml">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field>
<field name="report_file">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field> <field name="report_file">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field>
</record> </record>
<record id="property_account_report_open_invoices_webkit" model="ir.property">
<record id="property_account_report_print_journal_webkit" model="ir.property">
<field name="name">account_report_print_journal_webkit</field> <field name="name">account_report_print_journal_webkit</field>
<field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/> <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
<field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/> <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/>

3
account_financial_report_webkit/report/templates/account_report_open_invoices.mako
View File

@ -21,7 +21,6 @@
</head> </head>
<body> <body>
<% import addons %>
<% template1 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'open_invoices_inclusion.mako.html') %> <% template1 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'open_invoices_inclusion.mako.html') %>
<% context.lookup.put_template('open_invoices_inclusion.mako.html', template1) %> <% context.lookup.put_template('open_invoices_inclusion.mako.html', template1) %>
<% template2 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'grouped_by_curr_open_invoices_inclusion.mako.html') %> <% template2 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'grouped_by_curr_open_invoices_inclusion.mako.html') %>
@ -73,7 +72,7 @@
</div> </div>
</div> </div>
%for acc in objects: %for acc in objects:
%if hasattr(acc, 'grouped_ledger_lines'):
%if 'grouped_ledger_lines' in acc:
<% fl = formatLang %> <% fl = formatLang %>
<%include file="grouped_by_curr_open_invoices_inclusion.mako.html" args="account=acc,formatLang=fl"/> <%include file="grouped_by_curr_open_invoices_inclusion.mako.html" args="account=acc,formatLang=fl"/>
%else: %else:

Write Preview
Loading…
Cancel
Save