X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/ab435052813cbf5a2f9052dc3d46aa672dac9d44..b293ff8ad52fc76ba0c44783e3982418114d6b08:/SL/Helper/PrintOptions.pm

diff --git a/SL/Helper/PrintOptions.pm b/SL/Helper/PrintOptions.pm
index 7e6a87c07..9108a224e 100644
--- a/SL/Helper/PrintOptions.pm
+++ b/SL/Helper/PrintOptions.pm
@@ -4,6 +4,7 @@ use strict;
 
 use List::MoreUtils qw(any);
 
+sub opthash { +{ value => shift, selected => shift, oname => shift } }
 
 # generate the printing options displayed at the bottom of oe and is forms.
 # this function will attempt to guess what type of form is displayed, and will generate according options
@@ -17,15 +18,18 @@ use List::MoreUtils qw(any);
 sub get_print_options {
   my ($class, %params) = @_;
 
+  no warnings 'once';
+
   my $form     = $params{form}     || $::form;
   my $myconfig = $params{myconfig} || \%::myconfig;
   my $locale   = $params{locale}   || $::locale;
   my $options  = $params{options};
 
+  use warnings 'once';
+
   my $prefix = $options->{dialog_name_prefix} || '';
 
   # names 3 parameters and returns a hashref, for use in templates
-  sub opthash { +{ value => shift, selected => shift, oname => shift } }
   my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
 
   # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
@@ -51,6 +55,7 @@ sub get_print_options {
     ($form->{type} eq 'sales_order') ? (
       opthash("sales_order",         $form->{PD}{sales_order},         $locale->text('Confirmation')),
       opthash("proforma",            $form->{PD}{proforma},            $locale->text('Proforma Invoice')),
+      opthash("ic_supply",           $form->{PD}{ic_supply},            $locale->text('Intra-Community supply')),
     ) : undef,
     ($form->{type} =~ /sales_quotation$/) ?
       opthash('sales_quotation',     $form->{PD}{sales_quotation},     $locale->text('Quotation')) : undef,
@@ -59,13 +64,26 @@ sub get_print_options {
     ($form->{type} eq 'invoice') ? (
       opthash("invoice",             $form->{PD}{invoice},             $locale->text('Invoice')),
       opthash("proforma",            $form->{PD}{proforma},            $locale->text('Proforma Invoice')),
+      opthash("invoice_copy",        $form->{PD}{invoice_copy},        $locale->text('Invoice Copy')),
     ) : undef,
     ($form->{type} eq 'invoice' && $form->{storno}) ? (
       opthash("storno_invoice",      $form->{PD}{storno_invoice},      $locale->text('Storno Invoice')),
     ) : undef,
-    ($form->{type} =~ /_delivery_order$/) ? (
+    ($form->{type} eq 'invoice_for_advance_payment') ? (
+      opthash("invoice_for_advance_payment", $form->{PD}{invoice_for_advance_payment},      $locale->text('Invoice for Advance Payment')),
+    ) : undef,
+    ($form->{type} eq 'final_invoice') ? (
+      opthash("final_invoice", $form->{PD}{final_invoice},             $locale->text('Final Invoice')),
+    ) : undef,
+    ($form->{type} =~ /^supplier_delivery_order$/) ? (
+      opthash('supplier_delivery_order', $form->{PD}{supplier_delivery_order},  $locale->text('Supplier Delivery Order')),
+    ) : undef,
+    ($form->{type} =~ /(sales|purchase)_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
       opthash('pick_list',           $form->{PD}{pick_list},           $locale->text('Pick List')),
+    ) : undef,
+    ($form->{type} =~ /^letter$/) ? (
+      opthash('letter',              $form->{PD}{letter},              $locale->text('Letter')),
     ) : undef;
 
   push @SENDMODE,
@@ -107,28 +125,31 @@ sub get_print_options {
       if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
 
   @SELECTS = map {
-    sname => $_->[1],
-    DATA  => $_->[0],
-    show  => !$options->{"hide_" . $_->[1]} && scalar @{ $_->[0] }
+    sname  => $_->[1],
+    DATA   => $_->[0],
+    show   => !$options->{"hide_" . $_->[1]} && scalar @{ $_->[0]},
+    hname  => $locale->text($_->[2])
   },
-  [ \@FORMNAME,    'formname',    ],
-  [ \@LANGUAGE_ID, 'language_id', ],
-  [ \@FORMAT,      'format',      ],
-  [ \@SENDMODE,    'sendmode',    ],
-  [ \@MEDIA,       'media',       ],
-  [ \@PRINTER_ID,  'printer_id',  ];
+  [ \@FORMNAME,    'formname',    'Formname' ],
+  [ \@LANGUAGE_ID, 'language_id', 'Language' ],
+  [ \@FORMAT,      'format',      'Format'   ],
+  [ \@SENDMODE,    'sendmode',    'Sendmode' ],
+  [ \@MEDIA,       'media',       'Media'    ],
+  [ \@PRINTER_ID,  'printer_id',  'Printer'  ];
 
   my %dont_display_groupitems = (
     'dunning' => 1,
-    'letter'  => 1,
     );
 
   my %template_vars = (
     name_prefix          => $prefix || '',
+    show_headers         => $options->{show_headers},
     display_copies       => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),
     display_groupitems   => !$dont_display_groupitems{$form->{type}},
+    display_bothsided    => $options->{show_bothsided},
     groupitems_checked   => $form->{groupitems} ? "checked" : '',
+    bothsided_checked    => $form->{bothsided}  ? "checked" : '',
     remove_draft_checked => $form->{remove_draft} ? "checked" : ''
   );