Merge lp:~openerp-dev/openobject-addons/trunk-account-asset-usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Bharat Devnani (Open ERP)]

Hello,

Following usability issues are resolved :

    1) in all other view : the state bar is in the first tab, move it in the tab
    2) add icon on button

Thanks & Regards
Devnani Bharat

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

string="Confirm asset" => "Confirm Asset"
and correct the indentation too

review: Needs Fixing

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello,

I have improved the usability as suggested.

Thanks & Regards,
Devnani Bharat R.

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello,

I have also changed the label of Depr.. All.

Thanks & Regards,
Devnani Bharat R.

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello,

I have added tooltips in account_asset:

During (interval)
Computation Method
Time Method

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

replace tabs and solve conflicts

review: Needs Fixing

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

I have improved the usability in account_asset_view.xml

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

remove print statement

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

still indentation problem.

used 4 space instead of tab

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

I have made the changes as per your suggestion.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

Corrected indentation of button field.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Bharat Devnani (Open ERP) (bde-openerp)]

review: Needs Resubmitting

[Bharat Devnani (Open ERP) (bde-openerp)]

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

good work!

you have corrected all indentation problem in the xml file.

thanks,
mra

review: Approve

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

conflicts detected in the branch as new changes made on the main project branch.

thanks,
mra

review: Needs Fixing

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

Conflicts are resolved.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

it seems you have not merge properly your feature branch with main project branch.
Some usefull changes from project branch you have overrided in your feature branch.

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

branch seems weired.
for sake of clarity i reject this branch and please create new merge proposal for above feature.

thanks,
mra

review: Disapprove

=== 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 11:03:48 +0000
@@ -58,6 +58,7 @@
 
 account_asset_category()
 
+
 #class one2many_mod_asset(fields.one2many):
 #
 #    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
@@ -174,13 +175,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_period': fields.integer('Depre. all (period)', 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_invoice.py'
--- account_asset/account_asset_invoice.py	2011-05-27 13:38:54 +0000
+++ account_asset/account_asset_invoice.py	2011-05-30 11:03:48 +0000
@@ -38,19 +38,15 @@
     def move_line_get_item(self, cr, uid, line, context={}):
         asset_obj = self.pool.get('account.asset.asset')
         res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
-        if line.invoice_id and line.invoice_id.type not in ('out_invoice', 'out_refund') and line.asset_category_id:
-                vals = {
-                    'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name,
-                    'category_id': line.asset_category_id.id,
-                    'purchase_value': line.price_subtotal,
-                    'period_id': line.invoice_id.period_id.id,
-                    'partner_id': line.invoice_id.partner_id.id,
-                    'company_id': line.invoice_id.company_id.id,
-                    'currency_id': line.invoice_id.currency_id.id,
-                }
-                asset_id = asset_obj.create(cr, uid, vals, context=context)
-                if line.asset_category_id.open_asset:
-                    asset_obj.validate(cr, uid, [asset_id], context=context)
+        if line.asset_category_id:
+            vals = {
+                'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name,
+                'category_id': line.asset_category_id.id,
+                'purchase_value': line.price_subtotal
+            }
+            asset_id = asset_obj.create(cr, uid, vals, context=context)
+            if line.asset_category_id.open_asset:
+                asset_obj.validate(cr, uid, [asset_id], context=context)
         return res
 account_invoice_line()
 
 
=== 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 11:03:48 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
     <record model="ir.ui.view" id="view_account_asset_category_form">
         <field name="name">account.asset.category.form</field>
         <field name="model">account.asset.category</field>
@@ -76,7 +75,8 @@
                     <separator string="Other Information" colspan="4"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
-                    <separator string="Depreciation duration" colspan="4"/>
+                    <separator string="Depreciation Dates" colspan="2" />
+				    <separator string="Depreciation Method" colspan="2" />
                     <button 
                          name="%(wizard_asset_modify)d" 
                          states="open" 
@@ -84,13 +84,21 @@
                          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">
+    				    <field name="method_time"/>
+					    <field name="method_delay"/>
+                   	    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>                
+               	    </group>
+                    <group colspan="2" col="3">
+    				    <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">
@@ -120,9 +128,8 @@
                     <field name="note" nolabel="1"/>
                  </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-yes"/>
               </group>
            </form>
        </field>