From e4cef39a7672370a7ae2e61c94e5267825fd1c5c Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 6 Jun 2022 15:45:29 +0200 Subject: [PATCH] php 8.1 Deprecated null parameters. Clean UP local months names. --- reporting/rep302.php | 13 +++++++------ reporting/rep705.php | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/reporting/rep302.php b/reporting/rep302.php index 417e44b7..22344266 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -84,7 +84,7 @@ function getPeriods($stockid, $location) function print_inventory_planning() { - global $path_to_root; + global $path_to_root, $tmonths; $category = $_POST['PARAM_0']; $location = $_POST['PARAM_1']; @@ -112,11 +112,12 @@ 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 = 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'))); + + $per0 = $tmonths[date('n',mktime(0,0,0,date('m'),1,date('Y')))]; + $per1 = $tmonths[date('n',mktime(0,0,0,date('m')-1,1,date('Y')))]; + $per2 = $tmonths[date('n',mktime(0,0,0,date('m')-2,1,date('Y')))]; + $per3 = $tmonths[date('n',mktime(0,0,0,date('m')-3,1,date('Y')))]; + $per4 = $tmonths[date('n',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 bc837984..dfc9208a 100644 --- a/reporting/rep705.php +++ b/reporting/rep705.php @@ -166,7 +166,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime function print_annual_expense_breakdown() { - global $path_to_root, $SysPrefs; + global $path_to_root, $SysPrefs, $tmonths; $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -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 = 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)); + $per12 = $tmonths[date('n',mktime(0,0,0,$mo,$da,$yr))]; + $per11 = $tmonths[date('n',mktime(0,0,0,$mo-1,$da,$yr))]; + $per10 = $tmonths[date('n',mktime(0,0,0,$mo-2,$da,$yr))]; + $per09 = $tmonths[date('n',mktime(0,0,0,$mo-3,$da,$yr))]; + $per08 = $tmonths[date('n',mktime(0,0,0,$mo-4,$da,$yr))]; + $per07 = $tmonths[date('n',mktime(0,0,0,$mo-5,$da,$yr))]; + $per06 = $tmonths[date('n',mktime(0,0,0,$mo-6,$da,$yr))]; + $per05 = $tmonths[date('n',mktime(0,0,0,$mo-7,$da,$yr))]; + $per04 = $tmonths[date('n',mktime(0,0,0,$mo-8,$da,$yr))]; + $per03 = $tmonths[date('n',mktime(0,0,0,$mo-9,$da,$yr))]; + $per02 = $tmonths[date('n',mktime(0,0,0,$mo-10,$da,$yr))]; + $per01 = $tmonths[date('n',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