X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/44e1ec6fcc2422cb75d36578245e16a33acef2d8..2ef21b8f2aaae439a9408977458bdeb9b0fd9e25:/bin/mozilla/am.pl
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c28656795..d11f16113 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1688,11 +1688,11 @@ sub buchungsgruppe_header {
if ($form->{id}) {
$form->{selectIC} =~ s/selected//g;
- $form->{selectIC} =~ s/ value=$form->{inventory_accno_id}/ value=$form->{inventory_accno_id} selected/;
+ $form->{selectIC} =~ s/ value=\Q$form->{inventory_accno_id}\E/ value=$form->{inventory_accno_id} selected/;
$form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_0}/ value=$form->{income_accno_id_0} selected/;
+ $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_0}\E/ value=$form->{income_accno_id_0} selected/;
$form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_0}/ value=$form->{expense_accno_id_0} selected/;
+ $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_0}\E/ value=$form->{expense_accno_id_0} selected/;
}
if (!$eur) {
@@ -1719,9 +1719,9 @@ sub buchungsgruppe_header {
|;
if ($form->{id}) {
$form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_1}/ value=$form->{income_accno_id_1} selected/;
+ $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/ value=$form->{income_accno_id_1} selected/;
$form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/ value=$form->{expense_accno_id_1} selected/;
+ $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/ value=$form->{expense_accno_id_1} selected/;
}
$linkaccounts .= qq|
| | . $locale->text('Revenues EU with UStId') . qq| |
@@ -1734,9 +1734,9 @@ sub buchungsgruppe_header {
if ($form->{id}) {
$form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_2}/ value=$form->{income_accno_id_2} selected/;
+ $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_2}\E/ value=$form->{income_accno_id_2} selected/;
$form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_2}/ value=$form->{expense_accno_id_2} selected/;
+ $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/ value=$form->{expense_accno_id_2} selected/;
}
$linkaccounts .= qq|
@@ -1750,9 +1750,9 @@ sub buchungsgruppe_header {
if ($form->{id}) {
$form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_3}/ value=$form->{income_accno_id_3} selected/;
+ $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_3}\E/ value=$form->{income_accno_id_3} selected/;
$form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_3}/ value=$form->{expense_accno_id_3} selected/;
+ $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/ value=$form->{expense_accno_id_3} selected/;
}
$linkaccounts .= qq|
@@ -2352,33 +2352,30 @@ sub swap_payment_terms {
$lxdebug->leave_sub();
}
+sub _build_cfg_options {
+ my $idx = shift;
+ my $array = uc($idx) . 'S';
+
+ $form->{$array} = [];
+ foreach my $item (@_) {
+ push @{ $form->{$array} }, {
+ 'name' => $item,
+ 'value' => $item,
+ 'selected' => $item eq $myconfig{$idx},
+ };
+ }
+}
+
sub config {
$lxdebug->enter_sub();
# get defaults for account numbers and last numbers
AM->defaultaccounts(\%myconfig, \%$form);
- foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
- $dateformat .=
- ($item eq $myconfig{dateformat})
- ? "";
+ push @{ $form->{TEMPLATE_FORMATS} }, {
+ 'name' => $item->{name},
+ 'value' => $item->{value},
+ 'selected' => $item->{value} eq $myconfig{template_format},
+ };
}
if (!$myconfig{"default_media"}) {
$myconfig{"default_media"} = "screen";
}
+
my %selected = ($myconfig{"default_media"} => "selected");
- my $default_media = qq|
-
-
-
-|;
+ $form->{MEDIA} = [
+ { 'name' => $locale->text('Screen'), 'value' => 'screen', 'selected' => $selected{screen}, },
+ { 'name' => $locale->text('Printer'), 'value' => 'printer', 'selected' => $selected{printer}, },
+ { 'name' => $locale->text('Queue'), 'value' => 'queue', 'selected' => $selected{queue}, },
+ ];
- %selected = ();
- $selected{$myconfig{"default_printer_id"}} = "selected"
- if ($myconfig{"default_printer_id"});
- my $default_printer = qq||;
AM->printer(\%myconfig, $form);
+
+ $form->{PRINTERS} = [];
foreach my $printer (@{$form->{"ALL"}}) {
- $default_printer .= qq||;
+ push @{ $form->{PRINTERS} }, {
+ 'name' => $printer->{printer_description},
+ 'value' => $printer->{id},
+ 'selected' => $printer->{id} == $myconfig{default_printer_id},
+ };
}
%countrycodes = User->country_codes;
- $countrycodes = '';
- foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
- keys %countrycodes
- ) {
- $countrycodes .=
- ($myconfig{countrycode} eq $key)
- ? "