From a892678b33105b508b115ec20671c5a0f0c8891f Mon Sep 17 00:00:00 2001 From: Joe Date: Sun, 5 Jun 2022 10:19:54 +0200 Subject: [PATCH] php 8.1 deprecated null parameters. Clean Up. --- reporting/rep302.php | 12 +++++------- reporting/rep705.php | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/reporting/rep302.php b/reporting/rep302.php index 1c821689..417e44b7 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -112,13 +112,11 @@ function print_inventory_planning() $loc = get_location_name($location); $cols = array(0, 50, 150, 180, 210, 240, 270, 300, 330, 390, 435, 480, 525); - - $per0 = substr(date('F',mktime(0,0,0,date('m'),1,date('Y'))), 0, 3); - $per1 = substr(date('F',mktime(0,0,0,date('m')-1,1,date('Y'))), 0, 3); - $per2 = substr(date('F',mktime(0,0,0,date('m')-2,1,date('Y'))), 0, 3); - $per3 = substr(date('F',mktime(0,0,0,date('m')-3,1,date('Y'))), 0, 3); - $per4 = substr(date('F',mktime(0,0,0,date('m')-4,1,date('Y'))), 0, 3); - + $per0 = date('M',mktime(0,0,0,date('m'),1,date('Y'))); + $per1 = date('M',mktime(0,0,0,date('m')-1,1,date('Y'))); + $per2 = date('M',mktime(0,0,0,date('m')-2,1,date('Y'))); + $per3 = date('M',mktime(0,0,0,date('m')-3,1,date('Y'))); + $per4 = date('M',mktime(0,0,0,date('m')-4,1,date('Y'))); $headers = array(_('Category'), '', $per4, $per3, $per2, $per1, $per0, '3*M', _('QOH'), _('Cust Ord'), _('Supp Ord'), _('Sugg Ord')); diff --git a/reporting/rep705.php b/reporting/rep705.php index 3ac9d66d..bc837984 100644 --- a/reporting/rep705.php +++ b/reporting/rep705.php @@ -239,18 +239,18 @@ function print_annual_expense_breakdown() list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da); elseif ($SysPrefs->date_system == 2) list($yr, $mo, $da) = islamic_to_gregorian($yr, $mo, $da); - $per12 = substr(date('F',mktime(0,0,0,$mo,$da,$yr)), 0, 3); - $per11 = substr(date('F',mktime(0,0,0,$mo-1,$da,$yr)), 0, 3); - $per10 = substr(date('F',mktime(0,0,0,$mo-2,$da,$yr)), 0, 3); - $per09 = substr(date('F',mktime(0,0,0,$mo-3,$da,$yr)), 0, 3); - $per08 = substr(date('F',mktime(0,0,0,$mo-4,$da,$yr)), 0, 3); - $per07 = substr(date('F',mktime(0,0,0,$mo-5,$da,$yr)), 0, 3); - $per06 = substr(date('F',mktime(0,0,0,$mo-6,$da,$yr)), 0, 3); - $per05 = substr(date('F',mktime(0,0,0,$mo-7,$da,$yr)), 0, 3); - $per04 = substr(date('F',mktime(0,0,0,$mo-8,$da,$yr)), 0, 3); - $per03 = substr(date('F',mktime(0,0,0,$mo-9,$da,$yr)), 0, 3); - $per02 = substr(date('F',mktime(0,0,0,$mo-10,$da,$yr)), 0, 3); - $per01 = substr(date('F',mktime(0,0,0,$mo-11,$da,$yr)), 0, 3); + $per12 = date('M',mktime(0,0,0,$mo,$da,$yr)); + $per11 = date('M',mktime(0,0,0,$mo-1,$da,$yr)); + $per10 = date('M',mktime(0,0,0,$mo-2,$da,$yr)); + $per09 = date('M',mktime(0,0,0,$mo-3,$da,$yr)); + $per08 = date('M',mktime(0,0,0,$mo-4,$da,$yr)); + $per07 = date('M',mktime(0,0,0,$mo-5,$da,$yr)); + $per06 = date('M',mktime(0,0,0,$mo-6,$da,$yr)); + $per05 = date('M',mktime(0,0,0,$mo-7,$da,$yr)); + $per04 = date('M',mktime(0,0,0,$mo-8,$da,$yr)); + $per03 = date('M',mktime(0,0,0,$mo-9,$da,$yr)); + $per02 = date('M',mktime(0,0,0,$mo-10,$da,$yr)); + $per01 = date('M',mktime(0,0,0,$mo-11,$da,$yr)); $headers = array(_('Account'), _('Account Name'), $per01, $per02, $per03, $per04, $per05, $per06, $per07, $per08, $per09, $per10, $per11, $per12, _('Total')); -- 2.30.2