From 73c60da63f700192d2311bd9b22caaa0671d650d Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 13 Aug 2010 19:32:11 +0530
Subject: [PATCH] [FIX]: fix a name_search for the account move [REM]: remove
 unwanred menus

bzr revid: mga@tinyerp.com-20100813140211-wvttfoslyo3hhivg
---
 addons/account/account.py                     |  8 +++--
 addons/account/wizard/account_move_journal.py |  6 ++--
 .../wizard/account_move_journal_view.xml      | 36 +++++++++----------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 4c754360e89..52bee770bef 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1053,10 +1053,12 @@ class account_move(osv.osv):
         if not context:
           context={}
         ids = []
-
+        
         if name:
-          ids += self.search(cr, user, [('id','=',name)], limit=limit)
-          
+            ids += self.search(cr, user, [('name','=',name)], limit=limit)
+        if not ids:
+            ids += self.search(cr, user, [('id','=',name)], limit=limit)
+        
         return self.name_get(cr, user, ids, context=context)
     
     def name_get(self, cursor, user, ids, context=None):
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 0187cfc7b9b..84b152f95ec 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -87,9 +87,11 @@ class account_move_journal(osv.osv_memory):
 
         view = """<?xml version="1.0" encoding="utf-8"?>
         <form string="Standard entries">
-            <separator string="Open a Journal Items" colspan="4"/>
+            <separator string="Open a Journal Items !" colspan="4"/>
             <group colspan="4" >
-                <label width="300" string="Going to open a %s Journal(s) for %s Period"/>
+                <label width="300" string="Journal : %s"/>
+                <newline/>
+                <label width="300" string="Period :  %s"/>
             </group>
             <group colspan="4" col="4">
                 <label string ="" colspan="2"/>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index fbc160f9eb4..96d49d47c18 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -23,15 +23,15 @@
         </record>
         <menuitem action="action_account_moves_sale" sequence="4" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>
 
-        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">
-            <field name="name">Journal Refund Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'purchase_refund'}</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>
+<!--        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
+<!--            <field name="name">Journal Refund Items</field>-->
+<!--            <field name="res_model">account.move.journal</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
+<!--            <field name="context">{'journal_type':'purchase_refund'}</field>-->
+<!--            <field name="target">new</field>-->
+<!--        </record>-->
+<!--        <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>-->
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
@@ -43,15 +43,15 @@
         </record>
         <menuitem action="action_account_moves_purchase" sequence="4" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>
 
-        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">
-            <field name="name">Journal Refund Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'sale_refund'}</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>
+<!--        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
+<!--            <field name="name">Journal Refund Items</field>-->
+<!--            <field name="res_model">account.move.journal</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
+<!--            <field name="context">{'journal_type':'sale_refund'}</field>-->
+<!--            <field name="target">new</field>-->
+<!--        </record>-->
+<!--        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>-->
 
         <record id="action_account_moves_all" model="ir.actions.act_window">
             <field name="name">Journal Items</field>