From d2f2e832afde128c2e515dc3cb1569d27474a124 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:35:21 +0530
Subject: [PATCH] [REM] Account: general journal and central journal with
 target moves

bzr revid: mra@mra-laptop-20101004100521-ixj77ede6yq12l7o
---
 .../account/wizard/account_report_central_journal_view.xml   | 2 +-
 .../account/wizard/account_report_general_journal_view.xml   | 2 +-
 addons/account/wizard/account_report_print_journal.py        | 5 +----
 addons/account/wizard/account_report_print_journal_view.xml  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 3e24510a470..ca7103c685e 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="fiscalyear_id" position="after">
+                <field name="target_move" position="after">
                     <field name="amount_currency"/>
                     <newline/>
                 </field>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 5bc339202e5..eababa83982 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-                <field name="fiscalyear_id" position="after">
+                <field name="target_move" position="after">
 	                <field name="amount_currency"/>
 	                <newline/>
                 </field>
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index f264524dc4b..6256cca8ab6 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -30,19 +30,16 @@ class account_print_journal(osv.osv_memory):
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
                                             'Entries Sorted By', required=True),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True)
     }
     _defaults = {
         'sort_selection': 'date',
-        'target_move': 'all'
     }
 
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['sort_selection','target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data}
 
 account_print_journal()
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index 2b4a597b87b..eb3e5063361 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -8,9 +8,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
+               <field name="target_move" position="after">
                    <field name="sort_selection"/>
-                   <field name="target_move"/>
                    <field name="amount_currency"/>
                    <newline/>
                </field>