From a3e8f3b7b0b9188364eaecc91366c5d19ed9cc25 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 2 Jan 2012 18:41:37 +0530
Subject: [PATCH] [FIX] Improvement in Analytic account and Project

lp bug: https://launchpad.net/bugs/910121 fixed

bzr revid: kjo@tinyerp.com-20120102131137-cdnvza6m10u3uc19
---
 addons/account/project/project_view.xml                   | 2 +-
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 addons/project/project_view.xml                           | 4 ++--
 addons/project_timesheet/project_timesheet.py             | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index da6ec7f73a1..9fc2e7e612c 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -57,7 +57,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
+                <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
                     <field name="name"/>
                     <field name="code" groups="base.group_extended"/>
                     <field name="quantity"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 11474ee5e88..3190b8910ae 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -23,7 +23,7 @@
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                        <button name="set_open" string="Reactivate Account" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
                         <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                         <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
                     </group>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1ed2bc034e6..8f666067d50 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,7 +41,7 @@
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
                                 <field name="warn_manager"/>
                                 <field name="priority"/>
-                                <field name="active"/>
+                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                             <newline/>
                             <separator colspan="4"/>
@@ -49,7 +49,7 @@
                                 <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
-                                <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
+                                <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index f00835bc9a5..db7066505e1 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -243,6 +243,8 @@ class account_analytic_line(osv.osv):
        acc = self.pool.get('account.analytic.account').browse(cr, uid, account_id)
        st = acc.to_invoice.id
        res['value']['to_invoice'] = st or False
+       if acc.state == 'close' or acc.state == 'cancelled':
+           raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state'))
        return res  
 account_analytic_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: