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

[IMP] account: Small improvements in formatting and improved some code.

Browse Source 
bzr revid: uco@tinyerp.com-20110819121202-i827lpb1yq8y5hyh
This commit is contained in:
Ujjvala Collins (OpenERP)
2011-08-19 17:42:02 +05:30
parent 109d094ee8
commit 98cb234bf6
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_report_common.py
+15 -14
View File
@@ -63,18 +63,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
child_ids = report_obj.search(cr, uid, [('parent_id','=',report_id)])
child_ids.append(datas[0]['id'])
for child in report_obj.browse(cr, uid, child_ids):
if child.type == 'accounts':
for a in child.account_ids:
balance += a.balance
# it's the balance of the linked account.report (so it means it's only a way to reuse figures coming from another report)
if child.type == 'account_report' and child.account_report_id:
for a in child.account_report_id.account_ids:
balance +=a.balance
#it's the sum of balance of the children of this account.report (if there isn't, then it's 0.0)
if child.type == 'sum':
for child in report_obj.browse(cr, uid, child_ids):
for a in child.account_ids:
balance += a.balance
balance = self.get_report_balance(child)
if child.id == datas[0]['id']:
datas[0].update({'name': child.name, 'balance': balance})
else:
@@ -85,14 +74,26 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
cr, uid = self.cr, self.uid
report_obj = self.pool.get('account.report')
accounts = []
if acc_id and data['form'].get('display_details_per_account', False):
if acc_id and data['form'].get('account_details', False):
for rpt in report_obj.browse(cr, uid, [acc_id]):
for acc in rpt.account_ids:
accounts.append({'code': acc.code, 'name': acc.name, 'bal': acc.balance})
return accounts
def get_report_balance(self):
def get_report_balance(self, child):
balance = 0.0
if child.type == 'accounts':
for a in child.account_ids:
balance += a.balance
# it's the balance of the linked account.report (so it means it's only a way to reuse figures coming from another report)
if child.type == 'account_report' and child.account_report_id:
for a in child.account_report_id.account_ids:
balance += a.balance
#it's the sum of balance of the children of this account.report (if there isn't, then it's 0.0)
if child.type == 'sum':
for child in report_obj.browse(cr, uid, child_ids):
for a in child.account_ids:
balance += a.balance
return balance
report_sxw.report_sxw('report.account.common', 'account.account',
addons/account/report/account_report_common.rml
+9 -7
View File
@@ -105,29 +105,31 @@
<para style="Preformatted Text">
<font color="white"> </font>
</para>
<blockTable colWidths="490.0" style="Table1">
<blockTable colWidths="482.0" style="Table1">
<para style="P2">[[ repeatIn(get_report_details(data),'r') ]] </para>
<tr>
<td>
<blockTable colWidths="327.0,163.0" style="Table2">
<blockTable colWidths="314.0,156.0" style="Table2">
<tr>
<td><para style="P3">Report Name</para></td>
<td><para style="P3">Report Balance</para></td>
</tr>
<tr>
<td><para style="terp_default_8">[[ r['name'] ]]</para></td>
<td><para style="terp_default_8">[[ r['balance'] ]]</para></td>
<td><para style="terp_default_8">[[ formatLang(r['balance']) ]]</para></td>
</tr>
</blockTable>
<para style="Preformatted Text">
<font color="white"> </font>
</para>
<blockTable colWidths="490.0" style="Table2">
<blockTable colWidths="470.0" style="Table2">
<tr>
<td><para style="P3">Account Details</para></td>
<td>
<para style="P3">Account Details</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="95.0,232.0,163.0" style="Table3">
<blockTable colWidths="157.0,157.0,157.0" style="Table3">
<tr>
<td><para style="P3">Code</para></td>
<td><para style="P3">Name</para></td>
@@ -136,7 +138,7 @@
<tr>
<td><para style="terp_default_8">[[ repeatIn(get_account_details(r['id'], data), 'a') ]] [[ a['code'] ]]</para></td>
<td><para style="terp_default_8">[[ a['name'] ]]</para></td>
<td><para style="terp_default_8">[[ a['bal'] ]]</para></td>
<td><para style="terp_default_8">[[ formatLang(a['bal']) ]]</para></td>
</tr>
</blockTable>
</td>