diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8590ee286d4..175a227a9ea 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -18,6 +18,7 @@
                     <field name="parent_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="type" invisible="1"/>
+                    <field name="template_id" invisible="1"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 75f06614124..32a9d489453 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -31,10 +31,19 @@
                     <field name="partner_id"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
-                    <filter name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
-                    <filter name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
-                    <filter string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
-                        help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
+                    <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>
+                    <filter name="pending" string="To Renew" domain="[('state','=','pending')]" help="Pending contracts"/>
+                    <filter name="closed" string="Closed" domain="[('state','=','pending')]" help="Closed contracts"/>
+                    <filter name="cancelled" string="Cancelled" domain="[('state','=','cancel')]" help="Cancelled contracts"/>
+                    <separator/>
+                    <filter
+                        string="Expired or consumed"
+                        domain="[('state','in',('open','draft','pending')), '|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
+                        help="End date passed or prepaid unit consumed" />
+                    <filter
+                        string="Expiring soon"
+                        domain="[('date', '!=', False), ('date', '&lt;=', (context_today() + datetime.timedelta(30)).strftime('%%Y-%%m-%%d') )]"
+                        help="End date is in the next month" />
                     <separator/>
                     <filter string="Customer Contracts" help="Contracts assigned to a customer." name="has_partner" domain="[('partner_id', '!=', False)]"/>
                     <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('manager_id', '=', False)]"/>
@@ -44,6 +53,7 @@
                         <filter string="Account Manager" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Parent" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Template" domain="[]" context="{'group_by':'template_id'}"/>
                         <filter string="Start Date" domain="[]" context="{'group_by' : 'date_start'}" />
                         <filter string="End Date" domain="[]" context="{'group_by' : 'date'}" />
                     </group>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 005afa5d544..af5fc2f3890 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -196,7 +196,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Start Date'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True, track_visibility='onchange'),
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'),('pending','To Renew'),('close','Closed'),('cancelled', 'Cancelled')], 'Status', required=True, track_visibility='onchange'),
         'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
@@ -349,6 +349,4 @@ class account_analytic_line(osv.osv):
         (_check_no_view, 'You cannot create analytic line on view account.', ['account_id']),
     ]
 
-account_analytic_line()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: