pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF]

Browse Source 
bzr revid: mra@mra-laptop-20100803093723-dejx82wye5geawl4
This commit is contained in:
Mustufa Rangwala
2010-08-03 15:07:23 +05:30
parent 73e9893fbd
commit 26947ef596
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_general_journal.py
+1
View File
@@ -117,6 +117,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return data['form']['amount_currency']
def _sum_debit_period(self, period_id, journal_id=False):
if journal_id:
journals = [journal_id]
else:
addons/account/report/account_general_journal.rml
+4 -4
View File
@@ -309,10 +309,10 @@
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.period_id.id, o.journal_id.id)) ]]</para>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id, o.journal_id.id)) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.period_id.id, o.journal_id.id)) ]]</para>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id, o.journal_id.id)) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id, o.journal_id.id)-sum_debit_period(o.id, o.journal_id.id)) ]]</para>
@@ -346,7 +346,7 @@
</tr>
</blockTable>
<blockTable colWidths="82.0,118.0,83.0,88.0,100.0" style="Table_Journal_Detail">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>[[ lines(o.id) or removeParentNode('blockTable')]]
<tr>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(lines(o.id),'line')]]</font> [[ line['code'] ]]</para>
</td>
@@ -365,7 +365,7 @@
</tr>
</blockTable>
<blockTable colWidths="80.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Detail">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>[[ lines(o.id) or removeParentNode('blockTable')]]
<tr>
<td><para style="terp_default_9"><font>[[ repeatIn(lines(o.id),'line')]]</font> [[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>