audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

80 asset mgt analytic fix

Browse Source
This commit is contained in:
luc-demeyer
2015-06-02 18:05:25 +02:00
committed by Alexandre Fayolle
parent a7760fd39d
commit f521a76cef
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_asset_management/__openerp__.py
View File

@@ -22,7 +22,7 @@
##############################################################################
{
'name': 'Assets Management',
'version': '2.5',
'version': '2.6',
'depends': ['account'],
'conflicts': ['account_asset'],
'author': "OpenERP & Noviat,Odoo Community Association (OCA)",

7
account_asset_management/account_asset_invoice_view.xml
View File

@@ -3,12 +3,13 @@
<data>
<record model="ir.ui.view" id="view_account_invoice_asset_form">
<field name="name">account.invoice.line.form</field>
<field name="name">account.invoice.form.add.asset_category</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="arch" type="xml">
<field name="account_id" position="after">
<field name="asset_category_id"/>
<field name="account_id" position="before">
<field name="asset_id" groups="account.group_account_manager"/>
<field name="asset_category_id" invisible="context.get('type') not in ['in_invoice','in_refund']"/>
</field>
</field>
</record>

2
account_asset_management/account_asset_view.xml
View File

@@ -11,7 +11,7 @@
<group>
<group>
<field name="name"/>
<field name="parent_id"/>
<field name="parent_id" required="1"/>
<field name="active"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>

9
account_asset_management/wizard/account_asset_remove.py
View File

@@ -239,6 +239,7 @@ class account_asset_remove(orm.TransientModel):
move_line_vals = {
'name': asset.name,
'account_id': wiz_data.account_residual_value_id.id,
'analytic_account_id': asset.account_analytic_id.id,
'debit': residual_value,
'credit': 0.0,
'partner_id': partner_id,
@@ -251,6 +252,7 @@ class account_asset_remove(orm.TransientModel):
move_line_vals = {
'name': asset.name,
'account_id': wiz_data.account_sale_id.id,
'analytic_account_id': asset.account_analytic_id.id,
'debit': sale_value,
'credit': 0.0,
'partner_id': partner_id,
@@ -258,12 +260,13 @@ class account_asset_remove(orm.TransientModel):
}
move_lines.append((0, 0, move_line_vals))
balance = wiz_data.sale_value - residual_value
account_id = balance > 0 \
and wiz_data.account_plus_value_id.id \
or wiz_data.account_min_value_id.id
account_id = (wiz_data.account_plus_value_id.id
if balance > 0
else wiz_data.account_min_value_id.id)
move_line_vals = {
'name': asset.name,
'account_id': account_id,
'analytic_account_id': asset.account_analytic_id.id,
'debit': balance < 0 and -balance or 0.0,
'credit': balance > 0 and balance or 0.0,
'partner_id': partner_id,