projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 707bb172f4923d6ea97fe8b85900767706474ffe..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
// 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;
$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_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;
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_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;
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;
'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);
}
//
return print_link($link_text, $rep, $ar, "", $icon, $class, $id);
}
//
@@
-131,7
+145,8
@@
function print_link($link_text, $rep, $pars = array(), $dir = '',
$id = default_focus($id);
foreach($pars as $par => $val) {
$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);
}
$pars[] = 'REP_ID='.urlencode($rep);
$url .= implode ('&', $pars);