X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=1fe78205cfe8aa2cf2bc633b488a2348f8db793f;hb=566608b739ced48d1ca22dfa85a4ab4590e67c75;hp=1ebd59816fdda79dd8df2138eb5b87a67a661bfe;hpb=d8593f08b19e17fabb5dd1e0fe93c3a5d78e37ea;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 1ebd59816..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|
|
|
@@ -1532,7 +1534,7 @@ sub list_language {
$form->{title} = $locale->text('Languages');
- @column_index = qw(description template_code article_code);
+ @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
$column_header{description} =
qq| | |
@@ -1546,6 +1548,18 @@ sub list_language {
qq| | |
. $locale->text('Article Code')
. qq| | |;
+ $column_header{output_numberformat} =
+ qq||
+ . $locale->text('Number Format')
+ . qq| | |;
+ $column_header{output_dateformat} =
+ qq||
+ . $locale->text('Date Format')
+ . qq| | |;
+ $column_header{output_longdates} =
+ qq||
+ . $locale->text('Long Dates')
+ . qq| | |;
$form->header;
@@ -1584,6 +1598,20 @@ sub list_language {
$column_data{template_code} = qq|$ref->{template_code} | |;
$column_data{article_code} =
qq|$ref->{article_code} | |;
+ $column_data{output_numberformat} =
+ "" .
+ ($ref->{output_numberformat} ? $ref->{output_numberformat} :
+ $locale->text("use program settings")) .
+ " | ";
+ $column_data{output_dateformat} =
+ "" .
+ ($ref->{output_dateformat} ? $ref->{output_dateformat} :
+ $locale->text("use program settings")) .
+ " | ";
+ $column_data{output_longdates} =
+ "" .
+ ($ref->{output_longdates} ? $locale->text("Yes") : $locale->text("No")) .
+ " | ";
map { print "$column_data{$_}\n" } @column_index;
@@ -1646,6 +1674,28 @@ sub language_header {
$form->header;
+ my $numberformat =
+ qq||;
+ foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) {
+ $numberformat .=
+ ($item eq $form->{output_numberformat})
+ ? "";
+ }
+
+ my $dateformat =
+ qq||;
+ foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
+ $dateformat .=
+ ($item eq $form->{output_dateformat})
+ ? "";
+ }
+
print qq|
@@ -1661,15 +1711,33 @@ sub language_header {
|
| | . $locale->text('Language') . qq| |
- |
+ |
| | . $locale->text('Template Code') . qq| |
- {template_code}> |
+ |
| | . $locale->text('Article Code') . qq| |
- {article_code}> |
+ |
+
+
+ | | . $locale->text('Number Format') . qq| |
+ |
+
+
+ | | . $locale->text('Date Format') . qq| |
+ |
+
+
+ | | . $locale->text('Long Dates') . qq| |
+ {output_longdates} ? " checked" : "") .
+ qq|>| . $locale->text("Yes") .
+ qq|{output_longdates} ? "" : " checked") .
+ qq|>| . $locale->text("No") .
+ qq| |
|
@@ -1712,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;
@@ -2385,7 +2455,7 @@ sub list_payment {
-
+
{path}>
{login}>
@@ -2841,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} }
@@ -2892,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|
@@ -2968,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| |
+ |
+
+
+
| |
@@ -3465,20 +3589,39 @@ sub edit_units {
AM->units_in_use(\%myconfig, $form, $units);
map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
+ @languages = AM->language(\%myconfig, $form, 1);
+
@unit_list = ();
foreach $name (sort({ lc($a) cmp lc($b) } grep({ !$units->{$_}->{"base_unit"} } keys(%{$units})))) {
map({ push(@unit_list, $units->{$_}); }
sort({ ($units->{$a}->{"resolved_factor"} * 1) <=> ($units->{$b}->{"resolved_factor"} * 1) }
grep({ $units->{$_}->{"resolved_base_unit"} eq $name } keys(%{$units}))));
}
- map({ $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"}); } @unit_list);
+ my $i = 1;
+ foreach (@unit_list) {
+ $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"});
+ $_->{"UNITLANGUAGES"} = [];
+ foreach my $lang (@languages) {
+ push(@{ $_->{"UNITLANGUAGES"} },
+ { "idx" => $i,
+ "unit" => $_->{"name"},
+ "language_id" => $lang->{"id"},
+ "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
+ "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
+ });
+ }
+ $i++;
+ }
$units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
$ddbox = AM->unit_select_data($units, undef, 1);
$form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
$form->header();
- print($form->parse_html_template("am/edit_units", { "UNITS" => \@unit_list, "NEW_BASE_UNIT_DDBOX" => $ddbox }));
+ print($form->parse_html_template("am/edit_units",
+ { "UNITS" => \@unit_list,
+ "NEW_BASE_UNIT_DDBOX" => $ddbox,
+ "LANGUAGES" => \@languages }));
$lxdebug->leave_sub();
}
@@ -3488,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"}) {
@@ -3500,7 +3644,16 @@ sub add_unit {
$base_unit = $form->{"new_base_unit"};
}
- AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"});
+ my @languages;
+ foreach my $lang (AM->language(\%myconfig, $form, 1)) {
+ next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
+ push(@languages, { "id" => $lang->{"id"},
+ "localized" => $form->{"new_localized_$lang->{id}"},
+ "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
+ });
+ }
+
+ AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"}, \@languages);
$form->{"saved_message"} = $locale->text("The unit has been saved.");
@@ -3509,12 +3662,32 @@ sub add_unit {
$lxdebug->leave_sub();
}
+sub set_unit_languages {
+ $lxdebug->enter_sub();
+
+ my ($unit, $languages, $idx) = @_;
+
+ $unit->{"LANGUAGES"} = [];
+
+ foreach my $lang (@{$languages}) {
+ push(@{ $unit->{"LANGUAGES"} },
+ { "id" => $lang->{"id"},
+ "localized" => $form->{"localized_${idx}_$lang->{id}"},
+ "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
+ });
+ }
+
+ $lxdebug->leave_sub();
+}
+
sub save_unit {
$lxdebug->enter_sub();
$old_units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}, "resolved_");
AM->units_in_use(\%myconfig, $form, $old_units);
+ @languages = AM->language(\%myconfig, $form, 1);
+
$new_units = {};
@delete_units = ();
foreach $i (1..($form->{"rowcount"} * 1)) {
@@ -3526,6 +3699,7 @@ sub save_unit {
if ($form->{"unchangeable_$i"}) {
$new_units->{$form->{"old_name_$i"}} = $old_units->{$form->{"old_name_$i"}};
$new_units->{$form->{"old_name_$i"}}->{"unchanged_unit"} = 1;
+ set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
next;
}
@@ -3544,6 +3718,7 @@ sub save_unit {
my %h = map({ $_ => $form->{"${_}_$i"} } qw(name base_unit factor old_name));
$new_units->{$form->{"name_$i"}} = \%h;
$new_units->{$form->{"name_$i"}}->{"row"} = $i;
+ set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
}
foreach $unit (values(%{$new_units})) {