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

[IMP] account fixed asset 

bzr revid: openerp@ubuntu-20110330171702-5knjrrnbi5hsoicp
This commit is contained in:
OpenERP 2011-03-30 10:17:02 -07:00
parent e8af0914f6
commit d33e675009
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_asset/account_asset.py
View File

@ -80,7 +80,7 @@ class account_asset_asset(osv.osv):
'code': fields.char('Reference ', size=16, select=1),
'purch_valu': fields.float('Purchase value ', required=True, size=16, select=1),
'currency': fields.many2one('res.currency','Currency',required=True,size=5,select=1),
'company': fields.char('Company',size=16, select=1),
'company': fields.many2one('res.company', 'Company', required=True,size=5,select=1),
'note': fields.text('Note'),
'category_id': fields.many2one('account.asset.category', 'Asset category',required=True, change_default=True),
'localisation': fields.char('Localisation', size=32, select=2),
@ -96,7 +96,6 @@ class account_asset_asset(osv.osv):
'property_ids': fields.one2many('account.asset.property', 'asset_id', 'Asset method name', readonly=True, states={'draft':[('readonly',False)]}),
'value_total': fields.function(_amount_total, method=True, digits=(16,2),string='Total value'),
'test': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
}
_defaults = {
'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),
@ -241,6 +240,7 @@ class account_asset_property(osv.osv):
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'purchasedate': fields.date('Purchase date', required=True),
'method_progress_factor': fields.float('Progressif factor', readonly=True, states={'draft':[('readonly',False)]}),
'method_time': fields.selection([('delay','Delay'),('end','Ending period')], 'Time method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'method_delay': fields.integer('During', readonly=True, states={'draft':[('readonly',False)]}),

21
addons/account_asset/account_asset_view.xml
View File

@ -10,13 +10,12 @@
<field name="arch" type="xml">
<form string="Asset category">
<field name="name" select="1"/>
<field name="code" select="1"/>
<!-- <field name="code" select="1"/>-->
<field name="note" colspan="4"/>
<field name="account_asset_id"/>
<field name="account_actif_id"/>
<field name="journal_id"/>
<field name="type"/>
<!-- <field name="type"/>-->
</form>
</field>
</record>
@ -27,13 +26,13 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Asset category">
<field name="code"/>
<!-- <field name="code"/>-->
<field name="name"/>
<separator string="Accounts information" colspan="4"/>
<field name="account_asset_id"/>
<field name="account_actif_id"/>
<field name="journal_id"/>
<field name="type"/>
<!-- <field name="type"/>-->
</tree>
</field>
@ -74,13 +73,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Asset">
<group col="6" colspan="4">
<group col="6" colspan="4" >
<field name="name" select="1"/>
<field name="category_id" select="1"/>
<field name="code" select="1"/>
<field name="purch_valu" select="1"/>
<field name="currency" select="1"/>
<field name="company" select="1"/>
<field name="company" select="1" />
</group>
<!-- <field name="period_id" select="2"/>-->
@ -95,9 +94,8 @@
<page string="Depreciation">
<separator string="Other information" colspan="4"/>
<!--<field name="partner_id" select="2"/>
<field name="parent_id" select="2"/>
<field name="note" colspan="4" nolabel="1"/>
-->
<field name="parent_id" select="2"/>-->
<!--<field name="note" colspan="4" nolabel="1"/>-->
<separator string="Accounts information" colspan="4"/>
<field name="account_analytic_id"/>
<field name="journal_analytic_id"/>
@ -105,6 +103,7 @@
<field name="name" select="1" colspan="2"/>-->
<separator string="Depreciation duration" colspan="4"/>
<field name="method"/>
<field name="purchasedate"/>
<field name="method_progress_factor"/>
<newline/>
<field name="prorata" colspan="1"/>
@ -148,7 +147,7 @@
<group colspan="2" col="2">
<button name="validate" states="draft" string="Confirm asset" type="object"/>
</group>
</page>
<!-- </page>-->
<!--<page string="Entries">
<field name="entry_ids" colspan="4" nolabel="1"/>
</page>