diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 611edebfc92..287bb2c8353 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -331,6 +331,7 @@ class account_voucher(osv.osv):
                 elif line.type == 'cr':
                     move_line['credit'] = line.amount or False
                     amount=line.amount * (-1)
+                
                 ml_id=self.pool.get('account.move.line').create(cr, uid, move_line)
                 
                 if inv.narration:
@@ -338,17 +339,18 @@ class account_voucher(osv.osv):
                 else:
                     line.name=line.name
                 
-                an_line = {
-                     'name':line.name,
-                     'date':inv.date,
-                     'amount':amount,
-                     'account_id':line.account_analytic_id.id or False,
-                     'move_id':ml_id,
-                     'journal_id':an_journal_id ,
-                     'general_account_id':line.account_id.id,
-                     'ref':ref
-                 }
-                self.pool.get('account.analytic.line').create(cr,uid,an_line)
+                if line.account_analytic_id:
+                    an_line = {
+                         'name':line.name,
+                         'date':inv.date,
+                         'amount':amount,
+                         'account_id':line.account_analytic_id.id or False,
+                         'move_id':ml_id,
+                         'journal_id':an_journal_id ,
+                         'general_account_id':line.account_id.id,
+                         'ref':ref
+                     }
+                    self.pool.get('account.analytic.line').create(cr,uid,an_line)
                 
             self.write(cr, uid, [inv.id], {'move_id': move_id})
             obj=self.pool.get('account.move').browse(cr, uid, move_id)
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index ed7ff7294b2..654d060966b 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -76,14 +76,14 @@
 							<newline/>
 							<field name="field_description" colspan="4" readonly="1"/>
 							<newline/>
-							<separator string="Old Value : " colspan="2" readonly="1"/>
-							<separator string="New Value : " colspan="2" readonly="1"/>
+							<separator string="Old Value : " colspan="2"/>
+							<separator string="New Value : " colspan="2"/>
 							<newline/>
 							<field name="old_value" nolabel="1" colspan="2" readonly="1"/>
 							<field name="new_value" nolabel="1" colspan="2" readonly="1"/>
 							<newline/>
-							<separator string="Old Value Text : " colspan="2" readonly="1"/>
-							<separator string="New Value Text: " colspan="2" readonly="1"/>
+							<separator string="Old Value Text : " colspan="2"/>
+							<separator string="New Value Text: " colspan="2"/>
 							<newline/>
 							<field name="old_value_text" nolabel="1" colspan="2" readonly="1"/>
 							<field name="new_value_text" nolabel="1" colspan="2" readonly="1"/>