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;p=kivitendo-erp.git

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

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

e6de5d289ce87cf3a44511e1fc6313ea86d0f5e7
diff --cc bin/mozilla/ir.pl
index a0693b716,46e32fabc..bad6e4fff
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@@ -356,7 -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 gldate
 -    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}];