Unbalanced Ledger Fehlermeldung im Buchungsjournal wieder hinzugefuegt.

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

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 4a2d9792bad08cc4218e93ac59a04c16fba60d1d..2d8d31d3abcaddfabc57e15fedc10f190bcaeeff 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -35,6 +35,7 @@ use SL::GL;
 use SL::PE;
 
 require "$form->{path}/arap.pl";
 use SL::PE;
 
 require "$form->{path}/arap.pl";

+require "bin/mozilla/common.pl";

 
 1;
 
 
 1;
 


@@ -82,11 +83,11 @@ sub add {
 
   map {
     $chart .=
 
   map {
     $chart .=

-      "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}</option>"
+      "<option value=\"$_->{accno}--$_->{tax_id}\">$_->{accno}--$_->{description}</option>"

   } @{ $form->{chart} };
   map {
     $tax .=
   } @{ $form->{chart} };
   map {
     $tax .=

-      qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
+      qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription}  |

       . ($_->{rate} * 100) . qq| %|
   } @{ $form->{TAX} };
 
       . ($_->{rate} * 100) . qq| %|
   } @{ $form->{TAX} };
 


@@ -122,22 +123,14 @@ sub edit {
   $lxdebug->enter_sub();
 
   GL->transaction(\%myconfig, \%$form);
   $lxdebug->enter_sub();
 
   GL->transaction(\%myconfig, \%$form);

-

   map {
   map {

-    if ($form->{debitaccno} eq $_->{accno}) {
-      $form->{debitchart} .=
-        "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}";
-    }
-  } @{ $form->{chart} };
-  map {
-    if ($form->{creditaccno} eq $_->{accno}) {
-      $form->{creditchart} .=
-        "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}";
-    }
+    $chart .=
+      "<option value=\"$_->{accno}--$_->{tax_id}\">$_->{accno}--$_->{description}</option>"

   } @{ $form->{chart} };
   } @{ $form->{chart} };

+

   map {
     $tax .=
   map {
     $tax .=

-      qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
+      qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription}  |

       . ($_->{rate} * 100) . qq| %|
   } @{ $form->{TAX} };
 
       . ($_->{rate} * 100) . qq| %|
   } @{ $form->{TAX} };
 


@@ -145,10 +138,6 @@ sub edit {
 
   $form->{taxchart} = $tax;
 
 
   $form->{taxchart} = $tax;
 

-  if ($form->{tax} < 0) {
-    $form->{tax} = $form->{tax} * (-1);
-  }
-

   $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
 
   # departments
   $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
 
   # departments


@@ -162,22 +151,42 @@ sub edit {
     } (@{ $form->{all_departments} });
   }
 
     } (@{ $form->{all_departments} });
   }
 

-  $i = 1;
+  my $i        = 1;
+  my $tax      = 0;
+  my $taxaccno = "";

   foreach $ref (@{ $form->{GL} }) {
   foreach $ref (@{ $form->{GL} }) {

-    $form->{"accno_$i"} = "$ref->{accno}--$ref->{description}";
-
-    $form->{"projectnumber_$i"} = "$ref->{projectnumber}--$ref->{project_id}";
-    for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
-
-    if ($ref->{amount} < 0) {
-      $form->{totaldebit} -= $ref->{amount};
-      $form->{"debit_$i"} = $ref->{amount} * -1;
+    $j = $i - 1;
+    if ($tax && ($ref->{accno} eq $taxaccno)) {
+      $form->{"tax_$j"}      = abs($ref->{amount});
+      $form->{"taxchart_$j"} = $ref->{id} . "--" . $ref->{taxrate};
+      if ($form->{taxincluded}) {
+        if ($ref->{amount} < 0) {
+          $form->{"debit_$j"} += $form->{"tax_$j"};
+        } else {
+          $form->{"credit_$j"} += $form->{"tax_$j"};
+        }
+      }
+    } else {
+      $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};
+        $form->{"debit_$i"} = $ref->{amount} * -1;
+      } else {
+        $form->{totalcredit} += $ref->{amount};
+        $form->{"credit_$i"} = $ref->{amount};
+      }
+      $form->{"taxchart_$i"} = "0--0.00";
+      $i++;
+    }
+    if ($ref->{taxaccno} && !$tax) {
+      $taxaccno = $ref->{taxaccno};
+      $tax      = 1;

     } else {
     } else {

-      $form->{totalcredit} += $ref->{amount};
-      $form->{"credit_$i"} = $ref->{amount};
+      $taxaccno = "";
+      $tax      = 0;

     }
 
     }
 

-    $i++;

   }
 
   $form->{rowcount} = $i;
   }
 
   $form->{rowcount} = $i;


@@ -218,6 +227,21 @@ sub search {
        </tr>
 | if $form->{selectdepartment};
 
        </tr>
 | if $form->{selectdepartment};
 

+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 1 });
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
+  my $projectnumber =
+    NTI($cgi->popup_menu('-name' => "project_id",
+                         '-values' => \@project_values,
+                         '-labels' => \%project_labels));
+

   # use JavaScript Calendar or not
   $form->{jsscript} = $jscalendar;
   $jsscript = "";
   # use JavaScript Calendar or not
   $form->{jsscript} = $jscalendar;
   $jsscript = "";


