Merge lp:~openerp-dev/openobject-addons/trunk-bug-997141-cha into lp:openobject-addons

[Ajay Chauhan(OpenERP)]

Hello,
    i have made changes in calculation of residual amount to solve the bug.

Thanks,
Ajay Chauhan

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello ajay,

I don't think this code is working fine.

we need not to check a condition if posted_depreciation_line_ids: inside for x in range(len(posted_depreciation_line_ids), undone_dotation_number):

line 18 of your patch seems too static as is will always check for the index [0]!!

Please update your branch with latest trunk :)

Thanks,
Purnendu Singh

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-997141-cha]

6864. By Ajay Chauhan(OpenERP) on 2012-08-24

[IMP] account_asset: revert old changes

6865. By Ajay Chauhan(OpenERP) on 2012-08-24

[MERGE] merge with main addons

6866. By Ajay Chauhan(OpenERP) on 2012-08-24

[IMP] account_asset: fixed depriciation board calculation problem

[Ajay Chauhan(OpenERP) (cha-tinyerp)]

Hello Sir,
        I modified code to solve the bug. Kindly review the code.

Thanks,
Ajay Chauhan

review: Needs Resubmitting

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

After removing rounding from the residual value method when I finish all the depreciation and check the residual it does not become 0.

Thanks,
Mustufa

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-997141-cha]

6867. By Ajay Chauhan(OpenERP) on 2012-08-28

[IMP] account_asset: fix the issue of residual value

[Ajay Chauhan(OpenERP) (cha-tinyerp)]

Hello Sir,

    I have fixed the issue of not getting proper residual value when finish all depreciation. Kindly review this.

Thanks,
Ajay Chauhan

review: Needs Resubmitting

[Harry (OpenERP) (hmo-tinyerp)]

it's seem ok.

Thanks

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-997141-cha]

6868. By Harry (OpenERP) on 2012-10-23

[MERGE]

6869. By Harry (OpenERP) on 2012-10-23

[IMP] account_asset: comment

6870. By Cedric Snauwaert (OpenERP) on 2012-11-02

[MERGE]merge with latest addons_trunk

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2012-07-19 07:31:36 +0000
+++ account_asset/account_asset.py	2012-08-28 09:24:20 +0000
@@ -134,6 +134,7 @@
 
     def compute_depreciation_board(self, cr, uid, ids, context=None):
         depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
+        currency_obj = self.pool.get('res.currency')
         for asset in self.browse(cr, uid, ids, context=context):
             if asset.value_residual == 0.0:
                 continue
@@ -158,6 +159,9 @@
             for x in range(len(posted_depreciation_line_ids), undone_dotation_number):
                 i = x + 1
                 amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=context)
+                company_currency = asset.company_id.currency_id.id
+                current_currency = asset.currency_id.id
+                amount = currency_obj.compute(cr, uid, current_currency, company_currency, amount, context=context)
                 residual_amount -= amount
                 vals = {
                      'amount': amount,
@@ -189,7 +193,7 @@
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         cr.execute("""SELECT
-                l.asset_id as id, round(SUM(abs(l.debit-l.credit))) AS amount
+                l.asset_id as id, SUM(abs(l.debit-l.credit)) AS amount
             FROM
                 account_move_line l
             WHERE
@@ -347,8 +351,8 @@
         'sequence': fields.integer('Sequence', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
-        'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount to Depreciate', required=True),
+        'amount': fields.float('Depreciation Amount', digits_compute=dp.get_precision('Account'), required=True),
+        'remaining_value': fields.float('Amount to Depreciate', digits_compute=dp.get_precision('Account'),required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),