Anpassung der Historienfunktion

[kivitendo-erp.git] / bin / mozilla / pe.pl

diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 07ba302..54eba99 100644 (file)
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -50,8 +50,8 @@ sub add {
     "$form->{script}?action=add&type=$form->{type}&path=$form->{path}&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();
 }
@@ -427,11 +427,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|
        <input type=button onclick=set_history_window(|
@@ -440,8 +435,6 @@ print qq|
        . $locale->text('history') 
        . qq|>|;
 # /button for saving history
-=======
->>>>>>> .r1940
   print qq|
 </form>
 
@@ -474,6 +467,7 @@ sub save {
   }
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
+    $form->{snumber} = qq|projectnumber_| . $form->{projectnumber};
        $form->{addition} = "SAVED";
        $form->save_history($form->dbconnect(\%myconfig));
   }
@@ -498,6 +492,7 @@ sub delete {
   }
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumber} = qq|projectnumber_| . $form->{projectnumber};
        $form->{addition} = "DELETED";
        $form->save_history($form->dbconnect(\%myconfig));
   }
@@ -505,7 +500,7 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
 
 sub partsgroup_report {
   $lxdebug->enter_sub();
@@ -681,11 +676,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|
        <input type=button onclick=set_history_window(|
@@ -694,8 +684,6 @@ print qq|
        . $locale->text('history') 
        . qq|>|;
 # /button for saving history
-=======
->>>>>>> .r1940
   print qq|
 </form>
 
@@ -890,11 +878,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|
        <input type=button onclick=set_history_window(|
@@ -903,8 +886,6 @@ print qq|
        . $locale->text('history') 
        . qq|>|;
 # /button for saving history
-=======
->>>>>>> .r1940
   print qq|
 </form>