Merge branch 'verknuepfte-belege-debitorenbuchungen-doppelt-2383'

diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm
index ca6190c902167efec7db2d570c0f5a9c6d01ed7a..0a41f0b7df470f565a851a95dbcb1f9509b87b4f 100644 (file)
--- a/SL/Controller/Inventory.pm
+++ b/SL/Controller/Inventory.pm
@@ -45,8 +45,9 @@ sub action_stock {
   my ($self) = @_;
 
   my $qty = $::form->parse_amount(\%::myconfig, $::form->{qty});
-
-  if ($qty < 0) {
+  if (!$qty) {
+    flash_later('error', t8('Cannot stock without amount'));
+  } elsif ($qty < 0) {
     flash_later('error', t8('Cannot stock negative amounts'));
   } else {
     # do stock

diff --git a/locale/de/all b/locale/de/all
index 2ef84b96c52e716a70359927a2364b30dd5c3d1d..038ed28963f720c72d7645719ae99f249e94709c 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -407,6 +407,7 @@ $self->{texts} = {
   'Cannot save preferences!'    => 'Einstellungen können nicht gespeichert werden!',
   'Cannot save quotation!'      => 'Angebot kann nicht gespeichert werden!',
   'Cannot stock negative amounts' => 'Negative Mengen können nicht eingelagert werden!',
+  'Cannot stock without amount' => 'Kann nicht ohne Menge einlagern!',
   'Cannot storno invoice for a closed period!' => 'Das Rechnungsdatum der zu stornierenden Rechnung fällt in einen abgeschlossenen Zeitraum!',
   'Cannot storno storno invoice!' => 'Kann eine Stornorechnung nicht stornieren',
   'Cannot transfer. <br> Reason:<br>#1' => 'Kann nicht auslagern. <br>Grund:<br>#1',

diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index fb9660a019b7a800ad6b5b7d7175a772d0b08572..f5a7daf0a1b1d6c577cea492f78b967a5336a142 100644 (file)
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -20,6 +20,7 @@
 <input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
 <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
+<input type="hidden" name="show_details" value="[% show_details | html %]">
 
 <p><div class="listtop" width="100%">[% title %]</div></p>
 
@@ -224,5 +225,4 @@
      }
    //-->
   </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
+  <input type="hidden" name="webdav" value="[% webdav | html %]">