From ae6bcb4a9309b69edbdd69cddbc80ef9123ea61e Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Mon, 30 May 2011 18:33:52 +0530
Subject: [PATCH] [IMP] Improved Usability Issues

bzr revid: bde@tiny2-desktop-20110530130352-1ar0deccyh26r8wm
---
 addons/account_asset/account_asset.py       |  8 ++---
 addons/account_asset/account_asset_view.xml | 33 ++++++++++-----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 061f5d88318..7df0c86fdaf 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -38,11 +38,11 @@ class account_asset_category(osv.osv):
         'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}),
+        'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True),
+        'method_delay': fields.integer('Number of Depreciation'),
         'method_period': fields.integer('Period Length'),
         'method_progress_factor': fields.float('Progressif Factor'),
-        'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True),
         'prorata':fields.boolean('Prorata Temporis', help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
         'open_asset': fields.boolean('Skip Draft State', help="Check this if you want to automatically confirm the assets of this category when created by invoice."),
     }
@@ -175,7 +175,7 @@ class account_asset_asset(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner'),
 
         'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \
-            \nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
+         \nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
         'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
         'method_period': fields.integer('Depre. all (period)', readonly=True, states={'draft':[('readonly',False)]}),
         'method_end': fields.date('Ending date'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 2963c0f2c61..0df926f1771 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -19,7 +19,7 @@
                     <separator string="Depreciation Dates" colspan="2" />
                     <field name="method_time"/>
                     <field name="method_delay"/>
-                    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>                
+                    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
                 </group>
                 <group colspan="2" col="2">
                     <separator string="Depreciation Method" colspan="2" />
@@ -76,28 +76,28 @@
                     <separator string="Other Information" colspan="4"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
-                    <button 
-                         name="%(wizard_asset_modify)d" 
-                         states="open" 
-                         string="Change duration" 
-                         type="action" 
+                    <button
+                         name="%(wizard_asset_modify)d"
+                         states="open"
+                         string="Change duration"
+                         type="action"
                          colspan="2"/>
                     <newline/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2" />
-    				    <field name="method_time"/>
+				        <field name="method_time"/>
     				    <field name="method_delay"/>
-                      	<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>                
+                      	<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}">
                	    </group>
-				    <group colspan="2" col="3">
+                    <group colspan="2" col="3">
                         <separator string="Depreciation Method" colspan="2" />
                         <newline/>
-    				    <field name="method"/>
-					    <newline/>
-	                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
-					    <newline/>
-					    <field name="prorata" colspan="1"/>
-               		</group>
+				        <field name="method"/>
+				        <newline/>
+				        <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
+				        <newline/>
+				        <field name="prorata" colspan="1"/>
+                    </group>
                     <group colspan="4">
                         <field name="state" readonly="1"/>
                     </group>
@@ -128,9 +128,8 @@
                  </page>
                  <page string="Notes">
                     <field name="note" nolabel="1"/>
-                 </page>    
+                 </page>
               </notebook>
-              
               <group colspan="2" col="2">
                  <button name="validate" states="draft" string="Confirm Asset" type="object" icon="gtk-apply"/>
               </group>