X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=4e327fd422e432b35785e9465654f30f7044dc22;hb=8423c7b21bc3b4b2db7d0ffef756919619336e97;hp=d251740932c8b4398d49e6dcd602b5794021625a;hpb=24e5732397bd678379297f9660d366af9164c8dd;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index d25174093..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,46 +1919,29 @@ 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;
@@ -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|">
@@ -2276,6 +2284,9 @@ sub add_payment {
"$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
+ $form->{terms_netto} = 0;
+ $form->{terms_skonto} = 0;
+ $form->{percent_skonto} = 0;
&payment_header;
&form_footer;
@@ -2394,21 +2405,14 @@ sub list_payment {
-
+
{path}>
{login}>
{password}>
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ . $locale->text('Add') . qq|">
@@ -2450,10 +2454,6 @@ sub payment_header {
| . $locale->text('Description') . qq| |
|
-
- | . $locale->text('Ranking') . qq| |
- |
-
| . $locale->text('Long Description') . qq| |
|
@@ -2620,14 +2620,8 @@ sub list_sic {
{password}>
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Add') . qq|">
- print qq|
@@ -2981,10 +3005,35 @@ 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("Print options") . qq| |
+
+
+ | . $locale->text('Default template format') . qq| |
+ |
+
+
+ | . $locale->text('Number of copies') . qq| |
+ |
+
+
+
|
@@ -2993,16 +3042,8 @@ sub config {
|
-
-
- |
|
@@ -3088,40 +3129,40 @@ sub config {
|
-
-
- | . $locale->text('Tax Accounts') . qq| |
-
-
-
-
- |
-
-
+ |;
+#
+# | . $locale->text('Tax Accounts') . qq| |
+#
+#
+#
+#
+# |
+#
+print qq|
@@ -3135,14 +3176,8 @@ sub config {
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Save') . qq|">
- print qq|