@@ -227,14 +251,12 @@ sub search {
     $button1 = qq|
        <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}">
        <input type=button name=datefrom id="trigger1" value=|
     $button1 = qq|
        <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}">
        <input type=button name=datefrom id="trigger1" value=|

-      . $locale->text('button')
-      . qq|></td>  
+      . $locale->text('button') . qq|></td>  

        |;
     $button2 = qq|
        <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}">
        <input type=button name=dateto id="trigger2" value=|
        |;
     $button2 = qq|
        <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}">
        <input type=button name=dateto id="trigger2" value=|

-      . $locale->text('button')
-      . qq|></td>
+      . $locale->text('button') . qq|></td>

      |;
 
     #write Trigger
      |;
 
     #write Trigger


@@ -282,9 +304,14 @@ sub search {
          <th align=right>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        </tr>
          <th align=right>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        </tr>

+       <tr>
+         <th align=right>| . $locale->text('Project Number') . qq|</th>
+         <td colspan=3>$projectnumber</td>
+       </tr>

        <tr>
          <th align=right>| . $locale->text('From') . qq|</th>
           $button1
        <tr>
          <th align=right>| . $locale->text('From') . qq|</th>
           $button1

+         <th align=right>| . $locale->text('To (time)') . qq|</th>

           $button2
        </tr>
        <tr>
           $button2
        </tr>
        <tr>


@@ -297,12 +324,8 @@ sub search {
     . $locale->text('All') . qq|
                  <input name="category" class=radio type=radio value=A>&nbsp;|
     . $locale->text('Asset') . qq|
     . $locale->text('All') . qq|
                  <input name="category" class=radio type=radio value=A>&nbsp;|
     . $locale->text('Asset') . qq|

-                 <input name="category" class=radio type=radio value=C>&nbsp;|
-    . $locale->text('Contra') . qq|

                  <input name="category" class=radio type=radio value=L>&nbsp;|
     . $locale->text('Liability') . qq|
                  <input name="category" class=radio type=radio value=L>&nbsp;|
     . $locale->text('Liability') . qq|

-                 <input name="category" class=radio type=radio value=Q>&nbsp;|
-    . $locale->text('Equity') . qq|

                  <input name="category" class=radio type=radio value=I>&nbsp;|
     . $locale->text('Revenue') . qq|
                  <input name="category" class=radio type=radio value=E>&nbsp;|
                  <input name="category" class=radio type=radio value=I>&nbsp;|
     . $locale->text('Revenue') . qq|
                  <input name="category" class=radio type=radio value=E>&nbsp;|


@@ -338,6 +361,8 @@ sub search {
                  <tr>
                    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
                    <td>| . $locale->text('Subtotal') . qq|</td>
                  <tr>
                    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
                    <td>| . $locale->text('Subtotal') . qq|</td>

+                   <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
+                   <td>| . $locale->text('Project Number') . qq|</td>

                  </tr>
                </table>
              </tr>
                  </tr>
                </table>
              </tr>


@@ -391,7 +416,7 @@ sub generate_report {
 
   $form->{title} = $locale->text('General Ledger');
 
 
   $form->{title} = $locale->text('General Ledger');
 

-  $ml = ($form->{ml} =~ /(A|E)/) ? -1 : 1;
+  $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;

 
   unless ($form->{category} eq 'X') {
     $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
 
   unless ($form->{category} eq 'X') {
     $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });


@@ -443,6 +468,10 @@ sub generate_report {
     $option   .= "\n<br>" if $option;
     $option   .= $locale->text('Notes') . " : $form->{notes}";
   }
     $option   .= "\n<br>" if $option;
     $option   .= $locale->text('Notes') . " : $form->{notes}";
   }

+ if ($form->{project_id}) {
+    $href     .= "&project_id=" . $form->escape($form->{project_id});
+    $callback .= "&project_id=" . $form->escape($form->{project_id});
+  }

 
   if ($form->{datefrom}) {
     $href     .= "&datefrom=$form->{datefrom}";
 
   if ($form->{datefrom}) {
     $href     .= "&datefrom=$form->{datefrom}";


@@ -465,10 +494,14 @@ sub generate_report {
       . $locale->date(\%myconfig, $form->{dateto}, 1);
   }
 
       . $locale->date(\%myconfig, $form->{dateto}, 1);
   }
 

-  @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)
-    );
+  @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;
 
   if ($form->{accno} || $form->{gifi_accno}) {
     @columns = grep !/(accno|gifi_accno)/, @columns;


@@ -557,6 +590,8 @@ sub generate_report {
     . $locale->text('GIFI')
     . "</a></th>";
   $column_header{balance} = "<th>" . $locale->text('Balance') . "</th>";
     . $locale->text('GIFI')
     . "</a></th>";
   $column_header{balance} = "<th>" . $locale->text('Balance') . "</th>";

+  $column_header{projectnumbers} =
+      "<th class=listheading>"  . $locale->text('Project Numbers') . "</th>";

 
   $form->{landscape} = 1;
 
 
   $form->{landscape} = 1;
 


@@ -617,8 +652,9 @@ sub generate_report {
         </tr>
 |;
   }
         </tr>
 |;
   }

-
+  $form->{balance} *= $ml;

   foreach $ref (@{ $form->{GL} }) {
   foreach $ref (@{ $form->{GL} }) {

+    $form->{balance} *= $ml;

 
     # if item ne sort print subtotal
     if ($form->{l_subtotal} eq 'Y') {
 
     # if item ne sort print subtotal
     if ($form->{l_subtotal} eq 'Y') {


@@ -626,9 +662,10 @@ sub generate_report {
         &gl_subtotal;
       }
     }
         &gl_subtotal;
       }
     }

-    foreach $key (sort keys(%{ $ref->{amount} })) {
-      $form->{balance} += $ref->{amount}{$key};
-    }
+
+    #foreach $key (sort keys(%{ $ref->{amount} })) {
+    #  $form->{balance} += $ref->{amount}{$key};
+    #}

 
     $debit = "";
     foreach $key (sort keys(%{ $ref->{debit} })) {
 
     $debit = "";
     foreach $key (sort keys(%{ $ref->{debit} })) {


@@ -640,6 +677,7 @@ sub generate_report {
         $debit .=
           "<br>" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
       }
         $debit .=
           "<br>" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
       }

+      $form->{balance} = abs($form->{balance}) - abs($ref->{debit}{$key});

     }
 
     $credit = "";
     }
 
     $credit = "";


@@ -652,6 +690,7 @@ sub generate_report {
         $credit .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
       }
         $credit .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
       }

+      $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});

     }
 
     $debittax = "";
     }
 
     $debittax = "";


