X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=ca1ee4c0d89b75ed1b3fcf9f4a17b198a20ae3a3;hb=4f3393f4faf9b531d48bb97056468eaf5d0676c8;hp=5b6b16b0b1494cc9cc7f309e4a2bc1cbbed3e86c;hpb=a731cd269130cd68f9c3fb5b8a2c26dc20afe82e;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 5b6b16b0b..ca1ee4c0d 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -40,38 +40,15 @@ use Data::Dumper;
1;
-
-
-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";
# end of main
-sub add { &{"add_$form->{type}"} }
-sub delete { &{"delete_$form->{type}"} }
-
-sub display {
- if ($form->{display_nextsub}) {
- &{ $form->{display_nextsub} }();
- } else {
- &{ $form->{nextsub} }();
- }
-}
-
-sub save {
- if ($form->{save_nextsub}) {
- &{ $form->{save_nextsub} }();
- } else {
- &{ $form->{nextsub} }();
- }
-}
-
-sub edit {
- if ($form->{edit_nextsub}) {
- &{ $form->{edit_nextsub} }();
- } else {
- &{ "edit_$form->{type}" }();
- }
-}
+sub add { call_sub("add_$form->{type}"); }
+sub delete { call_sub("delete_$form->{type}"); }
+sub save { call_sub("save_$form->{type}"); }
+sub edit { call_sub("edit_$form->{type}"); }
+sub continue { call_sub($form->{"nextsub"}); }
sub add_account {
$lxdebug->enter_sub();
@@ -81,7 +58,7 @@ sub add_account {
AM->get_account(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&account_header;
@@ -508,7 +485,6 @@ sub form_footer {
-{path}>
{login}>
{password}>
@@ -557,7 +533,7 @@ sub list_account {
# construct callback
$callback =
- "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}";
$form->header;
@@ -622,7 +598,7 @@ sub list_account {
$ca->{link_edit_account} =
qq|$form->{script}?action=edit_account&id=$ca->{id}|
- .qq|&path=$form->{path}&login=$form->{login}|
+ .qq|&login=$form->{login}|
.qq|&password=$form->{password}&callback=$callback|;
}
@@ -667,7 +643,7 @@ sub add_department {
$form->{role} = "P";
$form->{callback} =
- "$form->{script}?action=add_department&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_department&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&department_header;
@@ -695,7 +671,7 @@ sub list_department {
AM->departments(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_department&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_department&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
@@ -751,7 +727,7 @@ sub list_department {
$profitcenter = ($ref->{role} eq "P") ? "X" : "";
$column_data{description} =
- qq|
{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} | |;
+ qq|{script}?action=edit_department&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} | |;
$column_data{cost} = qq|$costcenter | |;
$column_data{profit} = qq|$profitcenter | |;
@@ -778,7 +754,6 @@ sub list_department {
-{path}>
{login}>
{password}>
@@ -875,7 +850,7 @@ sub add_lead {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_lead&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&lead_header;
@@ -905,7 +880,7 @@ sub list_lead {
AM->lead(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_lead&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
@@ -949,7 +924,7 @@ sub list_lead {
$lead = $ref->{lead};
$column_data{description} =
- qq|{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead} | |;
+ qq|{script}?action=edit_lead&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead} | |;
map { print "$column_data{$_}\n" } @column_index;
@@ -971,7 +946,6 @@ sub list_lead {
-{path}>
{login}>
{password}>
@@ -1052,7 +1026,7 @@ sub add_business {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_business&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&business_header;
@@ -1082,7 +1056,7 @@ sub list_business {
AM->business(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_business&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
@@ -1139,7 +1113,7 @@ sub list_business {
$description =
$ref->{description};
$column_data{description} =
- qq|{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description | |;
+ qq|{script}?action=edit_business&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$description | |;
$column_data{discount} = qq|$discount | |;
$column_data{customernumberinit} =
qq|$ref->{customernumberinit} | |;
@@ -1167,7 +1141,6 @@ sub list_business {
-{path}>
{login}>
{password}>
@@ -1256,7 +1229,7 @@ sub add_language {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_language&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&language_header;
@@ -1286,7 +1259,7 @@ sub list_language {
AM->language(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_language&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
@@ -1352,7 +1325,7 @@ sub list_language {
$column_data{description} =
- qq|{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} | |;
+ qq|{script}?action=edit_language&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} | |;
$column_data{template_code} = qq|$ref->{template_code} | |;
$column_data{article_code} =
qq|$ref->{article_code} | |;
@@ -1394,7 +1367,6 @@ sub list_language {
-{path}>
{login}>
{password}>
@@ -1528,7 +1500,7 @@ sub add_buchungsgruppe {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_buchungsgruppe&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
AM->get_buchungsgruppe(\%myconfig, \%$form);
$form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
@@ -1563,7 +1535,7 @@ sub list_buchungsgruppe {
AM->buchungsgruppe(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_buchungsgruppe&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
@@ -1647,7 +1619,7 @@ sub list_buchungsgruppe {
my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|;
map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" }
- qw(login password path));
+ qw(login password));
my $row = 0;
foreach $ref (@{ $form->{ALL} }) {
@@ -1682,7 +1654,7 @@ sub list_buchungsgruppe {
}
$column_data{description} =
- qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} | |;
+ qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} | |;
$column_data{inventory_accno} = qq|$ref->{inventory_accno} | |;
$column_data{income_accno_0} =
qq|$ref->{income_accno_0} | |;
@@ -1722,7 +1694,6 @@ sub list_buchungsgruppe {
-{path}>
{login}>
{password}>
@@ -1914,7 +1885,7 @@ sub add_printer {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_printer&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&printer_header;
@@ -1944,7 +1915,7 @@ sub list_printer {
AM->printer(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_printer&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
@@ -1998,7 +1969,7 @@ sub list_printer {
$column_data{printer_description} =
- qq|{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description} | |;
+ qq|{script}?action=edit_printer&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description} | |;
$column_data{printer_command} = qq|$ref->{printer_command} | |;
$column_data{template_code} =
qq|$ref->{template_code} | |;
@@ -2026,7 +1997,6 @@ sub list_printer {
-{path}>
{login}>
{password}>
@@ -2116,7 +2086,7 @@ sub add_payment {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_payment&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
$form->{terms_netto} = 0;
@@ -2286,7 +2256,6 @@ sub list_payment {
-{path}>
{login}>
{password}>
@@ -2812,7 +2781,6 @@ print qq|
-{path}>
{login}>
{password}>
@@ -2863,7 +2831,6 @@ sub audit_control {