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

[IMP] account :Add the function of display_currency and display_initial Balance 

bzr revid: sbh@tinyerp.com-20100729120216-t2ts8exxlnk2ve8h
This commit is contained in:
sbh (Open ERP) 2010-07-29 17:32:16 +05:30
parent 3b983812ad
commit 1ffbc0ee4a
3 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/account/report/third_party_ledger.py
View File

@ -52,9 +52,13 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
'get_start_date':self._get_start_date,
'get_end_date': self._get_end_date,
'get_journal': self._get_journal,
'get_partners': self._get_partners,
'get_intial_balance': self._get_intial_balance,
})
'get_partners':self._get_partners,
'get_intial_balance':self._get_intial_balance,
'display_initial_balance':self._display_initial_balance,
'display_currency':self._display_currency,
})
def date_range(self, start, end):
if not start or not end:
@ -274,7 +278,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
"AND date < %s " ,
(partner.id, tuple(self.account_ids), self.date_lst[0],))
res = self.cr.fetchall()
return res[0][0],res[0][1],res[0][2]
return res
def _sum_debit_partner(self, partner, data):
result_tmp = 0.0
@ -456,7 +460,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
else:
currency_total = self.tot_currency = 0.0
return currency_total
def _display_initial_balance(self, data):
if data['form']['initial_balance'] :
return True
return False
def _display_currency(self,data):
if data['form']['amount_currency'] :
return True
return False
report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
'addons/account/report/third_party_ledger.rml',parser=third_party_ledger,
header='internal')

52
addons/account/report/third_party_ledger.rml
View File

@ -227,7 +227,7 @@
<font color="white"> </font>
</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currecny(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -255,7 +255,7 @@
<para style="P4">
<font color="white"> </font>
</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
@ -274,19 +274,19 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>[[ data['form']['initial_balance'] and get_intial_balance(p,data) or removeParentNode('tr') ]]
<td>
<para style="P2"></para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
</tr>
<tr>
@ -309,7 +309,7 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@ -338,7 +338,7 @@
<font color="white"> </font>
</para>
</section>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -369,7 +369,7 @@
<para style="P4">
<font color="white"> </font>
</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
@ -390,25 +390,23 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>[[ data['form']['initial_balance'] and get_intial_balance(p,data) or removeParentNode('tr') ]]
<td>
<para style="P2"></para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>[[display_initial_balance(data) or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
<td>
<para style="P5"></para>
</td>
<td>
<para style="P5">
<font color="white"> </font>
</para>
</td>
</td>
</tr>
<tr>
<td>
@ -435,7 +433,7 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>

48
addons/account/report/third_party_ledger_other.rml
View File

@ -410,7 +410,7 @@
<para style="P5">
<font color="white"> </font>
</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -435,7 +435,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
@ -454,19 +454,19 @@
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>[[ data['form']['initial_balance'] and get_intial_balance(p,data) or removeParentNode('tr') ]]
<td>
<para style="P2"></para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>[[ display_initial_balance(data) or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
</tr>
<tr>
@ -486,7 +486,7 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@ -513,7 +513,7 @@
</blockTable>
</section>
</section>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -542,7 +542,7 @@
</tr>
</blockTable>
<para style="P4"/>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
@ -565,25 +565,27 @@
</blockTable>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<td>
<para style="P2"></para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
<td>
<para style="P5"></para>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
</td>
</tr>
<tr>
<td>
<para style="P2"> [[ p.ref ]] - [[ p.name ]]</para>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p,data))) ]]</para>
@ -603,7 +605,7 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>