diff --git a/addons/account/account.py b/addons/account/account.py
index 9042d1ab3dc..25c6d057e67 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -795,10 +795,8 @@ class account_fiscalyear(osv.osv):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
-                                  help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True),
     }
-
     _defaults = {
         'state': lambda *a: 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@@ -875,11 +873,10 @@ class account_period(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "date_start"
 
@@ -1010,7 +1007,6 @@ class account_journal_period(osv.osv):
     _defaults = {
         'state': lambda *a: 'draft',
         'active': lambda *a: True,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "period_id"
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5112c568546..137297e9b3f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2142,7 +2142,7 @@
             <field name="view_mode">tree,form,search</field>
         </record>
 
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
 
         <!-- Account Tax Templates -->
 
@@ -2326,8 +2326,7 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="company_id"  widget="selection"
-                         />
+                  <field name="company_id" widget="selection"/>
                   <field name ="code_digits" />
                   <field name="chart_template_id"/>
                   <field name ="seq_journal" />
@@ -2428,7 +2427,7 @@
         <menuitem
             action="action_account_fiscal_position_template_form"
             id="menu_action_account_fiscal_position_form_template"
-            parent="account_template_folder" sequence="20"/>
+            parent="account_template_taxes" sequence="20"/>
 
         <!-- Cash Statement -->
         <record id="view_cash_statement_tree" model="ir.ui.view">