diff --git a/addons/account/account.py b/addons/account/account.py index ee0da138daf..04bf1a02fe9 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -5,6 +5,7 @@ import math from openerp.osv import expression from openerp.tools.float_utils import float_round as round +from openerp.tools.safe_eval import safe_eval as eval from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT from openerp.exceptions import UserError from openerp import api, fields, models, _ diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 866ad49c01d..d71735a12b7 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -2,11 +2,13 @@ from openerp import api, fields, models, _ from openerp.osv import expression +from openerp.tools import float_is_zero from openerp.tools import float_compare, float_round from openerp.tools.misc import formatLang from openerp.exceptions import UserError, ValidationError import time +import math class AccountCashboxLine(models.Model): """ Cash Box Details """ diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index e7ec5649f2f..a6e6ad03257 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -95,7 +95,7 @@ class AccountInvoice(models.Model): if line.account_id.internal_type in ('receivable', 'payable'): residual_signed += line.amount_residual * sign if line.currency_id == self.currency_id: - residual += line.currency_id and line.amount_residual_currency or line.amount_residual + residual += line.amount_residual_currency if line.currency_id else line.amount_residual else: from_currency = (line.currency_id and line.currency_id.with_context(date=line.date)) or line.company_id.currency_id.with_context(date=line.date) residual += from_currency.compute(line.amount_residual, self.currency_id) diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 4a6f923979c..b324d06aded 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -158,18 +158,23 @@ class AccountInvoiceReport(models.Model): # self._table = account_invoice_report tools.drop_view_if_exists(cr, self._table) cr.execute("""CREATE or REPLACE VIEW %s as ( + WITH currency_rate (currency_id, rate, date_start, date_end) AS ( + SELECT r.currency_id, r.rate, r.name AS date_start, + (SELECT name FROM res_currency_rate r2 + WHERE r2.name > r.name AND + r2.currency_id = r.currency_id + ORDER BY r2.name ASC + LIMIT 1) AS date_end + FROM res_currency_rate r + ) %s FROM ( %s %s %s ) AS sub - JOIN res_currency_rate cr ON (cr.currency_id = sub.currency_id) - WHERE - cr.id IN (SELECT id - FROM res_currency_rate cr2 - WHERE (cr2.currency_id = sub.currency_id) - AND ((sub.date IS NOT NULL AND cr2.name <= sub.date) - OR (sub.date IS NULL AND cr2.name <= NOW())) - ORDER BY name DESC LIMIT 1) + JOIN currency_rate cr ON + (cr.currency_id = sub.currency_id AND + cr.date_start <= COALESCE(sub.date, NOW()) AND + (cr.date_end IS NULL OR cr.date_end > COALESCE(sub.date, NOW()))) )""" % ( self._table, self._select(), self._sub_select(), self._from(), self._group_by())) diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 9a6443854e5..b29e0175f1a 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -83,9 +83,11 @@ class AccountConfigSettings(models.TransientModel): module_account_accountant = fields.Boolean(string='Full accounting features: journals, legal statements, chart of accounts, etc.', help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)""") - module_account_asset = fields.Boolean(string='Assets management', - help='This allows you to manage the assets owned by a company or a person.\n' - 'It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.\n' + module_account_asset = fields.Boolean(string='Assets management & Revenue recognition', + help='Asset management: This allows you to manage the assets owned by a company or a person.' + 'It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.\n\n' + 'Revenue recognition: This allows you to manage the Revenue recognition on selling product.' + 'It keeps track of the installment occurred on those revenue recognition, and creates account move for those installment lines.\n' '-This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, ' 'but not accounting (Journal Items, Chart of Accounts, ...)') module_account_budget = fields.Boolean(string='Budget management', diff --git a/addons/account/static/src/css/account_reconciliation.scss b/addons/account/static/src/css/account_reconciliation.scss index 1e1c3e5ed23..c2d4973d259 100644 --- a/addons/account/static/src/css/account_reconciliation.scss +++ b/addons/account/static/src/css/account_reconciliation.scss @@ -560,11 +560,10 @@ $aestetic_animation_speed: 300ms; } &.add_line_container { - &:nth-child(2n+1) { - width: 98%; - float: none; - margin: auto; - } + width: 98%; + float: none; + clear: both; + margin: auto; td { text-align: center; diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js index 86b486de48b..c650c15d291 100644 --- a/addons/account/static/src/js/account_reconciliation_widgets.js +++ b/addons/account/static/src/js/account_reconciliation_widgets.js @@ -1853,10 +1853,11 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({ changePartnerClickHandler: function() { var self = this; - self.$(".change_partner_container").find("input").attr("placeholder", self.st_line.partner_name); - self.$(".change_partner_container").show(); - self.$(".partner_name").hide(); - self.change_partner_field.$drop_down.trigger("click"); + $.when(self.changePartner(false)).then(function(){ + self.$(".change_partner_container").show(); + self.$(".partner_name").hide(); + self.change_partner_field.$drop_down.trigger("click"); + }) }, diff --git a/addons/account/tests/test_search.py b/addons/account/tests/test_search.py index 7a8ceaef362..f79e368d9c2 100644 --- a/addons/account/tests/test_search.py +++ b/addons/account/tests/test_search.py @@ -54,3 +54,18 @@ class TestSearch(AccountTestUsers): asale_ids = self.account_model.name_search(name='XX200', operator='ilike', args=[('id', 'in', self.all_ids)]) self.assertEqual(set([self.asale[0]]), set([a[0] for a in asale_ids]), "name_search 'ilike XX200' should have returned Product Sales account only") + + def test_property_unset_search(self): + cr, uid = self.cr, self.uid + res_partner_model = self.registry('res.partner') + account_payment_term_model = self.registry('account.payment.term') + + a_partner = res_partner_model.create(cr, uid, {'name': 'test partner'}) + a_payment_term = account_payment_term_model.create(cr, uid, {'name': 'test payment term'}) + + partner_ids = res_partner_model.search(cr, uid, [('property_payment_term', '=', False), ('id', '=', a_partner)]) + self.assertTrue(partner_ids, "unset property field 'propety_payment_term' should have been found") + + res_partner_model.write(cr, uid, [a_partner], {'property_payment_term': a_payment_term}) + partner_ids = res_partner_model.search(cr, uid, [('property_payment_term', '=', False), ('id', '=', a_partner)]) + self.assertFalse(partner_ids, "set property field 'propety_payment_term' should not have been found") diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index 9bacb760f79..b6d801e27f9 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -545,7 +545,7 @@ tree,form,calendar,graph [('type','in', ['out_invoice', 'out_refund']), ('state', 'not in', ['draft', 'cancel'])] - {'type':False} + {'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'} diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 4aaf8b8ca16..cb6645739a4 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from openerp import models, fields, api, _ +from openerp.tools.safe_eval import safe_eval as eval from openerp.exceptions import UserError diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 605e4379cee..17a05e1da90 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -669,34 +669,36 @@ class account_analytic_account(osv.osv): context = context or {} journal_obj = self.pool.get('account.journal') + fpos_obj = self.pool['account.fiscal.position'] + partner = contract.partner_id - if not contract.partner_id: + if not partner: raise UserError(_("You must first select a Customer for Contract %s!") % contract.name ) - fpos = contract.partner_id.property_account_position or False + fpos_id = fpos_obj.get_fiscal_position(cr, uid, partner.company_id.id, partner.id, context=context) journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', contract.company_id.id or False)], limit=1) if not journal_ids: raise UserError(_('Please define a sale journal for the company "%s".') % (contract.company_id.name or '', )) - partner_payment_term = contract.partner_id.property_payment_term and contract.partner_id.property_payment_term.id or False + partner_payment_term = partner.property_payment_term and partner.property_payment_term.id or False currency_id = False if contract.pricelist_id: currency_id = contract.pricelist_id.currency_id.id - elif contract.partner_id.property_product_pricelist: - currency_id = contract.partner_id.property_product_pricelist.currency_id.id + elif partner.property_product_pricelist: + currency_id = partner.property_product_pricelist.currency_id.id elif contract.company_id: currency_id = contract.company_id.currency_id.id invoice = { - 'account_id': contract.partner_id.property_account_receivable.id, + 'account_id': partner.property_account_receivable.id, 'type': 'out_invoice', - 'partner_id': contract.partner_id.id, + 'partner_id': partner.id, 'currency_id': currency_id, 'journal_id': len(journal_ids) and journal_ids[0] or False, 'date_invoice': contract.recurring_next_date, 'origin': contract.code, - 'fiscal_position_id': fpos and fpos.id, + 'fiscal_position_id': fpos_id, 'payment_term_id': partner_payment_term, 'company_id': contract.company_id.id or False, } diff --git a/addons/account_asset/__init__.py b/addons/account_asset/__init__.py index 8c1b6b60c16..f826640892b 100644 --- a/addons/account_asset/__init__.py +++ b/addons/account_asset/__init__.py @@ -1,23 +1,4 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- import account_asset import account_asset_invoice diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index 010fc167bfc..7a1f36b6f8c 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -1,36 +1,20 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- { - 'name': 'Assets Management', + 'name': 'Assets & Revenue Recognitions Management', 'version': '1.0', - 'depends': ['account'], - 'author': 'OpenERP S.A.', + 'depends': ['account_accountant'], + 'author': 'Odoo S.A.', 'description': """ -Financial and accounting asset management. -========================================== +Assets management +================= +Manage assets owned by a company or a person. +Keeps track of depreciations, and creates corresponding journal entries. -This Module manages the assets owned by a company or an individual. It will keep -track of depreciation's occurred on those assets. And it allows to create Move's -of the depreciation lines. +Revenue recognition +=================== +Manage revenue recognition on product sales. +Keeps track of the revenue recognition installments, and creates corresponding journal entries. """, 'website': 'https://www.odoo.com/page/accounting', @@ -39,23 +23,23 @@ of the depreciation lines. 'demo': [ 'account_asset_demo.yml', ], - 'test': [ - '../account/test/account_minimal_test.xml', - 'test/account_asset_demo_test.xml', - 'test/account_asset_demo.yml', - 'test/account_asset.yml', - 'test/account_asset_wizard.yml', - ], + # 'test': [ + # '../account/test/account_minimal_test.xml', + # 'test/account_asset_demo_test.xml', + # ], 'data': [ 'security/account_asset_security.xml', 'security/ir.model.access.csv', 'wizard/account_asset_change_duration_view.xml', 'wizard/wizard_asset_compute_view.xml', - 'account_asset_view.xml', - 'account_asset_invoice_view.xml', + 'views/account_asset_view.xml', + 'views/account_asset_invoice_view.xml', 'report/account_asset_report_view.xml', + 'views/account_asset.xml', + ], + 'qweb': [ + "static/src/xml/account_asset_template.xml", ], - 'auto_install': False, 'installable': True, 'application': False, } diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 7a326a8df7a..ebe22bc408c 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -1,335 +1,313 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- -import time -from datetime import datetime +from datetime import date, datetime from dateutil.relativedelta import relativedelta -from openerp.osv import fields, osv import openerp.addons.decimal_precision as dp -from openerp.tools.translate import _ -from openerp.exceptions import UserError +from openerp import api, fields, models, _ +from openerp.exceptions import UserError, ValidationError +from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF -class account_asset_category(osv.osv): + +class AccountAssetCategory(models.Model): _name = 'account.asset.category' _description = 'Asset category' - _columns = { - 'name': fields.char('Name', required=True, select=1), - 'note': fields.text('Note'), - 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), - 'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]), - 'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]), - 'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]), - 'journal_id': fields.many2one('account.journal', 'Journal', required=True), - 'company_id': fields.many2one('res.company', 'Company', required=True), - 'method': fields.selection([('linear','Linear: Computed on basis of Gross Value / Number of Depreciations'),('degressive','Degressive: Computed on basis of Residual Value * Degressive Factor')], 'Computation Method', required=True, help="Choose the method to use to compute the amount of depreciation lines.\n"\ - " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \ - " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"), - 'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"), - 'method_period': fields.integer('Period Length', help="State here the time between 2 depreciations, in months", required=True), - 'method_progress_factor': fields.float('Degressive Factor'), - 'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, - help="Choose the method to use to compute the dates and number of depreciation lines.\n"\ - " * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \ - " * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."), - 'method_end': fields.date('Ending date'), - 'prorata':fields.boolean('Prorata Temporis', help='Indicates that the first depreciation entry 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 invoices."), - } + active = fields.Boolean(default=True) + name = fields.Char(required=True, index=True) + note = fields.Text() + account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account') + account_asset_id = fields.Many2one('account.account', string='Asset Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]) + account_income_recognition_id = fields.Many2one('account.account', string='Recognition Income Account', domain=[('internal_type','=','other'), ('deprecated', '=', False)], oldname='account_expense_depreciation_id') + account_depreciation_id = fields.Many2one('account.account', string='Depreciation Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]) + journal_id = fields.Many2one('account.journal', string='Journal', required=True) + company_id = fields.Many2one('res.company', string='Company', required=True, default=lambda self: self.env['res.company']._company_default_get('account.asset.category')) + method = fields.Selection([('linear', 'Linear'), ('degressive', 'Degressive')], string='Computation Method', required=True, default='linear', + help="Choose the method to use to compute the amount of depreciation lines.\n" + " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" + " * Degressive: Calculated on basis of: Residual Value * Degressive Factor") + method_number = fields.Integer(string='Number of Depreciations', default=5, help="The number of depreciations needed to depreciate your asset") + method_period = fields.Integer(string='Period Length', default=1, help="State here the time between 2 depreciations, in months", required=True) + method_progress_factor = fields.Float('Degressive Factor', default=0.3) + method_time = fields.Selection([('number', 'Number of Depreciations'), ('end', 'Ending Date')], string='Time Method', required=True, default='number', + help="Choose the method to use to compute the dates and number of depreciation lines.\n" + " * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" + " * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond.") + method_end = fields.Date('Ending date') + prorata = fields.Boolean(string='Prorata Temporis', help='Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first of January') + open_asset = fields.Boolean(string='Skip Draft State', help="Check this if you want to automatically confirm the assets of this category when created by invoices.") + type = fields.Selection([('sale', 'Sale: Revenue Recognition'), ('purchase', 'Purchase: Asset')], required=True, index=True, default='purchase') - _defaults = { - 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context), - 'method': 'linear', - 'method_number': 5, - 'method_time': 'number', - 'method_period': 12, - 'method_progress_factor': 0.3, - } + @api.onchange('account_asset_id') + def onchange_account_asset(self): + self.account_depreciation_id = self.account_asset_id - def onchange_account_asset(self, cr, uid, ids, account_asset_id, context=None): - res = {'value':{}} - if account_asset_id: - res['value'] = {'account_depreciation_id': account_asset_id} - return res + @api.onchange('type') + def onchange_type(self): + if self.type == 'sale': + self.prorata = True + self.method_period = 1 + else: + self.method_period = 12 -class account_asset_asset(osv.osv): +class AccountAssetAsset(models.Model): _name = 'account.asset.asset' - _description = 'Asset' + _description = 'Asset/Revenue Recognition' + _inherit = ['mail.thread', 'ir.needaction_mixin'] - def unlink(self, cr, uid, ids, context=None): - for asset in self.browse(cr, uid, ids, context=context): - if asset.account_move_line_ids: - raise UserError(_('You cannot delete an asset that contains posted depreciation lines.')) - return super(account_asset_asset, self).unlink(cr, uid, ids, context=context) + account_move_line_ids = fields.One2many('account.move.line', 'asset_id', string='Entries', readonly=True, states={'draft': [('readonly', False)]}) + entry_count = fields.Integer(compute='_entry_count', string='# Asset Entries') + name = fields.Char(string='Asset/Deferred Revenue Name', required=True, readonly=True, states={'draft': [('readonly', False)]}) + code = fields.Char(string='Reference', size=32, readonly=True, states={'draft': [('readonly', False)]}, default=lambda self: self.env['ir.sequence'].next_by_code('account.asset.code')) + value = fields.Float(string='Gross Value', required=True, readonly=True, digits=0, states={'draft': [('readonly', False)]}, oldname='purchase_value') + currency_id = fields.Many2one('res.currency', string='Currency', required=True, readonly=True, states={'draft': [('readonly', False)]}, + default=lambda self: self.env.user.company_id.currency_id.id) + company_id = fields.Many2one('res.company', string='Company', required=True, readonly=True, states={'draft': [('readonly', False)]}, + default=lambda self: self.env['res.company']._company_default_get('account.asset.asset')) + note = fields.Text() + category_id = fields.Many2one('account.asset.category', string='Category', required=True, change_default=True, readonly=True, states={'draft': [('readonly', False)]}) + date = fields.Date(string='Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, default=fields.Date.context_today, oldname="purchase_date") + state = fields.Selection([('draft', 'Draft'), ('open', 'Running'), ('close', 'Close')], 'Status', required=True, copy=False, default='draft', + help="When an asset is created, the status is 'Draft'.\n" + "If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n" + "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status.") + active = fields.Boolean(default=True) + partner_id = fields.Many2one('res.partner', string='Partner', readonly=True, states={'draft': [('readonly', False)]}) + method = fields.Selection([('linear', 'Linear'), ('degressive', 'Degressive')], string='Computation Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, default='linear', + help="Choose the method to use to compute the amount of depreciation lines.\n * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" + " * Degressive: Calculated on basis of: Residual Value * Degressive Factor") + method_number = fields.Integer(string='Number of Depreciations', readonly=True, states={'draft': [('readonly', False)]}, default=5, help="The number of depreciations needed to depreciate your asset") + method_period = fields.Integer(string='Number of Months in a Period', required=True, readonly=True, default=12, states={'draft': [('readonly', False)]}, + help="The amount of time between two depreciations, in months") + method_end = fields.Date(string='Ending Date', readonly=True, states={'draft': [('readonly', False)]}) + method_progress_factor = fields.Float(string='Degressive Factor', readonly=True, default=0.3, states={'draft': [('readonly', False)]}) + value_residual = fields.Float(compute='_amount_residual', method=True, digits=0, string='Residual Value') + method_time = fields.Selection([('number', 'Number of Depreciations'), ('end', 'Ending Date')], string='Time Method', required=True, readonly=True, default='number', states={'draft': [('readonly', False)]}, + help="Choose the method to use to compute the dates and number of depreciation lines.\n" + " * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" + " * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond.") + prorata = fields.Boolean(string='Prorata Temporis', readonly=True, states={'draft': [('readonly', False)]}, + help='Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January / Start date of fiscal year') + history_ids = fields.One2many('account.asset.history', 'asset_id', string='History', readonly=True) + depreciation_line_ids = fields.One2many('account.asset.depreciation.line', 'asset_id', string='Depreciation Lines', readonly=True, states={'draft': [('readonly', False)], 'open': [('readonly', False)]}) + salvage_value = fields.Float(string='Salvage Value', digits=0, readonly=True, states={'draft': [('readonly', False)]}, + help="It is the amount you plan to have that you cannot depreciate.") + invoice_id = fields.Many2one('account.invoice', string='Invoice', states={'draft': [('readonly', False)]}, copy=False) + type = fields.Selection(related="category_id.type", string='Type', required=True, default='purchase') - def _get_last_depreciation_date(self, cr, uid, ids, context=None): + @api.multi + def unlink(self): + for asset in self: + if asset.state in ['open', 'close']: + raise UserError(_('You cannot delete a document is in %s state.') % (asset.state,)) + if asset.account_move_line_ids: + raise UserError(_('You cannot delete a document that contains posted lines.')) + return super(AccountAssetAsset, self).unlink() + @api.multi + def _get_last_depreciation_date(self): """ @param id: ids of a account.asset.asset objects @return: Returns a dictionary of the effective dates of the last depreciation entry made for given asset ids. If there isn't any, return the purchase date of this asset """ - cr.execute(""" - SELECT a.id as id, COALESCE(MAX(l.date),a.purchase_date) AS date + self.env.cr.execute(""" + SELECT a.id as id, COALESCE(MAX(l.date),a.date) AS date FROM account_asset_asset a LEFT JOIN account_move_line l ON (l.asset_id = a.id) WHERE a.id IN %s - GROUP BY a.id, a.purchase_date """, (tuple(ids),)) - return dict(cr.fetchall()) + GROUP BY a.id, a.date """, (tuple(self.ids),)) + result = dict(self.env.cr.fetchall()) + return result - def _compute_board_amount(self, cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=None): - #by default amount = 0 + def _compute_board_amount(self, sequence, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date): amount = 0 - if i == undone_dotation_number: + if sequence == undone_dotation_number: amount = residual_amount else: - if asset.method == 'linear': + if self.method == 'linear': amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids)) - if asset.prorata: - amount = amount_to_depr / asset.method_number + if self.prorata and self.category_id.type == 'purchase': + amount = amount_to_depr / self.method_number days = total_days - float(depreciation_date.strftime('%j')) - if i == 1: - amount = (amount_to_depr / asset.method_number) / total_days * days - elif i == undone_dotation_number: - amount = (amount_to_depr / asset.method_number) / total_days * (total_days - days) - elif asset.method == 'degressive': - amount = residual_amount * asset.method_progress_factor - if asset.prorata: + if sequence == 1: + amount = (amount_to_depr / self.method_number) / total_days * days + elif sequence == undone_dotation_number: + amount = (amount_to_depr / self.method_number) / total_days * (total_days - days) + elif self.method == 'degressive': + amount = residual_amount * self.method_progress_factor + if self.prorata: days = total_days - float(depreciation_date.strftime('%j')) - if i == 1: - amount = (residual_amount * asset.method_progress_factor) / total_days * days - elif i == undone_dotation_number: - amount = (residual_amount * asset.method_progress_factor) / total_days * (total_days - days) + if sequence == 1: + amount = (residual_amount * self.method_progress_factor) / total_days * days + elif sequence == undone_dotation_number: + amount = (residual_amount * self.method_progress_factor) / total_days * (total_days - days) return amount - def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None): - undone_dotation_number = asset.method_number - if asset.method_time == 'end': - end_date = datetime.strptime(asset.method_end, '%Y-%m-%d') + def _compute_board_undone_dotation_nb(self, depreciation_date, total_days): + undone_dotation_number = self.method_number + if self.method_time == 'end': + end_date = datetime.strptime(self.method_end, DF).date() undone_dotation_number = 0 while depreciation_date <= end_date: - depreciation_date = (datetime(depreciation_date.year, depreciation_date.month, depreciation_date.day) + relativedelta(months=+asset.method_period)) + depreciation_date = date(depreciation_date.year, depreciation_date.month, depreciation_date.day) + relativedelta(months=+self.method_period) undone_dotation_number += 1 - if asset.prorata: + if self.prorata and self.category_id.type == 'purchase': undone_dotation_number += 1 return undone_dotation_number - def compute_depreciation_board(self, cr, uid, ids, context=None): - depreciation_lin_obj = self.pool.get('account.asset.depreciation.line') - currency_obj = self.pool.get('res.currency') - for asset in self.browse(cr, uid, ids, context=context): - if asset.value_residual == 0.0: - continue - posted_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_check', '=', True)],order='depreciation_date desc') - old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)]) - if old_depreciation_line_ids: - depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context) + @api.multi + def compute_depreciation_board(self): + self.ensure_one() - amount_to_depr = residual_amount = asset.value_residual - if asset.prorata: - depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d') + posted_depreciation_line_ids = self.depreciation_line_ids.filtered(lambda x: x.move_check) + unposted_depreciation_line_ids = self.depreciation_line_ids.filtered(lambda x: not x.move_check) + + # Remove old unposted depreciation lines. We cannot use unlink() with One2many field + commands = [(2, line_id.id, False) for line_id in unposted_depreciation_line_ids] + + if self.value != 0.0: + amount_to_depr = residual_amount = self.value_residual + if self.prorata: + depreciation_date = datetime.strptime(self._get_last_depreciation_date()[self.id], DF).date() else: - # depreciation_date = 1st January of purchase year - purchase_date = datetime.strptime(asset.purchase_date, '%Y-%m-%d') - #if we already have some previous validated entries, starting date isn't 1st January but last entry + method period - if (len(posted_depreciation_line_ids)>0): - last_depreciation_date = datetime.strptime(depreciation_lin_obj.browse(cr,uid,posted_depreciation_line_ids[0],context=context).depreciation_date, '%Y-%m-%d') - depreciation_date = (last_depreciation_date+relativedelta(months=+asset.method_period)) + # depreciation_date = 1st of January of purchase year + asset_date = datetime.strptime(self.date, DF).date() + # if we already have some previous validated entries, starting date isn't 1st January but last entry + method period + if posted_depreciation_line_ids and posted_depreciation_line_ids[0].depreciation_date: + last_depreciation_date = datetime.strptime(posted_depreciation_line_ids[0].depreciation_date, DF).date() + depreciation_date = last_depreciation_date + relativedelta(months=+self.method_period) else: - depreciation_date = datetime(purchase_date.year, 1, 1) + depreciation_date = asset_date day = depreciation_date.day month = depreciation_date.month year = depreciation_date.year total_days = (year % 4) and 365 or 366 - undone_dotation_number = self._compute_board_undone_dotation_nb(cr, uid, asset, depreciation_date, total_days, context=context) + undone_dotation_number = self._compute_board_undone_dotation_nb(depreciation_date, total_days) for x in range(len(posted_depreciation_line_ids), undone_dotation_number): - i = x + 1 - amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=context) + sequence = x + 1 + amount = self._compute_board_amount(sequence, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date) + amount = self.currency_id.round(amount) residual_amount -= amount vals = { - 'amount': amount, - 'asset_id': asset.id, - 'sequence': i, - 'name': str(asset.id) +'/' + str(i), - 'remaining_value': residual_amount, - 'depreciated_value': (asset.purchase_value - asset.salvage_value) - (residual_amount + amount), - 'depreciation_date': depreciation_date.strftime('%Y-%m-%d'), + 'amount': amount, + 'asset_id': self.id, + 'sequence': sequence, + 'name': (self.code or str(self.id)) + '/' + str(sequence), + 'remaining_value': residual_amount, + 'depreciated_value': (self.value - self.salvage_value) - (residual_amount + amount), + 'depreciation_date': depreciation_date.strftime(DF), } - depreciation_lin_obj.create(cr, uid, vals, context=context) + commands.append((0, False, vals)) # Considering Depr. Period as months - depreciation_date = (datetime(year, month, day) + relativedelta(months=+asset.method_period)) + depreciation_date = date(year, month, day) + relativedelta(months=+self.method_period) day = depreciation_date.day month = depreciation_date.month year = depreciation_date.year + + self.write({'depreciation_line_ids': commands}) + return True - def validate(self, cr, uid, ids, context=None): - if context is None: - context = {} - return self.write(cr, uid, ids, { - 'state':'open' - }, context) + @api.multi + def validate(self): + self.write({'state': 'open'}) - def set_to_close(self, cr, uid, ids, context=None): - return self.write(cr, uid, ids, {'state': 'close'}, context=context) + @api.multi + def set_to_close(self): + unposted_dep_line = self.env['account.asset.depreciation.line'].search_count( + [('asset_id', 'in', self.ids), ('move_check', '=', False)]) + if unposted_dep_line: + raise UserError(_('You cannot close a document which has unposted lines.')) + self.message_post(body=_("Document closed.")) + self.write({'state': 'close'}) - def set_to_draft(self, cr, uid, ids, context=None): - return self.write(cr, uid, ids, {'state': 'draft'}, context=context) + @api.multi + def set_to_draft(self): + self.write({'state': 'draft'}) - def _amount_residual(self, cr, uid, ids, name, args, context=None): - cr.execute("""SELECT - l.asset_id as id, SUM(abs(l.debit-l.credit)) AS amount - FROM - account_move_line l - WHERE - l.asset_id IN %s GROUP BY l.asset_id """, (tuple(ids),)) - res=dict(cr.fetchall()) - for asset in self.browse(cr, uid, ids, context): - company_currency = asset.company_id.currency_id.id - current_currency = asset.currency_id.id - amount = self.pool['res.currency'].compute(cr, uid, company_currency, current_currency, res.get(asset.id, 0.0), context=context) - res[asset.id] = asset.purchase_value - amount - asset.salvage_value - for id in ids: - res.setdefault(id, 0.0) - return res + @api.one + @api.depends('value', 'salvage_value', 'depreciation_line_ids') + def _amount_residual(self): + total_amount = 0.0 + for line in self.depreciation_line_ids: + if line.move_check: + total_amount += line.amount + self.value_residual = self.value - total_amount - self.salvage_value - def onchange_company_id(self, cr, uid, ids, company_id=False, context=None): - val = {} - if company_id: - company = self.pool.get('res.company').browse(cr, uid, company_id, context=context) - val['currency_id'] = company.currency_id.id - return {'value': val} - - def onchange_purchase_salvage_value(self, cr, uid, ids, purchase_value, salvage_value, context=None): - val = {} - for asset in self.browse(cr, uid, ids, context=context): - if purchase_value: - val['value_residual'] = purchase_value - salvage_value - if salvage_value: - val['value_residual'] = purchase_value - salvage_value - return {'value': val} - def _entry_count(self, cr, uid, ids, field_name, arg, context=None): - MoveLine = self.pool('account.move.line') - return { - asset_id: MoveLine.search_count(cr, uid, [('asset_id', '=', asset_id)], context=context) - for asset_id in ids - } - _columns = { - 'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}), - 'entry_count': fields.function(_entry_count, string='# Asset Entries', type='integer'), - 'name': fields.char('Asset Name', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}), - 'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'note': fields.text('Note'), - 'category_id': fields.many2one('account.asset.category', 'Asset Category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}), - 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', required=True, copy=False, - help="When an asset is created, the status is 'Draft'.\n" \ - "If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \ - "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."), - 'active': fields.boolean('Active'), - 'partner_id': fields.many2one('res.partner', 'Supplier', readonly=True, states={'draft':[('readonly',False)]}), - 'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\ - " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \ - " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"), - 'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="The number of depreciations needed to depreciate your asset"), - 'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The amount of time between two depreciations, in months"), - 'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}), - 'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}), - 'value_residual': fields.function(_amount_residual, method=True, digits=0, string='Residual Value'), - 'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, - help="Choose the method to use to compute the dates and number of depreciation lines.\n"\ - " * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \ - " * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."), - 'prorata':fields.boolean('Prorata Temporis', readonly=True, states={'draft':[('readonly',False)]}, help='Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January'), - 'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True), - 'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True, states={'draft':[('readonly',False)],'open':[('readonly',False)]}), - 'salvage_value': fields.float('Salvage Value', digits=0, help="It is the amount you plan to have that you cannot depreciate.", readonly=True, states={'draft':[('readonly',False)]}), - } - _defaults = { - 'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').next_by_code(cr, uid, 'account.asset.code'), - 'purchase_date': lambda obj, cr, uid, context: time.strftime('%Y-%m-%d'), - 'active': True, - 'state': 'draft', - 'method': 'linear', - 'method_number': 5, - 'method_time': 'number', - 'method_period': 12, - 'method_progress_factor': 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), - } + @api.onchange('company_id') + def onchange_company_id(self): + self.currency_id = self.company_id.currency_id.id - def _check_recursion(self, cr, uid, ids, context=None, parent=None): - return super(account_asset_asset, self)._check_recursion(cr, uid, ids, context=context, parent=parent) + @api.multi + @api.depends('account_move_line_ids') + def _entry_count(self): + for asset in self: + asset.entry_count = self.env['account.move.line'].search_count([('asset_id', '=', asset.id)]) - def _check_prorata(self, cr, uid, ids, context=None): - for asset in self.browse(cr, uid, ids, context=context): - if asset.prorata and asset.method_time != 'number': - return False - return True + @api.one + @api.constrains('prorata', 'method_time') + def _check_prorata(self): + if self.prorata and self.method_time != 'number': + raise ValidationError(_('Prorata temporis can be applied only for time method "number of depreciations".')) - _constraints = [ - (_check_prorata, 'Prorata temporis can be applied only for time method "number of depreciations".', ['prorata']), - ] + @api.onchange('category_id') + def onchange_category_id(self): + vals = self.onchange_category_id_values(self.category_id.id) + # We cannot use 'write' on an object that doesn't exist yet + if vals: + for k, v in vals['value'].iteritems(): + setattr(self, k, v) - def onchange_category_id(self, cr, uid, ids, category_id, context=None): - res = {'value':{}} - asset_categ_obj = self.pool.get('account.asset.category') + def onchange_category_id_values(self, category_id): if category_id: - category_obj = asset_categ_obj.browse(cr, uid, category_id, context=context) - res['value'] = { - 'method': category_obj.method, - 'method_number': category_obj.method_number, - 'method_time': category_obj.method_time, - 'method_period': category_obj.method_period, - 'method_progress_factor': category_obj.method_progress_factor, - 'method_end': category_obj.method_end, - 'prorata': category_obj.prorata, + category = self.env['account.asset.category'].browse(category_id) + return { + 'value': { + 'method': category.method, + 'method_number': category.method_number, + 'method_time': category.method_time, + 'method_period': category.method_period, + 'method_progress_factor': category.method_progress_factor, + 'method_end': category.method_end, + 'prorata': category.prorata, + } } + + @api.onchange('method_time') + def onchange_method_time(self): + if self.method_time != 'number': + self.prorata = False + + @api.multi + def copy_data(self, default=None): + if default is None: + default = {} + default['name'] = self.name + _(' (copy)') + return super(AccountAssetAsset, self).copy_data(default)[0] + + @api.multi + def _compute_entries(self, date): + depreciation_ids = self.env['account.asset.depreciation.line'].search([ + ('asset_id', 'in', self.ids), ('depreciation_date', '<=', date), + ('move_check', '=', False)]) + return depreciation_ids.create_move() + + @api.model + def create(self, vals): + asset = super(AccountAssetAsset, self.with_context(mail_create_nolog=True)).create(vals) + asset.compute_depreciation_board() + return asset + + @api.multi + def write(self, vals): + res = super(AccountAssetAsset, self).write(vals) + if 'depreciation_line_ids' not in vals: + self.compute_depreciation_board() return res - def onchange_method_time(self, cr, uid, ids, method_time='number', context=None): - res = {'value': {}} - if method_time != 'number': - res['value'] = {'prorata': False} - return res - - def _compute_entries(self, cr, uid, ids, date, context=None): - result = [] - depreciation_obj = self.pool.get('account.asset.depreciation.line') - depreciation_ids = depreciation_obj.search(cr, uid, [('asset_id', 'in', ids), ('depreciation_date', '<=', date), ('move_check', '=', False)], context=context) - context = dict(context or {}, depreciation_date=time.strftime('%Y-%m-%d')) - return depreciation_obj.create_move(cr, uid, depreciation_ids, context=context) - - def create(self, cr, uid, vals, context=None): - asset_id = super(account_asset_asset, self).create(cr, uid, vals, context=context) - self.compute_depreciation_board(cr, uid, [asset_id], context=context) - return asset_id - - def open_entries(self, cr, uid, ids, context=None): - context = dict(context or {}, search_default_asset_id=ids, default_asset_id=ids) + @api.multi + def open_entries(self): return { 'name': _('Journal Items'), 'view_type': 'form', @@ -337,78 +315,74 @@ class account_asset_asset(osv.osv): 'res_model': 'account.move.line', 'view_id': False, 'type': 'ir.actions.act_window', - 'context': context, + 'context': dict(self.env.context or {}, search_default_asset_id=self.id, default_asset_id=self.id), } -class account_asset_depreciation_line(osv.osv): +class AccountAssetDepreciationLine(models.Model): _name = 'account.asset.depreciation.line' _description = 'Asset depreciation line' - def _get_move_check(self, cr, uid, ids, name, args, context=None): - res = {} - for line in self.browse(cr, uid, ids, context=context): - res[line.id] = bool(line.move_id) - return res + name = fields.Char(string='Depreciation Name', required=True, index=True) + sequence = fields.Integer(required=True) + asset_id = fields.Many2one('account.asset.asset', string='Asset', required=True, ondelete='cascade') + parent_state = fields.Selection(related='asset_id.state', string='State of Asset') + amount = fields.Float(string='Current Depreciation', digits=0, required=True) + remaining_value = fields.Float(string='Next Period Depreciation', digits=0, required=True) + depreciated_value = fields.Float(string='Amount Already Depreciated', required=True) + depreciation_date = fields.Date('Depreciation Date', index=True) + move_id = fields.Many2one('account.move', string='Depreciation Entry') + move_check = fields.Boolean(compute='_get_move_check', string='Posted', track_visibility='always', store=True) - _columns = { - 'name': fields.char('Depreciation Name', required=True, select=1), - 'sequence': fields.integer('Sequence', required=True), - 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True, ondelete='cascade'), - 'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'), - 'amount': fields.float('Current Depreciation', digits=0, required=True), - 'remaining_value': fields.float('Next Period Depreciation', digits=0, required=True), - 'depreciated_value': fields.float('Amount Already Depreciated', required=True), - 'depreciation_date': fields.date('Depreciation Date', select=1), - 'move_id': fields.many2one('account.move', 'Depreciation Entry'), - 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True) - } + @api.one + @api.depends('move_id') + def _get_move_check(self): + self.move_check = bool(self.move_id) - def create_move(self, cr, uid, ids, context=None): - context = dict(context or {}) - can_close = False - asset_obj = self.pool.get('account.asset.asset') - move_obj = self.pool.get('account.move') - move_line_obj = self.pool.get('account.move.line') - currency_obj = self.pool.get('res.currency') + @api.multi + def create_move(self): created_move_ids = [] asset_ids = [] - for line in self.browse(cr, uid, ids, context=context): - depreciation_date = context.get('depreciation_date') or line.depreciation_date or time.strftime('%Y-%m-%d') - company_currency = line.asset_id.company_id.currency_id.id - current_currency = line.asset_id.currency_id.id - context.update({'date': depreciation_date}) - amount = currency_obj.compute(cr, uid, current_currency, company_currency, line.amount, context=context) - sign = (line.asset_id.category_id.journal_id.type == 'purchase' and 1) or -1 + for line in self: + depreciation_date = self.env.context.get('depreciation_date') or line.depreciation_date or fields.Date.context_today(self) + company_currency = line.asset_id.company_id.currency_id + current_currency = line.asset_id.currency_id + amount = company_currency.compute(line.amount, current_currency) + sign = (line.asset_id.category_id.journal_id.type == 'purchase' or line.asset_id.category_id.journal_id.type == 'sale' and 1) or -1 asset_name = line.asset_id.name reference = line.name journal_id = line.asset_id.category_id.journal_id.id partner_id = line.asset_id.partner_id.id + categ_type = line.asset_id.category_id.type + debit_account = line.asset_id.category_id.account_asset_id.id + credit_account = line.asset_id.category_id.account_depreciation_id.id move_line_1 = { - 'name': asset_name, + 'name': asset_name or reference, 'ref': reference, - 'account_id': line.asset_id.category_id.account_depreciation_id.id, + 'account_id': credit_account, 'debit': 0.0, 'credit': amount, 'journal_id': journal_id, 'partner_id': partner_id, - 'currency_id': company_currency != current_currency and current_currency or False, + 'currency_id': company_currency != current_currency and current_currency or False, 'amount_currency': company_currency != current_currency and - sign * line.amount or 0.0, + 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id if categ_type == 'sale' else False, 'date': depreciation_date, + 'asset_id': line.asset_id.id if categ_type == 'sale' else False, } move_line_2 = { - 'name': asset_name, + 'name': asset_name or reference, 'ref': reference, - 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id, + 'account_id': debit_account, 'credit': 0.0, 'debit': amount, 'journal_id': journal_id, 'partner_id': partner_id, - 'currency_id': company_currency != current_currency and current_currency or False, + 'currency_id': company_currency != current_currency and current_currency or False, 'amount_currency': company_currency != current_currency and sign * line.amount or 0.0, - 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id, + 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id if categ_type == 'purchase' else False, 'date': depreciation_date, - 'asset_id': line.asset_id.id + 'asset_id': line.asset_id.id if categ_type == 'purchase' else False } move_vals = { 'name': asset_name, @@ -417,43 +391,67 @@ class account_asset_depreciation_line(osv.osv): 'journal_id': line.asset_id.category_id.journal_id.id, 'line_ids': [(0, 0, move_line_1), (0, 0, move_line_2)], } - move_id = move_obj.create(cr, uid, move_vals, context=context) - self.write(cr, uid, line.id, {'move_id': move_id}, context=context) - created_move_ids.append(move_id) - move_obj.post(cr, uid, [move_id], context=context) - asset_ids.append(line.asset_id.id) + move = self.env['account.move'].create(move_vals) + line.write({'move_id': move.id, 'move_check': True}) + created_move_ids.append(move.id) + move.post() + asset_ids.append(line.asset_id) + partner_name = line.asset_id.partner_id.name + currency_name = line.asset_id.currency_id.name + + def _format_message(message_description, tracked_values): + message = '' + if message_description: + message = '%s' % message_description + for name, values in tracked_values.iteritems(): + message += '
    • %s: ' % name + message += '%s
