X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=1fe78205cfe8aa2cf2bc633b488a2348f8db793f;hb=566608b739ced48d1ca22dfa85a4ab4590e67c75;hp=a86a0afb78678989d21ee4e3af819701150e40ae;hpb=af85349024c0d1fc6db899cd84708c7fb6dfb7f4;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index a86a0afb7..1fe78205c 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -364,7 +364,9 @@ sub account_header { | . $locale->text('Revenue') . qq|\n
| - . $locale->text('Expense') . qq| + . $locale->text('Expense') . qq|
+ | + . $locale->text('Costs') . qq| | @@ -1778,8 +1780,10 @@ sub add_buchungsgruppe { "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AM->get_buchungsgruppe(\%myconfig, \%$form); - if ($eur) { - $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; + $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; + for (my $i = 0; 4 > $i; $i++) { + map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; } + qw(income expense)); } &buchungsgruppe_header; @@ -2451,7 +2455,7 @@ sub list_payment { - + {path}> {login}> @@ -2907,6 +2911,37 @@ sub config { $myconfig{$item} =~ s/\\n/\r\n/g; } + @formats = (); + if ($opendocument_templates && $openofficeorg_writer_bin && + $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) { + push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"), + "value" => "opendocument_pdf" }); + } + if ($latex_templates) { + push(@formats, { "name" => $locale->text("PDF"), "value" => "pdf" }); + } + push(@formats, { "name" => "HTML", "value" => "html" }); + if ($latex_templates) { + push(@formats, { "name" => $locale->text("Postscript"), + "value" => "postscript" }); + } + if ($opendocument_templates) { + push(@formats, { "name" => $locale->text("OpenDocument/OASIS"), + "value" => "opendocument" }); + } + + if (!$myconfig{"template_format"}) { + $myconfig{"template_format"} = "pdf"; + } + $template_format = ""; + foreach $item (@formats) { + $template_format .= + ""; + } + %countrycodes = User->country_codes; $countrycodes = ''; foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} } @@ -2958,8 +2993,13 @@ sub config { $form->header; - if ($myconfig{menustyle} eq "old") { $oldS = "checked"; } - else { $newS = "checked"; } + if ($myconfig{menustyle} eq "old") { + $menustyle_old = "checked"; + } elsif ($myconfig{menustyle} eq "neu") { + $menustyle_neu = "checked"; + } elsif ($myconfig{menustyle} eq "v3") { + $menustyle_v3 = "checked"; + } print qq| @@ -3034,10 +3074,28 @@ sub config { | . $locale->text('Setup Menu') . qq| - New - Old + | . + $locale->text("Top (CSS)") . qq| + | . + $locale->text("Top (Javascript)") . qq| + | . + $locale->text("Old (on the side)") . qq| + + | . $locale->text("Print options") . qq| + + + | . $locale->text('Default template format') . qq| + + + + | . $locale->text('Number of copies') . qq| + + + + @@ -3573,7 +3631,8 @@ sub add_unit { $form->isblank("new_name", $locale->text("The name is missing.")); $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}); - $form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($units->{$form->{"new_name"}}); + $all_units = AM->retrieve_units(\%myconfig, $form); + $form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($all_units->{$form->{"new_name"}}); my ($base_unit, $factor); if ($form->{"new_base_unit"}) {