PHP 8 rerun of number_format fix.

[fa-stable.git] / reporting / includes / reporting.inc

diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index caffb6888a22062987b309dab734dbaebdb24143..4bcdad8397257c95ac4e3b6eeaf6f9d32839fcb5 100644 (file)
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -14,7 +14,7 @@
 // or display_note(print_document_link($order_no, _("Print this order")));
 // You only need full parameter list for invoices/credit notes
 
-function print_document_link($doc_no, $link_text, $link=true, $type_no, 
+function print_document_link($doc_no, $link_text, $link, $type_no, 
        $icon=false, $class='printlink', $id='', $email=0, $extra=0)
 {
        global $path_to_root;
@@ -70,7 +70,9 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
                                'PARAM_3' => $email, 
                                'PARAM_4' => '',
                                'PARAM_5' => '', 
-                               'PARAM_6' => $def_orientation);
+                               'PARAM_6' => $rep == 107 ? '' : $def_orientation);
+                       if ($rep == 107)
+                               $ar['PARAM_7'] = $def_orientation;
                        break;
                case ST_PURCHORDER :
                        $rep = 209;
@@ -90,8 +92,9 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
                                'PARAM_0' => $doc_no, 
                                'PARAM_1' => $doc_no, 
                                'PARAM_2' => '', 
-                               'PARAM_3' => '',
-                               'PARAM_4' => $def_orientation);
+                               'PARAM_3' => $email,
+                               'PARAM_4' => '',
+                               'PARAM_5' => $def_orientation);
                        break;
                case ST_SUPPAYMENT :
                        $rep = 210;
@@ -114,9 +117,20 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
                                'PARAM_3' => '', 
                                'PARAM_4' => $def_orientation);
                        break;
-//             default: $ar = array();
+               case ST_DIMENSION :
+                       $rep = 501;
+                       // from, to, email, comments, orientation
+                       $ar = array(
+                               'PARAM_0' => $doc_no, 
+                               'PARAM_1' => $doc_no, 
+                               'PARAM_2' => 1, 
+                               'PARAM_3' => '', 
+                               'PARAM_4' => $def_orientation);
+                       break;
+               default:
+                       return null;
        }
-       
+
        return print_link($link_text, $rep, $ar, "", $icon, $class, $id);
 }
 //
@@ -125,19 +139,19 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 function print_link($link_text, $rep, $pars = array(), $dir = '', 
        $icon=false, $class='printlink', $id='')
 {
-       global $path_to_root, $pdf_debug;
-
+       global $path_to_root, $SysPrefs;
        $url = $dir == '' ?  $path_to_root.'/reporting/prn_redirect.php?' : $dir;
 
        $id = default_focus($id);
+       $parm = array();
        foreach($pars as $par => $val) {
-               $pars[$par] = "$par=".urlencode($val);
+               if ($val != "")
+                       $parm[] = "$par=".urlencode($val);
        }
-       $pars[] = 'REP_ID='.urlencode($rep);
-       $url .= implode ('&', $pars);
-
+       $parm[] = 'REP_ID='.urlencode($rep);
+       $url .= implode ('&', $parm);
        if ($class != '')
-               $class = $pdf_debug ? '' : " class='$class'";
+               $class = $SysPrefs->pdf_debug ? '' : " class='$class'";
        if ($id != '')
                $id = " id='$id'";
        $pars = access_string($link_text);