' % values + return message + + msg_values = {_('Currency'): currency_name, _('Amount'): line.amount} + if partner_name: + msg_values[_('Partner')] = partner_name + msg = _format_message(_('Depreciation line posted.'), msg_values) + line.asset_id.message_post(body=msg) # we re-evaluate the assets to determine whether we can close them - for asset in asset_obj.browse(cr, uid, list(set(asset_ids)), context=context): - if currency_obj.is_zero(cr, uid, asset.currency_id, asset.value_residual): + for asset in asset_ids: + if asset.currency_id.is_zero(asset.value_residual): + asset.message_post(body=_("Document closed.")) asset.write({'state': 'close'}) + asset.compute_depreciation_board() return created_move_ids + @api.multi + def unlink(self): + for record in self: + if record.move_check: + if record.asset_id.category_id.type == 'purchase': + msg = _("You cannot delete posted depreciation lines.") + else: + msg = _("You cannot delete posted installment lines.") + raise UserError(msg) + return super(AccountAssetDepreciationLine, self).unlink() -class account_move_line(osv.osv): + +class AccountMoveLine(models.Model): _inherit = 'account.move.line' - _columns = { - 'asset_id': fields.many2one('account.asset.asset', 'Asset', ondelete="restrict"), - } + asset_id = fields.Many2one('account.asset.asset', string='Asset', ondelete="restrict") -class account_asset_history(osv.osv): + +class AccountAssetHistory(models.Model): _name = 'account.asset.history' _description = 'Asset history' - _columns = { - 'name': fields.char('History name', select=1), - 'user_id': fields.many2one('res.users', 'User', required=True), - 'date': fields.date('Date', required=True), - 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True), - 'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, - help="The method to use to compute the dates and number of depreciation lines.\n"\ - "Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \ - "Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."), - 'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"), - 'method_period': fields.integer('Period Length', help="Time in month between two depreciations"), - 'method_end': fields.date('Ending date'), - 'note': fields.text('Note'), - } _order = 'date desc' - _defaults = { - 'date': lambda *args: time.strftime('%Y-%m-%d'), - 'user_id': lambda self, cr, uid, ctx: uid - } + + name = fields.Char(string='History name', index=True) + user_id = fields.Many2one('res.users', string='User', required=True, default=lambda self: self.env.user) + date = fields.Date(required=True, default=fields.Date.context_today) + asset_id = fields.Many2one('account.asset.asset', string='Asset', required=True) + method_time = fields.Selection([('number', 'Number of Depreciations'), ('end', 'Ending Date')], string='Time Method', required=True, + help="The method to use to compute the dates and number of depreciation lines.\n" + "Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" + "Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond.") + method_number = fields.Integer(string='Number of Depreciations', help="The number of depreciations needed to depreciate your asset") + method_period = fields.Integer(string='Period Length', help="Time in months between two depreciations") + method_end = fields.Date(string='Ending date') + note = fields.Text() diff --git a/addons/account_asset/account_asset_demo.yml b/addons/account_asset/account_asset_demo.yml index cdfdfbbbd46..c1bcfd0257c 100644 --- a/addons/account_asset/account_asset_demo.yml +++ b/addons/account_asset/account_asset_demo.yml @@ -14,7 +14,7 @@ 'method_number': 3, 'account_asset_id': xfa_account_id[0], 'account_depreciation_id': xfa_account_id[0], - 'account_expense_depreciation_id': expense_account_id[0], + 'account_income_recognition_id': expense_account_id[0], } self._update(cr, uid, 'account.asset.category', 'account_asset', vals, 'account_asset_category_fixedassets0') vals = { @@ -23,7 +23,7 @@ 'method_number': 5, 'account_asset_id': xfa_account_id[0], 'account_depreciation_id': xfa_account_id[0], - 'account_expense_depreciation_id': expense_account_id[0], + 'account_income_recognition_id': expense_account_id[0], } self._update(cr, uid, 'account.asset.category', 'account_asset', vals, 'account_asset_category_fixedassets1') vals = { @@ -32,7 +32,7 @@ 'method_period': 12, 'method_number': 5, 'name': "CEO's car", - 'purchase_value': 12000.0, + 'value': 12000.0, 'category_id': ref('account_asset_category_fixedassets0'), } self._update(cr, uid, 'account.asset.asset', 'account_asset', vals, 'account_asset_asset_vehicles0') @@ -41,7 +41,7 @@ 'salvage_value': 0.0, 'method_time': 'end', 'name': 'V6 Engine and 10 inches tires', - 'purchase_value': 2800.0, + 'value': 2800.0, 'category_id': ref('account_asset_category_fixedassets0'), } self._update(cr, uid, 'account.asset.asset', 'account_asset', vals, 'account_asset_asset_cab0') @@ -51,9 +51,9 @@ 'state': 'open', 'method_period': 12, 'method_number': 20, - 'purchase_date': time.strftime('%Y-01-01'), + 'date': time.strftime('%Y-01-01'), 'name': 'Office', - 'purchase_value': 500000.0, + 'value': 500000.0, 'category_id': ref('account_asset_category_fixedassets0'), } self._update(cr, uid, 'account.asset.asset', 'account_asset', vals, 'account_asset_asset_office0') @@ -67,6 +67,6 @@ 'method_number': 6, 'account_asset_id': xfa_account_id[0], 'account_depreciation_id': xfa_account_id[0], - 'account_expense_depreciation_id': sale_account_id[0], + 'account_income_recognition_id': sale_account_id[0], } self._update(cr, uid, 'account.asset.category', 'account_asset', vals, 'account_asset_category_sale') diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 4f49018cfa1..b9b58171745 100644 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -1,66 +1,97 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- -from openerp.osv import fields, osv +from datetime import datetime +from dateutil.relativedelta import relativedelta +from openerp import api, fields, models +import openerp.addons.decimal_precision as dp +from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF -class account_invoice(osv.osv): +class AccountInvoice(models.Model): _inherit = 'account.invoice' - def action_number(self, cr, uid, ids, *args): - result = super(account_invoice, self).action_number(cr, uid, ids, *args) - for inv in self.browse(cr, uid, ids): - self.pool.get('account.invoice.line').asset_create(cr, uid, inv.invoice_line_ids) + + @api.multi + def action_move_create(self): + result = super(AccountInvoice, self).action_move_create() + for inv in self: + inv.invoice_line_ids.asset_create() return result - def line_get_convert(self, cr, uid, x, part, context=None): - res = super(account_invoice, self).line_get_convert(cr, uid, x, part, context=context) - res['asset_id'] = x.get('asset_id', False) + @api.model + def line_get_convert(self, line, part): + res = super(AccountInvoice, self).line_get_convert(line, part) + res['asset_id'] = line.get('asset_id', False) return res -class account_invoice_line(osv.osv): - +class AccountInvoiceLine(models.Model): _inherit = 'account.invoice.line' - _columns = { - 'asset_category_id': fields.many2one('account.asset.category', 'Asset Category'), - } - def asset_create(self, cr, uid, lines, context=None): - context = context or {} - asset_obj = self.pool.get('account.asset.asset') - for line in lines: - if line.asset_category_id: - vals = { - 'name': line.name, - 'code': line.invoice_id.number or False, - 'category_id': line.asset_category_id.id, - 'purchase_value': line.price_subtotal, - 'date': line.invoice_id.date, - 'partner_id': line.invoice_id.partner_id.id, - 'company_id': line.invoice_id.company_id.id, - 'currency_id': line.invoice_id.currency_id.id, - 'purchase_date' : line.invoice_id.date_invoice, - } - changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context) - vals.update(changed_vals['value']) - asset_id = asset_obj.create(cr, uid, vals, context=context) - if line.asset_category_id.open_asset: - asset_obj.validate(cr, uid, [asset_id], context=context) + + asset_category_id = fields.Many2one('account.asset.category', string='Asset Category') + asset_start_date = fields.Date(string='Asset End Date', compute='_get_asset_date', readonly=True, store=True) + asset_end_date = fields.Date(string='Asset Start Date', compute='_get_asset_date', readonly=True, store=True) + asset_mrr = fields.Float(string='Monthly Recurring Revenue', compute='_get_asset_date', readonly=True, digits=dp.get_precision('Account'), store=True) + + @api.one + @api.depends('asset_category_id', 'invoice_id.date_invoice') + def _get_asset_date(self): + self.asset_mrr = 0 + self.asset_start_date = False + self.asset_end_date = False + cat = self.asset_category_id + if cat: + months = cat.method_number * cat.method_period + if self.invoice_id.type in ['out_invoice', 'out_refund']: + self.asset_mrr = self.price_subtotal_signed / months + if self.invoice_id.date_invoice: + start_date = datetime.strptime(self.invoice_id.date_invoice, DF).replace(day=1) + end_date = (start_date + relativedelta(months=months, days=-1)) + self.asset_start_date = start_date.strftime(DF) + self.asset_end_date = end_date.strftime(DF) + + @api.one + def asset_create(self): + if self.asset_category_id and self.asset_category_id.method_number > 1: + vals = { + 'name': self.name, + 'code': self.invoice_id.number or False, + 'category_id': self.asset_category_id.id, + 'value': self.price_subtotal, + 'partner_id': self.invoice_id.partner_id.id, + 'company_id': self.invoice_id.company_id.id, + 'currency_id': self.invoice_id.currency_id.id, + 'date': self.asset_start_date or self.invoice_id.date_invoice, + 'invoice_id': self.invoice_id.id, + } + changed_vals = self.env['account.asset.asset'].onchange_category_id_values(vals['category_id']) + vals.update(changed_vals['value']) + asset = self.env['account.asset.asset'].create(vals) + if self.asset_category_id.open_asset: + asset.validate() return True + + + @api.multi + def product_id_change(self, product, uom_id, qty=0, name='', type='out_invoice', + partner_id=False, fposition_id=False, price_unit=False, currency_id=False, + company_id=None, date_invoice=None): + res = super(AccountInvoiceLine, self).product_id_change( + product, uom_id, qty=qty, name=name, type=type, partner_id=partner_id, + fposition_id=fposition_id, price_unit=price_unit, currency_id=currency_id, + company_id=company_id, date_invoice=date_invoice + ) + if product and res['value']: + product_obj = self.env['product.product'].browse(product) + if type == 'out_invoice': + res['value']['asset_category_id'] = product_obj.product_tmpl_id.deferred_revenue_category_id + elif type == 'in_invoice': + res['value']['asset_category_id'] = product_obj.product_tmpl_id.asset_category_id + + return res + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + asset_category_id = fields.Many2one('account.asset.category', string='Asset Type', ondelete="restrict") + deferred_revenue_category_id = fields.Many2one('account.asset.category', string='Deferred Revenue Type', ondelete="restrict") + diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml deleted file mode 100644 index c44d0743e70..00000000000 --- a/addons/account_asset/account_asset_invoice_view.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - account.invoice.line.form - account.invoice.line - - - - - - - - - - account.invoice.supplier.form - account.invoice - - - - - - - - - - diff --git a/addons/account_asset/report/__init__.py b/addons/account_asset/report/__init__.py index 5d59693a7fd..c60e4c9e043 100644 --- a/addons/account_asset/report/__init__.py +++ b/addons/account_asset/report/__init__.py @@ -1,22 +1,3 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## import account_asset_report diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py index 20bce5b17d3..938da73efd5 100644 --- a/addons/account_asset/report/account_asset_report.py +++ b/addons/account_asset/report/account_asset_report.py @@ -1,64 +1,46 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +from openerp import fields, models, tools -from openerp import tools -from openerp.osv import fields, osv -class asset_asset_report(osv.osv): +class AssetAssetReport(models.Model): _name = "asset.asset.report" _description = "Assets Analysis" _auto = False - _columns = { - 'name': fields.char('Year', required=False, readonly=True), - 'purchase_date': fields.date('Purchase Date', readonly=True), - 'depreciation_date': fields.date('Depreciation Date', readonly=True), - 'asset_id': fields.many2one('account.asset.asset', string='Asset', readonly=True), - 'asset_category_id': fields.many2one('account.asset.category',string='Asset category'), - 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), - 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', readonly=True), - 'depreciation_value': fields.float('Amount of Depreciation Lines', readonly=True), - 'move_check': fields.boolean('Posted', readonly=True), - 'nbr': fields.integer('# of Depreciation Lines', readonly=True), - 'gross_value': fields.float('Gross Amount', readonly=True), - 'posted_value': fields.float('Posted Amount', readonly=True), - 'unposted_value': fields.float('Unposted Amount', readonly=True), - 'company_id': fields.many2one('res.company', 'Company', readonly=True), - } - + + name = fields.Char(string='Year', required=False, readonly=True) + date = fields.Date(readonly=True) + depreciation_date = fields.Date(string='Depreciation Date', readonly=True) + asset_id = fields.Many2one('account.asset.asset', string='Asset', readonly=True) + asset_category_id = fields.Many2one('account.asset.category', string='Asset category', readonly=True) + partner_id = fields.Many2one('res.partner', string='Partner', readonly=True) + state = fields.Selection([('draft', 'Draft'), ('open', 'Running'), ('close', 'Close')], string='Status', readonly=True) + depreciation_value = fields.Float(string='Amount of Depreciation Lines', readonly=True) + installment_value = fields.Float(string='Amount of Installment Lines', readonly=True) + move_check = fields.Boolean(string='Posted', readonly=True) + installment_nbr = fields.Integer(string='# of Installment Lines', readonly=True) + depreciation_nbr = fields.Integer(string='# of Depreciation Lines', readonly=True) + gross_value = fields.Float(string='Gross Amount', readonly=True) + posted_value = fields.Float(string='Posted Amount', readonly=True) + unposted_value = fields.Float(string='Unposted Amount', readonly=True) + company_id = fields.Many2one('res.company', string='Company', readonly=True) + def init(self, cr): - tools.drop_view_if_exists(cr, 'asset_asset_report') - cr.execute(""" - create or replace view asset_asset_report as ( - select + tools.drop_view_if_exists(cr, 'asset_asset_report') + cr.execute(""" + create or replace view asset_asset_report as ( + select min(dl.id) as id, dl.name as name, dl.depreciation_date as depreciation_date, - a.purchase_date as purchase_date, + a.date as date, (CASE WHEN (select min(d.id) from account_asset_depreciation_line as d left join account_asset_asset as ac ON (ac.id=d.asset_id) where a.id=ac.id) = min(dl.id) - THEN a.purchase_value + THEN a.value ELSE 0 END) as gross_value, - dl.amount as depreciation_value, + dl.amount as depreciation_value, + dl.amount as installment_value, (CASE WHEN dl.move_check THEN dl.amount ELSE 0 @@ -72,13 +54,13 @@ class asset_asset_report(osv.osv): a.category_id as asset_category_id, a.partner_id as partner_id, a.state as state, - count(dl.*) as nbr, + count(dl.*) as installment_nbr, + count(dl.*) as depreciation_nbr, a.company_id as company_id from account_asset_depreciation_line dl left join account_asset_asset a on (dl.asset_id=a.id) - group by + group by dl.amount,dl.asset_id,dl.depreciation_date,dl.name, - a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id, - a.purchase_value, a.id, a.salvage_value + a.date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id, + a.value, a.id, a.salvage_value )""") - diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index 5b4b6d2bf8d..19f95375620 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -1,6 +1,5 @@ - - + asset.asset.report.pivot @@ -8,7 +7,7 @@ - + @@ -21,18 +20,46 @@ - + - + + + + asset.asset.report.pivot + asset.asset.report + + + + + + + + + + asset.revenue.report.graph + asset.asset.report + + + + + + + + + + + asset.asset.report.search asset.asset.report - + @@ -50,13 +77,46 @@ + context="{'group_by':'date:month'}"/> + + + + + asset.revenue.report.search + asset.asset.report + + + + + + + + + + + + + + + + + + + + + + + + Assets Analysis @@ -64,18 +124,45 @@ form pivot,graph + [('asset_category_id.type', '=', 'purchase')] {}

- From this report, you can have an overview on all depreciation. The - tool search can also be used to personalise your Assets reports and - so, match this analysis to your needs; + From this report, you can have an overview on all depreciations. The + search bar can also be used to personalize your assets depreciation reporting.

- + + + + + Deferred Revenue Analysis + asset.asset.report + form + pivot,graph + + [('asset_category_id.type', '=', 'sale')] + {} + +

+ From this report, you can have an overview of your deferred revenue. The + search bar can also be used to personalize your revenue recognition reporting. +

+ + + - - + parent="account.menu_finance_reports" sequence="21"/> + + + + + diff --git a/addons/account_asset/security/account_asset_security.xml b/addons/account_asset/security/account_asset_security.xml index 77f218d13b9..02320b922dd 100644 --- a/addons/account_asset/security/account_asset_security.xml +++ b/addons/account_asset/security/account_asset_security.xml @@ -1,5 +1,5 @@ - + Account Asset Category multi-company @@ -16,4 +16,4 @@ - + diff --git a/addons/account_asset/static/src/js/account_asset.js b/addons/account_asset/static/src/js/account_asset.js new file mode 100644 index 00000000000..accd57ed3f5 --- /dev/null +++ b/addons/account_asset/static/src/js/account_asset.js @@ -0,0 +1,39 @@ +/* +Purpose : show toggle button on depreciation/installment lines for posted/unposted line. +Details : called in list view with " + \ No newline at end of file diff --git a/addons/account_asset/test/account_asset.yml b/addons/account_asset/test/account_asset.yml deleted file mode 100644 index 708f16786a8..00000000000 --- a/addons/account_asset/test/account_asset.yml +++ /dev/null @@ -1,35 +0,0 @@ -- - In order to test the process of Account Asset, I perform a action to confirm Account Asset. -- - !python {model: account.asset.asset}: | - self.validate(cr, uid, [ref("account_asset_asset_vehicles_test0")]) -- - I check Asset is now in Open state. -- - !assert {model: account.asset.asset, id: account_asset_asset_vehicles_test0, severity: error, string: Asset should be in Open state}: - - state == 'open' -- - I compute depreciation lines for asset of CEO's Car . -- - !python {model: account.asset.asset}: | - self.compute_depreciation_board(cr, uid, [ref("account_asset_asset_vehicles_test0")]) - # pressing computation button can be remove if creation of depreciation lines while asset is created - value = self.browse(cr, uid, [ref("account_asset_asset_vehicles_test0")])[0] - assert value.method_number == len(value.depreciation_line_ids), 'Depreciation lines not created correctly' -- - I create account move for all depreciation lines. -- - !python {model: account.asset.depreciation.line}: | - ids = self.search(cr, uid, [('asset_id','=',ref('account_asset_asset_vehicles_test0'))]) - self.create_move(cr, uid, ids) -- - I check the move line is created. -- - !python {model: account.asset.asset}: | - asset = self.browse(cr, uid, [ref("account_asset_asset_vehicles_test0")])[0] - assert len(asset.depreciation_line_ids) == len(asset.account_move_line_ids), 'Move lines not created correctly' -- - I Check that After creating all the moves of depreciation lines the state "Close". -- - !assert {model: account.asset.asset, id: account_asset_asset_vehicles_test0}: - - state == 'close' diff --git a/addons/account_asset/test/account_asset_demo.yml b/addons/account_asset/test/account_asset_demo.yml deleted file mode 100644 index 8e8813574a5..00000000000 --- a/addons/account_asset/test/account_asset_demo.yml +++ /dev/null @@ -1,9 +0,0 @@ -- - !record {model: account.asset.category, id: account_asset_category_fixedassets_test0}: - account_asset_id: xfa -- - !record {model: account.asset.asset, id: account_asset_asset_vehicles_test0}: - category_id: account_asset_category_sale_test0 -- - !record {model: account.asset.asset, id: account_asset_asset_vehicles_test0}: - method_number: 5 diff --git a/addons/account_asset/test/account_asset_demo_test.xml b/addons/account_asset/test/account_asset_demo_test.xml index 4fbfd8e4a44..47af3b0d0cf 100644 --- a/addons/account_asset/test/account_asset_demo_test.xml +++ b/addons/account_asset/test/account_asset_demo_test.xml @@ -1,36 +1,49 @@ - + - + - Hardware - 3 Years 3 + 12 - + - Cars - 5 Years 5 + 12 - + - - - Revenue Recognition Maintenance Contract - 3 Years + + Maintenance Contract - 3 Years 3 + 12 + + sale + + + + + + + Maintenance Contract - 1 Year + 12 + 1 + + sale + - \ No newline at end of file + diff --git a/addons/account_asset/test/account_asset_wizard.yml b/addons/account_asset/test/account_asset_wizard.yml deleted file mode 100644 index 91a85218406..00000000000 --- a/addons/account_asset/test/account_asset_wizard.yml +++ /dev/null @@ -1,27 +0,0 @@ -- - I create a record to change the duration of asset for calculating depreciation. -- - !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset_asset_office_test0')}"}: - method_number: 10.0 -- - I change the duration. -- - !python {model: asset.modify}: | - context = {"active_id":ref('account_asset_asset_office_test0')} - self.modify(cr, uid, [ref("asset_modify_number_0")], context=context) -- - I check the proper depreciation lines created. -- - !assert {model: account.asset.asset, id: account_asset.account_asset_asset_office_test0}: - - method_number == len(depreciation_line_ids) -1 -- - I create a period to compute a asset on period. -- - !record {model: asset.depreciation.confirmation.wizard, id: asset_compute_period_0}: - {} -- - I compute a asset on period. -- - !python {model: asset.depreciation.confirmation.wizard}: | - context = {"active_ids": [ref("account_asset.account_asset_asset_office_test0")], "active_id":ref('account_asset.account_asset_asset_office_test0')} - self.asset_compute(cr, uid, [ref("asset_compute_period_0")], context=context) diff --git a/addons/account_asset/tests/__init__.py b/addons/account_asset/tests/__init__.py new file mode 100644 index 00000000000..054eb7df4fe --- /dev/null +++ b/addons/account_asset/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# +############################################################################## + +from . import test_account_asset diff --git a/addons/account_asset/tests/test_account_asset.py b/addons/account_asset/tests/test_account_asset.py new file mode 100644 index 00000000000..c3c582e9507 --- /dev/null +++ b/addons/account_asset/tests/test_account_asset.py @@ -0,0 +1,128 @@ +# -*- coding: utf-8 -*- + +from openerp import tools +from openerp.tests import common +from openerp.modules.module import get_module_resource + + +class TestAccountAsset(common.TransactionCase): + + def _load(self, module, *args): + tools.convert_file(self.cr, 'account_asset', + get_module_resource(module, *args), + {}, 'init', False, 'test', self.registry._assertion_report) + + def test_00_account_asset_asset(self): + self._load('account', 'test', 'account_minimal_test.xml') + self._load('account_asset', 'test', 'account_asset_demo_test.xml') + + # self.browse_ref("account_asset.data_fiscalyear_plus1").create_period() + # self.browse_ref("account_asset.data_fiscalyear_plus2").create_period() + # self.browse_ref("account_asset.data_fiscalyear_plus3").create_period() + # self.browse_ref("account_asset.data_fiscalyear_plus4").create_period() + # self.browse_ref("account_asset.data_fiscalyear_plus5").create_period() + + # In order to test the process of Account Asset, I perform a action to confirm Account Asset. + self.browse_ref("account_asset.account_asset_asset_vehicles0").validate() + + # I check Asset is now in Open state. + self.assertEqual(self.browse_ref("account_asset.account_asset_asset_vehicles0").state, 'open', + 'Asset should be in Open state') + + # I compute depreciation lines for asset of CEOs Car. + self.browse_ref("account_asset.account_asset_asset_vehicles0").compute_depreciation_board() + value = self.browse_ref("account_asset.account_asset_asset_vehicles0") + self.assertEqual(value.method_number, len(value.depreciation_line_ids), + 'Depreciation lines not created correctly') + + # I create account move for all depreciation lines. + ids = self.env['account.asset.depreciation.line'].search([('asset_id', '=', self.ref('account_asset.account_asset_asset_vehicles0'))]) + for line in ids: + line.create_move() + + # I check the move line is created. + asset = self.env['account.asset.asset'].browse([self.ref("account_asset.account_asset_asset_vehicles0")])[0] + self.assertEqual(len(asset.depreciation_line_ids), len(asset.account_move_line_ids), + 'Move lines not created correctly') + + # I Check that After creating all the moves of depreciation lines the state "Close". + self.assertEqual(self.browse_ref("account_asset.account_asset_asset_vehicles0").state, 'close', + 'State of asset should be close') + + invoice = self.env['account.invoice'].create({ + 'partner_id': self.ref("base.res_partner_12"), + 'account_id': self.ref("account_asset.a_sale"), + }) + self.env['account.invoice.line'].create({ + 'invoice_id': invoice.id, + 'account_id': self.ref("account_asset.a_sale"), + 'name': 'Insurance claim', + 'price_unit': 450, + 'quantity': 1, + 'asset_category_id': self.ref("account_asset.account_asset_category_sale1"), + }) + invoice.signal_workflow('invoice_open') + + from datetime import datetime + from dateutil.relativedelta import relativedelta + line_obj = self.env['account.asset.depreciation.line'] + recognition_ids = self.env['account.asset.asset'].search([('code', '=', invoice.number)]) + self.assertTrue(recognition_ids, + 'Revenue recognition has been not created from invoice.') + + # I confirm revenue recognition. + for asset in recognition_ids: + asset.validate() + recognition = recognition_ids[0] + first_invoice_line = invoice.invoice_line_ids[0] + self.assertTrue(recognition.state == 'open', + 'Recognition should be in Open state') + self.assertEqual(recognition.value, first_invoice_line.price_subtotal, + 'Recognition value is not same as invoice line.') + + # I post installment lines. + line_ids = [rec for rec in recognition.depreciation_line_ids] + for line in line_ids: + line.create_move() + + # I check that move line is created from posted installment lines. + self.assertEqual(len(recognition.depreciation_line_ids), len(recognition.account_move_line_ids), + 'Move lines not created correctly.') + + # I check data in move line and installment line. + first_installment_line = recognition.depreciation_line_ids[0] + first_move_line = recognition.account_move_line_ids[0] + self.assertEqual(first_installment_line.amount, first_move_line.credit, + 'First installment line amount is incorrect.') + remaining_value = recognition.value - first_installment_line.amount + self.assertEqual(first_installment_line.remaining_value, recognition.value - first_installment_line.amount, + 'Remaining value is incorrect.') + + # I check next installment date. + last_installment_date = datetime.strptime(first_installment_line.depreciation_date, '%Y-%m-%d') + installment_date = (last_installment_date+relativedelta(months=+recognition.method_period)) + self.assertEqual(recognition.depreciation_line_ids[1].depreciation_date, str(installment_date.date()), + 'Installment date is incorrect.') + + # WIZARD + # I create a record to change the duration of asset for calculating depreciation. + + account_asset_asset_office0 = self.browse_ref('account_asset.account_asset_asset_office0') + asset_modify_number_0 = self.env['asset.modify'].create({ + 'name': 'Test reason', + 'method_number': 10.0, + }).with_context({'active_id': account_asset_asset_office0.id}) + # I change the duration. + asset_modify_number_0.with_context({'active_id': account_asset_asset_office0.id}).modify() + + # I check the proper depreciation lines created. + self.assertEqual(account_asset_asset_office0.method_number, len(account_asset_asset_office0.depreciation_line_ids) - 1) + # I compute a asset on period. + + context = { + "active_ids": [self.ref("account_asset.menu_asset_depreciation_confirmation_wizard")], + "active_id": self.ref('account_asset.menu_asset_depreciation_confirmation_wizard'), + 'type': 'sale' + } + asset_compute_period_0 = self.env['asset.depreciation.confirmation.wizard'].create({}) + asset_compute_period_0.with_context(context).asset_compute() diff --git a/addons/account_asset/views/account_asset.xml b/addons/account_asset/views/account_asset.xml new file mode 100644 index 00000000000..198e95172d4 --- /dev/null +++ b/addons/account_asset/views/account_asset.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/addons/account_asset/views/account_asset_invoice_view.xml b/addons/account_asset/views/account_asset_invoice_view.xml new file mode 100644 index 00000000000..b4207df4dd6 --- /dev/null +++ b/addons/account_asset/views/account_asset_invoice_view.xml @@ -0,0 +1,39 @@ + + + + + account.invoice.line.form + account.invoice.line + + + + + + + + + + + account.invoice.supplier.form + account.invoice + + + + + + + + + + + account.invoice.form + account.invoice + + + + + + + + + diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/views/account_asset_view.xml similarity index 55% rename from addons/account_asset/account_asset_view.xml rename to addons/account_asset/views/account_asset_view.xml index d5a9f609329..854e77a38e6 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/views/account_asset_view.xml @@ -1,5 +1,4 @@ - - + - account.asset.asset.form account.asset.asset
-
@@ -96,63 +112,46 @@ - + + + - - + + + + + + - - - - - - - - - - - - - - - - + + + - - + -