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

[IMP] account: Improve the general_journal report

Browse Source 
bzr revid: sbh@tinyerp.com-20100721104122-sqnyy2ow31wjaws6
This commit is contained in:
sbh (Open ERP)
2010-07-21 16:11:22 +05:30
parent b87a568d47
commit 2a07e89586
2 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/general_journal.py
+1 -13
View File
@@ -48,12 +48,11 @@ class journal_print(report_sxw.rml_parse, common_report_header):
'get_start_period': self.get_start_period,
'get_end_period': self.get_end_period,
'get_sortby': self._get_sortby,
'sum_currency_amount_account': self._sum_currency_amount_account,
'get_filter': self._get_filter,
'get_journal': self._get_journal,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_currency ':self._get_currency
'get_currency':self._get_currency
})
def set_context(self, objects, data, ids, report_type=None): # Improve move to common default?
@@ -105,17 +104,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
else:
self.account_currency = False
def _sum_currency_amount_account(self, account, form):
self._set_get_account_currency_code(account.id)
self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %s ", (account.id,))
total = self.cr.fetchone()
if self.account_currency:
return_field = str(total[0]) + self.account_currency
return return_field
else:
currency_total = self.tot_currency = 0.0
return currency_total
def _get_account(self, data):
if data['model']=='account.journal.period':
return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
addons/account/report/general_journal.rml
+2 -26
View File
@@ -4,30 +4,7 @@
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
<!--<stroke color="darkblue"/>-->
<!--TITLE COMPANY-->
<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawString x="16.7cm" y="28.1cm">General Journal - [[ company.currency_id.name ]]</drawString>
<!--COL 2-->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>0.88cm 27.7cm 20.12cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</pageTemplate>
</template>
@@ -322,7 +299,6 @@
<td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit()) ]]</para></td>
<td><para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_currency_amount_account(o, data)) or '' ]]</u></para></td>
</tr>
</blockTable>
@@ -357,7 +333,7 @@
<td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['debit']-line['debit'] ) ]]</para></td>
<td><para style="terp_default_Right_9"><u>[[ formatLang(line['amount_currency']) or '' ]] [[ line['currency_code'] or '' ]]</u></para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['amount_currency']) or '' ]] [[ line['currency_code'] or '' ]]</para></td>
</tr>
</blockTable>
<para style="terp_default_2">