X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=d6ccfe2dfac35cda3e8dd42393d1444a0c1c2c77;hb=eeb490242d7da5631bd381fcf54bdf5402148440;hp=42aa6d5b250d35b12dda9908d3496178c2f6f171;hpb=a74031056eda7ea2929d769df3692324ad18e503;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 42aa6d5b2..d6ccfe2df 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;
@@ -2989,8 +2993,19 @@ 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";
+ }
+
+ my ($show_form_details, $hide_form_details);
+ $myconfig{"show_form_details"} = 1
+ unless (defined($myconfig{"show_form_details"}));
+ $show_form_details = "checked" if ($myconfig{"show_form_details"});
+ $hide_form_details = "checked" unless ($myconfig{"show_form_details"});
print qq|
@@ -3065,9 +3080,20 @@ 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('Form details (second row)') . qq|
+
+ | . $locale->text('Show by default') . qq|
+
+ | . $locale->text('Hide by default') . qq|
+
| . $locale->text("Print options") . qq|
@@ -3091,16 +3117,8 @@ sub config {
-
-
-
|
@@ -3618,7 +3636,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"}) {