In den Einkaufs- und Verkaufsmasken eine Checkbox "Details anzeigen" eingefügt, mit...

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index bb99e2c579f8e0aecc40fa321f7c9bbcd2011596..25be6fe9ae17fa4d997c5d79ca53c10774b54b13 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -90,6 +90,7 @@ use Data::Dumper;
 sub display_row {
   $lxdebug->enter_sub();
   my $numrows = shift;
 sub display_row {
   $lxdebug->enter_sub();
   my $numrows = shift;

+

   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);
   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);


@@ -197,9 +198,18 @@ sub display_row {
     . qq|</th>|;
 ############## ENDE Neueintrag ##################
 
     . qq|</th>|;
 ############## ENDE Neueintrag ##################
 

+  $form->{"show_details"} =
+    !defined($form->{"show_details"}) ? 1 :
+    $form->{"show_details"} ? 1 : 0;
+  my $show_details_new = 1 - $form->{"show_details"};
+  my $show_details_checked = $form->{"show_details"} ? "checked" : "";
+

   print qq|
   <tr>
     <td>
   print qq|
   <tr>
     <td>

+      <input type="hidden" name="show_details" value="$form->{show_details}">
+      <input type="checkbox" onclick="show_form_details($show_details_new);" $show_details_checked>
+      | . $locale->text("Show details") . qq|<br>

       <table width=100%>
        <tr class=listheading>|;
 
       <table width=100%>
        <tr class=listheading>|;
 


@@ -438,9 +448,13 @@ sub display_row {
     # Eintrag fuer Version 2.2.0 geaendert #
     # neue Optik im Rechnungsformular      #
 ########################################
     # Eintrag fuer Version 2.2.0 geaendert #
     # neue Optik im Rechnungsformular      #
 ########################################

+
+    my $row_style_attr =
+      'style="display:none;"' if (!$form->{"show_details"});
+

     # print second row
     print qq|
     # print second row
     print qq|

-        <tr  class=listrow$j>
+        <tr  class=listrow$j $row_style_attr>

          <td colspan=$colspan>
 |;
     if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
          <td colspan=$colspan>
 |;
     if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 5901ab07403e732bd426ba3e3b8f7c40fc9fb1fd..d918b50d813277e6ee82cfd5d67b9523a08ef427 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -582,6 +582,8 @@ sub form_header {
     $onload = qq|alert('$credittext')|;
   }
 
     $onload = qq|alert('$credittext')|;
   }
 

+  $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js">|;
+

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|


@@ -1086,7 +1088,7 @@ if ($form->{type} eq "credit_note") {
 
   if ($form->{id}) {
     print qq|
 
   if ($form->{id}) {
     print qq|

-    <input class=submit type=submit accesskey="u" name=action value="|
+    <input class=submit type=submit accesskey="u" name=action id=update_button value="|

       . $locale->text('Update') . qq|">
     <input class=submit type=submit name=action value="|
       . $locale->text('Ship to') . qq|">
       . $locale->text('Update') . qq|">
     <input class=submit type=submit name=action value="|
       . $locale->text('Ship to') . qq|">


@@ -1125,7 +1127,7 @@ if ($form->{type} eq "credit_note") {
 
   } else {
     if ($invdate > $closedto) {
 
   } else {
     if ($invdate > $closedto) {

-      print qq|<input class=submit type=submit name=action value="|
+      print qq|<input class=submit type=submit name=action id=update_button value="|

         . $locale->text('Update') . qq|">
       <input class=submit type=submit name=action value="|
         . $locale->text('Ship to') . qq|">
         . $locale->text('Update') . qq|">
       <input class=submit type=submit name=action value="|
         . $locale->text('Ship to') . qq|">

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 6941424866cccd7dcb0f0fbcc21a70e9bf6a3e83..2e1e763449fc6439a8c0cc1209762fb5753ae99c 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -700,6 +700,8 @@ sub form_header {
     $onload = qq|alert('$credittext')|;
   }
 
     $onload = qq|alert('$credittext')|;
   }
 

+  $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js">|;
+

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|


@@ -1030,7 +1032,7 @@ sub form_footer {
 </table>
 
 | . $locale->text("Edit the $form->{type}") . qq|<br>
 </table>
 
 | . $locale->text("Edit the $form->{type}") . qq|<br>

-<input class=submit type=submit name=action value="|
+<input class=submit type=submit name=action id=update_button value="|

     . $locale->text('Update') . qq|">
 <input class=submit type=submit name=action value="|
     . $locale->text('Ship to') . qq|">
     . $locale->text('Update') . qq|">
 <input class=submit type=submit name=action value="|
     . $locale->text('Ship to') . qq|">

diff --git a/js/show_form_details.js b/js/show_form_details.js
new file mode 100644 (file)
index 0000000..df2ff61
--- /dev/null
+++ b/js/show_form_details.js
@@ -0,0 +1,4 @@
+function show_form_details(new_value) {
+  document.forms[0].show_details.value = new_value;
+  document.getElementById("update_button").click();
+}

diff --git a/locale/de/all b/locale/de/all
index 5a2e42f3f3e4301ff9b6ed0d5731e4111ad33d02..f57487f6acecdc6a825dc61936c9bb0b56dffb3f 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -353,7 +353,7 @@ gestartet',
   'Dunnings'                    => 'Mahnungen',
   'E-mail'                      => 'eMail',
   'E-mail Statement to'         => 'Fälligkeitsabrechnung als eMail an',
   'Dunnings'                    => 'Mahnungen',
   'E-mail'                      => 'eMail',
   'E-mail Statement to'         => 'Fälligkeitsabrechnung als eMail an',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => '',

   'E-mailed'                    => 'eMail gesendet.',
   'ELSTER Export (Taxbird)'     => 'ELSTER-Export nach Taxbird',
   'ELSTER Export (Winston)'     => 'ELSTER Export nach Winston',
   'E-mailed'                    => 'eMail gesendet.',
   'ELSTER Export (Taxbird)'     => 'ELSTER-Export nach Taxbird',
   'ELSTER Export (Winston)'     => 'ELSTER Export nach Winston',


@@ -887,6 +887,7 @@ gestartet',
   'Shopartikel'                 => 'Shopartikel',
   'Short'                       => 'kurz',
   'Show'                        => 'Zeigen',
   'Shopartikel'                 => 'Shopartikel',
   'Short'                       => 'kurz',
   'Show'                        => 'Zeigen',

+  'Show details'                => 'Details anzeigen',

   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Signature'                   => 'Unterschrift',
   'Skonto'                      => 'Skonto',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Signature'                   => 'Unterschrift',
   'Skonto'                      => 'Skonto',

diff --git a/locale/de/cn b/locale/de/cn
index ba075a2025c1df3f45118aae2c07082b4c0d2164..f5ecf96a0df38c63f81af1dd4858bc08ed72beab 100644 (file)
--- a/locale/de/cn
+++ b/locale/de/cn
@@ -57,7 +57,7 @@ $self->{texts} = {
   'Discount'                    => 'Rabatt',
   'Due Date'                    => 'Fälligkeitsdatum',
   'E-mail'                      => 'eMail',
   'Discount'                    => 'Rabatt',
   'Due Date'                    => 'Fälligkeitsdatum',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Edit Credit Note'            => 'Gutschrift bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',
   'E-mailed'                    => 'eMail gesendet.',
   'Edit Credit Note'            => 'Gutschrift bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',


@@ -173,6 +173,7 @@ $self->{texts} = {
   'Ship via'                    => 'Transportmittel',
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',
   'Ship via'                    => 'Transportmittel',
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',

+  'Show details'                => 'Details anzeigen',

   'Source'                      => 'Beleg',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Source'                      => 'Beleg',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',

diff --git a/locale/de/dn b/locale/de/dn
index b0fc7a1e34f41336d89a9bbc29156e6637d11da8..f6d33fcac737f847a903070ffa9cf6ef47896e21 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -52,7 +52,7 @@ $self->{texts} = {
 gestartet',
   'Dunning overview'            => 'Mahnungsübersicht',
   'E-mail'                      => 'eMail',
 gestartet',
   'Dunning overview'            => 'Mahnungsübersicht',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Edit Dunning Process Config' => 'Mahnwesenkonfiguration bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',
   'E-mailed'                    => 'eMail gesendet.',
   'Edit Dunning Process Config' => 'Mahnwesenkonfiguration bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',


@@ -164,6 +164,7 @@ gestartet',
   'Ship'                        => 'Lagerausgang',
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',
   'Ship'                        => 'Lagerausgang',
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',

+  'Show details'                => 'Details anzeigen',

   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Start Dunning Process'       => 'Mahnprozess starten',
   'Storno Invoice'              => 'Stornorechnung',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Start Dunning Process'       => 'Mahnprozess starten',
   'Storno Invoice'              => 'Stornorechnung',

diff --git a/locale/de/ic b/locale/de/ic
index 87ac8fa0cff0d18aaefd87b5dfe645f72cefbfb7..acdd3abcc677b038ea0ddd64622a2ea542c31356 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -54,7 +54,7 @@ aktualisieren wollen?',
   'Discount'                    => 'Rabatt',
   'Drawing'                     => 'Zeichnung',
   'E-mail'                      => 'eMail',
   'Discount'                    => 'Rabatt',
   'Drawing'                     => 'Zeichnung',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Edit '                       => 'Bearbeiten',
   'Edit Assembly'               => 'Erzeugnis bearbeiten',
   'E-mailed'                    => 'eMail gesendet.',
   'Edit '                       => 'Bearbeiten',
   'Edit Assembly'               => 'Erzeugnis bearbeiten',


@@ -198,6 +198,7 @@ aktualisieren wollen?',
   'Shipping Address'            => 'Lieferadresse',
   'Shopartikel'                 => 'Shopartikel',
   'Short'                       => 'kurz',
   'Shipping Address'            => 'Lieferadresse',
   'Shopartikel'                 => 'Shopartikel',
   'Short'                       => 'kurz',

+  'Show details'                => 'Details anzeigen',

   'Sold'                        => 'Verkauft',
   'Stock'                       => 'einlagern',
   'Stock Assembly'              => 'Erzeugnis einlagern',
   'Sold'                        => 'Verkauft',
   'Stock'                       => 'einlagern',
   'Stock Assembly'              => 'Erzeugnis einlagern',

diff --git a/locale/de/io b/locale/de/io
index dfd973f4c2a41b23e77ff29289221e70f05b043b..45a1bd2e1936410949f231ac519dfb9b267bd5dc 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -31,7 +31,7 @@ $self->{texts} = {
   'Department'                  => 'Abteilung',
   'Discount'                    => 'Rabatt',
   'E-mail'                      => 'eMail',
   'Department'                  => 'Abteilung',
   'Discount'                    => 'Rabatt',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Enter longdescription'       => 'Langtext eingeben',
   'Extended'                    => 'Gesamt',
   'E-mailed'                    => 'eMail gesendet.',
   'Enter longdescription'       => 'Langtext eingeben',
   'Extended'                    => 'Gesamt',


@@ -119,6 +119,7 @@ $self->{texts} = {
   'Ship'                        => 'Lagerausgang',
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',
   'Ship'                        => 'Lagerausgang',
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',

+  'Show details'                => 'Details anzeigen',

   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Street'                      => 'Straße',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Street'                      => 'Straße',

diff --git a/locale/de/ir b/locale/de/ir
index 97440c89f1b3d3c0203402a86b356a86e8d25d69..2d6e2c4ed8ba7c3391ce65f28f49ec9b069db2ec 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -52,7 +52,7 @@ $self->{texts} = {
   'Discount'                    => 'Rabatt',
   'Due Date'                    => 'Fälligkeitsdatum',
   'E-mail'                      => 'eMail',
   'Discount'                    => 'Rabatt',
   'Due Date'                    => 'Fälligkeitsdatum',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Edit Vendor Invoice'         => 'Einkaufsrechnung bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',
   'E-mailed'                    => 'eMail gesendet.',
   'Edit Vendor Invoice'         => 'Einkaufsrechnung bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',


@@ -161,6 +161,7 @@ $self->{texts} = {
   'Ship'                        => 'Lagerausgang',
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',
   'Ship'                        => 'Lagerausgang',
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',

+  'Show details'                => 'Details anzeigen',

   'Source'                      => 'Beleg',
   'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',
   'Source'                      => 'Beleg',
   'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',

diff --git a/locale/de/is b/locale/de/is
index 3aa84c204a1806ce2c559aedfff26d5947b9c6f3..995f000e1230ad46c503077a22d44638da21b9d5 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -64,7 +64,7 @@ $self->{texts} = {
   'Due Date'                    => 'Fälligkeitsdatum',
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',
   'Due Date'                    => 'Fälligkeitsdatum',
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Edit Credit Note'            => 'Gutschrift bearbeiten',
   'Edit Sales Invoice'          => 'Rechnung bearbeiten',
   'E-mailed'                    => 'eMail gesendet.',
   'Edit Credit Note'            => 'Gutschrift bearbeiten',
   'Edit Sales Invoice'          => 'Rechnung bearbeiten',


@@ -187,6 +187,7 @@ $self->{texts} = {
   'Ship via'                    => 'Transportmittel',
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',
   'Ship via'                    => 'Transportmittel',
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',

+  'Show details'                => 'Details anzeigen',

   'Source'                      => 'Beleg',
   'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',
   'Source'                      => 'Beleg',
   'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',

diff --git a/locale/de/oe b/locale/de/oe
index 13117b43fd69bc7d0b75b5ad7fdd3b8d603be0f6..b60e43c3883219c912e629a9924e63a0c6635b0b 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -70,7 +70,7 @@ $self->{texts} = {
   'Done'                        => 'Fertig',
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',
   'Done'                        => 'Fertig',
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',

-  'E-mail address missing!'     => 'eMailadresse fehlt!',
+  'E-mail address missing!'     => 'E-mail address missing!',

   'E-mailed'                    => 'eMail gesendet.',
   'Edit Purchase Order'         => 'Lieferantenaufrag bearbeiten',
   'Edit Quotation'              => 'Angebot bearbeiten',
   'E-mailed'                    => 'eMail gesendet.',
   'Edit Purchase Order'         => 'Lieferantenaufrag bearbeiten',
   'Edit Quotation'              => 'Angebot bearbeiten',


@@ -212,6 +212,7 @@ $self->{texts} = {
   'Shipping Date'               => 'Lieferdatum',
   'Shipping Date missing!'      => 'Lieferdatum fehlt.',
   'Shipping Point'              => 'Versandort',
   'Shipping Date'               => 'Lieferdatum',
   'Shipping Date missing!'      => 'Lieferdatum fehlt.',
   'Shipping Point'              => 'Versandort',

+  'Show details'                => 'Details anzeigen',

   'Steuersatz'                  => 'Steuersatz',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Steuersatz'                  => 'Steuersatz',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',