@@ -665,6 +704,7 @@ sub generate_report {
         $debittax .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
       }
         $debittax .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
       }

+      $form->{balance} = abs($form->{balance}) - abs($ref->{debit_tax}{$key});

     }
 
     $credittax = "";
     }
 
     $credittax = "";


@@ -678,6 +718,7 @@ sub generate_report {
         $credittax .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
       }
         $credittax .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
       }

+      $form->{balance} = abs($form->{balance}) - abs($ref->{credit_tax}{$key});

     }
 
     $debitaccno  = "";
     }
 
     $debitaccno  = "";


@@ -686,14 +727,15 @@ sub generate_report {
     foreach $key (sort keys(%{ $ref->{debit_accno} })) {
       if ($key == 0) {
         $debitaccno =
     foreach $key (sort keys(%{ $ref->{debit_accno} })) {
       if ($key == 0) {
         $debitaccno =

-          "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
+          "<a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";

       } else {
         $debitaccno .=
       } else {
         $debitaccno .=

-          "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
-      }
-      if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
-        $ref->{debit_tax_accno}{$key} = $taxaccno;
+          "<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;
+      #       }

       $taxaccno    = $ref->{debit_tax_accno}{$key};
       $debittaxkey = $ref->{debit_taxkey}{$key};
     }
       $taxaccno    = $ref->{debit_tax_accno}{$key};
       $debittaxkey = $ref->{debit_taxkey}{$key};
     }


@@ -704,14 +746,15 @@ sub generate_report {
     foreach $key (sort keys(%{ $ref->{credit_accno} })) {
       if ($key == 0) {
         $creditaccno =
     foreach $key (sort keys(%{ $ref->{credit_accno} })) {
       if ($key == 0) {
         $creditaccno =

-          "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
+          "<a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";

       } else {
         $creditaccno .=
       } else {
         $creditaccno .=

-          "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
-      }
-      if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
-        $ref->{credit_tax_accno}{$key} = $taxaccno;
+          "<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;
+      #       }

       $taxaccno     = $ref->{credit_tax_accno}{$key};
       $credittaxkey = $ref->{credit_taxkey}{$key};
     }
       $taxaccno     = $ref->{credit_tax_accno}{$key};
       $credittaxkey = $ref->{credit_taxkey}{$key};
     }


@@ -720,10 +763,10 @@ sub generate_report {
     foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
       if ($key == 0) {
         $debittaxaccno =
     foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
       if ($key == 0) {
         $debittaxaccno =

-          "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
+          "<a href=$href&accno=$ref->{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";

       } else {
         $debittaxaccno .=
       } else {
         $debittaxaccno .=

-          "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
+          "<br><a href=$href&accno=$ref->{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";

       }
     }
 
       }
     }
 


@@ -731,10 +774,19 @@ sub generate_report {
     foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
       if ($key == 0) {
         $credittaxaccno =
     foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
       if ($key == 0) {
         $credittaxaccno =

-          "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+          "<a href=$href&accno=$ref->{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";

       } else {
         $credittaxaccno .=
       } else {
         $credittaxaccno .=

-          "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+          "<br><a href=$href&accno=$ref->{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+      }
+    }
+
+    $transdate = "";
+    foreach $key (sort keys(%{ $ref->{transdate} })) {
+      if ($key == 0) {
+        $transdate = "$ref->{transdate}{$key}";
+      } else {
+        $transdate .= "<br>$ref->{transdate}{$key}";

       }
     }
 
       }
     }
 


@@ -742,12 +794,10 @@ sub generate_report {
     #    $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
 
     $column_data{id}        = "<td align=right>&nbsp;$ref->{id}&nbsp;</td>";
     #    $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
 
     $column_data{id}        = "<td align=right>&nbsp;$ref->{id}&nbsp;</td>";

-    $column_data{transdate} =
-      "<td align=center>&nbsp;$ref->{transdate}&nbsp;</td>";
+    $column_data{transdate}    = "<td align=center>$transdate</td>";

     $column_data{reference} =
       "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";
     $column_data{reference} =
       "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";

-    $column_data{description} =
-      "<td align=center>$ref->{description}&nbsp;</td>";
+    $column_data{description}  = "<td align=center>$ref->{description}&nbsp;</td>";

     $column_data{source}       = "<td align=center>$ref->{source}&nbsp;</td>";
     $column_data{notes}        = "<td align=center>$ref->{notes}&nbsp;</td>";
     $column_data{debit}        = "<td align=right>$debit</td>";
     $column_data{source}       = "<td align=center>$ref->{source}&nbsp;</td>";
     $column_data{notes}        = "<td align=center>$ref->{notes}&nbsp;</td>";
     $column_data{debit}        = "<td align=right>$debit</td>";


@@ -769,9 +819,10 @@ 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} =
     $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} * $ml, 2, 0)
-      . "</td>";
+      "<td align=right>"
+      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . "</td>";
+    $column_data{projectnumbers} =
+      "<td>" . join(", ", sort({ lc($a) cmp lc($b) } keys(%{ $ref->{projectnumbers} }))) . "</td>";

 
     $i++;
     $i %= 2;
 
     $i++;
     $i %= 2;


@@ -786,6 +837,12 @@ sub generate_report {
 
   map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
 
 
   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>";
   $column_data{debit} =
     "<th align=right class=listtotal>"
     . $form->format_amount(\%myconfig, $totaldebit, 2, "&nbsp;") . "</th>";


@@ -810,6 +867,27 @@ sub generate_report {
 
   print qq|
         </tr>
 
   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>
         </tbody>
       </table>
     </td>


@@ -838,14 +916,7 @@ sub generate_report {
 <input class=submit type=submit name=action value="|
     . $locale->text('Sales Invoice') . qq|">
 <input class=submit type=submit name=action value="|
 <input class=submit type=submit name=action value="|
     . $locale->text('Sales Invoice') . qq|">
 <input class=submit type=submit name=action value="|

-    . $locale->text('Vendor Invoice') . qq|">|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
+    . $locale->text('Vendor Invoice') . qq|">

 
 </form>
 
 
 </form>
 


@@ -884,27 +955,18 @@ sub gl_subtotal {
 sub update {
   $lxdebug->enter_sub();
 
 sub update {
   $lxdebug->enter_sub();
 

-  if ($form->{transdate} ne $form->{oldtransdate}) {
-    if ($form->{selectprojectnumber}) {
-      $form->all_projects(\%myconfig, undef, $form->{transdate});
-      if (@{ $form->{all_project} }) {
-        $form->{selectprojectnumber} = "<option>\n";
-        for (@{ $form->{all_project} }) {
-          $form->{selectprojectnumber} .=
-            qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
-        }
-        $form->{selectprojectnumber} =
-          $form->escape($form->{selectprojectnumber}, 1);
-      }
-    }
-    $form->{oldtransdate} = $form->{transdate};
-  }
+  $form->{oldtransdate} = $form->{transdate};

 
 

-  my @a         = ();
-  my $count     = 0;
-  my $debittax  = 0;
-  my $credittax = 0;
-  my @flds      =
+  my @a           = ();
+  my $count       = 0;
+  my $debittax    = 0;
+  my $credittax   = 0;
+  my $debitcount  = 0;
+  my $creditcount = 0;
+  $debitlock  = 0;
+  $creditlock = 0;
+
+  my @flds =

     qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
 
   for my $i (1 .. $form->{rowcount}) {
     qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
 
   for my $i (1 .. $form->{rowcount}) {


@@ -917,13 +979,43 @@ sub update {
 
       push @a, {};
       $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
 
       push @a, {};
       $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";

+      if ($debitcredit) {
+        $debitcount++;
+      } else {
+        $creditcount++;
+      }
+
+      if (($debitcount >= 2) && ($creditcount == 2)) {
+        $form->{"credit_$i"} = 0;
+        $form->{"tax_$i"}    = 0;
+        $creditcount--;
+        $creditlock = 1;
+      }
+      if (($creditcount >= 2) && ($debitcount == 2)) {
+        $form->{"debit_$i"} = 0;
+        $form->{"tax_$i"}   = 0;
+        $debitcount--;
+        $debitlock = 1;
+      }
+      if (($creditcount == 1) && ($debitcount == 2)) {
+        $creditlock = 1;
+      }
+      if (($creditcount == 2) && ($debitcount == 1)) {
+        $debitlock = 1;
+      }
+      if ($debitcredit && $credittax) {
+        $form->{"taxchart_$i"} = "0--0.00";
+      }
+      if (!$debitcredit && $debittax) {
+        $form->{"taxchart_$i"} = "0--0.00";
+      }

       $amount =
         ($form->{"debit_$i"} == 0)
         ? $form->{"credit_$i"}
         : $form->{"debit_$i"};
       $j = $#a;
       if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
       $amount =
         ($form->{"debit_$i"} == 0)
         ? $form->{"credit_$i"}
         : $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"}) {
         $form->{"tax_$i"}      = 0;
       }
       if (!$form->{"korrektur_$i"}) {


@@ -987,39 +1079,46 @@ sub display_rows {
   my ($init) = @_;
   $lxdebug->enter_sub();
 
   my ($init) = @_;
   $lxdebug->enter_sub();
 

-  $form->{selectprojectnumber} = $form->unescape($form->{selectprojectnumber})
-    if $form->{selectprojectnumber};
-

   $form->{totaldebit}  = 0;
   $form->{totalcredit} = 0;
   my $chart = $form->{chart};
   $chart            = $form->unquote($chart);
   $form->{taxchart} = $form->unquote($form->{taxchart});
   $taxchart         = $form->{taxchart};
   $form->{totaldebit}  = 0;
   $form->{totalcredit} = 0;
   my $chart = $form->{chart};
   $chart            = $form->unquote($chart);
   $form->{taxchart} = $form->unquote($form->{taxchart});
   $taxchart         = $form->{taxchart};

+
+  my @old_project_ids = ();
+  map({ push(@old_project_ids, $form->{"project_id_$_"})
+          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 0,
+                                   "old_id" => \@old_project_ids });
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+

   for $i (1 .. $form->{rowcount}) {
 
     $source = qq|
   for $i (1 .. $form->{rowcount}) {
 
     $source = qq|

-    <td><input name="source_$i" value="$form->{"source_$i"}" tabindex=|
-      . ($i + 11 + (($i - 1) * 8))
-      . qq|></td>|;
+    <td><input name="source_$i" value="$form->{"source_$i"}" size="16" tabindex=|
+      . ($i + 11 + (($i - 1) * 8)) . qq|></td>|;

     $memo = qq|
     $memo = qq|

-    <td><input name="memo_$i" value="$form->{"memo_$i"}" tabindex=|
-      . ($i + 12 + (($i - 1) * 8))
-      . qq|></td>|;
+    <td><input name="memo_$i" value="$form->{"memo_$i"}" size="16" tabindex=|
+      . ($i + 12 + (($i - 1) * 8)) . qq|></td>|;

 
     if ($init) {
       $accno = qq|
 
     if ($init) {
       $accno = qq|

-      <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|
-        . ($i + 5 + (($i - 1) * 8))
-        . qq|>$form->{chartinit}</select></td>|;
+      <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:200px" tabindex=|
+        . ($i + 5 + (($i - 1) * 8)) . qq|>$form->{chartinit}</select></td>|;

       $tax =
       $tax =

-          qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
+        qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px" tabindex=|

         . ($i + 10 + (($i - 1) * 8))
         . qq|>$form->{taxchart}</select></td>|;
         . ($i + 10 + (($i - 1) * 8))
         . qq|>$form->{taxchart}</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))
       $korrektur =
         qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
         . ($i + 9 + (($i - 1) * 8))


@@ -1031,9 +1130,17 @@ sub display_rows {
       }
 
     } else {
       }
 
     } else {

-
-      $form->{totaldebit}  += $form->{"debit_$i"};
-      $form->{totalcredit} += $form->{"credit_$i"};
+      if ($form->{"debit_$i"} != 0) {
+        $form->{totaldebit} += $form->{"debit_$i"};
+        if (!$form->{taxincluded}) {
+          $form->{totaldebit} += $form->{"tax_$i"};
+        }
+      } else {
+        $form->{totalcredit} += $form->{"credit_$i"};
+        if (!$form->{taxincluded}) {
+          $form->{totalcredit} += $form->{"tax_$i"};
+        }
+      }

 
       for (qw(debit credit tax)) {
         $form->{"${_}_$i"} =
 
       for (qw(debit credit tax)) {
         $form->{"${_}_$i"} =


@@ -1049,7 +1156,7 @@ sub display_rows {
         $accno =~
           s/value=\"$chart_selected\"/value=\"$chart_selected\" selected/;
         $accno =
         $accno =~
           s/value=\"$chart_selected\"/value=\"$chart_selected\" selected/;
         $accno =

-          qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|
+          qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:200px" tabindex=|

           . ($i + 5 + (($i - 1) * 8))
           . qq|>$accno</select></td>|;
         $tax          = $taxchart;
           . ($i + 5 + (($i - 1) * 8))
           . qq|>$accno</select></td>|;
         $tax          = $taxchart;


@@ -1060,15 +1167,6 @@ sub display_rows {
           . ($i + 10 + (($i - 1) * 8))
           . qq|>$tax</select></td>|;
 
           . ($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->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
           $x = ($checked) ? "x" : "";
         if ($form->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
           $x = ($checked) ? "x" : "";


@@ -1081,22 +1179,17 @@ sub display_rows {
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked tabindex=|
           . ($i + 9 + (($i - 1) * 8))
           . qq|></td>|;
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked tabindex=|
           . ($i + 9 + (($i - 1) * 8))
           . qq|></td>|;

-        $form->hide_form("accno_$i", "projectnumber_$i");
+        $form->hide_form("accno_$i");

 
       } else {
 
         $accno = qq|
       <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|
 
       } else {
 
         $accno = qq|
       <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|

-          . ($i + 5 + (($i - 1) * 8))
-          . qq|>$chart</select></td>|;
+          . ($i + 5 + (($i - 1) * 8)) . qq|>$chart</select></td>|;

         $tax = qq|
       <td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
         $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>|;
-        }
+          . ($i + 10 + (($i - 1) * 8)) . qq|>$taxchart</select></td>|;
+

         $korrektur =
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
           . ($i + 9 + (($i - 1) * 8))
         $korrektur =
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
           . ($i + 9 + (($i - 1) * 8))


@@ -1108,33 +1201,43 @@ sub display_rows {
         }
       }
     }
         }
       }
     }

+    my $debitreadonly  = "";
+    my $creditreadonly = "";
+    if ($i == $form->{rowcount}) {
+      if ($debitlock) {
+        $debitreadonly = "readonly";
+      } elsif ($creditlock) {
+        $creditreadonly = "readonly";
+      }
+    }
+
+    my $projectnumber =
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@project_values,
+                           '-labels' => \%project_labels,
+                           '-default' => $form->{"project_id_$i"} ));

 
     print qq|<tr valign=top>
     $accno
     $fx_transaction
 
     print qq|<tr valign=top>
     $accno
     $fx_transaction

-    <td><input name="debit_$i" size=10 value="$form->{"debit_$i"}" accesskey=$i tabindex=|
-      . ($i + 6 + (($i - 1) * 8))
-      . qq|></td>
-    <td><input name="credit_$i" size=10 value="$form->{"credit_$i"}" tabindex=|
-      . ($i + 7 + (($i - 1) * 8))
-      . qq|></td>
-    <td><input name="tax_$i" size=8 value="$form->{"tax_$i"}" tabindex=|
-      . ($i + 8 + (($i - 1) * 8))
-      . qq|></td>
+    <td><input name="debit_$i" size=8 value="$form->{"debit_$i"}" accesskey=$i tabindex=|
+      . ($i + 6 + (($i - 1) * 8)) . qq| $debitreadonly></td>
+    <td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" tabindex=|
+      . ($i + 7 + (($i - 1) * 8)) . qq| $creditreadonly></td>
+    <td><input name="tax_$i" size=6 value="$form->{"tax_$i"}" tabindex=|
+      . ($i + 8 + (($i - 1) * 8)) . qq|></td>

     $korrektur
     $tax
     $source
     $memo
     $korrektur
     $tax
     $source
     $memo

-    $project
+    <td>$projectnumber</td>

   </tr>
 
   |;
   }
 
   $form->hide_form(qw(rowcount selectaccno));
   </tr>
 
   |;
   }
 
   $form->hide_form(qw(rowcount selectaccno));

-  print qq|
-<input type=hidden name=selectprojectnumber value="|
-    . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
+

   $lxdebug->leave_sub();
 
 }
   $lxdebug->leave_sub();
 
 }


@@ -1155,7 +1258,7 @@ sub form_header {
   <!--
   function setTaxkey(accno, row) {
     var taxkey = accno.options[accno.selectedIndex].value;
   <!--
   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);
     var found = reg.exec(taxkey);
     var index = found[1];
     index = parseInt(index);


@@ -1189,9 +1292,6 @@ sub form_header {
     $taxincluded = "checked";
   }
 
     $taxincluded = "checked";
   }
 

-  $amount =
-    qq|<input name=amount size=20 value="$form->{amount}" tabindex="4" $readonly>|;
-

   $department = qq|
        <tr>
          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
   $department = qq|
        <tr>
          <th align=right nowrap>| . $locale->text('Department') . qq|</th>


@@ -1212,21 +1312,19 @@ sub form_header {
 
     # with JavaScript Calendar
     $button1 = qq|
 
     # with JavaScript Calendar
     $button1 = qq|

-       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly>
+       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" tabindex="2" $readonly>

        <input type=button name=transdate id="trigger1" value=|
        <input type=button name=transdate id="trigger1" value=|

-      . $locale->text('button')
-      . qq|></td>  
+      . $locale->text('button') . qq|></td>  

        |;
 
     #write Trigger
     $jsscript =
        |;
 
     #write Trigger
     $jsscript =

-      Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1", "",
-                          "", "");
+      Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1");

   } else {
 
     # without JavaScript Calendar
     $button1 =
   } else {
 
     # without JavaScript Calendar
     $button1 =

-      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly></td>|;
+      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" tabindex="2" $readonly></td>|;

   }
 
   $form->header;
   }
 
   $form->header;


@@ -1254,10 +1352,10 @@ sub form_header {
     <td>
       <table width=100%>
        <tr>
     <td>
       <table width=100%>
        <tr>

-         <th align=right>| . $locale->text('Reference') . qq|</th>
+         <th align=left>| . $locale->text('Reference') . qq|</th>

          <td><input name=reference size=20 value="$form->{reference}" tabindex="1" $readonly></td>
          <td align=left>
          <td><input name=reference size=20 value="$form->{reference}" tabindex="1" $readonly></td>
          <td align=left>

-           <table width=100%>
+           <table>

              <tr>
                <th align=right nowrap>| . $locale->text('Date') . qq|</th>
                 $button1
              <tr>
                <th align=right nowrap>| . $locale->text('Date') . qq|</th>
                 $button1


@@ -1271,7 +1369,7 @@ sub form_header {
          <th align=right>| . $locale->text('Belegnummer') . qq|</th>
          <td><input name=id size=20 value="$form->{id}" $readonly></td>
          <td align=left>
          <th align=right>| . $locale->text('Belegnummer') . qq|</th>
          <td><input name=id size=20 value="$form->{id}" $readonly></td>
          <td align=left>

-         <table width=100%>
+         <table>

              <tr>
                <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
                <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly></td>
              <tr>
                <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
                <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly></td>


@@ -1285,8 +1383,16 @@ sub form_header {
   if ($form->{id}) {
     print qq|
        <tr>
   if ($form->{id}) {
     print qq|
        <tr>

-         <th align=right>| . $locale->text('Description') . qq|</th>
-         <td>$description</td>
+         <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+         <td width=1%>$description</td>
+          <td>
+           <table>
+             <tr>
+               <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+               <td><input type=checkbox name=taxincluded value=1 tabindex="5" $taxincluded></td>
+             </tr>
+           </table>
+        </td>

          <td align=left>
            <table width=100%>
              <tr>
          <td align=left>
            <table width=100%>
              <tr>


@@ -1299,15 +1405,9 @@ sub form_header {
   } else {
     print qq|
        <tr>
   } else {
     print qq|
        <tr>

-         <th align=right>| . $locale->text('Description') . qq|</th>
-         <td colspan=2>$description</td>
-       </tr>|;
-  }
-  print qq|
-       <tr>
-         <th align=right>| . $locale->text('Betrag') . qq|</th>
-         <td>$amount</td>
-         <td align=left>
+         <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+         <td width=1%>$description</td>
+         <td>

            <table>
              <tr>
                <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
            <table>
              <tr>
                <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>


@@ -1315,33 +1415,30 @@ sub form_header {
              </tr>
            </table>
         </td>
              </tr>
            </table>
         </td>

-      </tr>
+       </tr>|;
+  }
+  print qq|

       <tr>
       <tr>

+      <td colspan=4>

           <table width=100%>
           <tr class=listheading>
          <th class=listheading style="width:15%">|
           <table width=100%>
           <tr class=listheading>
          <th class=listheading style="width:15%">|

-    . $locale->text('Account')
-    . qq|</th>
+    . $locale->text('Account') . qq|</th>

          <th class=listheading style="width:10%">|
          <th class=listheading style="width:10%">|

-    . $locale->text('Debit')
-    . qq|</th>
+    . $locale->text('Debit') . qq|</th>

          <th class=listheading style="width:10%">|
          <th class=listheading style="width:10%">|

-    . $locale->text('Credit')
-    . qq|</th>
+    . $locale->text('Credit') . qq|</th>

           <th class=listheading style="width:10%">|
           <th class=listheading style="width:10%">|

-    . $locale->text('Tax')
-    . qq|</th>
+    . $locale->text('Tax') . qq|</th>

           <th class=listheading style="width:5%">|
           <th class=listheading style="width:5%">|

-    . $locale->text('Korrektur')
-    . qq|</th>
+    . $locale->text('Korrektur') . qq|</th>

           <th class=listheading style="width:10%">|
           <th class=listheading style="width:10%">|

-    . $locale->text('Taxkey')
-    . qq|</th>
+    . $locale->text('Taxkey') . qq|</th>

          <th class=listheading style="width:20%">|
          <th class=listheading style="width:20%">|

-    . $locale->text('Source')
-    . qq|</th>
+    . $locale->text('Source') . qq|</th>

          <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
          <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>

-         $project
+         <th class=listheading style="width:20%">|
+    . $locale->text('Project Number') . qq|</th>

        </tr>
 
 $jsscript
        </tr>
 
 $jsscript


@@ -1359,11 +1456,19 @@ sub form_footer {
 
   map {
     $form->{$_} =
 
   map {
     $form->{$_} =

-      $form->format_amount(\%myconfig, $form->{$_}, $decimalplaces, "&nbsp;")
+      $form->format_amount(\%myconfig, $form->{$_}, 2, "&nbsp;")

   } qw(totaldebit totalcredit);
 
   print qq|
   } qw(totaldebit totalcredit);
 
   print qq|

+    <tr class=listtotal>
+    <td></td>
+    <th align=right class=listtotal> $form->{totaldebit}</th>
+    <th align=right class=listtotal> $form->{totalcredit}</th> 
+    <td colspan=6></td>
+    </tr>

   </table>
   </table>

+  </td>
+  </tr>

 </table>
 
 <input type=hidden name=path value=$form->{path}>
 </table>
 
 <input type=hidden name=path value=$form->{path}>


@@ -1383,13 +1488,12 @@ sub form_footer {
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Storno') . qq|">|;
 
     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|
                <input class=submit type=submit name=action value="|
 
     if (!$form->{locked} && $radieren) {
       print qq|
                <input class=submit type=submit name=action value="|

-        . $locale->text('Post')
-        . qq|" accesskey="b">
+        . $locale->text('Post') . qq|" accesskey="b">

                <input class=submit type=submit name=action value="|
         . $locale->text('Delete') . qq|">|;
     }
                <input class=submit type=submit name=action value="|
         . $locale->text('Delete') . qq|">|;
     }


@@ -1407,11 +1511,6 @@ sub form_footer {
     }
   }
 
     }
   }
 

-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-

   print "
   </form>
 
   print "
   </form>
 


@@ -1433,12 +1532,12 @@ sub delete {
 <form method=post action=$form->{script}>
 |;
 
 <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) {
 
   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|
   }
 
   print qq|


@@ -1458,9 +1557,15 @@ sub delete {
 
 sub yes {
   $lxdebug->enter_sub();
 
 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();
 
   $form->error($locale->text('Cannot delete transaction!'));
   $lxdebug->leave_sub();
 


@@ -1477,15 +1582,30 @@ sub post {
   $transdate = $form->datetonum($form->{transdate}, \%myconfig);
   $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
   $transdate = $form->datetonum($form->{transdate}, \%myconfig);
   $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 

-  # check project
-  &check_project;
+  my @a           = ();
+  my $count       = 0;
+  my $debittax    = 0;
+  my $credittax   = 0;
+  my $debitcount  = 0;
+  my $creditcount = 0;
+  $creditlock = 0;
+  $debitlock  = 0;

 
 

-  my @a         = ();
-  my $count     = 0;
-  my $debittax  = 0;
-  my $credittax = 0;
-  my @flds      =
+  my @flds =

     qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
     qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);

+  if ($form->{storno}) {
+    for my $i (1 .. $form->{rowcount}) {
+      unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
+        if ($form->{"debit_$i"} ne "") {
+          $form->{"credit_$i"} = $form->{"debit_$i"};
+          $form->{"debit_$i"}  = "";
+        } elsif ($form->{"credit_$i"} ne "") {
+          $form->{"debit_$i"}  = $form->{"credit_$i"};
+          $form->{"credit_$i"} = "";
+        }
+      }
+    }
+  }

 
   for my $i (1 .. $form->{rowcount}) {
 
 
   for my $i (1 .. $form->{rowcount}) {
 


@@ -1497,13 +1617,44 @@ sub post {
 
       push @a, {};
       $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
 
       push @a, {};
       $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";

+
+      if ($debitcredit) {
+        $debitcount++;
+      } else {
+        $creditcount++;
+      }
+
+      if (($debitcount >= 2) && ($creditcount == 2)) {
+        $form->{"credit_$i"} = 0;
+        $form->{"tax_$i"}    = 0;
+        $creditcount--;
+        $creditlock = 1;
+      }
+      if (($creditcount >= 2) && ($debitcount == 2)) {
+        $form->{"debit_$i"} = 0;
+        $form->{"tax_$i"}   = 0;
+        $debitcount--;
+        $debitlock = 1;
+      }
+      if (($creditcount == 1) && ($debitcount == 2)) {
+        $creditlock = 1;
+      }
+      if (($creditcount == 2) && ($debitcount == 1)) {
+        $debitlock = 1;
+      }
+      if ($debitcredit && $credittax) {
+        $form->{"taxchart_$i"} = "0--0.00";
+      }
+      if (!$debitcredit && $debittax) {
+        $form->{"taxchart_$i"} = "0--0.00";
+      }

       $amount =
         ($form->{"debit_$i"} == 0)
         ? $form->{"credit_$i"}
         : $form->{"debit_$i"};
       $j = $#a;
       if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
       $amount =
         ($form->{"debit_$i"} == 0)
         ? $form->{"credit_$i"}
         : $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"}) {
         $form->{"tax_$i"}      = 0;
       }
       if (!$form->{"korrektur_$i"}) {


@@ -1516,12 +1667,23 @@ sub post {
           }
           if ($form->{taxincluded}) {
             $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
           }
           if ($form->{taxincluded}) {
             $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;

+            if ($debitcredit) {
+              $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
+            } else {
+              $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+            }

           } else {
             $form->{"tax_$i"} = $amount * $rate;
           }
         } else {
           $form->{"tax_$i"} = 0;
         }
           } else {
             $form->{"tax_$i"} = $amount * $rate;
           }
         } else {
           $form->{"tax_$i"} = 0;
         }

+      } elsif ($form->{taxincluded}) {
+        if ($debitcredit) {
+          $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
+        } else {
+          $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+        }

       }
 
       for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
       }
 
       for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }


@@ -1549,8 +1711,12 @@ sub post {
         ));
     }
     if ($form->{taxincluded}) {
         ));
     }
     if ($form->{taxincluded}) {

-      $debit    += $dr;
-      $credit   += $cr;
+      if ($dr) {
+        $debit += $dr + $tax;
+      }
+      if ($cr) {
+        $credit += $cr + $tax;
+      }

       $taxtotal += $tax;
     } else {
       if ($dr) {
       $taxtotal += $tax;
     } else {
       if ($dr) {


@@ -1571,6 +1737,11 @@ sub post {
   if ($form->round_amount($debit, 2) != $form->round_amount($credit, 2)) {
     $form->error($locale->text('Out of balance transaction!'));
   }
   if ($form->round_amount($debit, 2) != $form->round_amount($credit, 2)) {
     $form->error($locale->text('Out of balance transaction!'));
   }

+  
+  if ($form->round_amount($debit, 2) + $form->round_amount($credit, 2) == 0) {
+    $form->error($locale->text('Empty transaction!'));
+  }
+  

   if (($errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
     $errno *= -1;
     $err[1] = $locale->text('Cannot have a value in both Debit and Credit!');
   if (($errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
     $errno *= -1;
     $err[1] = $locale->text('Cannot have a value in both Debit and Credit!');


@@ -1580,6 +1751,13 @@ sub post {
     $form->error($err[$errno]);
   }
   undef($form->{callback});
     $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();
 
   $form->redirect("Buchung gespeichert. Buchungsnummer = " . $form->{id});
   $lxdebug->leave_sub();
 


@@ -1599,6 +1777,12 @@ sub storno {
 
   $form->{id}     = 0;
   $form->{storno} = 1;
 
   $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();
 
   &post;
   $lxdebug->leave_sub();