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

[Ajay Chauhan(OpenERP)]

Hello,

   I have solved an issue of deleting asset. https://bugs.launchpad.net/openobject-addons/+bug/1103422

Thanks,
Ajay Chauhan

Unmerged revisions

8517. By Ajay Chauhan(OpenERP) on 2013-01-24

[FIX] account_asset: solved an issue of deleting asset

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2012-12-17 15:23:03 +0000
+++ account_asset/account_asset.py	2013-01-24 09:00:30 +0000
@@ -23,6 +23,7 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
+from openerp.tools.translate import _
 from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 
@@ -325,6 +326,17 @@
         default.update({'depreciation_line_ids': [], 'state': 'draft'})
         return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
 
+    def unlink(self, cr, uid, ids, context=None):
+        assets = self.read(cr, uid, ids, ['state'], context=context)
+        unlink_ids = []
+        for a in assets:
+            if a['state'] in ['draft']:
+                unlink_ids.append(a['id'])
+            else:
+                raise osv.except_osv(_('Invalid Action!'), _('You can only delete asset having draft state!'))
+
+        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+
     def _compute_entries(self, cr, uid, ids, period_id, context=None):
         result = []
         period_obj = self.pool.get('account.period')
@@ -366,7 +378,7 @@
     _columns = {
         'name': fields.char('Depreciation Name', size=64, required=True, select=1),
         'sequence': fields.integer('Sequence', required=True),
-        'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
+        'asset_id': fields.many2one('account.asset.asset', 'Asset', ondelete='cascade', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
         'amount': fields.float('Current Depreciation', digits_compute=dp.get_precision('Account'), required=True),
         'remaining_value': fields.float('Next Period Depreciation', digits_compute=dp.get_precision('Account'),required=True),