Speichern der Historie nach Speichern des Belegs selber.

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

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index f176808..2d8d31d 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -494,10 +494,14 @@ sub generate_report {
       . $locale->date(\%myconfig, $form->{dateto}, 1);
   }
 
-  @columns =
-    qw(transdate id reference description notes source debit debit_accno credit
-       credit_accno debit_tax debit_tax_accno credit_tax credit_tax_accno accno
-       gifi_accno projectnumbers);
+  @columns = $form->sort_columns( qw(
+       transdate       id                reference         description  
+       notes           source            debit             debit_accno  
+       credit          credit_accno      debit_tax         debit_tax_accno
+       credit_tax      credit_tax_accno  accno             gifi_accno
+       projectnumbers  
+       )
+  );
 
   if ($form->{accno} || $form->{gifi_accno}) {
     @columns = grep !/(accno|gifi_accno)/, @columns;
@@ -833,6 +837,12 @@ sub generate_report {
 
   map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
 
+  my $balanced_ledger = $totaldebit 
+                      + $totaldebittax 
+                      - $totalcredit 
+                      - $totalcredittax;
+                    # = 0 for balanced ledger
+                    
   $column_data{debit} =
     "<th align=right class=listtotal>"
     . $form->format_amount(\%myconfig, $totaldebit, 2, "&nbsp;") . "</th>";
@@ -857,6 +867,27 @@ sub generate_report {
 
   print qq|
         </tr>
+        <tr>|;
+
+
+  if ( abs($balanced_ledger) >  0.001 ) {
+
+    print qq|<td colspan="4" style="background-color:#FFA0A0" >|
+        . $locale->text('Unbalanced Ledger') 
+        . ": " 
+        . $form->format_amount(\%myconfig, $balanced_ledger, 3, "&nbsp;")
+
+  } elsif ( abs($balanced_ledger) <= 0.001 ) {
+
+    print qq|<td colspan="3">|
+          . $locale->text('Balanced Ledger') 
+
+  }
+
+  
+  print qq|
+         </td>
+        </tr>
         </tbody>
       </table>
     </td>
@@ -1457,7 +1488,7 @@ sub form_footer {
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Storno') . qq|">|;
 
-    # Löschen und ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich
+    # Löschen und Ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich
 
     if (!$form->{locked} && $radieren) {
       print qq|
@@ -1526,9 +1557,15 @@ sub delete {
 
 sub yes {
   $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Transaction deleted!'))
-    if (GL->delete_transaction(\%myconfig, \%$form));
+  if (GL->delete_transaction(\%myconfig, \%$form)){
+    # saving the history
+      if(!exists $form->{addition} && $form->{id} ne "") {
+           $form->{addition} = "DELETED";
+           $form->save_history($form->dbconnect(\%myconfig));
+      }
+    # /saving the history 
+    $form->redirect($locale->text('Transaction deleted!'))
+  }
   $form->error($locale->text('Cannot delete transaction!'));
   $lxdebug->leave_sub();
 
@@ -1714,6 +1751,13 @@ sub post {
     $form->error($err[$errno]);
   }
   undef($form->{callback});
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+       $form->{addition} = "SAVED";
+       $form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id}; 
+       $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
   $form->redirect("Buchung gespeichert. Buchungsnummer = " . $form->{id});
   $lxdebug->leave_sub();
 
@@ -1733,6 +1777,12 @@ sub storno {
 
   $form->{id}     = 0;
   $form->{storno} = 1;
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+       $form->{addition} = "STORNO";
+       $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
   &post;
   $lxdebug->leave_sub();