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

Conflicts:
	bin/mozilla/ir.pl

diff --cc bin/mozilla/ir.pl
index a0693b716f85e490f28a0fe14c4b7398aca0a81d,46e32fabc55a63afe7a3a8c38ad76333c9c2339b..bad6e4fff249eec92f7b7c6615e77960142f3fc1
--- 1/bin/mozilla/ir.pl
--- 2/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}];