From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 18:18:02 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~40^2~3
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/24cc5f2baffdb1fd52acb76e8d73be3e694b1737?hp=-c

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

24cc5f2baffdb1fd52acb76e8d73be3e694b1737
diff --combined templates/webpages/is/form_footer.html
index d3a49a372,45664520d..6b3426b60
--- a/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>