/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 30175d89

Von Philip Reetz vor fast 19 Jahren hinzugefügt

ID 30175d8928a88a8b7f224a4515e192e66fa37656
Vorgänger 9475cae8
Nachfolger 1c4fffbe

Splitbuchungen fuer Kreditoren ergaenzt

           : $form->parse_amount($myconfig, $form->{exchangerate});
+      }
       for $i (1 .. $form->{rowcount}) {
         $form->{AP_amounts}{"amount_$i"} =
           (split(/--/, $form->{"AP_amount_$i"}))[0];
+      }
       ($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
       ($form->{AP}{payables})         = split(/--/, $form->{APselected});
       # reverse and parse amounts
       for my $i (1 .. 1) {
       for my $i (1 .. $form->{rowcount}) {
         $form->{"amount_$i"} =
           $form->round_amount(
                              $form->parse_amount($myconfig, $form->{"amount_$i"}) *
-...
       # taxincluded doesn't make sense if there is no amount
       $form->{taxincluded} = 0 if ($form->{amount} == 0);
       $query =
         qq| SELECT c.accno, t.rate FROM chart c, tax t where c.id=t.chart_id AND t.taxkey=$form->{taxkey}|;
       $sth = $dbh->prepare($query);
       $sth->execute || $form->dberror($query);
       ($form->{AP}{"tax"}, $form->{taxrate}) = $sth->fetchrow_array;
       $sth->finish;
       for $i (1 .. $form->{rowcount}) {
         ($form->{"taxkey_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
       $formtax = $form->parse_amount($myconfig, $form->{"tax"});
       $form->{"tax"} = $form->{amount} * $form->{taxrate};
       $form->{"tax"} =
         $form->round_amount($form->{"tax"} * $form->{exchangerate}, 2) * -1;
         $query =
           qq| SELECT c.accno, t.rate FROM chart c, tax t where c.id=t.chart_id AND t.taxkey=$form->{"taxkey_$i"}|;
         $sth = $dbh->prepare($query);
         $sth->execute || $form->dberror($query);
         ($form->{AP_amounts}{"tax_$i"}, $form->{"taxrate_$i"}) =
           $sth->fetchrow_array;
         $form->{AP_amounts}{"tax_$i"}{taxkey}    = $form->{"taxkey_$i"};
         $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
       if ($form->{taxcheck}) {
         $form->{"tax"} = $formtax * -1;
         $sth->finish;
         if (!$form->{"korrektur_$i"}) {
           if ($form->{taxincluded} *= 1) {
             $tax =
               $form->{"amount_$i"} -
               ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
             $amount = $form->{"amount_$i"} - $tax;
             $form->{"amount_$i"} = $form->round_amount($amount, 2);
             $diff += $amount - $form->{"amount_$i"};
             $form->{"tax_$i"} = $form->round_amount($tax, 2);
             $form->{netamount} += $form->{"amount_$i"};
           } else {
             $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
             $form->{"tax_$i"} =
               $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
             $form->{netamount} += $form->{"amount_$i"};
+          }
+        }
         $form->{total_tax} += $form->{"tax_$i"} * -1;
+      }
       $form->{total_tax} += ($form->{"tax"} * -1);
       # adjust paidaccounts if there is no date in the last row
       $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
       $form->{invpaid} = 0;
       $form->{netamount} *= -1;
       # add payments
       for my $i (1 .. $form->{paidaccounts}) {
-...
       $form->{invpaid} =
         $form->round_amount($form->{invpaid} * $form->{exchangerate}, 2);
       if ($form->{taxincluded} *= 1) {
         for $i (1 .. 1) {
           $tax =
             $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{taxrate} + 1));
           if ($form->{taxcheck}) {
             $tax = $formtax * -1;
+          }
           $amount = $form->{"amount_$i"} - $tax;
           $form->{"amount_$i"} = $form->round_amount($amount, 2);
           $diff += $amount - $form->{"amount_$i"};
           $form->{tax} = $form->round_amount($tax, 2);
           $form->{total_tax} = $form->{tax} * -1;
+        }
         print(STDERR "Steuer $form->{tax}\n");
         print(STDERR "TotalSteuer $form->{total_tax}\n");
         # deduct taxes from amount
         # $form->{amount} -= $form->{total_tax};
         # deduct difference from amount_1
         # $form->{amount_1} += $form->round_amount($diff, 2);
         $form->{amount} = $form->{amount_1} * -1;
+      }
       $form->{netamount} = $form->{amount};
       # store invoice total, this goes into ap table
       $form->{invtotal} = $form->{amount} + $form->{total_tax};
       $form->{invtotal} = $form->{netamount} + $form->{total_tax};
       # amount for total AP
       $form->{payables} = $form->{invtotal};
       print(STDERR $form->{payables},
             " Payables\n",
             $form->{invtotal},
             " Invtotal\n",
             $form->{netamount},
             " Netamount\n",
             $form->{total_tax},
             " Total_Tax\n\n");
       my ($query, $sth);
       # if we have an id delete old records
-...
+      }
       # add individual transactions
       foreach my $item (keys %{ $form->{AP} }) {
         if ($form->{$item} != 0) {
       for $i (1 .. $form->{rowcount}) {
         if ($form->{"amount_$i"} != 0) {
           $project_id = 'NULL';
           if ($item =~ /amount_/) {
             if ($form->{"project_id_$'"} && $form->{"projectnumber_$'"}) {
               $project_id = $form->{"project_id_$'"};
           if ("amount_$i" =~ /amount_/) {
             if ($form->{"project_id_$i"} && $form->{"projectnumber_$i"}) {
               $project_id = $form->{"project_id_$i"};
+            }
+          }
           if ("amount_$i" =~ /amount/) {
             $taxkey = $form->{AP_amounts}{"amount_$i"}{taxkey};
+          }
           # insert detail records in acc_trans
           $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
                                              project_id, taxkey)
                       VALUES ($form->{id}, (SELECT c.id FROM chart c
     		                        WHERE c.accno = '$form->{AP}{$item}'),
     		  $form->{$item}, '$form->{transdate}', $project_id, '$form->{taxkey}')|;
                                              WHERE c.accno = '$form->{AP_amounts}{"amount_$i"}'),
                         $form->{"amount_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
           $dbh->do($query) || $form->dberror($query);
           if ($form->{"tax_$i"} != 0) {
             # insert detail records in acc_trans
             $query =
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
                                               project_id, taxkey)
                         VALUES ($form->{id}, (SELECT c.id FROM chart c
                                               WHERE c.accno = '$form->{AP_amounts}{"tax_$i"}'),
                         $form->{"tax_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
             $dbh->do($query) || $form->dberror($query);
+          }
+        }
+      }
       # add payables
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
                                           project_id)
                   VALUES ($form->{id}, (SELECT c.id FROM chart c
                                         WHERE c.accno = '$form->{AP_amounts}{payables}'),
                   $form->{payables}, '$form->{transdate}', $project_id)|;
       $dbh->do($query) || $form->dberror($query);
       # if there is no amount but a payment record a payable
       if ($form->{amount} == 0 && $form->{invtotal} == 0) {
         $form->{payables} = $form->{invpaid};

       $form->{duedate}   = $duedate if $duedate;
       $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}";
       $form->{rowcount}  = 1;
       # build the popup menus
       $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
-...
         $form->{$key} = $form->{"select$key"};
         # if there is a value we have an old entry
         $j = 0;
         my $j = 0;
         my $k = 0;
         for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
           if ($key eq "AP_paid") {
-...
             $akey = $key;
             $akey =~ s/AP_//;
             if ($key eq "AP_tax") {
             if (($key eq "AP_tax") || ($key eq "AR_tax")) {
               $form->{"${key}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} =
                 "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
               $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} =
                 $form->round_amount(
                  $form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate * -1,
 );
                       $form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate,
 );
               if ($form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"} > 0) {
                 $totaltax +=
                   $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
-...
                 $withholdingrate +=
                   $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
+              }
               $formtax =
                 $form->round_amount(
                       $form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate,
 ) * -1;
               $index = $form->{acc_trans}{$key}->[$i - 1]->{index};
               $form->{"tax_$index"} =
                 $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
               $totaltax += $form->{"tax_$index"};
             } else {
               $form->{"${akey}_$i"} =
               $k++;
               $form->{"${akey}_$k"} =
                 $form->round_amount(
                       $form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate,
 );
               if ($akey eq 'amount') {
                 $form->{rowcount}++;
                 $form->{"${akey}_$i"} *= -1;
                 $totalamount += $form->{"${akey}_$i"};
                 $form->{taxrate} = $form->{acc_trans}{$key}->[$i - 1]->{rate};
                 $form->{rowcount}++;
                 $form->{"oldprojectnumber_$i"} = $form->{"projectnumber_$i"} =
                 $form->{"oldprojectnumber_$k"} = $form->{"projectnumber_$k"} =
                   "$form->{acc_trans}{$key}->[$i-1]->{projectnumber}";
                 $form->{"project_id_$i"} =
                 $form->{"project_id_$k"} =
                   "$form->{acc_trans}{$key}->[$i-1]->{project_id}";
+              }
               $form->{"${key}_$i"} =
               $form->{"${key}_$k"} =
                 "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
               $form->{"select${key}"} =~
                 /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n)/;
                 /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n/;
               $test = $1;
               $form->{"select${key}"} = $1;
               $form->{"${key}_$k"} = $1;
               if ($akey eq 'amount') {
                 $form->{selecttaxchart} =~
                   /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^<]*)/;
                 $form->{selecttaxchart} = $1;
                 $form->{"taxchart_$k"} = $form->{taxchart};
                 $form->{"taxchart_$k"} =~
                   /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^\"]*)/;
                 $form->{"taxchart_$k"} = $1;
+              }
+            }
+          }
-...
       if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
         # add tax to amounts and invtotal
         for $i (1 .. 1) {
         for $i (1 .. $form->{rowcount}) {
           $taxamount =
             ($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
           $tax = $form->round_amount($taxamount, 2);
           $diff                += ($taxamount - $tax);
           $form->{"amount_$i"} += $tax;
           $form->{"amount_$i"} += $form->{"tax_$i"};
+        }
         $form->{amount_1} += $form->round_amount($diff, 2);
+      }
       # check if calculated is equal to stored
       if ($form->{taxincluded} && $form->{taxrate} && $witholdingrate) {
         if ($form->{"taxrate"} > 0) {
           $taxamount =
             $form->round_amount(
                 ($form->{amount_1} - ($form->{amount_1} / ($form->{taxrate} + 1))),
 );
         } else {
           $taxamount =
             $form->round_amount(
                 ($totalamount + $totaltax + $totalwithholding) * $withholdingrate /
                   (1 - $withholdingrate),
             ) * $form->{"taxrate"} / $withholdingrate;
+        }
       } else {
         $taxamount = $totalamount * $form->{"taxrate"};
+      }
       $taxamount = $form->round_amount($taxamount, 2);
       $form->{tax} = $taxamount;
       $form->{tax} = $formtax;
       $form->{invtotal} = $totalamount + $totaltax + $totalwithholding;
       $form->{rowcount}++ if $form->{id};
       $form->{invtotal} = $totalamount + $totaltax;
       $form->{locked} =
         ($form->datetonum($form->{transdate}, \%myconfig) <=
-...
       # type=submit $locale->text('Add Accounts Payables Transaction')
       # type=submit $locale->text('Edit Accounts Payables Transaction')
       $form->{javascript} = qq|<script type="text/javascript">
       <!--
       function setTaxkey(accno, row) {
         var taxkey = accno.options[accno.selectedIndex].value;
         var reg = /--([0-9])*/;
         var found = reg.exec(taxkey);
         var index = found[1];
         index = parseInt(index);
         var tax = 'taxchart_' + row;
         for (var i = 0; i < document.getElementById(tax).options.length; ++i) {
           var reg2 = new RegExp("^"+ index, "");
           if (reg2.exec(document.getElementById(tax).options[i].value)) {
             document.getElementById(tax).options[i].selected = true;
             break;
+          }
+        }
       };
       //-->
       </script>|;
       # set option selected
       foreach $item (qw(vendor currency department)) {
         $form->{"select$item"} =~ s/ selected//;
-...
       $form->{radier} =
         ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
       $readonly = ($form->{radier}) ? "" : $readonly;
       map { $form->{$_} =~ s/\"/&quot;/g } qw(AP_amount AP taxchart);
       $readonly                 = ($form->{radier}) ? "" : $readonly;
       $selectAP_amount_unquoted = $form->{selectAP_amount};
       $taxchart                 = $form->{taxchart};
       map { $form->{$_} =~ s/\"/&quot;/g }
         qw(AP_amount selectAP_amount AP taxchart);
       # format amounts
       $form->{exchangerate} =
-...
                 <tr>
                   <td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
                   <th align=left nowrap>|
         . $locale->text('Tax Included')
         . qq|</th>
         . $locale->text('Tax Included') . qq|</th>
                 </tr>
     |;
-...
         $button1 = qq|
            <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}> $readonly</td>
            <td><input type=button name=transdate id="trigger1" value=|
           . $locale->text('button')
           . qq|></td>
           . $locale->text('button') . qq|></td>
            |;
         $button2 = qq|
            <td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}> $readonly</td>
            <td><input type=button name=duedate id="trigger2" value=|
           . $locale->text('button')
           . qq|></td></td>
           . $locale->text('button') . qq|></td></td>
          |;
         #write Trigger
-...
           </table>
         </td>
       </tr>
     $jsscript
       <input type=hidden name=selectAP_amount value="$form->{selectAP_amount}">
       <input type=hidden name=AP_amount value="$form->{AP_amount}">
       <input type=hidden name=taxchart value="$form->{taxchart}">
       <input type=hidden name=rowcount value=$form->{rowcount}>
       <tr>
         <td>
           <table width=100%>
     $jsscript
           <td>
               <table width=100%>
     	   <tr class=listheading>
     	  <th class=listheading style="width:15%">|
         . $locale->text('Account') . qq|</th>
     	  <th class=listheading style="width:10%">|
         . $locale->text('Amount') . qq|</th>
               <th class=listheading style="width:10%">|
         . $locale->text('Tax') . qq|</th>
               <th class=listheading style="width:5%">|
         . $locale->text('Korrektur') . qq|</th>
               <th class=listheading style="width:10%">|
         . $locale->text('Taxkey') . qq|</th>
               <th class=listheading style="width:10%">|
         . $locale->text('Project') . qq|</th>
     	</tr>
     |;
       $amount  = $locale->text('Amount');
       $project = $locale->text('Project');
       for $i (1 .. 1) {
         #     $form->{"selectAP_amount"} =~ s/ selected//;
         #     $form->{"selectAP_amount"} =~ s/option>\Q$form->{"AP_amount_$i"}\E/option selected>$form->{"AP_amount_$i"}/;
       for $i (1 .. $form->{rowcount}) {
         # format amounts
         $form->{"amount_$i"} =
           $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
         $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
         $selectAP_amount = $selectAP_amount_unquoted;
         $selectAP_amount =~
           s/option value=\"$form->{"AP_amount_$i"}\"/option value=\"$form->{"AP_amount_$i"}\" selected/;
         $tax          = $taxchart;
         $tax_selected = $form->{"taxchart_$i"};
         $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
         $tax =
           qq|<td><select id="taxchart_$i" name="taxchart_$i">$tax</select></td>|;
         print qq|
     	<tr>
     	  <th align=right nowrap>$amount</th>
     	  <td><input name="amount_$i" size=10 value=$form->{"amount_$i"} $readonly></td>
     	  <th>$project</th>
               <td width=50%><select name="AP_amount_$i">$selectAP_amount</select></td>
               <td><input name="amount_$i" onChange="setTaxkey(this, $i)" size=10 value=$form->{"amount_$i"}></td>
               <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
               <td><input type="checkbox" name="korrektur_$i" value="1"></td>
               $tax
     	  <td><input name="projectnumber_$i" size=20 value="$form->{"projectnumber_$i"}">
     	      <input type=hidden name="project_id_$i" value=$form->{"project_id_$i"}>
     	      <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}"></td>
     	  <td width=50%><select  name="AP_amountselected">$form->{selectAP_amount}</select></td>
     	</tr>
     |;
         $amount  = "";
-...
         ? $locale->text('Tax Included')
         : $locale->text('Tax');
       # format and reverse tax
       $form->{"tax"} = $form->format_amount(\%myconfig, $form->{"tax"}, 2);
       $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
       print qq|
             <tr>
     	  <th align=right nowrap>${taxlabel}</th>
     	  <td><input name="tax" size=10 value=$form->{"tax"} $readonly></td>
     	  <td align=right><input name=taxcheck class=checkbox type=checkbox value=1></td>
               <td align=left nowrap>| . $locale->text('Correct Tax') . qq|</td>
     	  <td><select name=taxchartselected>$form->{"selecttaxchart"}</select></td>
               <td colspan=6>
                 <hr noshade>
               </td>
             </tr>
     |;
       $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
       print qq|
             <tr>
     	  <th align=right nowrap>| . $locale->text('Total') . qq|</th>
     	  <td>$form->{invtotal}</td>
     	  <td><select name=APselected>$form->{selectAP}</select></td>
               <input type=hidden name=AP value="$form->{AP}">
     	  <th align=left>$form->{invtotal}</th>
     	  <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
     	  <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
     	  <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
     	  <td colspan=2></td>
               <td><select name=APselected>$form->{selectAP}</select></td>
     	  <input type=hidden name=AP value="$form->{AP}">
     	  <td colspan=4></td>
     	</tr>
     	<tr>
     	  <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
     	  <td colspan=5>$notes</td>
             </tr>
             </table>
             </td>
         </tr>
         <tr>
           <td>
             <table width=100%>
             <tr>
     	  <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
     	  <td align=left>$notes</td>
     	</tr>
           </table>
         </td>
-...
       $form->{invtotal} = 0;
       $form->{selectAP_amount} = $form->{AP_amount};
       $form->{selectAP_amount} =~
         s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
       #   $form->{selectAP_amount} = $form->{AP_amount};
       #   $form->{selectAP_amount} =~
       #     s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
       $form->{selectAP} = $form->{AP};
       $form->{selectAP} =~
-...
       @flds  = qw(amount AP_amount projectnumber oldprojectnumber project_id);
       $count = 0;
       for $i (1 .. 1) {
       for $i (1 .. $form->{rowcount}) {
         $form->{"amount_$i"} =
           $form->parse_amount(\%myconfig, $form->{"amount_$i"});
         $form->{"tax_$i"} = $form->parse_amount(\%myconfig, $form->{"tax_$i"});
         if ($form->{"amount_$i"}) {
           push @a, {};
           my $j = $#a;
           $j = $#a;
           if (!$form->{"korrektur_$i"}) {
             ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
             if ($taxkey > 1) {
               if ($form->{taxincluded}) {
                 $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
               } else {
                 $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
+              }
             } else {
               $form->{"tax_$i"} = 0;
+            }
+          }
           $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
           $totaltax += $form->{"tax_$i"};
           map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
           $count++;
+        }
+      }
       $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
       $form->{invtotal} += $form->{"amount_1"};
       map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
       $form->{exchangerate} = $exchangerate
         if (
-...
       $form->{AP} = $save_AP;
       &check_project;
     TAXCALC:
       # recalculate taxes
       @taxaccounts = split / /, $form->{taxaccounts};
       $form->{"tax"} = $form->parse_amount(\%myconfig, $form->{"tax"});
       if ($form->{taxincluded} && $form->{"rate"}) {
         $taxrate         = $form->{"rate"};
         $withholdingrate = 0;
         $amount =
           $form->round_amount(
                         ($form->{invtotal} - ($form->{invtotal} / ($taxrate + 1))),
 );
         $form->{"tax"} = $form->round_amount($amount, 2);
         $taxdiff += ($amount - $form->{"tax"});
         if (abs $taxdiff >= 0.005) {
           $form->{"tax"} += $form->round_amount($taxdiff, 2);
           $taxdiff = 0;
+        }
         $totaltax += $form->{"tax"};
       } else {
         $form->{"tax"} =
           $form->round_amount($form->{invtotal} * $form->{"rate"}, 2);
         $totaltax += $form->{"tax"};
+      }
       $form->{rowcount} = $count + 1;
       $form->{invtotal} =
         ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
-...
         $button1 = qq|
            <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
            <input type=button name=transdatefrom id="trigger1" value=|
           . $locale->text('button')
           . qq|></td>
           . $locale->text('button') . qq|></td>
           |;
         $button2 = qq|
            <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
            <input type=button name=transdateto name=transdateto id="trigger2" value=|
           . $locale->text('button')
           . qq|></td>
           . $locale->text('button') . qq|></td>
          |;
         #write Trigger
-...
         $option   .= $locale->text('Closed');
+      }
       @columns =
         $form->sort_columns(
       @columns = $form->sort_columns(
         qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee)
         );
       );
       foreach $item (@columns) {
         if ($form->{"l_$item"} eq "Y") {

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 30175d89

Von Philip Reetz vor fast 19 Jahren hinzugefügt