From e7bb33b70a0d13cfc735c68a1da2f65e1d29bceb Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Mon, 1 Feb 2010 19:14:26 +0530
Subject: [PATCH] [FIX]: migrate 'narration' field from voucher to account.move

bzr revid: mga@tinyerp.com-20100201134426-mydfj7dz9b6fuhi1
---
 addons/account/account.py               |  1 +
 addons/account/account_view.xml         |  3 +-
 addons/account_voucher/account.py       |  2 -
 addons/account_voucher/account_view.xml | 55 -------------------------
 4 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ddb90cc13cc..29ea824f171 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -818,6 +818,7 @@ class account_move(osv.osv):
             ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
         ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
+        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
     }
     _defaults = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 82f49d83cae..8be310245ac 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -917,7 +917,8 @@
                             <field name="reconcile_partial_id" groups="base.group_extended"/>
                         </tree>
                     </field>
-
+                    <separator colspan="4" string="Narration"/>
+                    <field name="narration" select="2" colspan="4" nolabel="1"/>
                     <separator colspan="4" string="State"/>
                     <field name="state" select="1"/>
                     <group col="2" colspan="2">
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 0060308d638..521767fa410 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -218,9 +218,7 @@ class account_move(osv.osv):
     _inherit = "account.move"
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
-
 account_move()
 
 class res_currency(osv.osv):
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
index b415f1af0b9..62333c56873 100755
--- a/addons/account_voucher/account_view.xml
+++ b/addons/account_voucher/account_view.xml
@@ -1,61 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<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="line_id" position="replace">
-				    <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"/>
-                            <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-
-                            <field name="debit" select="1"/>
-                            <field name="credit" select="1"/>
-
-                            <separator colspan="4" string="Optional Information"/>
-                            <field name="currency_id"/>
-                            <field name="amount_currency"/>
-                            <field name="quantity" select="1"/>
-                            <newline/>
-                            <field name="date_maturity"/>
-                            <field name="date_created"/>
-
-                            <separator colspan="4" string="State"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id"/>
-                            <field name="statement_id"/>
-                            <field name="state"/>
-                        </form>
-                        <tree editable="top" string="Account Entry Line">
-                            <field name="ref"/>
-                            <field name="invoice"/>
-                            <field name="name"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-                            <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
-                            <field name="date_maturity"/>
-                            <field name="debit" sum="Total Debit"/>
-                            <field name="credit" sum="Total Credit"/>
-                            <field name="analytic_account_id"/>
-                            <field groups="base.group_extended" name="amount_currency"/>
-                            <field groups="base.group_extended" name="currency_id"/>
-                            <field name="tax_code_id"/>
-                            <field name="tax_amount"/>
-                            <field name="state"/>
-                            <field name="reconcile_id"/>
-                            <field groups="base.group_extended" name="reconcile_partial_id"/>
-                        </tree>
-                    </field>
-                    <separator colspan="4" string="Narration"/>
-                    <field name="narration" select="2" colspan="4" nolabel="1"/>
-				</field>
-			</field>
-		</record>
 
 		<record model="ir.ui.view" id="account_form1">
 			<field name="name">account.form1</field>