[IMP] account, account_voucher: Improved the account voucher report.

[odoo/odoo.git] / addons / account_voucher / report / report_voucher.py

diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
old mode 100755 (executable)
new mode 100644 (file)
index 6c38f6a..8c7b1cc
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,7 +23,6 @@ import time
 from report import report_sxw
 from tools import amount_to_text_en
 
-
 class report_voucher(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_voucher, self).__init__(cr, uid, name, context)
@@ -35,22 +34,22 @@ class report_voucher(report_sxw.rml_parse):
             'get_ref' : self._get_ref
         })
 
-    def convert(self,amount, cur):
-        amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+    def convert(self, amount, cur):
+        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
         return amt_en
-    
+
     def debit(self, move_ids):
         debit = 0.0
-        for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+        for move in move_ids:
             debit +=move.debit
         return debit
-    
+
     def credit(self, move_ids):
         credit = 0.0
-        for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+        for move in move_ids:
             credit +=move.credit
         return credit
-    
+
     def _get_ref(self, voucher_id, move_ids):
         voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id','=',move_ids.partner_id.id), ('voucher_id','=',voucher_id)])
         if voucher_line:
@@ -62,5 +61,5 @@ report_sxw.report_sxw(
     'report.voucher.cash_receipt.drcr',
     'account.voucher',
     'addons/account_voucher/report/report_voucher.rml',
-    parser=report_voucher,header=False
+    parser=report_voucher,header="external"
 )