X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freporting.inc;h=4bcdad8397257c95ac4e3b6eeaf6f9d32839fcb5;hb=cc8de041156232390357cccd84da712f178b6d87;hp=68c443ea45ba24b9cfe88d7fec3abf5842030aa7;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc index 68c443ea..4bcdad83 100644 --- 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); @@ -130,16 +140,16 @@ function print_link($link_text, $rep, $pars = array(), $dir = '', $icon=false, $class='printlink', $id='') { 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 = $SysPrefs->pdf_debug ? '' : " class='$class'"; if ($id != '')