--- invoice_pdf.php_org 2007-02-06 01:25:18.000000000 +0100 +++ invoice_pdf.php 2007-02-06 02:42:28.000000000 +0100 @@ -160,7 +160,7 @@ function invoice_title($x,$y) { - global $invoice,$pdf,$CONFIG,$type; + global $invoice,$pdf,$CONFIG,$type,$dupl; $font_size = 16; $tmp = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); if($invoice['invoice']) @@ -179,8 +179,11 @@ $font_size = 16; $y=$y-text_align_left($x,$y,$font_size,iconv("UTF-8","ISO-8859-2",$type)); - if($type==trans('DUPLICATE')) +// if($type==trans('DUPLICATE')) + if($dupl) { + $y=$y-text_align_left($x,$y,$font_size,iconv("UTF-8","ISO-8859-2",trans('DUPLICATE'))); + $font_size = 12; $y=$y-text_align_left($x,$y+4,$font_size,iconv("UTF-8","ISO-8859-2",trans('Duplicate draw-up date:').' '.date('Y/m/d'))); } @@ -259,7 +262,7 @@ function invoice_data($x,$y,$width,$font_size,$margin) { - global $invoice,$pdf; + global $invoice,$pdf,$dupl; $pdf->setlinestyle(0.5); $pdf->line($x,$y,$x+$width,$y); $t_data[1] = ''.iconv("UTF-8","ISO-8859-2",trans('No.')).''; @@ -435,8 +438,7 @@ function invoice_body() { - global $invoice,$pdf,$id,$CONFIG; - + global $invoice,$pdf,$id,$CONFIG,$dupl; if($invoice['invoice']) $template = $CONFIG['invoices']['cnote_template_file']; else @@ -541,7 +543,8 @@ if($_GET['original']) $which[] = trans('ORIGINAL'); if($_GET['copy']) $which[] = trans('COPY'); - if($_GET['duplicate']) $which[] = trans('DUPLICATE'); +// if($_GET['duplicate']) $which[] = trans('DUPLICATE'); + if($_GET['duplicate']) $dupl=1; else $dupl=0; if(!sizeof($which)) $which[] = trans('ORIGINAL'); @@ -575,7 +578,8 @@ if($_GET['original']) $which[] = trans('ORIGINAL'); if($_GET['copy']) $which[] = trans('COPY'); - if($_GET['duplicate']) $which[] = trans('DUPLICATE'); +// if($_GET['duplicate']) $which[] = trans('DUPLICATE'); + if($_GET['duplicate']) $dupl=1; else $dupl=0; if(!sizeof($which)) $which[] = trans('ORIGINAL');