Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --combined templates/webpages/is/form_footer.html
index d3a49a372c859d04fdb4bb206fad0c4cca9cdfc8,45664520d663be31c1e3b1124f2323f4271e59e8..6b3426b60b26ff78d7f7ed73d18647515e324534
--- 1/templates/webpages/is/form_footer.html
--- 2/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@@ -164,7 -164,7 +164,7 @@@
  [% IF id && !is_type_credit_note %]
      <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
  [% END %]
 -[% IF show_delete %]
 +[% IF show_delete && !storno %]
      <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
  [% END %]
@@@ -191,4 -191,10 +191,10 @@@
        [% END %]
    [% END %]
  
+ <input type="hidden" name="rowcount" value="[% rowcount %]">
+ <input type="hidden" name="callback" value="[% callback | html %]">
+ <input type="hidden" name="draft_id" value="[% draft_id %]">
+ <input type="hidden" name="draft_description" value="[% draft_description %]">
+ <input type="hidden" name="customer_discount" value="[% customer_discount %]">
+ <input type="hidden" name="gldate" value="[% gldate %]">
  </form>