odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account :Rename the fuction 

bzr revid: sbh@tinyerp.com-20100728070705-exuywotl52kyp2ja
This commit is contained in:
sbh (Open ERP) 2010-07-28 12:37:05 +05:30
parent 45d56c2332
commit 05b7303ecd
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/report/account_journal.py
View File

@ -50,7 +50,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
'get_fiscalyear': self._get_fiscalyear,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_currency':self._get_currency,
'display_currency':self._display_currency,
'get_sortby': self._get_sortby,
})
@ -97,7 +97,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
return super(journal_print ,self)._get_account(data)
def _get_currency(self, data):
def _display_currency(self, data):
if data['model'] == 'account.journal.period':
return True
return data['form']['amount_currency']

2
addons/account/report/account_journal.rml
View File

@ -249,7 +249,7 @@
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="40.0,65.0,50.0,62.0,174.0,57.0,61.0,40.0" style="Table1" repeatRows="1">[[ get_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="40.0,65.0,50.0,62.0,174.0,57.0,61.0,40.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Voucher No</para></td>

4
addons/account/report/central_journal.py
View File

@ -48,7 +48,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
'get_sortby': self._get_sortby,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_currency':self._get_currency,
'display_currency':self._display_currency,
})
def set_context(self, objects, data, ids, report_type=None): # Improve move to common default?
@ -89,7 +89,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).fiscalyear_id.name
return super(journal_print ,self)._get_fiscalyear(data)
def _get_currency(self, data):
def _display_currency(self, data):
if data['model']=='account.journal.period':
return True
return data['form']['amount_currency']

12
addons/account/report/central_journal.rml
View File

@ -283,7 +283,7 @@
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="50.0,200.0,95.0,92.0,69.0" style="Table_Account_detail_Title">[[ get_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,200.0,95.0,92.0,69.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
@ -292,7 +292,7 @@
<td><para style="terp_tblheader_Details_Right">Balance</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ get_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
@ -305,7 +305,7 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Final_Total">[[ get_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@ -314,7 +314,7 @@
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_credit(o.period_id.id, o.journal_id.id) ) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Final_Total_currency">[[ get_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@ -329,7 +329,7 @@
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
<blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Journal_Line_Content">[[ get_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@ -338,7 +338,7 @@
<td><para style="terp_default_Right_9">[[ formatLang(line['debit']-line['credit']) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Journal_Line_Content_currency">[[ get_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>

4
addons/account/report/general_journal.py
View File

@ -52,7 +52,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
'get_journal': self._get_journal,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_currency':self._get_currency
'display_currency':self._display_currency
})
def set_context(self, objects, data, ids, report_type=None): # Improve move to common default?
@ -114,7 +114,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).fiscalyear_id.name
return super(journal_print ,self)._get_fiscalyear(data)
def _get_currency(self, data):
def _display_currency(self, data):
if data['model']=='account.journal.period':
return True
return data['form']['amount_currency']

8
addons/account/report/general_journal.rml
View File

@ -264,7 +264,7 @@
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="82.0,118.0,83.0,88.0,100.0" style="Table_Journal_Title" repeatRows="1"><para>[[ get_currency(data)==False or removeParentNode('blockTable') ]]</para>
<blockTable colWidths="82.0,118.0,83.0,88.0,100.0" style="Table_Journal_Title" repeatRows="1"><para>[[ display_currency(data)==False or removeParentNode('blockTable') ]]</para>
<tr>
<td><para style="terp_tblheader_Details">Code</para></td>
<td><para style="terp_tblheader_Details">Journal Name</para></td>
@ -280,7 +280,7 @@
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit()) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="80.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title" repeatRows="1">[[ get_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="80.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">Code</para></td>
<td><para style="terp_tblheader_Details">Journal Name</para></td>
@ -299,7 +299,7 @@
</blockTable>
<section>
<blockTable colWidths="82.0,118.0,83.0,88.0,100.0" style="Table_Journal_Detail">[[ get_currency(data) == False or removeParentNode('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>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(lines(o.id),'line')]]</font> [[ line['code'] ]]</para>
@ -318,7 +318,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="80.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Detail">[[ get_currency(data) or removeParentNode('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>
<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>