From 7a9d4468c8f7e41fe2decb2c0303a6b158cffe04 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 13 Apr 2010 18:57:44 +0530
Subject: [PATCH] [ADD] account: convert account_journal_select wizard to
 osv_memory wizard

bzr revid: psi@tinyerp.co.in-20100413132744-zfw2i1z3lzl4mx70
---
 addons/account/__openerp__.py                 |  1 +
 addons/account/account_view.xml               | 18 +-------
 addons/account/wizard/__init__.py             |  2 +-
 ...al_select.py => account_journal_select.py} | 46 +++++++++----------
 .../wizard/account_journal_select_view.xml    | 38 +++++++++++++++
 5 files changed, 64 insertions(+), 41 deletions(-)
 rename addons/account/wizard/{wizard_journal_select.py => account_journal_select.py} (50%)
 create mode 100644 addons/account/wizard/account_journal_select_view.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 4fe7bb7eae4..35e56f66025 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -63,6 +63,7 @@ module named account_voucherss
         'wizard/account_subscription_generate_view.xml',
         'wizard/account_fiscalyear_close_view.xml',
         'wizard/account_state_open_view.xml',
+        'wizard/account_journal_select_view.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 88462098852..d62c2113e27 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -652,23 +652,7 @@
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
 
-
-
-        <!--
-    Entries Journal lines
-    -->
-
-        <wizard id="action_move_journal_line_form_select" menu="False" model="account.move.line" name="account.move.journal.select" string="Standard entry"/>
-
-        <record id="ir_open_journal_period" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">account.journal.period</field>
-            <field name="name">Open Journal</field>
-            <field eval="'ir.actions.wizard,%d'%action_move_journal_line_form_select" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
- <!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
+<!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
         <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
 -->
         <!--
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 8fde393885f..7c7fdada600 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -27,7 +27,7 @@ import wizard_unreconcile
 import account_invoice_refund
 import wizard_pay_invoice
 import account_move_journal
-import wizard_journal_select
+import account_journal_select
 import account_move_bank_reconcile
 import account_subscription_generate
 import wizard_aged_trial_balance
diff --git a/addons/account/wizard/wizard_journal_select.py b/addons/account/wizard/account_journal_select.py
similarity index 50%
rename from addons/account/wizard/wizard_journal_select.py
rename to addons/account/wizard/account_journal_select.py
index 123a07fb627..f13958ed90f 100644
--- a/addons/account/wizard/wizard_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,37 +15,37 @@
 #    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/>.
 #
 ##############################################################################
 
-import wizard
-import pooler
+from osv import fields, osv
 
-def _action_open_window(self, cr, uid, data, context):
-    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-    act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
+class account_journal_select(osv.osv_memory):
+    """
+        Account Journal Select
+    """
+    _name = "account.journal.select"
+    _description = "Account Journal Select"
 
-    result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select')
-    id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-    result = act_obj.read(cr, uid, [id])[0]
+    def action_open_window(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        if context is None:
+            context = {}
 
-    cr.execute('select journal_id,period_id from account_journal_period where id=%s', (data['id'],))
-    journal_id,period_id = cr.fetchone()
+        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = act_obj.read(cr, uid, [id])[0]
+        cr.execute('select journal_id, period_id from account_journal_period where id=%s', (context['active_id'],))
+        journal_id, period_id = cr.fetchone()
 
-    result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
-    result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
-    return result
+        result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
+        result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
+        return result
 
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_journal('account.move.journal.select')
 
+account_journal_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
new file mode 100644
index 00000000000..71a0d591768
--- /dev/null
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="open_journal_button_view" model="ir.ui.view">
+            <field name="name">Open Journal Button</field>
+            <field name="model">account.journal.select</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Journal Select">
+                		<label string="Are you sure you want to open Journal Entries!" colspan="4"/>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open Entries" name="action_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_open_journal_button" model="ir.actions.act_window">
+            <field name="name">Open Journal</field>
+            <field name="res_model">account.journal.select</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="open_journal_button_view"/>
+           <field name="target">new</field>
+        </record>
+
+        <record id="ir_open_journal_period" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.journal.period</field>
+            <field name="name">Open Journal</field>
+            <field eval="'ir.actions.act_window,%d'%action_open_journal_button" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
+    </data>
+</openerp>