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

[IMP] account : replace the string 'With out Partner' with 'No Partner Defined' in aged partner balance report. 

bzr revid: vra@tinyerp.com-20100907084925-s20r7m6bb14cmyfg
This commit is contained in:
vra 2010-09-07 14:19:25 +05:30
parent 3d046db1fd
commit 56acf2e991
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/account/report/account_aged_partner_balance.py
View File

@ -224,7 +224,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND account_account.active ' ,(tuple(self.ACCOUNT_TYPE), self.date_from, ))
t = self.cr.fetchall()
for i in t:
totals['With out Partner'] = i[0]
totals['No Partner Defined'] = i[0]
future_past = {}
if self.direction_selection == 'future':
self.cr.execute('SELECT SUM(debit-credit) \
@ -239,7 +239,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND account_account.active ', (tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from, ))
t = self.cr.fetchall()
for i in t:
future_past['With out Partner'] = i[0]
future_past['No Partner Defined'] = i[0]
elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
self.cr.execute('SELECT SUM(debit-credit) \
FROM account_move_line AS l, account_account\
@ -253,7 +253,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND account_account.active ' , (tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
t = self.cr.fetchall()
for i in t:
future_past['With out Partner'] = i[0]
future_past['No Partner Defined'] = i[0]
history = []
for i in range(5):
self.cr.execute('SELECT SUM(debit-credit)\
@ -269,37 +269,37 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
t = self.cr.fetchall()
d = {}
for i in t:
d['With out Partner'] = i[0]
d['No Partner Defined'] = i[0]
history.append(d)
values = {}
if self.direction_selection == 'future':
before = False
if future_past.has_key('With out Partner'):
before = [ future_past['With out Partner'] ]
if future_past.has_key('No Partner Defined'):
before = [ future_past['No Partner Defined'] ]
self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
values['direction'] = before and before[0] or 0.0
elif self.direction_selection == 'past':
after = False
if future_past.has_key('With out Partner'):
after = [ future_past['With out Partner'] ]
if future_past.has_key('No Partner Defined'):
after = [ future_past['No Partner Defined'] ]
self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
values['direction'] = after and after[0] or ""
for i in range(5):
during = False
if history[i].has_key('With out Partner'):
during = [ history[i]['With out Partner'] ]
if history[i].has_key('No Partner Defined'):
during = [ history[i]['No Partner Defined'] ]
self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
values[str(i)] = during and during[0] or ""
total = False
if totals.has_key( 'With out Partner' ):
total = [ totals['With out Partner'] ]
if totals.has_key( 'No Partner Defined' ):
total = [ totals['No Partner Defined'] ]
values['total'] = total and total[0] or 0.0
## Add for total
self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
values['name'] = 'With out Partner'
values['name'] = 'No Partner Defined'
if values['total']:
res.append(values)