From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 15:53:21 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~53
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e6de5d289ce87cf3a44511e1fc6313ea86d0f5e7;hp=3ec63dab8cfe1cd0981342870de4f8da4163b88e;p=kivitendo-erp.git

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

Conflicts:
	bin/mozilla/ir.pl
---

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 46e32fabc..bad6e4fff 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -327,7 +327,7 @@ sub form_header {
     max_dunning_level dunning_amount
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
-    convert_from_do_ids convert_from_oe_ids show_details
+    convert_from_do_ids convert_from_oe_ids show_details gldate
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 
diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index e979a807e..ad241a17a 100644
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -128,6 +128,7 @@
 
 [% IF show_delete %]
     <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]
 
     <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">