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

[MERGE] Merged the branch for the fix of lp:706287

Browse Source 
bzr revid: jvo@tinyerp.com-20110405090043-yku7lwfk1fdrv1jy
This commit is contained in:
Jay Vora (OpenERP)
2011-04-05 14:30:43 +05:30
parent 2ff157afc3 38c2930fff
commit b61aaa73a0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_balance.py
+2 -2
View File
@@ -89,10 +89,10 @@ class account_balance(report_sxw.rml_parse, common_report_header):
self.sum_debit += account_rec['debit']
self.sum_credit += account_rec['credit']
if disp_acc == 'bal_movement':
if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0:
if (not currency_obj.is_zero(self.cr, self.uid, currency, res['debit'])) or (not currency_obj.is_zero(self.cr, self.uid, currency, res['credit'])) or not (currency_obj.is_zero(self.cr, self.uid, currency, res['balance'])):
self.result_acc.append(res)
elif disp_acc == 'bal_solde':
if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0:
if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
self.result_acc.append(res)
else:
self.result_acc.append(res)
addons/account/report/account_balance_sheet.py
+2 -2
View File
@@ -143,10 +143,10 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += account.balance
if data['form']['display_account'] == 'bal_movement':
if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
if (not currency_pool.is_zero(self.cr, self.uid, currency, account.credit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account.debit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account.balance)):
accounts_temp.append(account_dict)
elif data['form']['display_account'] == 'bal_solde':
if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account_dict)
else:
accounts_temp.append(account_dict)
addons/account/report/account_profit_loss.py
+2 -2
View File
@@ -113,10 +113,10 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += abs(account.debit - account.credit)
if data['form']['display_account'] == 'bal_movement':
if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
if (not currency_pool.is_zero(self.cr, self.uid, currency, account.credit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account.debit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account.balance)):
accounts_temp.append(account)
elif data['form']['display_account'] == 'bal_solde':
if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account)
else:
accounts_temp.append(account)