X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fpe.pl;h=ef3a5a06471cf947a36ee8049d6459ef1c795205;hb=391d6b54a3a294bb45c4aa52c9c245059f9d4422;hp=07ba3026df474817f2519cc6846be148c38e64f3;hpb=2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8;p=kivitendo-erp.git
diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 07ba3026d..ef3a5a064 100644
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -47,11 +47,11 @@ sub add {
# construct callback
$form->{callback} =
- "$form->{script}?action=add&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
- &{"form_$form->{type}_header"};
- &{"form_$form->{type}_footer"};
+ call_sub("form_$form->{type}_header");
+ call_sub("form_$form->{type}_footer");
$lxdebug->leave_sub();
}
@@ -72,8 +72,8 @@ sub edit {
if ($form->{type} eq 'pricegroup') {
PE->get_pricegroup(\%myconfig, \%$form);
}
- &{"form_$form->{type}_header"};
- &{"form_$form->{type}_footer"};
+ call_sub("form_$form->{type}_header");
+ call_sub("form_$form->{type}_footer");
$lxdebug->leave_sub();
}
@@ -173,7 +173,6 @@ sub search {
-{path}>
{login}>
{password}>
@@ -197,7 +196,7 @@ sub project_report {
PE->projects(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=project_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
+ "$form->{script}?action=project_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
E($form->{active});
$href = $callback;
@@ -278,7 +277,7 @@ sub project_report {
|;
$column_data{projectnumber} =
- qq|
{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber} | |;
+ qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber} | |;
$column_data{description} = qq|$ref->{description} | |;
$column_data{active} =
qq|| .
@@ -308,7 +307,6 @@ sub project_report {
{type}>
-{path}>
{login}>
{password}>
@@ -413,7 +411,6 @@ sub form_project_footer {
-{path}>
{login}>
{password}>
@@ -427,11 +424,6 @@ sub form_project_footer {
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
@@ -474,6 +464,7 @@ sub save {
}
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
$form->{addition} = "SAVED";
$form->save_history($form->dbconnect(\%myconfig));
}
@@ -498,6 +489,7 @@ sub delete {
}
# saving the history
if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
@@ -505,7 +497,7 @@ sub delete {
$lxdebug->leave_sub();
}
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
sub partsgroup_report {
$lxdebug->enter_sub();
@@ -514,7 +506,7 @@ sub partsgroup_report {
PE->partsgroups(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=partsgroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=partsgroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
if ($form->{status} eq 'all') {
$option = $locale->text('All');
@@ -575,7 +567,7 @@ sub partsgroup_report {
|;
$column_data{partsgroup} =
- qq| | {script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup} | |;
+ qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup} | |;
map { print "$column_data{$_}\n" } @column_index;
print "
@@ -599,7 +591,6 @@ sub partsgroup_report {
{type}>
-{path}>
{login}>
{password}>
@@ -667,7 +658,6 @@ sub form_partsgroup_footer {
-{path}>
{login}>
{password}>
@@ -681,11 +671,6 @@ sub form_partsgroup_footer {
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
@@ -716,7 +699,7 @@ sub pricegroup_report {
PE->pricegroups(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=pricegroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=pricegroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
if ($form->{status} eq 'all') {
$option = $locale->text('All');
@@ -779,7 +762,7 @@ sub pricegroup_report {
|;
$column_data{pricegroup} =
- qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup} | |;
+ qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup} | |;
map { print "$column_data{$_}\n" } @column_index;
@@ -804,7 +787,6 @@ sub pricegroup_report {
{type}>
-{path}>
{login}>
{password}>
@@ -876,7 +858,6 @@ sub form_pricegroup_footer {
-{path}>
{login}>
{password}>
@@ -890,11 +871,6 @@ sub form_pricegroup_footer {
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|