Quoting

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f4556cf2cfbfc29baa774c3fb8ea4bf605317ffe..2891634f005c312023173d28fedeb389a2fb82a4 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -77,7 +77,10 @@ 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
+  
   if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
   {
     $form->error("Access Denied");
@@ -574,7 +577,9 @@ sub form_header {
     $form->write_trigger(\%myconfig, 2,
                          "orddate", "BL", "trigger_orddate",
                          "quodate", "BL", "trigger_quodate");
-
+  # show history button js
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show history button js
   $form->header;
 
   print qq|
@@ -848,7 +853,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>$form->{"${item}_description"}</th>
+               <th align=right>$form->{"${item}_description"}&nbsp;|
+               . $form->{"${item}_rate"} * 100 .qq|%</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
@@ -887,7 +893,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+                  . $form->{"${item}_rate"} * 100 .qq|%</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>
@@ -1147,6 +1154,18 @@ if ($form->{type} eq "credit_note") {
     }
   }
 
+  # button for saving history
+  if($form->{id} ne "") {
+    print qq|
+         <input type="button" class="submit" onclick="set_history_window(|
+         . Q($form->{id})
+         . qq|);" name="history" id="history" value="|
+         . $locale->text('history')
+         . qq|">|;
+  }
+  # /button for saving history
+
+
   print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
     qq|
 
@@ -1331,6 +1350,7 @@ sub update {
   }
   $lxdebug->leave_sub();
 }
+
 sub post_payment {
   $lxdebug->enter_sub();
   for $i (1 .. $form->{paidaccounts}) {
@@ -1425,10 +1445,30 @@ sub post {
     if (!(IS->post_invoice(\%myconfig, \%$form))) {
       $form->error($locale->text('Cannot post invoice!'));
     }
+    # saving the history
+       if(!exists $form->{addition}) {
+         $form->{addition} = "PRINTED AND POSTED";
+         $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history
+    
   } else {
-    $form->redirect(
-            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
-      if (IS->post_invoice(\%myconfig, \%$form));
+      if (IS->post_invoice(\%myconfig, \%$form)){
+       # saving the history
+               if(!exists $form->{addition}) {
+                       if($form->{storno}) {
+                               $form->{addition} = "STORNO";
+                       }
+                       else {
+                               $form->{addition} = "POSTED";
+                       }
+                       $form->save_history($form->dbconnect(\%myconfig));
+       }
+       # /saving the history
+    
+       $form->redirect(
+            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
+       }
     $form->error($locale->text('Cannot post invoice!'));
   }
 
@@ -1584,9 +1624,15 @@ sub credit_note {
 
 sub yes {
   $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Invoice deleted!'))
-    if (IS->delete_invoice(\%myconfig, \%$form, $spool));
+  if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
+    # saving the history
+       if(!exists $form->{addition}) {
+         $form->{addition} = "DELETED";
+         $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history 
+    $form->redirect($locale->text('Invoice deleted!')); 
+  }
   $form->error($locale->text('Cannot delete invoice!'));
 
   $lxdebug->leave_sub();