X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=1fe78205cfe8aa2cf2bc633b488a2348f8db793f;hb=566608b739ced48d1ca22dfa85a4ab4590e67c75;hp=d7373d78bf56bd4600a978dd8baa73cd273b87f4;hpb=baf92f533975d1224700a85d0b8ededd8246d09b;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index d7373d78b..1fe78205c 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -40,6 +40,8 @@ use Data::Dumper;
1;
+require "$form->{path}/common.pl";
+
# end of main
sub add { &{"add_$form->{type}"} }
@@ -92,14 +94,13 @@ sub account_header {
$form->{description} =~ s/\"/"/g;
if (@{ $form->{TAXKEY} }) {
- $form->{selecttaxkey} = "|;
+ 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|
@@ -1659,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| |
|
@@ -1710,6 +1780,11 @@ 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);
+ $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;
&form_footer;
@@ -1763,19 +1838,19 @@ sub list_buchungsgruppe {
. qq||;
$column_header{income_accno_1} =
qq||
- . $locale->text('Erlöse EU o. UStId')
+ . $locale->text('Erlöse EU m. UStId')
. qq| | |;
$column_header{expense_accno_1} =
qq||
- . $locale->text('Aufwand EU o. UStId')
+ . $locale->text('Aufwand EU m. UStId')
. qq| | |;
$column_header{income_accno_2} =
qq||
- . $locale->text('Erlöse EU m. UStId')
+ . $locale->text('Erlöse EU o. UStId')
. qq| | |;
$column_header{expense_accno_2} =
qq||
- . $locale->text('Aufwand EU m. UStId')
+ . $locale->text('Aufwand EU o. UStId')
. qq| | |;
$column_header{income_accno_3} =
qq||
@@ -1887,50 +1962,33 @@ sub buchungsgruppe_header {
# $locale->text('Buchungsgruppe hinzufügen')
# $locale->text('Buchungsgruppe bearbeiten')
- $form->{description} =~ s/\"/"/g;
+ my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
+ my %acc_type_map = (
+ "IC" => $acc_inventory,
+ "IC_income" => $acc_income,
+ "IC_sale" => $acc_income,
+ "IC_expense" => $acc_expense,
+ "IC_cogs" => $acc_expense,
+ );
- # build the popup menus
- $form->{taxaccounts} = "";
- foreach $key (keys %{ $form->{IC_links} }) {
+ foreach $key (keys(%acc_type_map)) {
foreach $ref (@{ $form->{IC_links}{$key} }) {
-
- # if this is a tax field
- if ($key =~ /IC_tax/) {
- if ($key =~ /$item/) {
- $form->{taxaccounts} .= "$ref->{accno} ";
- $form->{"IC_tax_$ref->{accno}_description"} =
- "$ref->{accno}--$ref->{description}";
-
- if ($form->{id}) {
- if ($form->{amount}{ $ref->{accno} }) {
- $form->{"IC_tax_$ref->{accno}"} = "checked";
- }
- } else {
- $form->{"IC_tax_$ref->{accno}"} = "checked";
- }
- }
- } else {
-
- $form->{"select$key"} .=
- "" }
+ sort({ $a->{"accno"} cmp $b->{"accno"} }
+ values(%{$acc_type_map{$type}}))));
+ }
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=$form->{inventory_accno_id}/ 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_expense} =~ s/selected//g;
@@ -1946,11 +2004,11 @@ sub buchungsgruppe_header {
|;
} else {
$linkaccounts = qq|
- |;
- }
+ {inventory_accno_id}>|;
+ }
- $linkaccounts .= qq|
+ $linkaccounts .= qq|
|
| . $locale->text('Erlöse Inland') . qq| |
|
@@ -2025,7 +2083,7 @@ sub buchungsgruppe_header {
| . $locale->text('Buchungsgruppe') . qq| |
- |
+ |
$linkaccounts
|
@@ -2267,207 +2325,6 @@ sub delete_printer {
}
-sub add_adr {
- $lxdebug->enter_sub();
-
- $form->{title} = "Add";
-
- $form->{callback} =
- "$form->{script}?action=add_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
-
- &adr_header;
- &form_footer;
-
- $lxdebug->leave_sub();
-}
-
-sub edit_adr {
- $lxdebug->enter_sub();
-
- $form->{title} = "Edit";
-
- AM->get_adr(\%myconfig, \%$form);
-
- &adr_header;
-
- $form->{orphaned} = 1;
- &form_footer;
-
- $lxdebug->leave_sub();
-}
-
-sub list_adr {
- $lxdebug->enter_sub();
-
- AM->adr(\%myconfig, \%$form);
-
- $form->{callback} =
- "$form->{script}?action=list_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
- $callback = $form->escape($form->{callback});
-
- $form->{title} = $locale->text('ADR');
-
- @column_index = qw(adr_code adr_description);
-
- $column_header{adr_description} =
- qq||
- . $locale->text('ADR Description')
- . qq| | |;
- $column_header{adr_code} =
- qq||
- . $locale->text('ADR Code')
- . qq| | |;
-
- $form->header;
-
- print qq|
-
-
-
-
- $form->{title} |
-
-
-
-
-
- |
-
-
-
|
-
-
-
-
-
-
-
-
-|;
-
- $lxdebug->leave_sub();
-}
-
-sub adr_header {
- $lxdebug->enter_sub();
-
- $form->{title} = $locale->text("$form->{title} ADR");
-
- # $locale->text('Add ADR')
- # $locale->text('Edit ADR')
-
- $form->{adr_description} =~ s/\"/"/g;
- $form->{adr_code} =~ s/\"/"/g;
-
-
- $form->header;
-
- print qq|
-
-
-
-
-
- | . $locale->text('Tax Accounts') . qq| |
-
-
-
-
- |
-
-
+ |;
+#
+# | . $locale->text('Tax Accounts') . qq| |
+#
+#
+#
+#
+# |
+#
+print qq|
@@ -3679,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();
}
@@ -3702,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"}) {
@@ -3714,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.");
@@ -3723,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)) {
@@ -3740,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;
}
@@ -3758,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})) {