openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06862
lp:~openerp-dev/openobject-addons/trunk-account-asset-add_fields_asset_category-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset
Ujjvala Collins (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-account-asset-add_fields_asset_category-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-add_fields_asset_category-uco/+merge/61227
[ADD] :
------------
* on asset category: add new fields for the needed default value for all fields of depreciation method & duration of asset (that means, that we should be able to choose an asset category and all the fields of that 2 groups should be filled with default value of the category)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-add_fields_asset_category-uco/+merge/61227
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-account-asset-add_fields_asset_category-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2011-05-13 10:15:23 +0000
+++ account_asset/account_asset.py 2011-05-17 10:42:32 +0000
@@ -37,6 +37,8 @@
'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True),
+ 'method_delay': fields.integer('During (interval)'),
}
_defaults = {
@@ -198,7 +200,13 @@
'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
}
-
+ def onchange_category_id(self, cr, uid, ids, category_id, context=None):
+ res = {'value':{}}
+ if category_id:
+ category_obj = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context)
+ res['value'] = {'method': category_obj.method, 'method_delay': category_obj.method_delay}
+ return res
+
def _compute_period(self, cr, uid, property, context={}):
if (len(property.entry_asset_ids or [])/2)>=property.method_delay:
return False
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-05-13 10:15:23 +0000
+++ account_asset/account_asset_view.xml 2011-05-17 10:42:32 +0000
@@ -15,6 +15,8 @@
<field name="account_asset_id"/>
<field name="account_depreciation_id"/>
<field name="account_expense_depreciation_id"/>
+ <field name="method"/>
+ <field name="method_delay"/>
<group col="4" colspan="4" groups="analytic.group_analytic_accounting">
<separator string="Analytic information" colspan="4" />
<newline/>
@@ -50,7 +52,7 @@
<form string="Asset">
<group col="6" colspan="4">
<field name="name" select="1"/>
- <field name="category_id" select="1"/>
+ <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
<field name="code" select="1"/>
<field name="purchase_value" select="1"/>
<field name="currency_id" select="1"/>
Follow ups