From c141ef0840abd01cba567f69fa86abab75134cc7 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 12 Nov 2009 13:33:40 +0530
Subject: [PATCH] [FIX]: fix the problem that appers in to the account move due
 to accout voucher

bzr revid: mga@tinyerp.com-20091112080340-oeg9zkjwberb3pbf
---
 addons/account_voucher/__terp__.py      |  2 +-
 addons/account_voucher/account.py       | 12 +-----------
 addons/account_voucher/account_view.xml | 20 ++++----------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index 92f6199f3cb..b23c289a8f1 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -41,10 +41,10 @@
     
     "update_xml" : [
         "voucher_sequence.xml",
-        "account_view.xml",
         "account_report.xml",
         "voucher_wizard.xml",
         "voucher_view.xml",
+        "account_view.xml",
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 4006cde9863..71765ef0fb6 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -220,17 +220,7 @@ class AccountMove(osv.osv):
     _inherit = "account.move"
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'voucher_type': fields.selection([
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher'),
-            ('journal_voucher','Journal Voucher'),
-            ],'Voucher Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Narration'),
+        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
 
 AccountMove()
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
index 5201e41e468..b415f1af0b9 100755
--- a/addons/account_voucher/account_view.xml
+++ b/addons/account_voucher/account_view.xml
@@ -1,26 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<record model="ir.ui.view" id="account_move_inherit">
-			<field name="name">account.move.type.form.inherit1</field>
+		<record model="ir.ui.view" id="account_move_inherit_new">
+			<field name="name">account.move.type.form.inherit2</field>
 			<field name="inherit_id" ref="account.view_move_form"/>
 			<field name="model">account.move</field>
 			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="journal_id" position="after">
-                    <field name="voucher_type" groups="base.group_extended" select="2"/>
-				</field>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="account_move_inherit_new">
-			<field name="name">account.move.type.form.inherit2</field>
-			<field name="inherit_id" ref="account_move_inherit"/>
-			<field name="model">account.move</field>
-			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<field name="line_id" position="replace">
-				    <field colspan="4" default_get="{'lines':line_id ,'journal':journal_id }" name="line_id" nolabel="1" widget="one2many_list" height="275">
+				    <field colspan="4" default_get="{'lines':line_id ,'journal':journal_id }" name="line_id" nolabel="1" widget="one2many_list" height="250">
                         <form string="Account Entry Line">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -120,7 +108,7 @@
 			</field>
 		</record>
 	
-<!--	sub_currency	-->
+        <!--	sub_currency	-->
 		<record model="ir.ui.view" id="sub_currency_form">
 			<field name="name">sub.currency.form</field>
 			<field name="inherit_id" ref="base.view_currency_form" />