From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 6 Jan 2014 13:39:33 +0000 (+0100)
Subject: Merge branch 'verknuepfte-belege-debitorenbuchungen-doppelt-2383'
X-Git-Tag: release-3.1.0beta1~22^2~51^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/e680ea8e9206479b23c8c020a5be3f4c8795cfc5?hp=575c4b7f700f3068e105d7d248f48b501cbb006c

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

diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm
index ca6190c90..0a41f0b7d 100644
--- 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 2ef84b96c..038ed2896 100755
--- 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 fb9660a01..f5a7daf0a 100644
--- 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 %]">