Prozentangaben in der Steuerbeschreibung wieder hinzugefuegt

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f4556cf..d50d6d0 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -37,6 +37,7 @@ use Data::Dumper;
 
 require "$form->{path}/io.pl";
 require "$form->{path}/arap.pl";
+require "bin/mozilla/drafts.pl";
 
 1;
 
@@ -44,7 +45,9 @@ require "$form->{path}/arap.pl";
 
 sub add {
   $lxdebug->enter_sub();
-  
+
+  return $lxdebug->leave_sub() if (load_draft_maybe());
+
   if ($form->{type} eq "credit_note") {
     $form->{title} = $locale->text('Add Credit Note');
 
@@ -77,7 +80,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 +580,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|
@@ -616,7 +624,7 @@ sub form_header {
 <input type=hidden name=storno value=$form->{storno}>
 <input type=hidden name=storno_id value=$form->{storno_id}>
 
-
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
 
 <table width=100%>
   <tr class=listtop>
@@ -1100,9 +1108,9 @@ if ($form->{type} eq "credit_note") {
     <input class=submit type=submit name=action value="|
       . $locale->text('Print') . qq|">
     <input class=submit type=submit name=action value="|
-      . $locale->text('E-mail') . qq|">|;
+      . $locale->text('E-mail') . qq|"> |;
     print qq|<input class=submit type=submit name=action value="|
-      . $locale->text('Storno') . qq|">| unless ($form->{storno});
+      . $locale->text('Storno') . qq|"> | unless ($form->{storno});
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Post Payment') . qq|">
 |;
@@ -1143,17 +1151,34 @@ if ($form->{type} eq "credit_note") {
       <input class=submit type=submit name=action value="|
         . $locale->text('Print and Post') . qq|">
       <input class=submit type=submit name=action value="|
-        . $locale->text('Post') . qq|">|;
+        . $locale->text('Post') . qq|"> | .
+        NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+                         '-class' => 'submit'));
     }
   }
 
+  # 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|
 
 <input type=hidden name=rowcount value=$form->{rowcount}>
 
 <input name=callback type=hidden value="$form->{callback}">
-
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
@@ -1331,6 +1356,7 @@ sub update {
   }
   $lxdebug->leave_sub();
 }
+
 sub post_payment {
   $lxdebug->enter_sub();
   for $i (1 .. $form->{paidaccounts}) {
@@ -1425,10 +1451,32 @@ sub post {
     if (!(IS->post_invoice(\%myconfig, \%$form))) {
       $form->error($locale->text('Cannot post invoice!'));
     }
+    remove_draft();
+    # 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)){
+      remove_draft();
+       # 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 +1632,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();