X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=4e327fd422e432b35785e9465654f30f7044dc22;hb=a25ac4907df1aca0db5fd0017b96e5d0bc5eadf1;hp=d7373d78bf56bd4600a978dd8baa73cd273b87f4;hpb=baf92f533975d1224700a85d0b8ededd8246d09b;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index d7373d78b..4e327fd42 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} = "
@@ -1659,15 +1675,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 +1744,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 +1802,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||
@@ -1861,14 +1900,7 @@ sub list_buchungsgruppe {
{password}>
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ . $locale->text('Add') . qq|">
@@ -1887,50 +1919,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 +1961,11 @@ sub buchungsgruppe_header {
|;
} else {
$linkaccounts = qq|
- |;
- }
+ {inventory_accno_id}>|;
+ }
- $linkaccounts .= qq|
+ $linkaccounts .= qq|
|
| . $locale->text('Erlöse Inland') . qq| |
|
@@ -2025,7 +2040,7 @@ sub buchungsgruppe_header {
| . $locale->text('Buchungsgruppe') . qq| |
- |
+ |
$linkaccounts
|
@@ -2180,14 +2195,7 @@ sub list_printer {
{password}>
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ . $locale->text('Add') . qq|">
@@ -2267,207 +2275,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} |
-
-
-
-
-
- |
-
-
-
|
-
-
-
-
-
-
-
-