Die verloren gegangenen Checkboxen "Offen"/"Geschlossen" bei den Berichtsfunktionen...

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

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 3baa8799f09f70fb1a73e4cde5bf0328ce6c168f..39a9f34c9d3949712803951a0cd9861ce65dfb11 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -110,6 +110,9 @@ sub add {
 
 sub edit {
   $lxdebug->enter_sub();
+  # show history button
+  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
 
   $form->{simple_save} = 0;
 
@@ -1111,7 +1114,17 @@ sub form_footer {
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
-
+|;
+# button for saving history
+print qq|
+       <input type=button class=submit onclick=set_history_window(|
+       . $form->{id} 
+       . qq|); name=history id=history value=|
+       . $locale->text('history') 
+       . qq|>|;
+# /button for saving history
+
+qq|
 </form>
 
 </body>
@@ -1328,10 +1341,6 @@ sub search {
        </tr>
 | if $form->{selectdepartment};
 
-  $openclosed = qq|
-               <input type=hidden name="open" value=1>
-|;
-
   my $delivered;
   if (($form->{"type"} eq "sales_order") ||
       ($form->{"type"} eq "purchase_order")) {
@@ -1427,7 +1436,12 @@ sub search {
           <th align=right>| . $locale->text('Include in Report') . qq|</th>
           <td colspan=5>
            <table>
-             $openclosed
+        <tr>
+          <td><input type="checkbox" name="open" value="1" id="open" checked>
+            <label for="open">| . $locale->text("Open") . qq|</td>
+          <td><input type="checkbox" name="closed" value="1" id="closed">
+            <label for="closed">| . $locale->text("Closed") . qq|</td>
+        </tr>
         $delivered
              <tr>
                <td><input name="l_id" class=checkbox type=checkbox value=Y>
@@ -1921,6 +1935,12 @@ sub save_and_close {
   }
 
   relink_accounts();
+  # saving the history
+  if(!exists $form->{addition}) {
+       $form->{addition} = "SAVED";
+       $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
 
   $form->redirect(
             $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
@@ -1995,6 +2015,12 @@ sub save {
     unless $form->{$ordnumber};
 
   relink_accounts();
+  # saving the history
+  if(!exists $form->{addition}) {
+       $form->{addition} = "SAVED";
+       $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
 
   OE->save(\%myconfig, \%$form);
   $form->{simple_save} = 1;
@@ -2059,8 +2085,15 @@ sub yes {
     $msg = $locale->text('Quotation deleted!');
     $err = $locale->text('Cannot delete quotation!');
   }
-
-  $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool));
+  if (OE->delete(\%myconfig, \%$form, $spool)){
+    $form->redirect($msg);
+    # saving the history
+    if(!exists $form->{addition}) {
+         $form->{addition} = "DELETED";
+         $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history 
+  }
   $form->error($err);
 
   $lxdebug->leave_sub();