Merge lp:~openerp-dev/openobject-addons/trunk-bug-1241559-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

         I have fixed this issue, wrong depreciation date for fiscal years not starting jan 1st in Accounting -> Asset.

Thanks,
Chirag Dodiya(cod).

[Amit Parik (amit-parik)]

Hello,

Not good for me! What will be happen is mutiple fiscal year for the same company!
Better you have to search the fiscal year for the assets purchase date(purchase_date).

Also please improve the help for Prorata Temporis.

Thank you!

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-1241559-cod]

8955. By Chirag Dodiya(OpenERP) on 2013-10-23

[IMP] improved code for search fiscal start date based on purchase date and improved help of prorata field

8956. By Chirag Dodiya(OpenERP) on 2013-10-23

[IMP] improved help of prorata field

[Chirag Dodiya(OpenERP) (chirag.dodiya-openerp)]

Hello sir,

      I have improved code as par your suggestion.

Thanks,
Chirag Dodiya(cod).

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-1241559-cod]

8957. By Chirag Dodiya(OpenERP) on 2013-12-31

[MRG]Merge with lp:openobject-addons

Unmerged revisions

8957. By Chirag Dodiya(OpenERP) on 2013-12-31

[MRG]Merge with lp:openobject-addons

8956. By Chirag Dodiya(OpenERP) on 2013-10-23

[IMP] improved help of prorata field

8955. By Chirag Dodiya(OpenERP) on 2013-10-23

[IMP] improved code for search fiscal start date based on purchase date and improved help of prorata field

8954. By Chirag Dodiya(OpenERP) on 2013-10-22

[FIX] Improved code for set depreciation date

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2013-10-27 12:31:04 +0000
+++ account_asset/account_asset.py	2014-01-15 16:16:14 +0000
@@ -153,14 +153,19 @@
             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
                 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))
                 else:
-                    depreciation_date = datetime(purchase_date.year, 1, 1)
+		     # depreciation_date = start date of fiscal year or 1st January of purchase year
+		     fiscal_date = self.pool.get('account.fiscalyear').search_read(cr, uid, [('date_start', '<=', purchase_date), ('date_stop', '>=', purchase_date)], ['date_start'], context=context)
+		     if fiscal_date:
+			fis_date = datetime.strptime(fiscal_date[0]['date_start'], '%Y-%m-%d') 
+			depreciation_date = datetime(purchase_date.year, fis_date.month, fis_date.day)
+		     else:
+			depreciation_date = datetime(purchase_date.year, 1, 1)
             day = depreciation_date.day
             month = depreciation_date.month
             year = depreciation_date.year
@@ -268,7 +273,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 January/start date of fiscal year'),
         '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)]}),