#
#======================================================================
-
use SL::AP;
use SL::IR;
use SL::PE;
require "$form->{path}/arap.pl";
1;
-# end of main
+# end of main
# this is for our long dates
# $locale->text('January')
# $locale->text('Nov')
# $locale->text('Dec')
-
sub add {
$lxdebug->enter_sub();
-
$form->{title} = "Add";
-
- $form->{callback} = "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback};
+
+ $form->{callback} =
+ "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ unless $form->{callback};
&create_links;
&display_form;
-
+
$lxdebug->leave_sub();
}
-
sub edit {
$lxdebug->enter_sub();
-
$form->{title} = "Edit";
&create_links;
$lxdebug->leave_sub();
}
-
sub display_form {
$lxdebug->enter_sub();
-
&form_header;
&form_footer;
$lxdebug->leave_sub();
}
-
sub create_links {
$lxdebug->enter_sub();
-
$form->create_links("AP", \%myconfig, "vendor");
$taxincluded = $form->{taxincluded};
- $duedate = $form->{duedate};
+ $duedate = $form->{duedate};
IR->get_vendor(\%myconfig, \%$form);
-
- $form->{duedate} = $duedate if $duedate;
+
+ $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";
-
- map { $tax .= qq|<option value=\"$_->{taxkey}--$_->{rate}\">$_->{taxdescription} |.($_->{rate} * 100).qq| %|} @{ $form->{TAX} };
- $form->{taxchart} = $tax;
+
+ map {
+ $tax .=
+ qq|<option value=\"$_->{taxkey}--$_->{rate}\">$_->{taxdescription} |
+ . ($_->{rate} * 100) . qq| %|
+ } @{ $form->{TAX} };
+ $form->{taxchart} = $tax;
$form->{selecttaxchart} = $tax;
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
# vendors
if (@{ $form->{all_vendor} }) {
$form->{vendor} = qq|$form->{vendor}--$form->{vendor_id}|;
- map { $form->{selectvendor} .= "<option>$_->{name}--$_->{id}\n" } (@{ $form->{all_vendor} });
+ map { $form->{selectvendor} .= "<option>$_->{name}--$_->{id}\n" }
+ (@{ $form->{all_vendor} });
}
-
+
# departments
if (@{ $form->{all_departments} }) {
$form->{selectdepartment} = "<option>\n";
- $form->{department} = "$form->{department}--$form->{department_id}";
+ $form->{department} = "$form->{department}--$form->{department_id}";
- map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+ map {
+ $form->{selectdepartment} .=
+ "<option>$_->{description}--$_->{id}\n"
+ } (@{ $form->{all_departments} });
}
- $form->{employee} = "$form->{employee}--$form->{employee_id}";
-
+ $form->{employee} = "$form->{employee}--$form->{employee_id}";
+
# forex
$form->{forex} = $form->{exchangerate};
$exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
-
+
foreach $key (keys %{ $form->{AP_links} }) {
foreach $ref (@{ $form->{AP_links}{$key} }) {
if ($key eq "AP_paid") {
- $form->{"select$key"} .= "<option value=\"$ref->{accno}\">$ref->{accno}--$ref->{description}</option>\n";
+ $form->{"select$key"} .=
+ "<option value=\"$ref->{accno}\">$ref->{accno}--$ref->{description}</option>\n";
} else {
- $form->{"select$key"} .= "<option value=\"$ref->{accno}--$ref->{taxkey}\">$ref->{accno}--$ref->{description}</option>\n";
+ $form->{"select$key"} .=
+ "<option value=\"$ref->{accno}--$ref->{taxkey}\">$ref->{accno}--$ref->{description}</option>\n";
}
}
$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") {
$j++;
- $form->{"AP_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
- $form->{"paid_$j"} = $form->{acc_trans}{$key}->[$i-1]->{amount};
- $form->{"datepaid_$j"} = $form->{acc_trans}{$key}->[$i-1]->{transdate};
- $form->{"source_$j"} = $form->{acc_trans}{$key}->[$i-1]->{source};
- $form->{"memo_$j"} = $form->{acc_trans}{$key}->[$i-1]->{memo};
-
- $form->{"forex_$j"} = $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i-1]->{exchangerate};
- $form->{"AP_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}";
- $form->{paidaccounts}++;
+ $form->{"AP_paid_$j"} =
+ "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+ $form->{"paid_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{amount};
+ $form->{"datepaid_$j"} =
+ $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+ $form->{"source_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
+ $form->{"memo_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+
+ $form->{"forex_$j"} = $form->{"exchangerate_$i"} =
+ $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
+ $form->{"AP_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}";
+ $form->{paidaccounts}++;
} else {
$akey = $key;
$akey =~ s/AP_//;
- if ($key eq "AP_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, 2);
- if ($form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"} > 0) {
- $totaltax += $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
- $taxrate += $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
- } else {
- $totalwithholding += $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, 2) *-1;
- } else {
- $form->{"${akey}_$i"} = $form->round_amount($form->{acc_trans}{$key}->[$i-1]->{amount} / $exchangerate, 2);
- if ($akey eq 'amount') {
- $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->{acc_trans}{$key}->[$i-1]->{projectnumber}";
- $form->{"project_id_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{project_id}";
- }
- $form->{"${key}_$i"} = "$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)/;
- $test = $1;
- $form->{"select${key}"} = $1;
- if ($akey eq 'amount') {
- $form->{selecttaxchart} =~ /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^<]*)/;
- $form->{selecttaxchart} = $1;
- }
- }
+ 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,
+ 2);
+
+ if ($form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"} > 0) {
+ $totaltax +=
+ $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
+ $taxrate +=
+ $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
+ } else {
+ $totalwithholding +=
+ $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
+ $withholdingrate +=
+ $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
+ }
+ $index = $form->{acc_trans}{$key}->[$i - 1]->{index};
+ $form->{"tax_$index"} =
+ $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
+ $totaltax += $form->{"tax_$index"};
+
+ } else {
+ $k++;
+ $form->{"${akey}_$k"} =
+ $form->round_amount(
+ $form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate,
+ 2);
+ if ($akey eq 'amount') {
+ $form->{rowcount}++;
+ $form->{"${akey}_$i"} *= -1;
+ $totalamount += $form->{"${akey}_$i"};
+ $form->{taxrate} = $form->{acc_trans}{$key}->[$i - 1]->{rate};
+ $form->{"oldprojectnumber_$k"} = $form->{"projectnumber_$k"} =
+ "$form->{acc_trans}{$key}->[$i-1]->{projectnumber}";
+ $form->{"project_id_$k"} =
+ "$form->{acc_trans}{$key}->[$i-1]->{project_id}";
+ }
+ $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/;
+ $test = $1;
+ $form->{"${key}_$k"} = $1;
+ if ($akey eq 'amount') {
+ $form->{"taxchart_$k"} = $form->{taxchart};
+ $form->{"taxchart_$k"} =~
+ /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^\"]*)/;
+ $form->{"taxchart_$k"} = $1;
+ }
+ }
}
}
}
- $form->{taxincluded} = $taxincluded if ($form->{id});
- $form->{paidaccounts} = 1 if not defined $form->{paidaccounts};
+ $form->{taxincluded} = $taxincluded if ($form->{id});
+ $form->{paidaccounts} = 1 if not defined $form->{paidaccounts};
if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
- # add tax to amounts and invtotal
- for $i (1 .. 1) {
- $taxamount = ($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
+
+ # add tax to amounts and invtotal
+ 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;
+ $diff += ($taxamount - $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))), 2);
- } else {
- $taxamount = $form->round_amount(($totalamount + $totaltax + $totalwithholding) * $withholdingrate / (1 - $withholdingrate), 2) * $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->{locked} = ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig));
+
+ $form->{invtotal} = $totalamount + $totaltax;
+
+ $form->{locked} =
+ ($form->datetonum($form->{transdate}, \%myconfig) <=
+ $form->datetonum($form->{closedto}, \%myconfig));
$lxdebug->leave_sub();
}
-
sub form_header {
$lxdebug->enter_sub();
-
$title = $form->{title};
$form->{title} = $locale->text("$title Accounts Payables Transaction");
$form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
-# type=submit $locale->text('Add Accounts Payables Transaction')
-# type=submit $locale->text('Edit Accounts Payables Transaction')
+ # 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->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+ $form->{"select$item"} =~
+ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
- $readonly = ($form->{id}) ? "readonly" : "";
-
- $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
- $readonly = ($form->{radier}) ? "" : $readonly;
-
- map { $form->{$_} =~ s/\"/"/g } qw(AP_amount AP taxchart);
+ $readonly = ($form->{id}) ? "readonly" : "";
+
+ $form->{radier} =
+ ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+ $readonly = ($form->{radier}) ? "" : $readonly;
+ $selectAP_amount_unquoted = $form->{selectAP_amount};
+ $taxchart = $form->{taxchart};
+ map { $form->{$_} =~ s/\"/"/g }
+ qw(AP_amount selectAP_amount AP taxchart);
+
# format amounts
- $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
+ $form->{exchangerate} =
+ $form->format_amount(\%myconfig, $form->{exchangerate});
+
+ $form->{creditlimit} =
+ $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
+ $form->{creditremaining} =
+ $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
- $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
- $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
-
$exchangerate = qq|
<input type=hidden name=forex value=$form->{forex}>
|;
if ($form->{forex}) {
$exchangerate .= qq|
<tr>
- <th align=right>|.$locale->text('Exchangerate').qq|</th>
+ <th align=right>| . $locale->text('Exchangerate') . qq|</th>
<td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
</tr>
|;
} else {
$exchangerate .= qq|
- <th align=right>|.$locale->text('Exchangerate').qq|</th>
+ <th align=right>| . $locale->text('Exchangerate') . qq|</th>
<td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
|;
}
}
-
+
$taxincluded = "";
$taxincluded = qq|
<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>
+ <th align=left nowrap>|
+ . $locale->text('Tax Included') . qq|</th>
</tr>
|;
-
-
if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
$rows = 2;
}
- $notes = qq|<textarea name=notes rows=$rows cols=50 wrap=soft $readonly>$form->{notes}</textarea>|;
-
+ $notes =
+ qq|<textarea name=notes rows=$rows cols=50 wrap=soft $readonly>$form->{notes}</textarea>|;
+
$department = qq|
<tr>
- <th align="right" nowrap>|.$locale->text('Department').qq|</th>
+ <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
<td colspan=3><select name=department>$form->{selectdepartment}</select>
<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
</td>
| if $form->{selectdepartment};
$n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
-
- $vendor = ($form->{selectvendor}) ? qq|<select name=vendor>$form->{selectvendor}</select>| : qq|<input name=vendor value="$form->{vendor}" size=35>|;
+
+ $vendor =
+ ($form->{selectvendor})
+ ? qq|<select name=vendor>$form->{selectvendor}</select>|
+ : qq|<input name=vendor value="$form->{vendor}" size=35>|;
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
$jsscript = "";
- if ($form->{jsscript})
- {
+ if ($form->{jsscript}) {
+
# with JavaScript Calendar
$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>
+ <td><input type=button name=transdate id="trigger1" value=|
+ . $locale->text('button') . qq|></td>
|;
- $button2 = qq|
+ $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>
+ <td><input type=button name=duedate id="trigger2" value=|
+ . $locale->text('button') . qq|></td></td>
|;
+
#write Trigger
- $jsscript = Form->write_trigger(\%myconfig,"2","transdate","BL","trigger1","duedate","BL","trigger2");
- }
- else
- {
- # without JavaScript Calendar
- $button1 = qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}> $readonly</td>|;
- $button2 = qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}> $readonly</td>|;
- }
-
+ $jsscript =
+ Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1",
+ "duedate", "BL", "trigger2");
+ } else {
+
+ # without JavaScript Calendar
+ $button1 =
+ qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}> $readonly</td>|;
+ $button2 =
+ qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}> $readonly</td>|;
+ }
+
$form->header;
-
+
print qq|
<body>
<td>
<table>
<tr>
- <th align=right nowrap>|.$locale->text('Vendor').qq|</th>
+ <th align=right nowrap>| . $locale->text('Vendor') . qq|</th>
<td colspan=3>$vendor</td>
<input type=hidden name=selectvendor value="$form->{selectvendor}">
<input type=hidden name=oldvendor value="$form->{oldvendor}">
<td colspan=3>
<table width=100%>
<tr>
- <th align=left nowrap>|.$locale->text('Credit Limit').qq|</th>
+ <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
<td>$form->{creditlimit}</td>
- <th align=left nowrap>|.$locale->text('Remaining').qq|</th>
+ <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
<td class="plus$n">$form->{creditremaining}</td>
<input type=hidden name=creditlimit value=$form->{creditlimit}>
<input type=hidden name=creditremaining value=$form->{creditremaining}>
</table>
</td>
<tr>
- <th align=right nowrap>|.$locale->text('Currency').qq|</th>
+ <th align=right nowrap>| . $locale->text('Currency') . qq|</th>
<td><select name=currency>$form->{selectcurrency}</select></td>
<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
<td align=right>
<table>
<tr>
- <th align=right nowrap>|.$locale->text('Invoice Number').qq|</th>
+ <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
<td><input name=invnumber size=11 value="$form->{invnumber}" $readonly></td>
</tr>
<tr>
- <th align=right nowrap>|.$locale->text('Order Number').qq|</th>
+ <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
<td><input name=ordnumber size=11 value="$form->{ordnumber}" $readonly></td>
</tr>
<tr>
- <th align=right nowrap>|.$locale->text('Invoice Date').qq|</th>
+ <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
$button1
</tr>
<tr>
- <th align=right nowrap>|.$locale->text('Due Date').qq|</th>
+ <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
$button2
</tr>
</table>
</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');
+ $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->{"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;
+ $re_amount = quotemeta($form->{"AP_amount_$i"});
+ $selectAP_amount =~
+ s/option value=\"${re_amount}\"/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" style="width:200px">$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" onChange="setTaxkey(this, $i)" style="width:100%">$selectAP_amount</select></td>
+ <td><input name="amount_$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 = "";
+ $amount = "";
$project = "";
}
- $taxlabel = ($form->{taxincluded}) ? $locale->text('Tax Included') : $locale->text('Tax');
- # format and reverse tax
- $form->{"tax"} = $form->format_amount(\%myconfig, $form->{"tax"}, 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>
- </tr>
-|;
-
-
-
-
+ $taxlabel =
+ ($form->{taxincluded})
+ ? $locale->text('Tax Included')
+ : $locale->text('Tax');
-
$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 colspan=6>
+ <hr noshade>
+ </td>
+ </tr>
+ <tr>
+ <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}">
-
- </tr>
- <tr>
- <th align=right nowrap>|.$locale->text('Notes').qq|</th>
- <td colspan=5>$notes</td>
+
+ <td colspan=4></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>
<td>
<table width=100%>
<tr class=listheading>
- <th class=listheading colspan=6>|.$locale->text('Payments').qq|</th>
+ <th class=listheading colspan=6>| . $locale->text('Payments') . qq|</th>
</tr>
|;
-
if ($form->{currency} eq $form->{defaultcurrency}) {
@column_index = qw(datepaid source memo paid AP_paid);
} else {
@column_index = qw(datepaid source memo paid exchangerate AP_paid);
}
- $column_data{datepaid} = "<th>".$locale->text('Date')."</th>";
- $column_data{paid} = "<th>".$locale->text('Amount')."</th>";
- $column_data{exchangerate} = "<th>".$locale->text('Exch')."</th>";
- $column_data{AP_paid} = "<th>".$locale->text('Account')."</th>";
- $column_data{source} = "<th>".$locale->text('Source')."</th>";
- $column_data{memo} = "<th>".$locale->text('Memo')."</th>";
+ $column_data{datepaid} = "<th>" . $locale->text('Date') . "</th>";
+ $column_data{paid} = "<th>" . $locale->text('Amount') . "</th>";
+ $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
+ $column_data{AP_paid} = "<th>" . $locale->text('Account') . "</th>";
+ $column_data{source} = "<th>" . $locale->text('Source') . "</th>";
+ $column_data{memo} = "<th>" . $locale->text('Memo') . "</th>";
print "
<tr>
";
$form->{"selectAP_paid_$i"} = $form->{selectAP_paid};
- $form->{"selectAP_paid_$i"} =~ s/option value=\"$form->{"AP_paid_$i"}\">/option value=\"$form->{"AP_paid_$i"}\" selected>/;
+ $form->{"selectAP_paid_$i"} =~
+ s/option value=\"$form->{"AP_paid_$i"}\">/option value=\"$form->{"AP_paid_$i"}\" selected>/;
-
# format amounts
- $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
- $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-
+ $form->{"paid_$i"} =
+ $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ $form->{"exchangerate_$i"} =
+ $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+
$exchangerate = qq| |;
if ($form->{currency} ne $form->{defaultcurrency}) {
if ($form->{"forex_$i"}) {
- $exchangerate = qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
+ $exchangerate =
+ qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
} else {
- $exchangerate = qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
+ $exchangerate =
+ qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
}
}
<input type=hidden name="forex_$i" value=$form->{"forex_$i"}>
|;
- $column_data{"paid_$i"} = qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
- $column_data{"AP_paid_$i"} = qq|<td align=center><select name="AP_paid_$i">$form->{"selectAP_paid_$i"}</select></td>|;
+ $column_data{"paid_$i"} =
+ qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
+ $column_data{"AP_paid_$i"} =
+ qq|<td align=center><select name="AP_paid_$i">$form->{"selectAP_paid_$i"}</select></td>|;
$column_data{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
- $column_data{"datepaid_$i"} = qq|<td align=center><input name="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}></td>|;
- $column_data{"source_$i"} = qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
- $column_data{"memo_$i"} = qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
-
+ $column_data{"datepaid_$i"} =
+ qq|<td align=center><input name="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}></td>|;
+ $column_data{"source_$i"} =
+ qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
+ $column_data{"memo_$i"} =
+ qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
print qq|
<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
<input type=hidden name=selectAP_paid value="$form->{selectAP_paid}">
-
+
</table>
</td>
</tr>
$lxdebug->leave_sub();
}
-
sub form_footer {
$lxdebug->enter_sub();
-
print qq|
<input name=callback type=hidden value="$form->{callback}">
|;
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-
+ $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+
if ($form->{id} && $form->{radier}) {
-# print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
-# |;
+
+ # print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
+ # |;
if (!$form->{revtrans}) {
if (!$form->{locked}) {
- print qq|
- <input class=submit type=submit name=action value="|.$locale->text('Post').qq|">
- <input class=submit type=submit name=action value="|.$locale->text('Delete').qq|">
+ print qq|
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Post') . qq|">
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Delete') . qq|">
|;
}
}
if ($transdate > $closedto) {
print qq|
-<input class=submit type=submit name=action value="|.$locale->text('Post as new').qq|">
+<input class=submit type=submit name=action value="|
+ . $locale->text('Post as new') . qq|">
|;
}
} else {
if (($transdate > $closedto) && !$form->{id}) {
- print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
- <input class=submit type=submit name=action value="|.$locale->text('Post').qq|">|;
+ print qq|<input class=submit type=submit name=action value="|
+ . $locale->text('Update') . qq|">
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Post') . qq|">|;
}
}
$lxdebug->leave_sub();
}
-
sub update {
$lxdebug->enter_sub();
my $display = shift;
-# if ($display) {
-# goto TAXCALC;
-# }
+ # if ($display) {
+ # goto TAXCALC;
+ # }
$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} =~ s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/;
+ $form->{selectAP} =~
+ s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/;
- ($AP_amountaccno, $AP_amounttaxkey) = split(/--/, $form->{AP_amountselected});
+ ($AP_amountaccno, $AP_amounttaxkey) =
+ split(/--/, $form->{AP_amountselected});
$form->{selecttaxchart} = $form->{taxchart};
- $form->{selecttaxchart} =~ s/value=\"$AP_amounttaxkey--([^\"]*)\"/value=\"$AP_amounttaxkey--$1\" selected/;
-
+ $form->{selecttaxchart} =~
+ s/value=\"$AP_amounttaxkey--([^\"]*)\"/value=\"$AP_amounttaxkey--$1\" selected/;
+
$form->{rate} = $1;
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining);
-
- @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id);
+ map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+ qw(exchangerate creditlimit creditremaining);
+
+ @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id);
$count = 0;
- for $i (1 .. 1) {
- $form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
+ 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"};
-
- $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, 'sell')));
+
+ map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
+
+ $form->{exchangerate} = $exchangerate
+ if (
+ $form->{forex} = (
+ $exchangerate =
+ $form->check_exchangerate(
+ \%myconfig, $form->{currency}, $form->{transdate}, 'sell'
+ )));
$form->{invdate} = $form->{transdate};
$save_AP = $form->{AP};
$form->{AP} = $save_AP;
&check_project;
+ $form->{rowcount} = $count + 1;
+ $form->{invtotal} =
+ ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
-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))), 2);
- $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->{invtotal} = ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
-
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
- map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
+ map {
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ } qw(paid exchangerate);
$totalpaid += $form->{"paid_$i"};
-
- $form->{"exchangerate_$i"} = $exchangerate if ($form->{"forex_$i"} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell')));
+
+ $form->{"exchangerate_$i"} = $exchangerate
+ if (
+ $form->{"forex_$i"} = (
+ $exchangerate =
+ $form->check_exchangerate(
+ \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell'
+ )));
}
}
- $form->{creditremaining} -= ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} - $form->{oldinvtotal});
- $form->{oldinvtotal} = $form->{invtotal};
+ $form->{creditremaining} -=
+ ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} -
+ $form->{oldinvtotal});
+ $form->{oldinvtotal} = $form->{invtotal};
$form->{oldtotalpaid} = $totalpaid;
-
+
&display_form;
$lxdebug->leave_sub();
}
-
-
+
sub post {
$lxdebug->enter_sub();
-
# check if there is a vendor, invoice and due date
$form->isblank("transdate", $locale->text("Invoice Date missing!"));
- $form->isblank("duedate", $locale->text("Due Date missing!"));
- $form->isblank("vendor", $locale->text('Vendor missing!'));
-
-
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ $form->isblank("duedate", $locale->text("Due Date missing!"));
+ $form->isblank("vendor", $locale->text('Vendor missing!'));
+
+ $closedto = $form->datetonum($form->{closedto}, \%myconfig);
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $form->error($locale->text('Cannot post transaction for a closed period!')) if ($transdate <= $closedto);
+ $form->error($locale->text('Cannot post transaction for a closed period!'))
+ if ($transdate <= $closedto);
- $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) if ($form->{currency} ne $form->{defaultcurrency});
+ $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
+ if ($form->{currency} ne $form->{defaultcurrency});
delete($form->{AP});
for $i (1 .. $form->{paidaccounts}) {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
- $form->error($locale->text('Cannot post payment for a closed period!')) if ($datepaid <= $closedto);
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($datepaid <= $closedto);
if ($form->{currency} ne $form->{defaultcurrency}) {
- $form->{"exchangerate_$i"} = $form->{exchangerate} if ($transdate == $datepaid);
- $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($transdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
}
-
+
}
}
-
# if old vendor ne vendor redo form
($vendor) = split /--/, $form->{vendor};
&update;
exit;
}
- ($debitaccno, $debittaxkey) = split /--/, $form->{AP_amountselected};
- ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
- ($payablesaccno, $payablestaxkey) = split /--/, $form->{APselected};
+ ($debitaccno, $debittaxkey) = split /--/, $form->{AP_amountselected};
+ ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
+ ($payablesaccno, $payablestaxkey) = split /--/, $form->{APselected};
$form->{AP}{amount_1} = $debitaccno;
$form->{AP}{payables} = $payablesaccno;
- $form->{taxkey} = $taxkey;
-
+ $form->{taxkey} = $taxkey;
+
$form->{id} = 0 if $form->{postasnew};
- $form->redirect($locale->text('Transaction posted!')) if (AP->post_transaction(\%myconfig, \%$form));
+ $form->redirect($locale->text('Transaction posted!'))
+ if (AP->post_transaction(\%myconfig, \%$form));
$form->error($locale->text('Cannot post transaction!'));
-
+
$lxdebug->leave_sub();
}
-
sub post_as_new {
$lxdebug->enter_sub();
-
$form->{postasnew} = 1;
&post;
$lxdebug->leave_sub();
}
-
sub delete {
$lxdebug->enter_sub();
-
$form->{title} = $locale->text('Confirm!');
-
+
$form->header;
delete $form->{header};
-
+
print qq|
<body>
|;
foreach $key (keys %$form) {
- $form->{$key} =~ s/\"/"/g;
+ $form->{$key} =~ s/\"/"/g;
print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
}
print qq|
<h2 class=confirm>$form->{title}</h2>
-<h4>|.$locale->text('Are you sure you want to delete Transaction').qq| $form->{invnumber}</h4>
+<h4>|
+ . $locale->text('Are you sure you want to delete Transaction')
+ . qq| $form->{invnumber}</h4>
-<input name=action class=submit type=submit value="|.$locale->text('Yes').qq|">
+<input name=action class=submit type=submit value="|
+ . $locale->text('Yes') . qq|">
</form>
</body>
$lxdebug->leave_sub();
}
-
-
sub yes {
$lxdebug->enter_sub();
-
- $form->redirect($locale->text('Transaction deleted!')) if (AP->delete_transaction(\%myconfig, \%$form, $spool));
+ $form->redirect($locale->text('Transaction deleted!'))
+ if (AP->delete_transaction(\%myconfig, \%$form, $spool));
$form->error($locale->text('Cannot delete transaction!'));
$lxdebug->leave_sub();
}
-
sub search {
$lxdebug->enter_sub();
-
# setup vendor selection
$form->all_vc(\%myconfig, "vendor", "AP");
if (@{ $form->{all_vendor} }) {
- map { $vendor .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{all_vendor} };
+ map { $vendor .= "<option>$_->{name}--$_->{id}\n" }
+ @{ $form->{all_vendor} };
$vendor = qq|<select name=vendor><option>\n$vendor\n</select>|;
} else {
$vendor = qq|<input name=vendor size=35>|;
}
# departments
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} }) {
$form->{selectdepartment} = "<option>\n";
- map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+ map {
+ $form->{selectdepartment} .=
+ "<option>$_->{description}--$_->{id}\n"
+ } (@{ $form->{all_departments} });
}
$department = qq|
<tr>
- <th align=right nowrap>|.$locale->text('Department').qq|</th>
+ <th align=right nowrap>| . $locale->text('Department') . qq|</th>
<td colspan=3><select name=department>$form->{selectdepartment}</select></td>
</tr>
| if $form->{selectdepartment};
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
- $jsscript = "";
- if ($form->{jsscript})
- {
+ $jsscript = "";
+ if ($form->{jsscript}) {
+
# with JavaScript Calendar
$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>
+ <input type=button name=transdatefrom id="trigger1" value=|
+ . $locale->text('button') . qq|></td>
|;
- $button2 = qq|
+ $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>
+ <input type=button name=transdateto name=transdateto id="trigger2" value=|
+ . $locale->text('button') . qq|></td>
|;
+
#write Trigger
- $jsscript = Form->write_trigger(\%myconfig,"2","transdatefrom","BR","trigger1","transdateto","BL","trigger2");
- }
- else
- {
- # without JavaScript Calendar
- $button1 = qq|
+ $jsscript =
+ Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger1",
+ "transdateto", "BL", "trigger2");
+ } else {
+
+ # without JavaScript Calendar
+ $button1 = qq|
<td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
- $button2 = qq|
+ $button2 = qq|
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
- }
-
+ }
+
$form->header;
print qq|
<td>
<table>
<tr>
- <th align=right>|.$locale->text('Vendor').qq|</th>
+ <th align=right>| . $locale->text('Vendor') . qq|</th>
<td colspan=3>$vendor</td>
</tr>
$department
<tr>
- <th align=right nowrap>|.$locale->text('Invoice Number').qq|</th>
+ <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
<td colspan=3><input name=invnumber size=20></td>
</tr>
<tr>
- <th align=right nowrap>|.$locale->text('Order Number').qq|</th>
+ <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
<td colspan=3><input name=ordnumber size=20></td>
</tr>
<tr>
- <th align=right nowrap>|.$locale->text('Notes').qq|</th>
+ <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
<td colspan=3><input name=notes size=40></td>
</tr>
<tr>
- <th align=right nowrap>|.$locale->text('From').qq|</th>
+ <th align=right nowrap>| . $locale->text('From') . qq|</th>
$button1
- <th align=right>|.$locale->text('Bis').qq|</th>
+ <th align=right>| . $locale->text('Bis') . qq|</th>
$button2
</tr>
<input type=hidden name=sort value=transdate>
<td>
<table>
<tr>
- <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
+ <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
<td>
<table width=100%>
<tr>
<td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>|.$locale->text('Open').qq|</td>
+ <td nowrap>| . $locale->text('Open') . qq|</td>
<td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Closed').qq|</td>
+ <td nowrap>| . $locale->text('Closed') . qq|</td>
</tr>
<tr>
<td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('ID').qq|</td>
+ <td nowrap>| . $locale->text('ID') . qq|</td>
<td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>|.$locale->text('Invoice Number').qq|</td>
+ <td nowrap>| . $locale->text('Invoice Number') . qq|</td>
<td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Order Number').qq|</td>
+ <td nowrap>| . $locale->text('Order Number') . qq|</td>
</tr>
<tr>
<td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>|.$locale->text('Vendor').qq|</td>
+ <td nowrap>| . $locale->text('Vendor') . qq|</td>
<td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>|.$locale->text('Invoice Date').qq|</td>
+ <td nowrap>| . $locale->text('Invoice Date') . qq|</td>
<td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Amount').qq|</td>
+ <td nowrap>| . $locale->text('Amount') . qq|</td>
</tr>
<tr>
<td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Tax').qq|</td>
+ <td nowrap>| . $locale->text('Tax') . qq|</td>
<td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>|.$locale->text('Total').qq|</td>
+ <td nowrap>| . $locale->text('Total') . qq|</td>
<td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Date Paid').qq|</td>
+ <td nowrap>| . $locale->text('Date Paid') . qq|</td>
</tr>
<tr>
<td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>|.$locale->text('Paid').qq|</td>
+ <td nowrap>| . $locale->text('Paid') . qq|</td>
<td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Due Date').qq|</td>
+ <td nowrap>| . $locale->text('Due Date') . qq|</td>
<td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Amount Due').qq|</td>
+ <td nowrap>| . $locale->text('Amount Due') . qq|</td>
</tr>
<tr>
<td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Notes').qq|</td>
+ <td nowrap>| . $locale->text('Notes') . qq|</td>
<td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Employee').qq|</td>
+ <td nowrap>| . $locale->text('Employee') . qq|</td>
</tr>
<tr>
<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
- <td nowrap>|.$locale->text('Subtotal').qq|</td>
+ <td nowrap>| . $locale->text('Subtotal') . qq|</td>
</tr>
</table>
</td>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
-<input class=submit type=submit name=action value="|.$locale->text('Continue').qq|">
+<input class=submit type=submit name=action value="|
+ . $locale->text('Continue') . qq|">
</form>
</body>
$lxdebug->leave_sub();
}
-
sub ap_transactions {
$lxdebug->enter_sub();
-
$form->{vendor} = $form->unescape($form->{vendor});
($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor});
AP->ap_transactions(\%myconfig, \%$form);
- $callback = "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ $callback =
+ "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
$href = $callback;
-
if ($form->{vendor}) {
- $callback .= "&vendor=".$form->escape($form->{vendor},1);
- $href .= "&vendor=".$form->escape($form->{vendor});
- $option .= $locale->text('Vendor')." : $form->{vendor}";
+ $callback .= "&vendor=" . $form->escape($form->{vendor}, 1);
+ $href .= "&vendor=" . $form->escape($form->{vendor});
+ $option .= $locale->text('Vendor') . " : $form->{vendor}";
}
if ($form->{department}) {
- $callback .= "&department=".$form->escape($form->{department},1);
- $href .= "&department=".$form->escape($form->{department});
+ $callback .= "&department=" . $form->escape($form->{department}, 1);
+ $href .= "&department=" . $form->escape($form->{department});
($department) = split /--/, $form->{department};
$option .= "\n<br>" if ($option);
- $option .= $locale->text('Department')." : $department";
+ $option .= $locale->text('Department') . " : $department";
}
if ($form->{invnumber}) {
- $callback .= "&invnumber=".$form->escape($form->{invnumber},1);
- $href .= "&invnumber=".$form->escape($form->{invnumber});
+ $callback .= "&invnumber=" . $form->escape($form->{invnumber}, 1);
+ $href .= "&invnumber=" . $form->escape($form->{invnumber});
$option .= "\n<br>" if ($option);
- $option .= $locale->text('Invoice Number')." : $form->{invnumber}";
+ $option .= $locale->text('Invoice Number') . " : $form->{invnumber}";
}
if ($form->{ordnumber}) {
- $callback .= "&ordnumber=".$form->escape($form->{ordnumber},1);
- $href .= "&ordnumber=".$form->escape($form->{ordnumber});
+ $callback .= "&ordnumber=" . $form->escape($form->{ordnumber}, 1);
+ $href .= "&ordnumber=" . $form->escape($form->{ordnumber});
$option .= "\n<br>" if ($option);
- $option .= $locale->text('Order Number')." : $form->{ordnumber}";
+ $option .= $locale->text('Order Number') . " : $form->{ordnumber}";
}
if ($form->{notes}) {
- $callback .= "¬es=".$form->escape($form->{notes},1);
- $href .= "¬es=".$form->escape($form->{notes});
+ $callback .= "¬es=" . $form->escape($form->{notes}, 1);
+ $href .= "¬es=" . $form->escape($form->{notes});
$option .= "\n<br>" if $option;
- $option .= $locale->text('Notes')." : $form->{notes}";
+ $option .= $locale->text('Notes') . " : $form->{notes}";
}
-
+
if ($form->{transdatefrom}) {
$callback .= "&transdatefrom=$form->{transdatefrom}";
- $href .= "&transdatefrom=$form->{transdatefrom}";
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('From')." ".$locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ $href .= "&transdatefrom=$form->{transdatefrom}";
+ $option .= "\n<br>" if ($option);
+ $option .=
+ $locale->text('From') . " "
+ . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
$callback .= "&transdateto=$form->{transdateto}";
- $href .= "&transdateto=$form->{transdateto}";
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Bis')." ".$locale->date(\%myconfig, $form->{transdateto}, 1);
+ $href .= "&transdateto=$form->{transdateto}";
+ $option .= "\n<br>" if ($option);
+ $option .=
+ $locale->text('Bis') . " "
+ . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ($form->{open}) {
$callback .= "&open=$form->{open}";
- $href .= "&open=$form->{open}";
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Open');
+ $href .= "&open=$form->{open}";
+ $option .= "\n<br>" if ($option);
+ $option .= $locale->text('Open');
}
if ($form->{closed}) {
$callback .= "&closed=$form->{closed}";
- $href .= "&closed=$form->{closed}";
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Closed');
+ $href .= "&closed=$form->{closed}";
+ $option .= "\n<br>" if ($option);
+ $option .= $locale->text('Closed');
}
- @columns = $form->sort_columns(qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee));
+ @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") {
push @column_index, $item;
-
+
# add column to href and callback
$callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
+ $href .= "&l_$item=Y";
}
}
-
+
if ($form->{l_subtotal} eq 'Y') {
$callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
+ $href .= "&l_subtotal=Y";
}
-
-
- $column_header{id} = qq|<th><a class=listheading href=$href&sort=id>|.$locale->text('ID').qq|</a></th>|;
- $column_header{transdate} = qq|<th><a class=listheading href=$href&sort=transdate>|.$locale->text('Date').qq|</a></th>|;
- $column_header{duedate} = qq|<th><a class=listheading href=$href&sort=duedate>|.$locale->text('Due Date').qq|</a></th>|;
- $column_header{due} = qq|<th class=listheading>|.$locale->text('Amount Due').qq|</th>|;
- $column_header{invnumber} = qq|<th><a class=listheading href=$href&sort=invnumber>|.$locale->text('Invoice').qq|</a></th>|;
- $column_header{ordnumber} = qq|<th><a class=listheading href=$href&sort=ordnumber>|.$locale->text('Order').qq|</a></th>|;
- $column_header{name} = qq|<th><a class=listheading href=$href&sort=name>|.$locale->text('Vendor').qq|</a></th>|;
- $column_header{netamount} = qq|<th class=listheading>|.$locale->text('Amount').qq|</th>|;
- $column_header{tax} = qq|<th class=listheading>|.$locale->text('Tax').qq|</th>|;
- $column_header{amount} = qq|<th class=listheading>|.$locale->text('Total').qq|</th>|;
- $column_header{paid} = qq|<th class=listheading>|.$locale->text('Paid').qq|</th>|;
- $column_header{datepaid} = qq|<th><a class=listheading href=$href&sort=datepaid>|.$locale->text('Date Paid').qq|</a></th>|;
- $column_header{notes} = qq|<th class=listheading>|.$locale->text('Notes').qq|</th>|;
- $column_header{employee} = "<th><a class=listheading href=$href&sort=employee>".$locale->text('Employee')."</th>";
-
-
+
+ $column_header{id} =
+ qq|<th><a class=listheading href=$href&sort=id>|
+ . $locale->text('ID')
+ . qq|</a></th>|;
+ $column_header{transdate} =
+ qq|<th><a class=listheading href=$href&sort=transdate>|
+ . $locale->text('Date')
+ . qq|</a></th>|;
+ $column_header{duedate} =
+ qq|<th><a class=listheading href=$href&sort=duedate>|
+ . $locale->text('Due Date')
+ . qq|</a></th>|;
+ $column_header{due} =
+ qq|<th class=listheading>| . $locale->text('Amount Due') . qq|</th>|;
+ $column_header{invnumber} =
+ qq|<th><a class=listheading href=$href&sort=invnumber>|
+ . $locale->text('Invoice')
+ . qq|</a></th>|;
+ $column_header{ordnumber} =
+ qq|<th><a class=listheading href=$href&sort=ordnumber>|
+ . $locale->text('Order')
+ . qq|</a></th>|;
+ $column_header{name} =
+ qq|<th><a class=listheading href=$href&sort=name>|
+ . $locale->text('Vendor')
+ . qq|</a></th>|;
+ $column_header{netamount} =
+ qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
+ $column_header{tax} =
+ qq|<th class=listheading>| . $locale->text('Tax') . qq|</th>|;
+ $column_header{amount} =
+ qq|<th class=listheading>| . $locale->text('Total') . qq|</th>|;
+ $column_header{paid} =
+ qq|<th class=listheading>| . $locale->text('Paid') . qq|</th>|;
+ $column_header{datepaid} =
+ qq|<th><a class=listheading href=$href&sort=datepaid>|
+ . $locale->text('Date Paid')
+ . qq|</a></th>|;
+ $column_header{notes} =
+ qq|<th class=listheading>| . $locale->text('Notes') . qq|</th>|;
+ $column_header{employee} =
+ "<th><a class=listheading href=$href&sort=employee>"
+ . $locale->text('Employee') . "</th>";
+
$form->{title} = $locale->text('AP Transactions');
$form->header;
-
+
print qq|
<body>
$callback = $form->escape($form->{callback});
if (@{ $form->{AP} }) {
- $sameitem = $form->{AP}->[0]->{$form->{sort}};
+ $sameitem = $form->{AP}->[0]->{ $form->{sort} };
}
-
+
# sums and tax on reports by Antonio Gallardo
#
foreach $ap (@{ $form->{AP} }) {
if ($form->{l_subtotal} eq 'Y') {
- if ($sameitem ne $ap->{$form->{sort}}) {
- &ap_subtotal;
- $sameitem = $ap->{$form->{sort}};
+ if ($sameitem ne $ap->{ $form->{sort} }) {
+ &ap_subtotal;
+ $sameitem = $ap->{ $form->{sort} };
}
}
-
- $column_data{netamount} = "<td align=right>".$form->format_amount(\%myconfig, $ap->{netamount}, 2, " ")."</td>";
- $column_data{tax} = "<td align=right>".$form->format_amount(\%myconfig, $ap->{amount} - $ap->{netamount}, 2, " ") . "</td>";
- $column_data{amount} = "<td align=right>".$form->format_amount(\%myconfig, $ap->{amount}, 2, " ") . "</td>";
- $column_data{paid} = "<td align=right>".$form->format_amount(\%myconfig, $ap->{paid}, 2, " ")."</td>";
- $column_data{due} = "<td align=right>".$form->format_amount(\%myconfig, $ap->{amount} - $ap->{paid}, 2, " ")."</td>";
+
+ $column_data{netamount} =
+ "<td align=right>"
+ . $form->format_amount(\%myconfig, $ap->{netamount}, 2, " ")
+ . "</td>";
+ $column_data{tax} = "<td align=right>"
+ . $form->format_amount(\%myconfig, $ap->{amount} - $ap->{netamount},
+ 2, " ")
+ . "</td>";
+ $column_data{amount} =
+ "<td align=right>"
+ . $form->format_amount(\%myconfig, $ap->{amount}, 2, " ") . "</td>";
+ $column_data{paid} =
+ "<td align=right>"
+ . $form->format_amount(\%myconfig, $ap->{paid}, 2, " ") . "</td>";
+ $column_data{due} = "<td align=right>"
+ . $form->format_amount(\%myconfig, $ap->{amount} - $ap->{paid},
+ 2, " ")
+ . "</td>";
$totalnetamount += $ap->{netamount};
- $totalamount += $ap->{amount};
- $totalpaid += $ap->{paid};
- $totaldue += ($ap->{amount} - $ap->{paid});
+ $totalamount += $ap->{amount};
+ $totalpaid += $ap->{paid};
+ $totaldue += ($ap->{amount} - $ap->{paid});
$subtotalnetamount += $ap->{netamount};
- $subtotalamount += $ap->{amount};
- $subtotalpaid += $ap->{paid};
- $subtotaldue += ($ap->{amount} - $ap->{paid});
+ $subtotalamount += $ap->{amount};
+ $subtotalpaid += $ap->{paid};
+ $subtotaldue += ($ap->{amount} - $ap->{paid});
$column_data{transdate} = "<td>$ap->{transdate} </td>";
- $column_data{duedate} = "<td>$ap->{duedate} </td>";
- $column_data{datepaid} = "<td>$ap->{datepaid} </td>";
+ $column_data{duedate} = "<td>$ap->{duedate} </td>";
+ $column_data{datepaid} = "<td>$ap->{datepaid} </td>";
$module = ($ap->{invoice}) ? "ir.pl" : $form->{script};
- $column_data{invnumber} = qq|<td><a href="$module?action=edit&path=$form->{path}&id=$ap->{id}&login=$form->{login}&password=$form->{password}&callback=$callback">$ap->{invnumber}</a></td>|;
- $column_data{id} = "<td>$ap->{id}</td>";
+ $column_data{invnumber} =
+ qq|<td><a href="$module?action=edit&path=$form->{path}&id=$ap->{id}&login=$form->{login}&password=$form->{password}&callback=$callback">$ap->{invnumber}</a></td>|;
+ $column_data{id} = "<td>$ap->{id}</td>";
$column_data{ordnumber} = "<td>$ap->{ordnumber} </td>";
- $column_data{name} = "<td>$ap->{name}</td>";
+ $column_data{name} = "<td>$ap->{name}</td>";
$ap->{notes} =~ s/\r\n/<br>/g;
- $column_data{notes} = "<td>$ap->{notes} </td>";
+ $column_data{notes} = "<td>$ap->{notes} </td>";
$column_data{employee} = "<td>$ap->{employee} </td>";
-
+
$i++;
$i %= 2;
print "
<tr class=listrow$i >
";
-
+
map { print "\n$column_data{$_}" } @column_index;
print qq|
|;
}
-
+
if ($form->{l_subtotal} eq 'Y') {
&ap_subtotal;
}
-
+
# print totals
print qq|
<tr class=listtotal>
|;
-
+
map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{netamount} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totalnetamount, 2, " ")."</th>";
- $column_data{tax} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totalamount - $totalnetamount, 2, " ")."</th>";
- $column_data{amount} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totalamount, 2, " ")."</th>";
- $column_data{paid} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totalpaid, 2, " ")."</th>";
- $column_data{due} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totaldue, 2, " ")."</th>";
+
+ $column_data{netamount} =
+ "<th class=listtotal align=right>"
+ . $form->format_amount(\%myconfig, $totalnetamount, 2, " ") . "</th>";
+ $column_data{tax} = "<th class=listtotal align=right>"
+ . $form->format_amount(\%myconfig, $totalamount - $totalnetamount,
+ 2, " ")
+ . "</th>";
+ $column_data{amount} =
+ "<th class=listtotal align=right>"
+ . $form->format_amount(\%myconfig, $totalamount, 2, " ") . "</th>";
+ $column_data{paid} =
+ "<th class=listtotal align=right>"
+ . $form->format_amount(\%myconfig, $totalpaid, 2, " ") . "</th>";
+ $column_data{due} =
+ "<th class=listtotal align=right>"
+ . $form->format_amount(\%myconfig, $totaldue, 2, " ") . "</th>";
map { print "$column_data{$_}\n" } @column_index;
</tr>
<tr>
<td><hr size=3 noshade></td>
- </tr>
+ </tr>
</table>
<br>
<form method=post action=$form->{script}>
-
+
<input name=callback type=hidden value="$form->{callback}">
-
+
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|.$locale->text('AP Transaction').qq|">
-<input class=submit type=submit name=action value="|.$locale->text('Vendor Invoice').qq|">|;
+<input class=submit type=submit name=action value="|
+ . $locale->text('AP Transaction') . qq|">
+
+<input class=submit type=submit name=action value="|
+ . $locale->text('Vendor Invoice') . qq|">|;
if ($form->{menubar}) {
require "$form->{path}/menu.pl";
$lxdebug->leave_sub();
}
-
sub ap_subtotal {
$lxdebug->enter_sub();
-
map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{netamount} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotalnetamount, 2, " ")."</th>";
- $column_data{tax} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount, 2, " ")."</th>";
- $column_data{amount} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotalamount, 2, " ")."</th>";
- $column_data{paid} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotalpaid, 2, " ")."</th>";
- $column_data{due} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotaldue, 2, " ")."</th>";
+
+ $column_data{netamount} =
+ "<th class=listsubtotal align=right>"
+ . $form->format_amount(\%myconfig, $subtotalnetamount, 2, " ")
+ . "</th>";
+ $column_data{tax} = "<th class=listsubtotal align=right>"
+ . $form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount,
+ 2, " ")
+ . "</th>";
+ $column_data{amount} =
+ "<th class=listsubtotal align=right>"
+ . $form->format_amount(\%myconfig, $subtotalamount, 2, " ") . "</th>";
+ $column_data{paid} =
+ "<th class=listsubtotal align=right>"
+ . $form->format_amount(\%myconfig, $subtotalpaid, 2, " ") . "</th>";
+ $column_data{due} =
+ "<th class=listsubtotal align=right>"
+ . $form->format_amount(\%myconfig, $subtotaldue, 2, " ") . "</th>";
$subtotalnetamount = 0;
- $subtotalamount = 0;
- $subtotalpaid = 0;
- $subtotaldue = 0;
+ $subtotalamount = 0;
+ $subtotalpaid = 0;
+ $subtotaldue = 0;
print "<tr class=listsubtotal>";
-
+
map { print "\n$column_data{$_}" } @column_index;
print qq|
$lxdebug->leave_sub();
}
-
-
-
projects / kivitendo-erp.git / blobdiff