Removed delivery in a batch cannot be voided after the invoice is made. Fixed.

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

diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index 68c443ea45ba24b9cfe88d7fec3abf5842030aa7..dd4b5a5c2214c579f251174f6a72e875265b1899 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;
@@ -92,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;
@@ -116,9 +117,18 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
                                'PARAM_3' => '', 
                                'PARAM_4' => $def_orientation);
                        break;
+               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;
-//             default: $ar = array();
        }
 
        return print_link($link_text, $rep, $ar, "", $icon, $class, $id);
@@ -135,7 +145,8 @@ function print_link($link_text, $rep, $pars = array(), $dir = '',
 
        $id = default_focus($id);
        foreach($pars as $par => $val) {
-               $pars[$par] = "$par=".urlencode($val);
+               if ($val != null)
+                       $pars[$par] = "$par=".urlencode($val);
        }
        $pars[] = 'REP_ID='.urlencode($rep);
        $url .= implode ('&', $pars);