Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-account-asset-parent_id_asset-uco 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-parent_id_asset-uco/+merge/65942
[IMP] Account asset:
------------------------------------
* we can set an asset hierarchy but there is no parent_id field displayed in
the asset form view.
Improvements I did:
---------------------------------
* Added parent_id field on form view of asset.
* Added check constraint for the same field by overriding orm method
_check_recursion.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-parent_id_asset-uco/+merge/65942
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-account-asset-parent_id_asset-uco into
lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2011-06-23 15:15:03 +0000
+++ account_asset/account_asset.py 2011-06-27 07:36:41 +0000
@@ -228,6 +228,9 @@
'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
}
+
+ def _check_recursion(self, cr, uid, ids, context=None, parent=None):
+ return super(account_asset_asset, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
def _check_prorata(self, cr, uid, ids, context=None):
for asset in self.browse(cr, uid, ids, context=context):
@@ -236,6 +239,7 @@
return True
_constraints = [
+ (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
(_check_prorata, '\nProrata temporis can be applied only for computation method linear and time method delay.', ['prorata']),
]
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-06-23 15:15:03 +0000
+++ account_asset/account_asset_view.xml 2011-06-27 07:36:41 +0000
@@ -65,6 +65,7 @@
<field name="name" select="1"/>
<field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
<field name="code" select="1"/>
+ <field name="parent_id"/>
<field name="purchase_value" select="1"/>
<field name="salvage_value"/>
<field name="value_residual"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp