From fe874c11f86ae11cccfb7f4dbc5ad26fff9f618a Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 23 Aug 2010 08:54:16 +0000 Subject: [PATCH] Period bug caused warning on no fiscal year. Had to be reduces by one. --- CHANGELOG.txt | 4 ++++ gl/accruals.php | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3bed45e6..33375b4f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +23-Aug-2010 Joe Hunt +# Period bug caused warning on no fiscal year. Had to be reduces by one. +$ /gl/accruals.php + 22-Aug-2010 Janusz Dobrowolski + Extended number formatting to allow maximum precision numbers with 'max' specifier. /includes/current_user.inc diff --git a/gl/accruals.php b/gl/accruals.php index 8636dde9..445e8657 100644 --- a/gl/accruals.php +++ b/gl/accruals.php @@ -54,10 +54,11 @@ if (isset($_POST['go']) || isset($_POST['show'])) if ($input_error == 0) { $periods = input_num('periods'); + $per = $periods - 1; $date_ = get_post('date_'); $freq = get_post('freq'); - $lastdate = ($freq== 1?add_days($date_,7*$periods):($freq==2?add_days($date_,14*$periods): - ($freq==3?add_months($date_,$periods):add_months($date_,3*$periods)))); + $lastdate = ($freq== 1?add_days($date_,7*$per):($freq==2?add_days($date_,14*$per): + ($freq==3?add_months($date_,$per):add_months($date_,3*$per)))); if (!is_date_in_fiscalyears($lastdate, false)) { display_error(_("Some of the period dates are outside the fiscal year. Create a new fiscal year first!")); -- 2.30.2