use SL::PE;
require "$form->{path}/arap.pl";
+require "bin/mozilla/common.pl";
1;
unless $form->{callback};
&create_links;
+ AP->get_transdate(\%myconfig, $form);
&display_form;
$lxdebug->leave_sub();
sub edit {
$lxdebug->enter_sub();
+ # show history button
+ $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+ #/show hhistory button
$form->{title} = "Edit";
$duedate = $form->{duedate};
IR->get_vendor(\%myconfig, \%$form);
-
+ $form->{taxincluded} = $taxincluded;
$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} |
+ qq|<option value=\"$_->{id}--$_->{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];
"<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";
+ "<option value=\"$ref->{accno}--$ref->{tax_id}\">$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") {
$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->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
$form->{paidaccounts}++;
} else {
$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,
- 2);
+ $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}"};
$withholdingrate +=
$form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
}
- $formtax =
- $form->round_amount(
- $form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate,
- 2) * -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,
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->{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}";
+ my $q_description = quotemeta($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;
+ /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/;
+ $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]->{id}--[^\"]*)/;
+ $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))),
- 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->{invtotal} = $totalamount + $totaltax;
$form->{locked} =
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
+ $form->{"APselected"} = $form->{"AP_1"};
+
$lxdebug->leave_sub();
}
# 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//;
}
$readonly = ($form->{id}) ? "readonly" : "";
+ my $APselected_quoted = quotemeta($form->{"APselected"});
+ $form->{selectAP} = $form->{AP};
+ $form->{selectAP} =~
+ s/value=\"${APselected_quoted}\"/value=\"$form->{APselected}\" selected/;
+
$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->{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} =
<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>
|;
? qq|<select name=vendor>$form->{selectvendor}</select>|
: qq|<input name=vendor value="$form->{vendor}" size=35>|;
+ 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"};
+ }
+
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
$jsscript = "";
$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;
+ $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>|;
+
+ my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
+
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => "project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"project_id_$i"} ));
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><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>
+ <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" "$korrektur"></td>
+ $tax
+ <td>$projectnumber</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>
<td>
<table width=100%>
<tr class=listheading>
- <th class=listheading colspan=6>| . $locale->text('Payments') . qq|</th>
+ <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
</tr>
|;
if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AP_paid);
+ @column_index = qw(datepaid source memo paid AP_paid paid_project_id);
} else {
- @column_index = qw(datepaid source memo paid exchangerate AP_paid);
+ @column_index = qw(datepaid source memo paid exchangerate AP_paid paid_project_id);
}
$column_data{datepaid} = "<th>" . $locale->text('Date') . "</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{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
print "
<tr>
</tr>
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
s/option value=\"$form->{"AP_paid_$i"}\">/option value=\"$form->{"AP_paid_$i"}\" selected>/;
# format amounts
- $form->{"paid_$i"} =
+ if ($form->{"paid_$i"}) {
+ $form->{"paid_$i"} =
$form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ }
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$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>|;
+ qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}>
+ <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></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{"paid_project_id_$i"} =
+ qq|<td>|
+ . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"paid_project_id_$i"} ))
+ . qq|</td>|;
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
</tr>
";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
map { $form->{$_} =~ s/\"/"/g } qw(selectAP_paid);
- print qq|
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
<input type=hidden name=selectAP_paid value="$form->{selectAP_paid}">
print qq|
<input name=callback type=hidden value="$form->{callback}">
+<input name="gldate" type="hidden" value="| . Q($form->{gldate}) . qq|">
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
$transdate = $form->datetonum($form->{transdate}, \%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|">|;
+
+ if ($form->{id}) {
# print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
# |;
-
- if (!$form->{revtrans}) {
- if (!$form->{locked}) {
- print qq|
+ if ($form->{radier}) {
+ 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|
+ print qq|
+<input class=submit type=submit name=action value="|
+ . $locale->text('Use As Template') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Post as new') . qq|">
+ . $locale->text('Post Payment') . qq|">
|;
- }
-
- } else {
- if (($transdate > $closedto) && !$form->{id}) {
- print qq|<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">
+ } elsif (($transdate > $closedto) && !$form->{id}) {
+ print qq|
<input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">|;
- }
+ . $locale->text('Post') . qq|">|;
}
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
+ # button for saving history
+ if($form->{id} ne "") {
+ print qq|
+ <input type=button class=submit onclick=set_history_window(|
+ . $form->{id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
}
-
+ # /button for saving history
print "
</form>
$form->{invtotal} = 0;
- $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_amount} = $form->{AP_amount};
+ # $form->{selectAP_amount} =~
+ # s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
($AP_amountaccno, $AP_amounttaxkey) =
split(/--/, $form->{AP_amountselected});
@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 (
&check_name(vendor);
$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))),
- 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->{rowcount} = $count + 1;
$form->{invtotal} =
($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
$lxdebug->leave_sub();
}
+
+sub post_payment {
+ $lxdebug->enter_sub();
+ for $i (1 .. $form->{paidaccounts}) {
+ if ($form->{"paid_$i"}) {
+ $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+
+ $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+
+ $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 ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
+ }
+ }
+ }
+
+ ($form->{AP}) = split /--/, $form->{AP};
+ ($form->{AP_paid}) = split /--/, $form->{AP_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AP->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
+
sub post {
$lxdebug->enter_sub();
delete($form->{AP});
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$form->{taxkey} = $taxkey;
$form->{id} = 0 if $form->{postasnew};
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "POSTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$form->redirect($locale->text('Transaction posted!'))
if (AP->post_transaction(\%myconfig, \%$form));
$lxdebug->enter_sub();
$form->{postasnew} = 1;
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "POSTED AS NEW";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&post;
$lxdebug->leave_sub();
}
+sub use_as_template {
+ $lxdebug->enter_sub();
+
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+ $form->{paidaccounts} = 1;
+ $form->{rowcount}--;
+ $form->{invdate} = $form->current_date(\%myconfig);
+ &update;
+
+ $lxdebug->leave_sub();
+}
+
sub delete {
$lxdebug->enter_sub();
sub yes {
$lxdebug->enter_sub();
-
- $form->redirect($locale->text('Transaction deleted!'))
- if (AP->delete_transaction(\%myconfig, \%$form, $spool));
+ if (AP->delete_transaction(\%myconfig, \%$form, $spool)) {
+ # saving the history
+ if(!exists $form->{addition}) {
+ $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();
$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
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
}
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 });
+
+ my %labels = ();
+ my @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+ '-labels' => \%labels));
+
$form->header;
print qq|
<th align=right nowrap>| . $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 nowrap>| . $locale->text('From') . qq|</th>
$button1
<tr>
<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
<td nowrap>| . $locale->text('Subtotal') . qq|</td>
+ <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+ <td nowrap>| . $locale->text('Project Number') . qq|</td>
</tr>
</table>
</td>
$option .= "\n<br>" if ($option);
$option .= $locale->text('Closed');
}
+ if ($form->{globalproject_id}) {
+ $callback .= "&globalproject_id=" . E($form->{globalproject_id});
+ $href .= "&globalproject_id=" . E($form->{globalproject_id});
+ }
@columns =
- $form->sort_columns(
- qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee)
- );
+ qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+ due duedate notes employee globalprojectnumber);
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
$column_header{employee} =
"<th><a class=listheading href=$href&sort=employee>"
. $locale->text('Employee') . "</th>";
+ $column_header{globalprojectnumber} =
+ qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
$form->{title} = $locale->text('AP Transactions');
$ap->{notes} =~ s/\r\n/<br>/g;
$column_data{notes} = "<td>$ap->{notes} </td>";
$column_data{employee} = "<td>$ap->{employee} </td>";
+ $column_data{globalprojectnumber} =
+ "<td>" . H($ap->{globalprojectnumber}) . "</td>";
$i++;
$i %= 2;
. $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";
- &menubar;
- }
+ . $locale->text('Vendor Invoice') . qq|">
- print qq|
</form>
</body>