[IMP] account: Print journal reports => override pre_print_report and transfter the...

bzr revid: mra@mra-laptop-20100709111145-9k19xnx4nvl9kdbt

diff --git a/addons/account/wizard/account_common_journal_report.py b/addons/account/wizard/account_common_journal_report.py
index d24aadb..b08786c 100644 (file)
--- a/addons/account/wizard/account_common_journal_report.py
+++ b/addons/account/wizard/account_common_journal_report.py
@@ -34,7 +34,7 @@ class account_common_journal_report(osv.osv_memory):
         return result
 
     def pre_print_report(self, cr, uid, ids, data, query_line, context=None):
-        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
+#        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
         fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)
         period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
         data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)

diff --git a/addons/account/wizard/account_report_balance.py b/addons/account/wizard/account_report_balance.py
index 5b6e3ed..4997e8e 100644 (file)
--- a/addons/account/wizard/account_report_balance.py
+++ b/addons/account/wizard/account_report_balance.py
@@ -25,7 +25,6 @@ from osv import osv, fields
 from tools.translate import _
 
 class account_balance_report(osv.osv_memory):
-    
     _inherit = "account.common.report"
     _name = 'account.balance.report'
     _description = 'Account Balance Report'
@@ -33,11 +32,11 @@ class account_balance_report(osv.osv_memory):
         'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'),
                          ('bal_solde','With balance is not equal to 0'),
                          ],'Display accounts', required=True),
-    }
+                }
 
     _defaults = {
         'display_account': 'bal_all'
-    }
+                }
 
 #    def default_get(self, cr, uid, fields, context=None):
 #        """ To get default values for the object.
@@ -60,7 +59,7 @@ class account_balance_report(osv.osv_memory):
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         data['form'].update(self.read(cr, uid, ids, ['display_account',])[0])
         data['form']['query_line'] = query_line
-        return { 'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data, 'nodestroy':True, }
+        return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data, 'nodestroy':True, }
 
 account_balance_report()
 

diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index dfdd49a..bf9b014 100644 (file)
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import osv, fields
-from tools.translate import _
 
 class account_print_journal(osv.osv_memory):
     _inherit = "account.common.journal.report"
@@ -30,17 +30,23 @@ class account_print_journal(osv.osv_memory):
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
                                               'Entries Sorted By', required=True),
-    }
-
+                }
     _defaults = {
         'sort_selection': 'date',
-    }
+                }
+
+    def pre_print_report(self, cr, uid, ids, data, query_line, context=None):
+        if context is None:
+            context = {}
+        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
+        return super(account_print_journal, self).pre_print_report(cr, uid, ids, data, query_line, context=context)
 
-        
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
-        data = self.pre_print_report(cr, uid, ids, data, query_line, context)
+        if context is None:
+            context = {}
+        data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
         return { 'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data, 'nodestroy':True, }
-        
+
 account_print_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: