Merge lp:~openerp-dev/openobject-addons/7.0-account-assets_fixes-acl into lp:openobject-addons/7.0

[Anaël Closson (openerp)]

[lp:~openerp-dev/openobject-addons/7.0-account-assets_fixes-acl]

9907. By Anaël Closson (openerp) on 2014-03-18

[FIX] account assets: prorata temporis tooltip should match the fix from revision 9906.

9908. By Martin Trigaux (OpenERP) on 2014-03-25

[IMP] use finds method account.fiscalyear

9909. By Martin Trigaux (OpenERP) on 2014-03-25

[FIX] copy should not keep history and move lines of previous asset

9910. By Martin Trigaux (OpenERP) on 2014-03-26

[FIX] compute correctly the depreciation lines to recreate in 'Ending Date' method

9911. By Martin Trigaux (OpenERP) on 2014-03-26

[ADD] some tests, fixed the test account_asset_wizard as the number of depreciation was fixed

Unmerged revisions

9911. By Martin Trigaux (OpenERP) on 2014-03-26

[ADD] some tests, fixed the test account_asset_wizard as the number of depreciation was fixed

9910. By Martin Trigaux (OpenERP) on 2014-03-26

[FIX] compute correctly the depreciation lines to recreate in 'Ending Date' method

9909. By Martin Trigaux (OpenERP) on 2014-03-25

[FIX] copy should not keep history and move lines of previous asset

9908. By Martin Trigaux (OpenERP) on 2014-03-25

[IMP] use finds method account.fiscalyear

9907. By Anaël Closson (openerp) on 2014-03-18

[FIX] account assets: prorata temporis tooltip should match the fix from revision 9906.

9906. By Anaël Closson (openerp) on 2014-03-17

[FIX] Assets depreciation: several fixes:
 - first depreciation always starts on 01/01/asset_purchase_year
 - prorata temporis is always computed against start of year

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2014-01-17 10:40:37 +0000
+++ account_asset/account_asset.py	2014-03-26 15:52:48 +0000
@@ -51,7 +51,7 @@
                                        "  * 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'),
+        '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 day of depreciation period.'),
         '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."),
     }
 
@@ -105,19 +105,16 @@
 
     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
+        assert undone_dotation_number > len(posted_depreciation_line_ids)
         amount = 0
         if i == undone_dotation_number:
             amount = residual_amount
         else:
             if asset.method == 'linear':
                 amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids))
-                if asset.prorata:
-                    amount = amount_to_depr / asset.method_number
-                    days = total_days - float(depreciation_date.strftime('%j'))
+                if asset.prorata and i == 1:
                     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)
+                        amount = amount * (30 - float(depreciation_date.strftime('%j')) % 30) / 30
             elif asset.method == 'degressive':
                 amount = residual_amount * asset.method_progress_factor
                 if asset.prorata:
@@ -128,21 +125,29 @@
                         amount = (residual_amount * asset.method_progress_factor) / total_days * (total_days - days)
         return amount
 
+    # TODO in trunk: rename total_days into number_posted_lines
     def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None):
-        undone_dotation_number = asset.method_number
+        """Compute the number of remaining depreciation line to compute (skipping posted one)
+        asset: browse record (account.asset) of the current asset
+        depreciation_date: date of the next depreciation
+        total_days: the number 
+        """
         if asset.method_time == 'end':
             end_date = datetime.strptime(asset.method_end, '%Y-%m-%d')
             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))
                 undone_dotation_number += 1
-        if asset.prorata:
-            undone_dotation_number += 1
+            undone_dotation_number += self.pool.get('account.asset.depreciation.line').search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '!=', False)], count=True)
+        else:
+            undone_dotation_number = asset.method_number
         return undone_dotation_number
 
     def compute_depreciation_board(self, cr, uid, ids, context=None):
+        """Generate depreciation lines, skip posted entries and recreate unposted"""
         depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
         currency_obj = self.pool.get('res.currency')
+        fy_obj = self.pool.get('account.fiscalyear')
         for asset in self.browse(cr, uid, ids, context=context):
             if asset.value_residual == 0.0:
                 continue
@@ -155,23 +160,29 @@
             if asset.prorata:
                 depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
             else:
-                # depreciation_date = 1st January of purchase year
+                # depreciation_date = first day of current period
                 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 we already have some previous validated entries, starting date isn't 1st day of period 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))
                 else:
-                    depreciation_date = datetime(purchase_date.year, 1, 1)
+                    # else we should start at the first day of the period, relative to the start of fiscal year
+                    fiscal_year_ids = fy_obj.finds(cr, uid, purchase_date, context=context)
+                    fiscal_year = fiscal_year_ids and fy_obj.browse(cr, uid, fiscal_year_ids[0], context=context)
+                    delta = relativedelta(purchase_date, (fiscal_year and datetime.strptime(fiscal_year.date_start, '%Y-%m-%d') or datetime(purchase_date.year, 1, 1)))
+                    period_start = purchase_date + relativedelta(months=-((delta.years * 12 + delta.months) % asset.method_period))                    
+                    depreciation_date = datetime(period_start.year, period_start.month, 1)
+
             day = depreciation_date.day
             month = depreciation_date.month
             year = depreciation_date.year
-            total_days = (year % 4) and 365 or 366
+            total_days = asset.method_period * 30  # we use month of 30 days for accounting
 
