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

[IMP] Improved Usability Issues 

bzr revid: bde@tiny2-desktop-20110530130352-1ar0deccyh26r8wm
This commit is contained in:
bde 2011-05-30 18:33:52 +05:30
parent c94ad474bd
commit ae6bcb4a93
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account_asset/account_asset.py
View File

@ -38,11 +38,11 @@ class account_asset_category(osv.osv):
'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, readonly=True, states={'draft':[('readonly',False)]}),
'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}),
'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True),
'method_delay': fields.integer('Number of Depreciation'),
'method_period': fields.integer('Period Length'),
'method_progress_factor': fields.float('Progressif Factor'),
'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True),
'prorata':fields.boolean('Prorata Temporis', help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
'open_asset': fields.boolean('Skip Draft State', help="Check this if you want to automatically confirm the assets of this category when created by invoice."),
}
@ -175,7 +175,7 @@ class account_asset_asset(osv.osv):
'partner_id': fields.many2one('res.partner', 'Partner'),
'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \
\nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
\nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
'method_period': fields.integer('Depre. all (period)', readonly=True, states={'draft':[('readonly',False)]}),
'method_end': fields.date('Ending date'),

33
addons/account_asset/account_asset_view.xml
View File

@ -19,7 +19,7 @@
<separator string="Depreciation Dates" colspan="2" />
<field name="method_time"/>
<field name="method_delay"/>
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Depreciation Method" colspan="2" />
@ -76,28 +76,28 @@
<separator string="Other Information" colspan="4"/>
<field name="partner_id"/>
<field name="purchase_date"/>
<button
name="%(wizard_asset_modify)d"
states="open"
string="Change duration"
type="action"
<button
name="%(wizard_asset_modify)d"
states="open"
string="Change duration"
type="action"
colspan="2"/>
<newline/>
<group colspan="2" col="2">
<separator string="Depreciation Dates" colspan="2" />
<field name="method_time"/>
<field name="method_time"/>
<field name="method_delay"/>
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}">
</group>
<group colspan="2" col="3">
<group colspan="2" col="3">
<separator string="Depreciation Method" colspan="2" />
<newline/>
<field name="method"/>
<newline/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
<newline/>
<field name="prorata" colspan="1"/>
</group>
<field name="method"/>
<newline/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
<newline/>
<field name="prorata" colspan="1"/>
</group>
<group colspan="4">
<field name="state" readonly="1"/>
</group>
@ -128,9 +128,8 @@
</page>
<page string="Notes">
<field name="note" nolabel="1"/>
</page>
</page>
</notebook>
<group colspan="2" col="2">
<button name="validate" states="draft" string="Confirm Asset" type="object" icon="gtk-apply"/>
</group>