From a3f9c908a07c334e2751f6c573bda098455d6076 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 5 Nov 2014 15:49:15 +0100 Subject: [PATCH 1/4] [IMP] account: (over)due payments report The report includes all due payments, not only the one after the maturity date. The maturity date is displayed in the report so no confusion is possible for payments below the maturity date. Fixes #3064 --- addons/account/account_report.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 0017409f416..65a841abe7d 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -11,7 +11,7 @@ - + Date: Wed, 5 Nov 2014 16:56:44 +0100 Subject: [PATCH 2/4] [FIX] account_asset: move lines should use the depreciation line date opw-616843 --- addons/account_asset/account_asset.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 806013e6a4c..179222ebe08 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -431,7 +431,7 @@ class account_asset_depreciation_line(osv.osv): 'partner_id': partner_id, 'currency_id': company_currency != current_currency and current_currency or False, 'amount_currency': company_currency != current_currency and - sign * line.amount or 0.0, - 'date': depreciation_date, + 'date': line.depreciation_date, }) move_line_obj.create(cr, uid, { 'name': asset_name, @@ -446,7 +446,7 @@ class account_asset_depreciation_line(osv.osv): '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, - 'date': depreciation_date, + 'date': line.depreciation_date, 'asset_id': line.asset_id.id }) self.write(cr, uid, line.id, {'move_id': move_id}, context=context) From 056c06570c741fab1515978a957766b0a77bd80a Mon Sep 17 00:00:00 2001 From: Julien Legros Date: Wed, 5 Nov 2014 17:38:50 +0100 Subject: [PATCH 3/4] [FIX] account_asset: asset depreciation should use the correct dates fix a5cf71973916f3e9b6ea578a614c76b0b34689d8 --- addons/account_asset/account_asset.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 179222ebe08..9cf4c14fff2 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -399,7 +399,7 @@ class account_asset_depreciation_line(osv.osv): created_move_ids = [] asset_ids = [] for line in self.browse(cr, uid, ids, context=context): - depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d') + depreciation_date = context.get('depreciation_date') or line.depreciation_date or time.strftime('%Y-%m-%d') ctx = dict(context, account_period_prefer_normal=True) period_ids = period_obj.find(cr, uid, depreciation_date, context=ctx) company_currency = line.asset_id.company_id.currency_id.id @@ -431,7 +431,7 @@ class account_asset_depreciation_line(osv.osv): 'partner_id': partner_id, 'currency_id': company_currency != current_currency and current_currency or False, 'amount_currency': company_currency != current_currency and - sign * line.amount or 0.0, - 'date': line.depreciation_date, + 'date': depreciation_date, }) move_line_obj.create(cr, uid, { 'name': asset_name, @@ -446,7 +446,7 @@ class account_asset_depreciation_line(osv.osv): '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, - 'date': line.depreciation_date, + 'date': depreciation_date, 'asset_id': line.asset_id.id }) self.write(cr, uid, line.id, {'move_id': move_id}, context=context) From cb91966b11fb914d9cf9d64d5377d7924a10c486 Mon Sep 17 00:00:00 2001 From: Julien Legros Date: Wed, 5 Nov 2014 18:24:40 +0100 Subject: [PATCH 4/4] [REVERT] 056c06570c741fab1515978a957766b0a77bd80a and a5cf71973916f3e9b6ea578a614c76b0b34689d8 --- addons/account_asset/account_asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 9cf4c14fff2..806013e6a4c 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -399,7 +399,7 @@ class account_asset_depreciation_line(osv.osv): 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') + depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d') ctx = dict(context, account_period_prefer_normal=True) period_ids = period_obj.find(cr, uid, depreciation_date, context=ctx) company_currency = line.asset_id.company_id.currency_id.id