-            undone_dotation_number = self._compute_board_undone_dotation_nb(cr, uid, asset, depreciation_date, total_days, context=context)
-            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)
+            undone_dotation_number = self._compute_board_undone_dotation_nb(cr, uid, asset, depreciation_date, len(posted_depreciation_line_ids), context=context)
+            for sequence in range(len(posted_depreciation_line_ids) + 1, undone_dotation_number + 1):
+                amount = self._compute_board_amount(cr, uid, asset, sequence, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=context)
                 company_currency = asset.company_id.currency_id.id
                 current_currency = asset.currency_id.id
                 # compute amount into company currency
@@ -180,8 +191,8 @@
                 vals = {
                      'amount': amount,
                      'asset_id': asset.id,
-                     'sequence': i,
-                     'name': str(asset.id) +'/' + str(i),
+                     'sequence': sequence,
+                     'name': str(asset.id) +'/' + str(sequence),
                      'remaining_value': residual_amount,
                      'depreciated_value': (asset.purchase_value - asset.salvage_value) - (residual_amount + amount),
                      'depreciation_date': depreciation_date.strftime('%Y-%m-%d'),
@@ -270,7 +281,7 @@
                                   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'),
+        '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 day of depreciation period.'),
         '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_compute=dp.get_precision('Account'), help="It is the amount you plan to have that you cannot depreciate.", readonly=True, states={'draft':[('readonly',False)]}),
@@ -330,7 +341,7 @@
             default = {}
         if context is None:
             context = {}
-        default.update({'depreciation_line_ids': [], 'state': 'draft'})
+        default.update({'depreciation_line_ids': [], 'account_move_line_ids': [], 'history_ids': [], 'state': 'draft'})
         return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
 
     def _compute_entries(self, cr, uid, ids, period_id, context=None):

=== modified file 'account_asset/test/account_asset_wizard.yml'
--- account_asset/test/account_asset_wizard.yml	2011-12-20 10:08:42 +0000
+++ account_asset/test/account_asset_wizard.yml	2014-03-26 15:52:48 +0000
@@ -13,7 +13,7 @@
   I check the proper depreciation lines created.
 -
   !assert {model: account.asset.asset, id: account_asset.account_asset_asset_office0}:
-    - method_number == len(depreciation_line_ids) -1
+    - method_number == len(depreciation_line_ids)
 -
   I create a period to compute a asset on period.
 -

=== added directory 'account_asset/tests'
=== added file 'account_asset/tests/__init__.py'
--- account_asset/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ account_asset/tests/__init__.py	2014-03-26 15:52:48 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2014-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_depreciation
+
+checks = [
+    test_depreciation,
+]

=== added file 'account_asset/tests/test_depreciation.py'
--- account_asset/tests/test_depreciation.py	1970-01-01 00:00:00 +0000
+++ account_asset/tests/test_depreciation.py	2014-03-26 15:52:48 +0000
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+import time
+
+class TestDepreciation(common.TransactionCase):
+
+    def setUp(self):
+        super(TestDepreciation, self).setUp()
+
+        # Usefull models
+        self.ir_model_data = self.registry('ir.model.data')
+        self.asset = self.registry('account.asset.asset')
+        self.asset_line = self.registry('account.asset.depreciation.line')
+        self.useless_category_id = self.ir_model_data.get_object_reference(self.cr, self.uid, 'account_asset', 'account_asset_category_fixedassets0')[1]
+
+    def test_yearly(self):
+        cr, uid, context = self.cr, self.uid, {}
+        asset_id = self.asset.create(cr, uid, {
+            'name': 'A 5 years car',
+            'category_id': self.useless_category_id,
+            'purchase_value': 10000,
+            'method': 'linear',
+            'method_number': 5,
+            'method_period': 12,
+            'purchase_date': time.strftime('%Y-01-01')
+        }, context=context)
+        asset = self.asset.browse(cr, uid, asset_id, context=context)
+
+        self.assertEquals(len(asset.depreciation_line_ids), 5, 'Incorrect number of depreciations for created asset')
+        # make sure lines are sorted by sequence
+        lines = sorted([line for line in asset.depreciation_line_ids], key=lambda line: line.sequence)
+        remanining_value = asset.purchase_value
+        depreciation_amount = asset.purchase_value/asset.method_number
+        for line in lines:
+            self.assertEquals(line.amount, depreciation_amount, "Linear depreciation does not have equal depreciation")
+            self.assertEquals(line.remaining_value, remanining_value-depreciation_amount, "Remaining value should be decreased of the depreciation amount")
+            remanining_value -= depreciation_amount
+
+    def test_monthly(self):
+        cr, uid, context = self.cr, self.uid, {}
+        
+        asset_id = self.asset.create(cr, uid, {
+            'name': 'A 4 months coffee machine',
+            'category_id': self.useless_category_id,
+            'purchase_value': 24,
+            'method': 'linear',
+            'method_number': 4,
+            'method_period': 1,
+            'purchase_date': time.strftime('%Y-05-15')
+        }, context=context)
+        asset = self.asset.browse(cr, uid, asset_id, context=context)
+
+        self.assertEquals(len(asset.depreciation_line_ids), 4, "Incorrect number of depreciations for created asset")
+        lines = sorted([line for line in asset.depreciation_line_ids], key=lambda line: line.sequence)
+        self.assertEquals(lines[0].depreciation_date, time.strftime('%Y-05-01'), "First depreciation should be the first day of the current period")
+
+        self.asset_line.create_move(cr, uid, [lines[0].id], context=context)
+        self.asset_line.create_move(cr, uid, [lines[1].id], context=context)
+
+        self.asset.compute_depreciation_board(cr, uid, [asset_id], context=context)
+        self.assertEquals(len(asset.depreciation_line_ids), 4, "The number of depreciation lines has changed when some are posted")