io.pl print_options auf templateing umgeschireben.

Soweit ich weiss ist das eine der ersten frontend Funktionen aus SQL Ledger die auf templating umgeschrieben wurde.
Funktionalitaet wurde eins zu eins erhalten, die einzige gewollte Aenderung betrifft die Moeglichkeit
nicht direkt auf den Bildschirm auszugeben sondern die Optionen in einer Variable zurueckzugeben.

Ansonsten kleinere Aenderungen bedingt durch Programmierstil und Beschraenkungen von HTML::Template:
- der Check ob einige Selects angezeigt werden funktioniert jetzt ueber einen Referenzcheck,
  da languages und printers aus irgendeinem Grund als hashref initialisiert werden und dann als array gespeichert werden
- die Auswahl zwischen form und myconfigvariablen funktioniert leicht anders und wird vermutlich noch geaendert werden.

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index f20d4e5d21d6498e9ce1b3cbb90f16b3e7c218dc..c0b8856e60ccd2b4e8e7d07176ad8013fb63fcf0 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1474,233 +1474,108 @@ sub send_email {
   $lxdebug->leave_sub();
 }
 
+# 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
+#
+# about the coding: 
+# this version builds the arrays of options pretty directly. if you have trouble understanding how,
+# the opthash function builds hashrefs which are then pieced together for the template arrays.
+# unneeded options are "undef"ed out, and then grepped out. 
+#
+# the inline options is untested, but intended to be used later in metatemplating
 sub print_options {
-  $lxdebug->enter_sub();
-  $form->{sendmode} = "attachment";
+  $lxdebug->enter_sub() and my ($inline) = @_;
 
-  $form->{"format"} =
-    $form->{"format"} ? $form->{"format"} :
-    $myconfig{"template_format"} ? $myconfig{"template_format"} :
-    "pdf";
+  # names 3 parameters and returns a hashref, for use in templates
+  sub opthash { +{ value => shift, selected => shift, oname => shift } }
 
-  $form->{"copies"} =
-    $form->{"copies"} ? $form->{"copies"} :
-    $myconfig{"copies"} ? $myconfig{"copies"} :
-    3;
-
-  $form->{"media"} =
-    $form->{"media"} ? $form->{"media"} :
-    $myconfig{"default_media"} ? $myconfig{"default_media"} :
-    "screen";
-
-  $form->{"printer_id"} =
-    defined($form->{"printer_id"}) ? $form->{"printer_id"} :
-    $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
-    "";
+  # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
+  $form->{sendmode}   = "attachment";
+  $form->{format}     = $form->{format} || $myconfig{template_format} || "pdf";
+  $form->{copies}     = $form->{copies} || $myconfig{copies} || 3;
+  $form->{media}      = $form->{media} || $myconfig{default_media} || "screen";
+  $form->{printer_id} = $form->{printer_id} || $myconfig{default_printer_id} || "";
 
   $form->{PD}{ $form->{formname} } = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
-  $form->{SM}{ $form->{sendmode} } = "selected";
-
-  if ($form->{type} eq 'purchase_order') {
-    $type = qq|<select name=formname>
-           <option value=purchase_order $form->{PD}{purchase_order}>|
-      . $locale->text('Purchase Order') . qq|
-           <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
-  if ($form->{type} eq 'credit_note') {
-    $type = qq|<select name=formname>
-           <option value=credit_note $form->{PD}{credit_note}>|
-      . $locale->text('Credit Note');
-  }
-
-  if ($form->{type} eq 'sales_order') {
-    $type = qq|<select name=formname>
-           <option value=sales_order $form->{PD}{sales_order}>|
-      . $locale->text('Confirmation') . qq|
-      <option value=proforma $form->{PD}{proforma}>|
-      . $locale->text('Proforma Invoice') . qq|
-           <option value=pick_list $form->{PD}{pick_list}>|
-      . $locale->text('Pick List') . qq|
-           <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
-
-  if ($form->{type} =~ /_quotation$/) {
-    $type = qq|<select name=formname>
-           <option value="$`_quotation" $form->{PD}{"$`_quotation"}>|
-      . $locale->text('Quotation');
-  }
-
-  if ($form->{type} eq 'invoice') {
-    $type = qq|<select name=formname>
-           <option value=invoice $form->{PD}{invoice}>|
-      . $locale->text('Invoice') . qq|
-      <option value=proforma $form->{PD}{proforma}>|
-      . $locale->text('Proforma Invoice') . qq|
-      <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
+  $form->{SM}{ $form->{formname} } = "selected";
+
+  push @FORMNAME, grep $_,
+    ($form->{type} eq 'purchase_order') ? (
+      opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
+      opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List')) 
+    ) : undef,
+    ($form->{type} eq 'credit_note') ?
+      opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
+    ($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("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
+      opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List')) 
+    ) : undef,
+    ($form->{type} =~ /_quotation$/) ?
+      opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
+    ($form->{type} eq 'invoice') ? (
+      opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
+      opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+      opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+    ) : undef,
+    ($form->{type} eq 'invoice' && $form->{storno}) ? (
+      opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
+      opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) 
+    ) : undef,
+    ($form->{type} eq 'credit_note') ?
+      opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
+
+  push @SENDMODE, 
+    opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
+    opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
+      if ($form->{media} eq 'email');
+
+  push @MEDIA, grep $_,
+      opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
+    (scalar keys %{ $form->{printers} } && $latex_templates) ?
+      opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
+    ($latex_templates) ? 
+      opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
+        if ($form->{media} ne 'email');
+
+  push @FORMAT, grep $_,
+    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) ?
+      opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
+    ($latex_templates) ? (
+      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')),
+      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript'))
+    ) : undef,
+      opthash("html", $form->{DF}{html}, "HTML"),
+    ($opendocument_templates) ?
+      opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
+
+  push @LANGUAGE_ID, 
+    map { opthash($_->{id}, ($_->{id} eq $form->{language} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
+      if (ref $form->{languages} eq 'ARRAY');
+
+  push @PRINTER_ID, 
+    map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{printers} }
+      if (ref $form->{printers} eq 'ARRAY');
+
+  @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+
+  %template_vars = (
+    display_copies       => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+    display_remove_draft => (!$form->{id} && $form->{draft_id}),
+    groupitems_checked   => $form->{groupitems} ? "checked" : '',
+    remove_draft_checked => $form->{remove_draft} ? "checked" : ''
+  );
 
-  if ($form->{type} eq 'invoice' && $form->{storno}) {
-    $type = qq|<select name=formname>
-           <option value=storno_invoice $form->{PD}{storno_invoice}>|
-      . $locale->text('Storno Invoice') . qq|
-      <option value=storno_packing_list $form->{PD}{storno_packing_list}>|
-      . $locale->text('Storno Packing List');
-  }
+  my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
-  if ($form->{type} eq 'credit_note') {
-    $type = qq|<select name=formname>
-           <option value=credit_note $form->{PD}{credit_note}>|
-      . $locale->text('Credit Note');
-  }
-
-  if ($form->{media} eq 'email') {
-    $media = qq|<select name=sendmode>
-           <option value=attachment $form->{SM}{attachment}>|
-      . $locale->text('Attachment') . qq|
-           <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
+  if ($inline) {
+    $lxdebug->leave_sub() and return $print_options;
   } else {
-    $media = qq|<select name=media>
-           <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates) {
-      $media .= qq|
-            <option value=printer $form->{OP}{printer}>|
-        . $locale->text('Printer');
-    }
-    if ($latex_templates) {
-      $media .= qq|
-            <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
-    }
-  }
-
-  $format = qq|<select name=format>|;
-  if ($opendocument_templates && $openofficeorg_writer_bin &&
-      $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
-    $format .= qq|<option value=opendocument_pdf | .
-      $form->{DF}{"opendocument_pdf"} . qq|>| .
-      $locale->text("PDF (OpenDocument/OASIS)") . qq|</option>|;
-  }
-
-  if ($latex_templates) {
-    $format .= qq|<option value=pdf $form->{DF}{pdf}>| .
-      $locale->text('PDF') . qq|</option>|;
-  }
-
-  $format .= qq|<option value=html $form->{DF}{html}>HTML</option>|;
-
-  if ($latex_templates) {
-    $format .= qq|<option value=postscript $form->{DF}{postscript}>| .
-      $locale->text('Postscript') . qq|</option>|;
+    print $print_options; $lxdebug->leave_sub();
   }
-
-  if ($opendocument_templates) {
-    $format .= qq|<option value=opendocument $form->{DF}{opendocument}>| .
-      $locale->text("OpenDocument/OASIS") . qq|</option>|;
-  }
-  $format .= qq|</select>|;
-
-  if (scalar(keys (%{ $form->{languages} })) !=0) {
-    $language_select = qq|<select name=language_id>
-               <option value=""></option>}|;
-    foreach $item (@{ $form->{languages} }) {
-      if ($form->{language_id} eq $item->{id}) {
-        $language_select .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-      } else {
-        $language_select .= qq|<option value="$item->{id}">$item->{description}</option>|;
-      }
-    }
-  }
-
-  if (scalar(keys (%{ $form->{printers} })) !=0) {
-    my $selected = !$form->{"printer_id"} ? "selected" : "";
-    $printer_select = qq|<select name=printer_id $selected>
-                  <option value=""></option>|;
-    foreach $item (@{ $form->{printers} }) {
-      $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : "";
-      $printer_select .= qq|<option value="$item->{id}" $selected>$item->{printer_description}</option>|;
-    }
-  }
-
-
-
-  print qq|
-<table width=100% cellspacing=0 cellpadding=0>
-  <tr>
-    <td>
-      <table>
-       <tr>
-         <td>$type</select></td>|;
-  if (scalar(keys (%{ $form->{languages} })) !=0) {
-  print qq|
-          <td>${language_select}</select></td>|;
-  }
-  print qq|
-         <td>$format</select></td>
-         <td>$media</select></td>|;
-  if (scalar(keys (%{ $form->{printers} })) !=0) {
-  print qq|
-         <td>$printer_select</select></td>
-|;
-  }
-
-  if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') {
-    print qq|
-         <td>| . $locale->text('Copies') . qq|
-         <input name=copies size=2 value=$form->{copies}></td>
-|;
-  }
-
-  $form->{groupitems} = "checked" if $form->{groupitems};
-  $form->{remove_draft} = "checked" if $form->{remove_draft};
-
-  print qq|
-          <td>| . $locale->text('Group Items') . qq|</td>
-          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>|;
-
-  print qq|
-          <td>| . $locale->text('Remove Draft') . qq|</td>
-          <td><input name=remove_draft type=checkbox class=checkbox $form->{remove_draft}></td>| if (!$form->{id} && $form->{draft_id});
-  print qq|
-        </tr>
-      </table>
-    </td>
-    <td align=right>
-      <table>
-        <tr>
-|;
-
-  if ($form->{printed} =~ /$form->{formname}/) {
-    print qq|
-         <th>\|| . $locale->text('Printed') . qq|\|</th>
-|;
-  }
-
-  if ($form->{emailed} =~ /$form->{formname}/) {
-    print qq|
-         <th>\|| . $locale->text('E-mailed') . qq|\|</th>
-|;
-  }
-
-  if ($form->{queued} =~ /$form->{formname}/) {
-    print qq|
-         <th>\|| . $locale->text('Queued') . qq|\|</th>
-|;
-  }
-
-  print qq|
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
 }
 
 sub print {

diff --git a/locale/de/all b/locale/de/all
index dcd498d55a6c88626b1755a700201cf2fa95e025..4da9db1b23b3841db736d0c07832ac5947c9f6ae 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -394,7 +394,6 @@ gestartet',
   'E-mail'                      => 'eMail',
   'E-mail Statement to'         => 'Fälligkeitsabrechnung als eMail an',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'EAN'                         => 'EAN',
   'EAN-Code'                    => 'EAN-Code',
   'ELSE'                        => 'Zusatz',
@@ -815,7 +814,6 @@ gestartet',
   'Print'                       => 'Drucken',
   'Print and Post'              => 'Drucken und Buchen',
   'Print options'               => 'Druckoptionen',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Printer Command'             => 'Druckbefehl',
   'Printer Command missing!'    => 'Druckbefehl fehlt',
@@ -851,7 +849,6 @@ gestartet',
   'Quarter'                     => 'Quartal',
   'Quarterly'                   => 'quartalsweise',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',

diff --git a/locale/de/dn b/locale/de/dn
index 9c5eb6a0adb0378e51b854719caa0a730083edef..4b4d1e8570689e0699ab2b5591fb52db0c1aca66 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -26,7 +26,6 @@ $self->{texts} = {
   'Confirmation'                => 'Auftragsbestätigung',
   'Contact'                     => 'Kontakt',
   'Continue'                    => 'Weiter',
-  'Copies'                      => 'Kopien',
   'Could not create dunning copy!' => 'Could not create dunning copy!',
   'Country'                     => 'Land',
   'Credit Note'                 => 'Gutschrift',
@@ -60,7 +59,6 @@ gestartet',
   'Dunning overview'            => 'Mahnungsübersicht',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'ELSE'                        => 'Zusatz',
   'Edit Dunning Process Config' => 'Mahnwesenkonfiguration bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',
@@ -73,7 +71,6 @@ gestartet',
   'Fristsetzung'                => 'Fristsetzung',
   'Group'                       => 'Warengruppe',
   'Group Invoices'              => 'Rechnungen zusammenfassen',
-  'Group Items'                 => 'Waren gruppieren',
   'History'                     => 'Historie',
   'In-line'                     => 'im Text',
   'Interest Rate'               => 'Zinssatz',
@@ -146,7 +143,6 @@ gestartet',
   'Postscript'                  => 'Postscript',
   'Price'                       => 'Preis',
   'Pricegroup'                  => 'Preisgruppe',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
@@ -156,12 +152,10 @@ gestartet',
   'Purchase Order'              => 'Lieferantenauftrag',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',
-  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/ic b/locale/de/ic
index e9edee620d716ca9b9d02b9cbdf7f2692dded1f5..dc4e862ba7bc406dd6dc2819580c4c467c5c36ea 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -40,7 +40,6 @@ aktualisieren wollen?',
   'Confirmation'                => 'Auftragsbestätigung',
   'Contact'                     => 'Kontakt',
   'Continue'                    => 'Weiter',
-  'Copies'                      => 'Kopien',
   'Could not update prices!'    => 'Preise konnten nicht aktualisiert werden!',
   'Country'                     => 'Land',
   'Credit Note'                 => 'Gutschrift',
@@ -59,7 +58,6 @@ aktualisieren wollen?',
   'Drawing'                     => 'Zeichnung',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'EAN'                         => 'EAN',
   'EAN-Code'                    => 'EAN-Code',
   'ELSE'                        => 'Zusatz',
@@ -78,7 +76,6 @@ aktualisieren wollen?',
   'From'                        => 'Von',
   'Geschäftsvolumen'            => 'Geschäftsvolumen',
   'Group'                       => 'Warengruppe',
-  'Group Items'                 => 'Waren gruppieren',
   'History'                     => 'Historie',
   'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => 'Wenn Sie diese Meldung sehen haben Sie wahrscheinlich ein frisches LX-Office Setup und noch keine Buchungsgruppen eingerichtet. Ein Administrator kann dies im Systemmenü erledigen.',
   'Image'                       => 'Grafik',
@@ -171,7 +168,6 @@ aktualisieren wollen?',
   'Preisklasse'                 => 'Preisgruppe',
   'Price'                       => 'Preis',
   'Pricegroup'                  => 'Preisgruppe',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
@@ -181,14 +177,12 @@ aktualisieren wollen?',
   'Purchase Order'              => 'Lieferantenauftrag',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'Quoted'                      => 'Angeboten',
   'RFQ'                         => 'Anfrage',
   'ROP'                         => 'Mindestlagerbestand',
-  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'Revenue'                     => 'Erlöskonto',

diff --git a/locale/de/io b/locale/de/io
index 9f3b1830e1d6ddde4e59920e00a1096b83096fd4..ff55bf7d246f4d8ff40e512bed94f60561f1a212 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -23,7 +23,6 @@ $self->{texts} = {
   'Confirmation'                => 'Auftragsbestätigung',
   'Contact'                     => 'Kontakt',
   'Continue'                    => 'Weiter',
-  'Copies'                      => 'Kopien',
   'Country'                     => 'Land',
   'Credit Note'                 => 'Gutschrift',
   'Customer Number'             => 'Kundennummer',
@@ -38,7 +37,6 @@ $self->{texts} = {
   'Discount'                    => 'Rabatt',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
@@ -47,7 +45,6 @@ $self->{texts} = {
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Group'                       => 'Warengruppe',
-  'Group Items'                 => 'Waren gruppieren',
   'History'                     => 'Historie',
   'In-line'                     => 'im Text',
   'Invoice'                     => 'Rechnung',
@@ -106,7 +103,6 @@ $self->{texts} = {
   'Postscript'                  => 'Postscript',
   'Price'                       => 'Preis',
   'Pricegroup'                  => 'Preisgruppe',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
@@ -115,12 +111,10 @@ $self->{texts} = {
   'Purchase Order'              => 'Lieferantenauftrag',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',
-  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/ir b/locale/de/ir
index 2e8226d8f8d0aeecaafd6dea14830ebec6e5492a..57adf4b2e0511cc400f34b0fd345504fd687ef18 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -36,7 +36,6 @@ $self->{texts} = {
   'Contact'                     => 'Kontakt',
   'Contact Person'              => 'Ansprechpartner',
   'Continue'                    => 'Weiter',
-  'Copies'                      => 'Kopien',
   'Country'                     => 'Land',
   'Credit Limit'                => 'Kreditlimit',
   'Credit Note'                 => 'Gutschrift',
@@ -61,7 +60,6 @@ $self->{texts} = {
   'Due Date'                    => 'Fälligkeitsdatum',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'ELSE'                        => 'Zusatz',
   'Edit Vendor Invoice'         => 'Einkaufsrechnung bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',
@@ -75,7 +73,6 @@ $self->{texts} = {
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Group'                       => 'Warengruppe',
-  'Group Items'                 => 'Waren gruppieren',
   'History'                     => 'Historie',
   'In-line'                     => 'im Text',
   'Internal Notes'              => 'interne Bemerkungen',
@@ -147,7 +144,6 @@ $self->{texts} = {
   'Postscript'                  => 'Postscript',
   'Price'                       => 'Preis',
   'Pricegroup'                  => 'Preisgruppe',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
@@ -157,7 +153,6 @@ $self->{texts} = {
   'Purchase Order'              => 'Lieferantenauftrag',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
@@ -166,7 +161,6 @@ $self->{texts} = {
   'Rechnungsnummer'             => 'Rechnungsnummer',
   'Record in'                   => 'Buchen auf',
   'Remaining'                   => 'Rest',
-  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/is b/locale/de/is
index e4e058f5723be2f5e6e9fa6a81d91d2e6b40cbad..868c6e88c53401a3d42fd7cd37b4162befba6a16 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -41,7 +41,6 @@ $self->{texts} = {
   'Contact'                     => 'Kontakt',
   'Contact Person'              => 'Ansprechpartner',
   'Continue'                    => 'Weiter',
-  'Copies'                      => 'Kopien',
   'Country'                     => 'Land',
   'Credit Limit'                => 'Kreditlimit',
   'Credit Limit exceeded!!!'    => 'Kreditlimit überschritten!',
@@ -73,7 +72,6 @@ $self->{texts} = {
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'ELSE'                        => 'Zusatz',
   'Edit Credit Note'            => 'Gutschrift bearbeiten',
   'Edit Sales Invoice'          => 'Rechnung bearbeiten',
@@ -91,7 +89,6 @@ $self->{texts} = {
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Group'                       => 'Warengruppe',
-  'Group Items'                 => 'Waren gruppieren',
   'History'                     => 'Historie',
   'In-line'                     => 'im Text',
   'Incoming Payments'           => 'Zahlungseingänge',
@@ -170,7 +167,6 @@ $self->{texts} = {
   'Pricegroup'                  => 'Preisgruppe',
   'Print'                       => 'Drucken',
   'Print and Post'              => 'Drucken und Buchen',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
@@ -180,7 +176,6 @@ $self->{texts} = {
   'Purchase Order'              => 'Lieferantenauftrag',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
@@ -189,7 +184,6 @@ $self->{texts} = {
   'RFQ'                         => 'Anfrage',
   'Record in'                   => 'Buchen auf',
   'Remaining'                   => 'Rest',
-  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/oe b/locale/de/oe
index cfcdab3548ccb886be40f5f6164486f8999c4672..cab452e084b70ac4d8f61c5bf24b1c6f83434908 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -43,7 +43,6 @@ $self->{texts} = {
   'Contact'                     => 'Kontakt',
   'Contact Person'              => 'Ansprechpartner',
   'Continue'                    => 'Weiter',
-  'Copies'                      => 'Kopien',
   'Country'                     => 'Land',
   'Credit Limit'                => 'Kreditlimit',
   'Credit Limit exceeded!!!'    => 'Kreditlimit überschritten!',
@@ -72,7 +71,6 @@ $self->{texts} = {
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
-  'E-mailed'                    => 'eMail gesendet.',
   'ELSE'                        => 'Zusatz',
   'Edit Purchase Order'         => 'Lieferantenaufrag bearbeiten',
   'Edit Quotation'              => 'Angebot bearbeiten',
@@ -93,7 +91,6 @@ $self->{texts} = {
   'February'                    => 'Februar',
   'From'                        => 'Von',
   'Group'                       => 'Warengruppe',
-  'Group Items'                 => 'Waren gruppieren',
   'History'                     => 'Historie',
   'ID'                          => 'Buchungsnummer',
   'In-line'                     => 'im Text',
@@ -167,7 +164,6 @@ $self->{texts} = {
   'Price'                       => 'Preis',
   'Pricegroup'                  => 'Preisgruppe',
   'Print'                       => 'Drucken',
-  'Printed'                     => 'gedruckt.',
   'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
@@ -178,7 +174,6 @@ $self->{texts} = {
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
-  'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
@@ -189,7 +184,6 @@ $self->{texts} = {
   'RFQ'                         => 'Anfrage',
   'RFQ Number'                  => 'Anfragenummer',
   'Remaining'                   => 'Rest',
-  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Request for Quotation'       => 'Anfrage',
   'Request for Quotations'      => 'Anfragen',

diff --git a/templates/webpages/generic/print_options_de.html b/templates/webpages/generic/print_options_de.html
new file mode 100644 (file)
index 0000000..3524509
--- /dev/null
+++ b/templates/webpages/generic/print_options_de.html
@@ -0,0 +1,29 @@
+<table width=100% cellspacing=0 cellpadding=0>
+  <tr>
+    <td>
+      <table>
+  <tr>
+    <td>
+    <TMPL_LOOP SELECTS><TMPL_IF show>
+      <select name="<TMPL_VAR sname>"><TMPL_LOOP DATA>
+        <option value="<TMPL_VAR value>" <TMPL_VAR selected>><TMPL_VAR oname></option></TMPL_LOOP></select>
+    </TMPL_IF></TMPL_LOOP>
+    </td>
+    <TMPL_IF display_copies>
+      <td>Kopien <input name=copies size=2 value=<TMPL_VAR copies>></td>
+    </TMPL_IF>
+      <td>Waren gruppieren</td>
+      <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>
+    <TMPL_IF display_remove_draft>
+      <td>Entwurf l&ouml;schen</td>
+      <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>
+    </TMPL_IF>
+    </tr>
+      </table>
+    </td>
+    <td align=right>
+      <table><tr><th><TMPL_VAR status_msg></th></tr></table>
+    </td>
+  </tr>
+</table>
+

diff --git a/templates/webpages/generic/print_options_master.html b/templates/webpages/generic/print_options_master.html
new file mode 100644 (file)
index 0000000..a9fe1ee
--- /dev/null
+++ b/templates/webpages/generic/print_options_master.html
@@ -0,0 +1,29 @@
+<table width=100% cellspacing=0 cellpadding=0>
+  <tr>
+    <td>
+      <table>
+  <tr>
+    <td>
+    <TMPL_LOOP SELECTS><TMPL_IF show>
+      <select name="<TMPL_VAR sname>"><TMPL_LOOP DATA>
+        <option value="<TMPL_VAR value>" <TMPL_VAR selected>><TMPL_VAR oname></option></TMPL_LOOP></select>
+    </TMPL_IF></TMPL_LOOP>
+    </td>
+    <TMPL_IF display_copies>
+      <td><translate>Copies</translate> <input name=copies size=2 value=<TMPL_VAR copies>></td>
+    </TMPL_IF>
+      <td><translate>Group Items</translate></td>
+      <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>
+    <TMPL_IF display_remove_draft>
+      <td><translate>Remove Draft</translate></td>
+      <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>
+    </TMPL_IF>
+    </tr>
+      </table>
+    </td>
+    <td align=right>
+      <table><tr><th><TMPL_VAR status_msg></th></tr></table>
+    </td>
+  </tr>
+</table>
+