openerp-dev-web team mailing list archive

["Bharat Devnani \(Open ERP\)" <bde@xxxxxxxxxxx>]

Bharat Devnani (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde/+merge/62878

Hello sir,

I have added tooltip for Computation method, During (interval) and Time Method,

I have created groups for depreciation period and for dates,

changed the label name from Computation method to Computation Method, and corrected all indentations.

Thanks & Regards, 
Devnani Bharat R.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde/+merge/62878
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2011-05-27 14:50:49 +0000
+++ account_asset/account_asset.py	2011-05-30 13:26:25 +0000
@@ -174,13 +174,14 @@
         'active': fields.boolean('Active', select=2),
         'partner_id': fields.many2one('res.partner', 'Partner'),
 
-        '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, 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"),
+        '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'),
         'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
         'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
-        '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, readonly=True, states={'draft':[('readonly',False)]}, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of every 12 months"),
         'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
         'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
         'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True,),

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2011-05-27 13:49:30 +0000
+++ account_asset/account_asset_view.xml	2011-05-30 13:26:25 +0000
@@ -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,21 +76,31 @@
                     <separator string="Other Information" colspan="4"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
-                    <separator string="Depreciation duration" colspan="4"/>
-                    <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/>
-                    <field name="method"/>
-                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
-                    <newline/>
-                    <field name="method_time"/>
-                    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
-                    <field name="prorata" colspan="1"/>
-                    <field name="method_delay"/>
+                    <group colspan="2" col="2">
+                        <separator string="Depreciation Dates" colspan="2" />
+                        <field name="method_time"/>
+                        <field name="method_delay"/>
+                        <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}">
+               	    </group>
+               	    <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>
+                    <group colspan="4">
+                        <field name="state" readonly="1"/>
+                    </group>
                     <newline/>
                  </page>
                  <page string="Depreciation board">
@@ -118,11 +128,10 @@
                  </page>
                  <page string="Notes">
                     <field name="note" nolabel="1"/>
-                 </page>    
+                 </page>
               </notebook>
-              <field name="state" readonly="1"/>
               <group colspan="2" col="2">
-                 <button name="validate" states="draft" string="Confirm asset" type="object"/>
+                 <button name="validate" states="draft" string="Confirm Asset" type="object" icon="gtk-apply"/>
               </group>
            </form>
        </field>