#
#======================================================================
+use POSIX qw(strftime);
+use List::Util qw(sum);
+
use SL::AP;
+use SL::FU;
use SL::IR;
+use SL::IS;
use SL::PE;
+use SL::ReportGenerator;
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
+require "bin/mozilla/reportgenerator.pl";
+
+use strict;
1;
# $locale->text('Dec')
sub add {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- return $lxdebug->leave_sub() if (load_draft_maybe());
+ $main::auth->assert('general_ledger');
+
+ return $main::lxdebug->leave_sub() if (load_draft_maybe());
$form->{title} = "Add";
- $form->{callback} =
- "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
+ $form->{callback} = "ap.pl?action=add&DONT_LOAD_DRAFT=1" unless $form->{callback};
AP->get_transdate(\%myconfig, $form);
$form->{initial_transdate} = $form->{transdate};
$form->{transdate} = $form->{initial_transdate};
&display_form;
- $lxdebug->leave_sub();
+ $main::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
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ $main::auth->assert('general_ledger');
$form->{title} = "Edit";
&create_links;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub display_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ $main::auth->assert('general_ledger');
&form_header;
&form_footer;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub create_links {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('general_ledger');
$form->create_links("AP", \%myconfig, "vendor");
- $taxincluded = $form->{taxincluded};
- $duedate = $form->{duedate};
+ my $taxincluded = $form->{taxincluded};
+ my $duedate = $form->{duedate};
IR->get_vendor(\%myconfig, \%$form);
$form->{taxincluded} = $taxincluded;
$form->{notes} = $form->{intnotes} unless $form->{notes};
# currencies
- @curr = split(/:/, $form->{currencies});
- chomp $curr[0];
- $form->{defaultcurrency} = $curr[0];
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
+ map { $form->{selectcurrency} .= "<option>$_\n" } $form->get_all_currencies(\%myconfig);
# vendors
- if (@{ $form->{all_vendor} }) {
+ if (@{ $form->{all_vendor} || [] }) {
$form->{vendor} = qq|$form->{vendor}--$form->{vendor_id}|;
map { $form->{selectvendor} .= "<option>$_->{name}--$_->{id}\n" }
(@{ $form->{all_vendor} });
}
# departments
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
$form->{department} = "$form->{department}--$form->{department_id}";
map {
$form->{selectdepartment} .=
"<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
+ } (@{ $form->{all_departments} || [] });
}
$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";
- } else {
- $form->{"select$key"} .=
- "<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
- 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->{"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") || ($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}"};
- } 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}";
- 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}--${q_description}<\/option>\n/;
- $form->{"${key}_$k"} = $1;
-
- if ($akey eq "AP") {
- $form->{APselected} = $form->{acc_trans}{$key}->[$i-1]->{accno};
-
- } elsif ($akey eq 'amount') {
- $form->{"${key}_$k"} = $form->{acc_trans}{$key}->[$i-1]->{accno} .
- "--" . $form->{acc_trans}{$key}->[$i-1]->{id};
- $form->{"taxchart_$k"} = $form->{acc_trans}{$key}->[$i-1]->{id} .
- "--" . $form->{acc_trans}{$key}->[$i-1]->{rate};
- }
- }
- }
- }
- }
-
- $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 .. $form->{rowcount}) {
- $taxamount =
- ($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
- $tax = $form->round_amount($taxamount, 2);
- $diff += ($taxamount - $tax);
- $form->{"amount_$i"} += $form->{"tax_$i"};
- }
- $form->{amount_1} += $form->round_amount($diff, 2);
- }
-
- $taxamount = $form->round_amount($taxamount, 2);
-
- $form->{invtotal} = $totalamount + $totaltax;
+ AP->setup_form($form);
$form->{locked} =
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_header {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
+
+ $main::auth->assert('general_ledger');
- $title = $form->{title};
+ my $title = $form->{title};
$form->{title} = $locale->text("$title Accounts Payables Transaction");
$form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
};
//-->
</script>|;
+ # show history button
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+ #/show hhistory button
# set option selected
- foreach $item (qw(vendor currency department)) {
+ foreach my $item (qw(vendor currency department)) {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
- $readonly = ($form->{id}) ? "readonly" : "";
+ my $readonly = ($form->{id}) ? "readonly" : "";
- $form->{radier} =
- ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
- $readonly = ($form->{radier}) ? "" : $readonly;
+ $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+ $readonly = ($form->{radier}) ? "" : $readonly;
- # format amounts
- $form->{exchangerate} =
- $form->format_amount(\%myconfig, $form->{exchangerate});
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
- $form->{creditlimit} =
- $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
- $form->{creditremaining} =
- $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
+ # format amounts
+ $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");
- $exchangerate = qq|
+ my $exchangerate = qq|
<input type=hidden name=forex value=$form->{forex}>
|;
- if ($form->{currency} ne $form->{defaultcurrency}) {
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
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 = "";
+ my $taxincluded = "";
$taxincluded = qq|
<tr>
</tr>
|;
+ my $rows;
if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
$rows = 2;
}
- $notes =
+ my $notes =
qq|<textarea name=notes rows=$rows cols=50 wrap=soft $readonly>$form->{notes}</textarea>|;
- $department = qq|
+ my $department = qq|
<tr>
- <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>
- </tr>
+ <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>
+ </tr>
| if $form->{selectdepartment};
- $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+ my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
- $vendor =
+ my $vendor =
($form->{selectvendor})
- ? qq|<select name=vendor>$form->{selectvendor}</select>|
+ ? qq|<select name="vendor" onchange="document.getElementById('update_button').click();">$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 },
- "charts" => { "key" => "ALL_CHARTS",
- "transdate" => $form->{transdate} },
- "taxcharts" => "ALL_TAXCHARTS");
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids },
+ "charts" => { "key" => "ALL_CHARTS",
+ "transdate" => $form->{transdate} },
+ "taxcharts" => { "key" => "ALL_TAXCHARTS",
+ "module" => "AP" },);
map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
@{ $form->{ALL_CHARTS} });
}
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
- $jsscript = "";
+ $form->{jsscript} = 1;
+ my $jsscript = "";
+ my ($button1, $button2);
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 name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\" $readonly></td>
<td><input type=button name=transdate id="trigger1" value=|
. $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 name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\" $readonly></td>
<td><input type=button name=duedate id="trigger2" value=|
. $locale->text('button') . qq|></td></td>
|;
# without JavaScript Calendar
$button1 =
- qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}> $readonly</td>|;
+ qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\" $readonly></td>|;
$button2 =
- qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}> $readonly</td>|;
+ qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\" $readonly></td>|;
}
- $form->header;
+ my $follow_up_vc = $form->{vendor};
+ $follow_up_vc =~ s/--.*?//;
+ my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
+
+ $form->header;
+ my $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+ $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
print qq|
-<body>
+<body onLoad="$onload">
<form method=post action=$form->{script}>
<input type=hidden name=locked value=$form->{locked}>
<input type=hidden name=title value="$title">
+<input type="hidden" name="follow_up_trans_id_1" value="| . H($form->{id}) . qq|">
+<input type="hidden" name="follow_up_trans_type_1" value="ap_transaction">
+<input type="hidden" name="follow_up_trans_info_1" value="| . H($follow_up_trans_info) . qq|">
+<input type="hidden" name="follow_up_rowcount" value="1">
+
| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
<table width=100%>
<td>
<table width=100%>
<tr valign=top>
- <td>
- <table>
- <tr>
- <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}">
- <input type=hidden name=vendor_id value="$form->{vendor_id}">
- <input type=hidden name=terms value=$form->{terms}>
- </tr>
- <tr>
- <td></td>
- <td colspan=3>
- <table width=100%>
- <tr>
- <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
- <td>$form->{creditlimit}</td>
- <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}>
- </tr>
- </table>
- </td>
- <tr>
- <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}>
- <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
- <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
- $exchangerate
- </tr>
- $department
- $taxincluded
- </table>
- </td>
- <td align=right>
- <table>
- <tr>
- <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>
- <td><input name=ordnumber size=11 value="$form->{ordnumber}" $readonly></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
+ <td>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Vendor') . qq|</th>
+ <td colspan=3>$vendor <input type="button" value="D" onclick="show_vc_details('vendor')"></td>
+ <input type=hidden name=selectvendor value="| . H($form->{selectvendor}) . qq|">
+ <input type=hidden name=oldvendor value="| . H($form->{oldvendor}) . qq|">
+ <input type=hidden name=vendor_id value="| . H($form->{vendor_id}) . qq|">
+ <input type=hidden name=terms value="| . H($form->{terms}) . qq|">
+ </tr>
+ <tr>
+ <td></td>
+ <td colspan=3>
+ <tr>
+ <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
+ <td>$form->{creditlimit}</td>
+ <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}>
+ </tr>
+ </table>
+ </td>
+ <tr>
+ <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}>
+ <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
+ <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
+ $exchangerate
+ </tr>
+ $department
+ $taxincluded
+ </table>
+ </td>
+ <td align=right>
+ <tr>
+ <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>
+ <td><input name=ordnumber size=11 value="$form->{ordnumber}" $readonly></td>
+ </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
$button1
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
+ </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
$button2
- </tr>
- </table>
- </td>
- </tr>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
</td>
</tr>
$jsscript
<input type=hidden name=rowcount value=$form->{rowcount}>
<tr>
- <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>
+ <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: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');
+ my $amount = $locale->text('Amount');
+ my $project = $locale->text('Project');
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
# format amounts
$form->{"amount_$i"} =
$selected_taxchart = $taxchart_init unless ($form->{"taxchart_$i"});
- $selectAP_amount =
+ my $selectAP_amount =
NTI($cgi->popup_menu('-name' => "AP_amount_$i",
'-id' => "AP_amount_$i",
'-style' => 'width:400px',
. $cgi->hidden('-name' => "previous_AP_amount_$i",
'-default' => $selected_accno_full);
- $tax = qq|<td>| .
+ my $tax = qq|<td>| .
NTI($cgi->popup_menu('-name' => "taxchart_$i",
'-id' => "taxchart_$i",
'-style' => 'width:200px',
'-default' => $selected_taxchart))
. qq|</td>|;
- my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
-
my $projectnumber =
NTI($cgi->popup_menu('-name' => "project_id_$i",
'-values' => \@project_values,
'-default' => $form->{"project_id_$i"} ));
print qq|
- <tr>
+ <tr>
<td>$selectAP_amount</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>
+ <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
$tax
<td>$projectnumber</td>
- </tr>
+ </tr>
|;
$amount = "";
$project = "";
}
- $taxlabel =
+ my $taxlabel =
($form->{taxincluded})
? $locale->text('Tax Included')
: $locale->text('Tax');
+ $form->{invtotal_unformatted} = $form->{invtotal};
$form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
- $APselected =
+ my $APselected =
NTI($cgi->popup_menu('-name' => "APselected", '-id' => "APselected",
'-style' => 'width:400px',
'-values' => \@AP_values, '-labels' => \%AP_labels,
</td>
</tr>
<tr>
- <td>${APselected}</td>
- <th align=left>$form->{invtotal}</th>
+ <td>${APselected}</td>
+ <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=oldinvtotal value=$form->{oldinvtotal}>
+ <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
- <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
+ <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
- <td colspan=4></td>
+ <td colspan=4></td>
</tr>
- </table>
- </td>
+ </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>
+ <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
+ <td align=left>$notes</td>
+ </tr>
</table>
</td>
</tr>
<tr>
<td>
<table width=100%>
- <tr class=listheading>
- <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
- </tr>
+ <tr class=listheading>
+ <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
+ </tr>
|;
- if ($form->{currency} eq $form->{defaultcurrency}) {
+ my @column_index;
+ if ($form->{defaultcurrency} && ($form->{currency} eq $form->{defaultcurrency})) {
@column_index = qw(datepaid source memo paid AP_paid paid_project_id);
} else {
@column_index = qw(datepaid source memo paid exchangerate AP_paid paid_project_id);
}
+ my %column_data;
$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{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
+ $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
print "
<tr>
</tr>
";
- my @triggers = ();
+ my @triggers = ();
+ $form->{totalpaid} = 0;
+
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
print "
<tr>
";
- $selectAP_paid =
+ my $selectAP_paid =
NTI($cgi->popup_menu('-name' => "AP_paid_$i",
'-id' => "AP_paid_$i",
'-values' => \@AP_paid_values,
'-labels' => \%AP_paid_labels,
'-default' => $form->{"AP_paid_$i"}));
+ $form->{totalpaid} += $form->{"paid_$i"};
+
# format amounts
if ($form->{"paid_$i"}) {
$form->{"paid_$i"} =
}
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+ if ($form->{"exchangerate_$i"} == 0) {
+ $form->{"exchangerate_$i"} = "";
+ }
$exchangerate = qq| |;
- if ($form->{currency} ne $form->{defaultcurrency}) {
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
if ($form->{"forex_$i"}) {
$exchangerate =
qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
|;
$column_data{"paid_$i"} =
- qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
+ qq|<td align=center><input name="paid_$i" size=11 value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
$column_data{"AP_paid_$i"} =
qq|<td align=center>${selectAP_paid}</td>|;
$column_data{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
$column_data{"datepaid_$i"} =
- 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>|;
+ qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="| . $locale->text('Details (one letter abbreviation)') . qq|"></td>|;
$column_data{"source_$i"} =
qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
$column_data{"memo_$i"} =
";
push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
- print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+
+ my $paid_missing = $form->{invtotal_unformatted} - $form->{totalpaid};
+
+ print qq|
+ <tr>
+ <td></td>
+ <td></td>
+ <td align="center">| . $locale->text('Total') . qq|</td>
+ <td align="center">| . H($form->format_amount(\%myconfig, $form->{totalpaid}, 2)) . qq|</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td align="center">| . $locale->text('Missing amount') . qq|</td>
+ <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+ </tr>
+| . $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
qq|
<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
</table>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_footer {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
+
+ $main::auth->assert('general_ledger');
+
+ my $follow_ups_block;
+ if ($form->{id}) {
+ my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+
+ if (@{ $follow_ups} ) {
+ my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups };
+ $follow_ups_block = qq|<p>| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</p>|;
+ }
+ }
print qq|
+$follow_ups_block
+
<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}>
-<input type=hidden name=password value=$form->{password}>
|
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
qq|</label><br>|);
}
- $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
- print qq|<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">|;
+ print qq|<input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">|;
if ($form->{id}) {
-
- # print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').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|">
+ 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|">
|;
}
+ # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
+ print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
+ if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($form->{totalpaid} == 0) || ($form->{totalpaid} eq "")));
- 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 Payment') . qq|">
+ print qq| <input class=submit type=submit name=action value="| . $locale->text('Post Payment') . qq|">
+ <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|">
+ <input type="button" class="submit" onclick="follow_up_window()" value="| . $locale->text('Follow-Up') . qq|">
|;
} elsif (($transdate > $closedto) && !$form->{id}) {
print qq|
- <input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|"> | .
- NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
- '-class' => 'submit'));
+ <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
}
# 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|>|;
+ print qq| <input type="button" class="submit" onclick="set_history_window($form->{id});" name="history" id="history" value="| . $locale->text('history') . qq|"> |;
}
# /button for saving history
+ # mark_as_paid button
+ if($form->{id} ne "") {
+ print qq| <input type="submit" class="submit" name="action" value="| . $locale->text('mark as paid') . qq|"> |;
+ }
+ # /mark_as_paid button
print "
</form>
</html>
";
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
+}
+
+sub mark_as_paid {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('general_ledger');
+
+ &mark_as_paid_common(\%myconfig,"ap");
+
+ $main::lxdebug->leave_sub();
}
sub update {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('general_ledger');
my $display = shift;
$form->{invtotal} = 0;
+ delete @{ $form }{ grep { m/^tax_\d+$/ } keys %{ $form } };
+
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 .. $form->{rowcount}) {
+ my @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id taxchart);
+ my $count = 0;
+ my (@a, $j, $totaltax);
+ for my $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, {};
$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;
- }
+ my ($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"} = 0;
+ $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
}
+ } else {
+ $form->{"tax_$i"} = 0;
}
$form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
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->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
$form->{invdate} = $form->{transdate};
- $save_AP = $form->{AP};
- &check_name(vendor);
- $form->{AP} = $save_AP;
+ my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1);
+
+ my $vendor_changed = &check_name("vendor");
+
+ $form->{AP} = $saved_variables{AP};
+ if ($saved_variables{AP_amount_1} =~ m/.--./) {
+ map { $form->{$_} = $saved_variables{$_} } qw(AP_amount_1 taxchart_1);
+ } else {
+ delete $form->{taxchart_1};
+ }
$form->{rowcount} = $count + 1;
$form->{invtotal} =
($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
- for $i (1 .. $form->{paidaccounts}) {
+ my $totalpaid;
+ for my $i (1 .. $form->{paidaccounts}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
map {
$form->{"${_}_$i"} =
$totalpaid += $form->{"paid_$i"};
- $form->{"exchangerate_$i"} = $exchangerate
- if (
- $form->{"forex_$i"} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell'
- )));
+ $form->{"forex_$i"} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+ $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
}
}
$form->{oldinvtotal} = $form->{invtotal};
$form->{oldtotalpaid} = $totalpaid;
+ # notes
+ $form->{notes} = $form->{intnotes} if $vendor_changed;
+
&display_form;
- $lxdebug->leave_sub();
+ $main::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);
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('general_ledger');
+
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+ my $invdate = $form->datetonum($form->{transdate}, \%myconfig);
+
+ for my $i (1 .. $form->{paidaccounts}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
+ my $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->date_closed($form->{"datepaid_$i"}, \%myconfig));
- if ($form->{currency} ne $form->{defaultcurrency}) {
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
if ($invdate == $datepaid);
$form->isblank("exchangerate_$i",
($form->{AP}) = split /--/, $form->{AP};
($form->{AP_paid}) = split /--/, $form->{AP_paid};
- $form->redirect($locale->text(' Payment posted!'))
+ $form->redirect($locale->text('Payment posted!'))
if (AP->post_payment(\%myconfig, \%$form));
$form->error($locale->text('Cannot post payment!'));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('general_ledger');
# 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);
- $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ if ($myconfig{mandatory_departments} && !$form->{department}) {
+ $form->{saved_message} = $::locale->text('You have to specify a department.');
+ update();
+ exit;
+ }
+
+ my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ $form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
- $form->error($locale->text('Cannot post transaction for a closed period!'))
- if ($transdate <= $closedto);
+ my $zero_amount_posting = 1;
+ for my $i (1 .. $form->{rowcount}) {
+ if ($form->parse_amount(\%myconfig, $form->{"amount_$i"})) {
+ $zero_amount_posting = 0;
+ last;
+ }
+ }
+
+ $form->error($locale->text('Zero amount posting!')) if $zero_amount_posting;
$form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
- if ($form->{currency} ne $form->{defaultcurrency});
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency}));
delete($form->{AP});
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
- $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+ my $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->date_closed($form->{"datepaid_$i"}, \%myconfig));
- if ($form->{currency} ne $form->{defaultcurrency}) {
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
if ($transdate == $datepaid);
$form->isblank("exchangerate_$i",
}
# if old vendor ne vendor redo form
- ($vendor) = split /--/, $form->{vendor};
+ my ($vendor) = split /--/, $form->{vendor};
if ($form->{oldvendor} ne "$vendor--$form->{vendor_id}") {
&update;
- exit;
+ ::end_of_request();
}
- ($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;
+ my ($debitaccno, $debittaxkey) = split /--/, $form->{AP_amountselected};
+ my ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
+ my ($payablesaccno, $payablestaxkey) = split /--/, $form->{APselected};
+# $form->{AP_amount_1} = $debitaccno;
+ $form->{AP_payables} = $payablesaccno;
$form->{taxkey} = $taxkey;
+ $form->{storno} = 0;
$form->{id} = 0 if $form->{postasnew};
if (AP->post_transaction(\%myconfig, \%$form)) {
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
$form->{addition} = "POSTED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
- # /saving the history
+ # /saving the history
remove_draft() if $form->{remove_draft};
+ # Dieser Text wird niemals ausgegeben: Probleme beim redirect?
$form->redirect($locale->text('Transaction posted!'));
+ } else {
+ $form->error($locale->text('Cannot post transaction!'));
}
- $form->error($locale->text('Cannot post transaction!'));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post_as_new {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('general_ledger');
$form->{postasnew} = 1;
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{addition} = "POSTED AS NEW";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{addition} = "POSTED AS NEW";
+ $form->save_history;
}
- # /saving the history
+ # /saving the history
&post;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub use_as_template {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('general_ledger');
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->{invdate} = $form->current_date(\%myconfig);
&update;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub delete {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ $main::auth->assert('general_ledger');
$form->{title} = $locale->text('Confirm!');
<form method=post action=$form->{script}>
|;
- foreach $key (keys %$form) {
+ foreach my $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
}
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub yes {
- $lxdebug->enter_sub();
- if (AP->delete_transaction(\%myconfig, \%$form, $spool)) {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('general_ledger');
+
+ if (AP->delete_transaction(\%myconfig, \%$form, $main::spool)) {
# saving the history
if(!exists $form->{addition}) {
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{addition} = "DELETED";
+ $form->save_history;
}
- # /saving the history
+ # /saving the history
$form->redirect($locale->text('Transaction deleted!'));
}
$form->error($locale->text('Cannot delete transaction!'));
- $lxdebug->leave_sub();
+ $main::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} };
- $vendor = qq|<select name=vendor><option>\n$vendor\n</select>|;
- } else {
- $vendor = qq|<input name=vendor size=35>|;
- }
-
- # departments
- if (@{ $form->{all_departments} }) {
- $form->{selectdepartment} = "<option>\n";
+ $main::lxdebug->enter_sub();
- map {
- $form->{selectdepartment} .=
- "<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
- }
-
- $department = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- </tr>
-| if $form->{selectdepartment};
+ $main::auth->assert('general_ledger | invoice_edit');
- $form->{title} = $locale->text('AP Transactions');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- # use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
- $jsscript = "";
- if ($form->{jsscript}) {
+ # setup customer selection
+ $form->all_vc(\%myconfig, "vendor", "AP");
- # 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>
- |;
- $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>
- |;
+ $form->{title} = $locale->text('AP Transactions');
+ $form->{fokus} = "search.vendor";
+ $form->{jsscript} = 1;
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger1",
- "transdateto", "BL", "trigger2");
- } else {
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 },
+ "departments" => "ALL_DEPARTMENTS",
+ "vendors" => "ALL_VC");
- # without JavaScript Calendar
- $button1 = qq|
- <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
- $button2 = qq|
- <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
- }
+ # constants and subs for template
+ $form->{jsscript} = 1;
+ $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 1 });
+ $form->header;
+ print $form->parse_html_template('ap/search', { %myconfig });
- 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));
+ $main::lxdebug->leave_sub();
+}
- $form->header;
+sub create_subtotal_row {
+ $main::lxdebug->enter_sub();
- print qq|
-<body>
+ my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
-<form method=post action=$form->{script}>
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <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>
- <td colspan=3><input name=invnumber size=20></td>
- </tr>
- <tr>
- <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>
- <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
- <th align=right>| . $locale->text('Bis') . qq|</th>
- $button2
- </tr>
- <input type=hidden name=sort value=transdate>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table>
- <tr>
- <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 align=right><input name=closed class=checkbox type=checkbox value=Y></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 align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></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>
- </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 align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></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>
- </tr>
- <tr>
- <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></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 align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></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 align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></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>
- </tr>
- <tr>
- <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></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>
- </tr>
- <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>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
-$jsscript
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
-<br>
-<input type=hidden name=nextsub value=$form->{nextsub}>
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+ $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
-<input class=submit type=submit name=action value="|
- . $locale->text('Continue') . qq|">
-</form>
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
-</body>
-</html>
-|;
+ $main::lxdebug->leave_sub();
- $lxdebug->leave_sub();
+ return $row;
}
sub ap_transactions {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('general_ledger | vendor_invoice_edit');
- $form->{vendor} = $form->unescape($form->{vendor});
($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor});
- AP->ap_transactions(\%myconfig, \%$form);
+ report_generator_set_default_sort('transdate', 1);
- $callback =
- "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
- $href = $callback;
+ AP->ap_transactions(\%myconfig, \%$form);
- if ($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});
- ($department) = split /--/, $form->{department};
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Department') . " : $department";
- }
- if ($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}";
- }
- if ($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}";
- }
- if ($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}";
- }
+ $form->{title} = $locale->text('AP Transactions');
- 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);
- }
- 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);
- }
- if ($form->{open}) {
- $callback .= "&open=$form->{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');
- }
- if ($form->{globalproject_id}) {
- $callback .= "&globalproject_id=" . E($form->{globalproject_id});
- $href .= "&globalproject_id=" . E($form->{globalproject_id});
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+ my @columns =
+ qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
+ due duedate transaction_description notes employee globalprojectnumber
+ vendornumber country ustid taxzone payment_terms charts);
+
+ my @hidden_variables = map { "l_${_}" } @columns;
+ push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
+
+ my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables);
+
+ my %column_defs = (
+ 'transdate' => { 'text' => $locale->text('Date'), },
+ 'id' => { 'text' => $locale->text('ID'), },
+ 'type' => { 'text' => $locale->text('Type'), },
+ 'invnumber' => { 'text' => $locale->text('Invoice'), },
+ 'ordnumber' => { 'text' => $locale->text('Order'), },
+ 'name' => { 'text' => $locale->text('Vendor'), },
+ 'netamount' => { 'text' => $locale->text('Amount'), },
+ 'tax' => { 'text' => $locale->text('Tax'), },
+ 'amount' => { 'text' => $locale->text('Total'), },
+ 'paid' => { 'text' => $locale->text('Paid'), },
+ 'datepaid' => { 'text' => $locale->text('Date Paid'), },
+ 'due' => { 'text' => $locale->text('Amount Due'), },
+ 'duedate' => { 'text' => $locale->text('Due Date'), },
+ 'transaction_description' => { 'text' => $locale->text('Transaction description'), },
+ 'notes' => { 'text' => $locale->text('Notes'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
+ 'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
+ 'vendornumber' => { 'text' => $locale->text('Vendor Number'), },
+ 'country' => { 'text' => $locale->text('Country'), },
+ 'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
+ 'taxzone' => { 'text' => $locale->text('Steuersatz'), },
+ 'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
+ 'charts' => { 'text' => $locale->text('Buchungskonto'), },
+ );
+
+ foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {
+ my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
- @columns =
- qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
- due duedate notes employee globalprojectnumber);
+ my %column_alignment = map { $_ => 'right' } qw(netamount tax amount paid due);
- foreach $item (@columns) {
- if ($form->{"l_$item"} eq "Y") {
- push @column_index, $item;
+ $form->{"l_type"} = "Y";
+ map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
- # add column to href and callback
- $callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
- }
- }
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
- if ($form->{l_subtotal} eq 'Y') {
- $callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
- }
+ $report->set_export_options('ap_transactions', @hidden_variables, qw(sort sortdir));
- $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{globalprojectnumber} =
- qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
- $form->{title} = $locale->text('AP Transactions');
+ my @options;
+ push @options, $locale->text('Vendor') . " : $form->{vendor}" if ($form->{vendor});
+ push @options, $locale->text('Department') . " : " . (split /--/, $form->{department})[0] if ($form->{department});
+ push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if ($form->{invnumber});
+ push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if ($form->{ordnumber});
+ push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
+ push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if ($form->{transaction_description});
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if ($form->{transdatefrom});
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if ($form->{transdateto});
+ push @options, $locale->text('Open') if ($form->{open});
+ push @options, $locale->text('Closed') if ($form->{closed});
- $form->header;
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $locale->text('vendor_invoice_list') . strftime('_%Y%m%d', localtime time),
+ );
+ $report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
- print qq|
-<body>
+ # add sort and escape callback, this one we use for the add sub
+ $form->{callback} = $href .= "&sort=$form->{sort}";
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>$option</td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>
-|;
+ # escape callback for href
+ my $callback = $form->escape($href);
- map { print "\n$column_header{$_}" } @column_index;
+ my @subtotal_columns = qw(netamount amount paid due);
- print qq|
- </tr>
-|;
+ my %totals = map { $_ => 0 } @subtotal_columns;
+ my %subtotals = map { $_ => 0 } @subtotal_columns;
- # add sort and escape callback
- $form->{callback} = "$callback&sort=$form->{sort}";
- $callback = $form->escape($form->{callback});
+ my $idx = 0;
- if (@{ $form->{AP} }) {
- $sameitem = $form->{AP}->[0]->{ $form->{sort} };
- }
+ foreach my $ap (@{ $form->{AP} }) {
+ $ap->{tax} = $ap->{amount} - $ap->{netamount};
+ $ap->{due} = $ap->{amount} - $ap->{paid};
- # sums and tax on reports by Antonio Gallardo
- #
- foreach $ap (@{ $form->{AP} }) {
+ map { $subtotals{$_} += $ap->{$_};
+ $totals{$_} += $ap->{$_} } @subtotal_columns;
- if ($form->{l_subtotal} eq 'Y') {
- if ($sameitem ne $ap->{ $form->{sort} }) {
- &ap_subtotal;
- $sameitem = $ap->{ $form->{sort} };
- }
- }
+ map { $ap->{$_} = $form->format_amount(\%myconfig, $ap->{$_}, 2) } qw(netamount tax amount paid due);
- $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});
-
- $subtotalnetamount += $ap->{netamount};
- $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>";
-
- $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{ordnumber} = "<td>$ap->{ordnumber} </td>";
- $column_data{name} = "<td>$ap->{name}</td>";
- $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;
- print "
- <tr class=listrow$i >
-";
+ my $is_storno = $ap->{storno} && $ap->{storno_id};
+ my $has_storno = $ap->{storno} && !$ap->{storno_id};
- map { print "\n$column_data{$_}" } @column_index;
+ if ($ap->{invoice}) {
+ $ap->{type} =
+ $has_storno ? $locale->text("Invoice with Storno (abbreviation)")
+ : $is_storno ? $locale->text("Storno (one letter abbreviation)")
+ : $locale->text("Invoice (one letter abbreviation)");
+ } else {
+ $ap->{type} =
+ $has_storno ? $locale->text("AP Transaction with Storno (abbreviation)")
+ : $is_storno ? $locale->text("AP Transaction Storno (one letter abbreviation)")
+ : $locale->text("AP Transaction (abbreviation)");
+ }
- print qq|
- </tr>
-|;
+ my $row = { };
- }
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $ap->{$column},
+ 'align' => $column_alignment{$column},
+ };
+ }
- if ($form->{l_subtotal} eq 'Y') {
- &ap_subtotal;
- }
+ $row->{invnumber}->{link} = build_std_url("script=" . ($ap->{invoice} ? 'ir.pl' : 'ap.pl'), 'action=edit')
+ . "&id=" . E($ap->{id}) . "&callback=${callback}";
- # print totals
- print qq|
- <tr class=listtotal>
-|;
+ my $row_set = [ $row ];
- 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>";
+ if (($form->{l_subtotal} eq 'Y')
+ && (($idx == (scalar @{ $form->{AP} } - 1))
+ || ($ap->{ $form->{sort} } ne $form->{AP}->[$idx + 1]->{ $form->{sort} }))) {
+ push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
+ }
- map { print "$column_data{$_}\n" } @column_index;
+ $report->add_data($row_set);
- print qq|
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
+ $idx++;
+ }
-<br>
-<form method=post action=$form->{script}>
+ $report->add_separator();
+ $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
-<input name=callback type=hidden value="$form->{callback}">
+ $report->generate_with_headers();
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+ $main::lxdebug->leave_sub();
+}
-<input class=submit type=submit name=action value="|
- . $locale->text('AP Transaction') . qq|">
+sub storno {
+ $main::lxdebug->enter_sub();
-<input class=submit type=submit name=action value="|
- . $locale->text('Vendor Invoice') . qq|">
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- </form>
+ $main::auth->assert('general_ledger');
-</body>
-</html>
-|;
+ if (IS->has_storno(\%myconfig, $form, 'ap')) {
+ $form->{title} = $locale->text("Cancel Accounts Payables Transaction");
+ $form->error($locale->text("Transaction has already been cancelled!"));
+ }
- $lxdebug->leave_sub();
-}
+ AP->storno($form, \%myconfig, $form->{id});
-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>";
-
- $subtotalnetamount = 0;
- $subtotalamount = 0;
- $subtotalpaid = 0;
- $subtotaldue = 0;
-
- print "<tr class=listsubtotal>";
-
- map { print "\n$column_data{$_}" } @column_index;
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = "ordnumber_$form->{ordnumber}";
+ $form->{addition} = "STORNO";
+ $form->save_history;
+ }
+ # /saving the history
- print qq|
- </tr>
-|;
+ $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
projects / kivitendo-erp.git / blobdiff