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 @@ - + + 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 @@ - - account.move.type.form.inherit2 - - account.move - form - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
account.form1