odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge pso's branch related to default companies for account_asset module 

bzr revid: qdp-launchpad@openerp.com-20110513100954-9aqww61203scp7xn
This commit is contained in:
Quentin (OpenERP) 2011-05-13 12:09:54 +02:00
parent 1073a9314c d666142b2b
commit e40dffa998
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/account_asset/account_asset.py
View File

@ -26,17 +26,23 @@ from datetime import datetime
class account_asset_category(osv.osv):
_name = 'account.asset.category'
_description = 'Asset category'
_columns = {
'name': fields.char('Asset category', size=64, required=True, select=1),
'note': fields.text('Note'),
'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'), #FIXME:add in the form view with group = analytic
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), #FIXME:add in the form view with group = analytic
'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
'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'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
_defaults = {
'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context),
}
account_asset_category()
#class one2many_mod_asset(fields.one2many):
@ -189,6 +195,7 @@ class account_asset_asset(osv.osv):
'method_period': lambda obj, cr, uid, context: 12,
'method_progress_factor': lambda obj, cr, uid, context: 0.3,
'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),
}

7
addons/account_asset/account_asset_view.xml
View File

@ -10,7 +10,7 @@
<form string="Asset category">
<group col="6" colspan="4">
<field name="name" select="1" colspan="4"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="journal_id"/>
<field name="account_asset_id"/>
@ -55,8 +55,8 @@
<field name="code" select="1"/>
<field name="purchase_value" select="1"/>
<field name="currency_id" select="1"/>
<field name="company_id" select="1"/>
<field name="value_residual"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="value_residual"/>
</group>
<notebook colspan="4">
<page string="Depreciation">
@ -194,6 +194,7 @@
<field name="code"/>
<field name="value_total"/>
<field name="purchase_date"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state"/>
</tree>
</field>