X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/e2f6b9d3965445c69b2efb2b3fd4a025b3c1b37c..a14a3ff56b00e22c39a2cfb0e465f8c7764a4cd4:/bin/mozilla/gl.pl

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 6d4cb661e..2668083bb 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -82,11 +82,11 @@ sub add {
 
   map {
     $chart .=
-      "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}</option>"
+      "<option value=\"$_->{accno}--$_->{tax_id}\">$_->{accno}--$_->{description}</option>"
   } @{ $form->{chart} };
   map {
     $tax .=
-      qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
+      qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription}  |
       . ($_->{rate} * 100) . qq| %|
   } @{ $form->{TAX} };
 
@@ -124,12 +124,12 @@ sub edit {
   GL->transaction(\%myconfig, \%$form);
   map {
     $chart .=
-      "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}</option>"
+      "<option value=\"$_->{accno}--$_->{tax_id}\">$_->{accno}--$_->{description}</option>"
   } @{ $form->{chart} };
 
   map {
     $tax .=
-      qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
+      qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription}  |
       . ($_->{rate} * 100) . qq| %|
   } @{ $form->{TAX} };
 
@@ -159,7 +159,7 @@ sub edit {
     $j = $i - 1;
     if ($tax && ($ref->{accno} eq $taxaccno)) {
       $form->{"tax_$j"}      = abs($ref->{amount});
-      $form->{"taxchart_$j"} = $ref->{taxkey} . "--" . $ref->{taxrate};
+      $form->{"taxchart_$j"} = $ref->{id} . "--" . $ref->{taxrate};
       if ($form->{taxincluded}) {
         if ($ref->{amount} < 0) {
           $form->{"debit_$j"} += $form->{"tax_$j"};
@@ -168,7 +168,7 @@ sub edit {
         }
       }
     } else {
-      $form->{"accno_$i"} = "$ref->{accno}--$ref->{accnotaxkey}";
+      $form->{"accno_$i"} = "$ref->{accno}--$ref->{tax_id}";
       for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
       if ($ref->{amount} < 0) {
         $form->{totaldebit} -= $ref->{amount};
@@ -177,7 +177,7 @@ sub edit {
         $form->{totalcredit} += $ref->{amount};
         $form->{"credit_$i"} = $ref->{amount};
       }
-      $form->{"taxchart_$i"} = "0--";
+      $form->{"taxchart_$i"} = "0--0.00";
       $i++;
     }
     if ($ref->{taxaccno} && !$tax) {
@@ -293,6 +293,7 @@ sub search {
 	<tr>
 	  <th align=right>| . $locale->text('From') . qq|</th>
           $button1
+	  <th align=right>| . $locale->text('To (time)') . qq|</th>
           $button2
 	</tr>
 	<tr>
@@ -620,15 +621,17 @@ sub generate_report {
         </tr>
 |;
   }
-   $form->{balance} *= $ml;
+  $form->{balance} *= $ml;
   foreach $ref (@{ $form->{GL} }) {
     $form->{balance} *= $ml;
+
     # if item ne sort print subtotal
     if ($form->{l_subtotal} eq 'Y') {
       if ($sameitem ne $ref->{ $form->{sort} }) {
         &gl_subtotal;
       }
     }
+
     #foreach $key (sort keys(%{ $ref->{amount} })) {
     #  $form->{balance} += $ref->{amount}{$key};
     #}
@@ -656,7 +659,7 @@ sub generate_report {
         $credit .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
       }
-      $form->{balance} = abs($form->{balance}) - abs( $ref->{credit}{$key});
+      $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
     }
 
     $debittax = "";
@@ -698,9 +701,10 @@ sub generate_report {
         $debitaccno .=
           "<br><a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
       }
-#       if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
-#         $ref->{debit_tax_accno}{$key} = $taxaccno;
-#       }
+
+      #       if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
+      #         $ref->{debit_tax_accno}{$key} = $taxaccno;
+      #       }
       $taxaccno    = $ref->{debit_tax_accno}{$key};
       $debittaxkey = $ref->{debit_taxkey}{$key};
     }
@@ -716,9 +720,10 @@ sub generate_report {
         $creditaccno .=
           "<br><a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
       }
-#       if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
-#         $ref->{credit_tax_accno}{$key} = $taxaccno;
-#       }
+
+      #       if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
+      #         $ref->{credit_tax_accno}{$key} = $taxaccno;
+      #       }
       $taxaccno     = $ref->{credit_tax_accno}{$key};
       $credittaxkey = $ref->{credit_taxkey}{$key};
     }
@@ -776,9 +781,8 @@ sub generate_report {
     $column_data{gifi_accno}       =
       "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</td>";
     $column_data{balance} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0)
-      . "</td>";
+      "<td align=right>"
+      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . "</td>";
 
     $i++;
     $i %= 2;
@@ -965,7 +969,7 @@ sub update {
         : $form->{"debit_$i"};
       $j = $#a;
       if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
-        $form->{"taxchart_$i"} = "0--";
+        $form->{"taxchart_$i"} = "0--0.00";
         $form->{"tax_$i"}      = 0;
       }
       if (!$form->{"korrektur_$i"}) {
@@ -1052,13 +1056,14 @@ sub display_rows {
       <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:200px" tabindex=|
         . ($i + 5 + (($i - 1) * 8)) . qq|>$form->{chartinit}</select></td>|;
       $tax =
-          qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px" tabindex=|
+        qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px" tabindex=|
         . ($i + 10 + (($i - 1) * 8))
         . qq|>$form->{taxchart}</select></td>|;
-#       if ($form->{selectprojectnumber}) {
-#         $project = qq|
-#     <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-#       }
+
+      #       if ($form->{selectprojectnumber}) {
+      #         $project = qq|
+      #     <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+      #       }
       $korrektur =
         qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
         . ($i + 9 + (($i - 1) * 8))
@@ -1101,20 +1106,21 @@ sub display_rows {
           . qq|>$accno</select></td>|;
         $tax          = $taxchart;
         $tax_selected = $form->{"taxchart_$i"};
+        print(STDERR "TAX_SELCTED $tax_selected\n");
         $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
         $tax =
             qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
           . ($i + 10 + (($i - 1) * 8))
           . qq|>$tax</select></td>|;
 
-#         if ($form->{selectprojectnumber}) {
-#           $form->{"projectnumber_$i"} = ""
-#             if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
-# 
-#           $project = $form->{"projectnumber_$i"};
-#           $project =~ s/--.*//;
-#           $project = qq|<td>$project</td>|;
-#         }
+        #         if ($form->{selectprojectnumber}) {
+        #           $form->{"projectnumber_$i"} = ""
+        #             if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
+        #
+        #           $project = $form->{"projectnumber_$i"};
+        #           $project =~ s/--.*//;
+        #           $project = qq|<td>$project</td>|;
+        #         }
 
         if ($form->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
@@ -1138,10 +1144,11 @@ sub display_rows {
         $tax = qq|
       <td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
           . ($i + 10 + (($i - 1) * 8)) . qq|>$taxchart</select></td>|;
-#         if ($form->{selectprojectnumber}) {
-#           $project = qq|
-#       <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-#         }
+
+        #         if ($form->{selectprojectnumber}) {
+        #           $project = qq|
+        #       <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+        #         }
         $korrektur =
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
           . ($i + 9 + (($i - 1) * 8))
@@ -1182,9 +1189,10 @@ sub display_rows {
   }
 
   $form->hide_form(qw(rowcount selectaccno));
-#   print qq|
-# <input type=hidden name=selectprojectnumber value="|
-#     . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
+
+  #   print qq|
+  # <input type=hidden name=selectprojectnumber value="|
+  #     . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
   $lxdebug->leave_sub();
 
 }
@@ -1205,7 +1213,7 @@ sub form_header {
   <!--
   function setTaxkey(accno, row) {
     var taxkey = accno.options[accno.selectedIndex].value;
-    var reg = /--([0-9])*/;
+    var reg = /--([0-9]*)/;
     var found = reg.exec(taxkey);
     var index = found[1];
     index = parseInt(index);
@@ -1266,8 +1274,7 @@ sub form_header {
 
     #write Trigger
     $jsscript =
-      Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1", "",
-                          "", "");
+      Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1");
   } else {
 
     # without JavaScript Calendar
@@ -1484,12 +1491,12 @@ sub delete {
 <form method=post action=$form->{script}>
 |;
 
-  map { $form->{$_} =~ s/\"/&quot;/g } qw(reference description chart);
+  map { $form->{$_} =~ s/\"/&quot;/g } qw(reference description chart taxchart);
 
   delete $form->{header};
 
   foreach $key (keys %$form) {
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
   }
 
   print qq|
@@ -1547,9 +1554,9 @@ sub post {
       unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
         if ($form->{"debit_$i"} ne "") {
           $form->{"credit_$i"} = $form->{"debit_$i"};
-          $form->{"debit_$i"} = "";
+          $form->{"debit_$i"}  = "";
         } elsif ($form->{"credit_$i"} ne "") {
-          $form->{"debit_$i"} = $form->{"credit_$i"};
+          $form->{"debit_$i"}  = $form->{"credit_$i"};
           $form->{"credit_$i"} = "";
         }
       }
@@ -1603,7 +1610,7 @@ sub post {
         : $form->{"debit_$i"};
       $j = $#a;
       if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
-        $form->{"taxchart_$i"} = "0--";
+        $form->{"taxchart_$i"} = "0--0.00";
         $form->{"tax_$i"}      = 0;
       }
       if (!$form->{"korrektur_$i"}) {