From: Rolf Fluehmann Date: Mon, 4 Jan 2016 15:52:51 +0000 (+0100) Subject: Neues numberformat 1'000 X-Git-Tag: release-3.4.1~491 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e358c9af31afc5d60840f615f3c81d7b2bf7ad94;p=kivitendo-erp.git Neues numberformat 1'000 --- diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 56c48f3a9..ad17f3123 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -750,7 +750,7 @@ sub language_header { $::form->header; print $::form->parse_html_template('am/language_header', { - numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ], + numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ], dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ], }); @@ -816,7 +816,7 @@ sub config { _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)); _build_cfg_options('timeformat', qw(hh:mm hh:mm:ss)); - _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00')); + _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00")); my @formats = (); if ($::lx_office_conf{print_templates}->{opendocument} diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html index c40c563d4..12162f6a7 100644 --- a/templates/webpages/csv_import/form.html +++ b/templates/webpages/csv_import/form.html @@ -168,7 +168,7 @@ [%- LxERP.t8('Number Format') %]: - [% L.select_tag('settings.numberformat', ['1.000,00', '1000,00', '1,000.00', '1000.00'], default = SELF.profile.get('numberformat'), style = 'width: 300px') %] + [% L.select_tag('settings.numberformat', ['1.000,00', '1000,00', '1,000.00', '1000.00', "1'000.00"], default = SELF.profile.get('numberformat'), style = 'width: 300px') %]