X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=57822abc9e806c83969f4bba2b67b103c798df06;hb=4cedba163990bd449e05da972691ebf035d61de3;hp=c84b6146e5d3d641bee163014b9e1bbaa5e503bc;hpb=ce47a2340ef118b494854deae1b0ddc74b1d1c5a;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index c84b6146e..57822abc9 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -31,14 +31,18 @@
#
#======================================================================
+use POSIX qw(strftime);
+
use SL::AP;
use SL::IR;
use SL::IS;
use SL::PE;
+use SL::ReportGenerator;
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
+require "bin/mozilla/reportgenerator.pl";
1;
@@ -213,10 +217,21 @@ sub form_header {
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$readonly = ($form->{radier}) ? "" : $readonly;
+ $form->{exchangerate} = $exchangerate
+ if (
+ $form->{forex} = (
+ $exchangerate =
+ $form->check_exchangerate(
+ \%myconfig, $form->{currency}, $form->{transdate}, 'sell'
+ )));
+
+
# format amounts
$form->{exchangerate} =
$form->format_amount(\%myconfig, $form->{exchangerate});
-
+ if ($form->{exchangerate} == 0) {
+ $form->{exchangerate} = "";
+ }
$form->{creditlimit} =
$form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
$form->{creditremaining} =
@@ -647,6 +662,9 @@ $jsscript
}
$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}) {
@@ -762,8 +780,8 @@ sub form_footer {
}
# ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
- print qq| |
- if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap') && !$form->{paid_1});
+ print qq| |
+ if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap'));
print qq|
@@ -775,13 +793,12 @@ sub form_footer {
}
# button for saving history
if($form->{id} ne "") {
- print qq| |;
+ print qq| |;
}
# /button for saving history
# mark_as_paid button
if($form->{id} ne "") {
- print qq||;
+ print qq| |;
}
# /mark_as_paid button
print "
@@ -796,7 +813,7 @@ sub form_footer {
sub mark_as_paid {
$lxdebug->enter_sub();
- $form->mark_as_paid(\%myconfig,"ap");
+ &mark_as_paid_common(\%myconfig,"ap");
$lxdebug->leave_sub();
}
@@ -893,6 +910,9 @@ sub update {
sub post_payment {
$lxdebug->enter_sub();
+
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
for $i (1 .. $form->{paidaccounts}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
@@ -979,6 +999,7 @@ sub post {
$form->{AP}{amount_1} = $debitaccno;
$form->{AP}{payables} = $payablesaccno;
$form->{taxkey} = $taxkey;
+ $form->{storno} = 0;
$form->{id} = 0 if $form->{postasnew};
@@ -1290,359 +1311,179 @@ $jsscript
$lxdebug->leave_sub();
}
+sub create_subtotal_row {
+ $lxdebug->enter_sub();
+
+ my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
+
+ $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
+
+ $lxdebug->leave_sub();
+
+ return $row;
+}
+
sub ap_transactions {
$lxdebug->enter_sub();
- $form->{vendor} = $form->unescape($form->{vendor});
($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor});
+ $form->{sort} ||= 'transdate';
+
AP->ap_transactions(\%myconfig, \%$form);
- $callback =
- "$form->{script}?action=ap_transactions&login=$form->{login}&password=$form->{password}";
- $href = $callback;
+ $form->{title} = $locale->text('AP Transactions');
+
+ 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);
+
+ 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('Salesperson'), },
+ 'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
+ );
+
+ foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid
+ employee shippingpoint shipvia)) {
+ $column_defs{$name}->{link} = $href . "&sort=$name";
+ }
+
+ my %column_alignment = map { $_ => 'right' } qw(netamount tax amount paid due);
+
+ $form->{"l_type"} = "Y";
+ map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
+ $report->set_export_options('ap_transactions', @hidden_variables);
+
+ $report->set_sort_indicator($form->{sort}, 1);
+
+ my @options;
if ($form->{vendor}) {
- $callback .= "&vendor=" . $form->escape($form->{vendor}, 1);
- $href .= "&vendor=" . $form->escape($form->{vendor});
- $option .= $locale->text('Vendor') . " : $form->{vendor}";
+ push @options, $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
" if ($option);
- $option .= $locale->text('Department') . " : $department";
+ push @options, $locale->text('Department') . " : $department";
}
if ($form->{invnumber}) {
- $callback .= "&invnumber=" . $form->escape($form->{invnumber}, 1);
- $href .= "&invnumber=" . $form->escape($form->{invnumber});
- $option .= "\n
" if ($option);
- $option .= $locale->text('Invoice Number') . " : $form->{invnumber}";
+ push @options, $locale->text('Invoice Number') . " : $form->{invnumber}";
}
if ($form->{ordnumber}) {
- $callback .= "&ordnumber=" . $form->escape($form->{ordnumber}, 1);
- $href .= "&ordnumber=" . $form->escape($form->{ordnumber});
- $option .= "\n
" if ($option);
- $option .= $locale->text('Order Number') . " : $form->{ordnumber}";
+ push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
}
if ($form->{notes}) {
- $callback .= "¬es=" . $form->escape($form->{notes}, 1);
- $href .= "¬es=" . $form->escape($form->{notes});
- $option .= "\n
" if $option;
- $option .= $locale->text('Notes') . " : $form->{notes}";
+ push @options, $locale->text('Notes') . " : $form->{notes}";
+ }
+ if ($form->{transaction_description}) {
+ push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
-
if ($form->{transdatefrom}) {
- $callback .= "&transdatefrom=$form->{transdatefrom}";
- $href .= "&transdatefrom=$form->{transdatefrom}";
- $option .= "\n
" if ($option);
- $option .=
- $locale->text('From') . " "
- . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
- $callback .= "&transdateto=$form->{transdateto}";
- $href .= "&transdateto=$form->{transdateto}";
- $option .= "\n
" if ($option);
- $option .=
- $locale->text('Bis') . " "
- . $locale->date(\%myconfig, $form->{transdateto}, 1);
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ($form->{open}) {
- $callback .= "&open=$form->{open}";
- $href .= "&open=$form->{open}";
- $option .= "\n
" if ($option);
- $option .= $locale->text('Open');
+ push @options, $locale->text('Open');
}
if ($form->{closed}) {
- $callback .= "&closed=$form->{closed}";
- $href .= "&closed=$form->{closed}";
- $option .= "\n
" if ($option);
- $option .= $locale->text('Closed');
- }
- if ($form->{globalproject_id}) {
- $callback .= "&globalproject_id=" . E($form->{globalproject_id});
- $href .= "&globalproject_id=" . E($form->{globalproject_id});
+ push @options, $locale->text('Closed');
}
- @columns =
- qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
- due duedate notes employee globalprojectnumber);
+ $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('invoice_list') . strftime('_%Y%m%d', localtime time),
+ );
+ $report->set_options_from_form();
- $form->{"l_type"} = "Y";
+ # add sort and escape callback, this one we use for the add sub
+ $form->{callback} = $href .= "&sort=$form->{sort}";
- foreach $item (@columns) {
- if ($form->{"l_$item"} eq "Y") {
- push @column_index, $item;
+ # escape callback for href
+ $callback = $form->escape($href);
- # add column to href and callback
- $callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
- }
- }
+ my @subtotal_columns = qw(netamount amount paid due);
- if ($form->{l_subtotal} eq 'Y') {
- $callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
- }
+ my %totals = map { $_ => 0 } @subtotal_columns;
+ my %subtotals = map { $_ => 0 } @subtotal_columns;
- $column_header{id} =
- qq|
|
- . $locale->text('ID')
- . qq| | |;
- $column_header{transdate} =
- qq||
- . $locale->text('Date')
- . qq| | |;
- $column_header{type} =
- "" . $locale->text('Type') . " | ";
- $column_header{duedate} =
- qq||
- . $locale->text('Due Date')
- . qq| | |;
- $column_header{due} =
- qq|| . $locale->text('Amount Due') . qq| | |;
- $column_header{invnumber} =
- qq||
- . $locale->text('Invoice')
- . qq| | |;
- $column_header{ordnumber} =
- qq||
- . $locale->text('Order')
- . qq| | |;
- $column_header{name} =
- qq||
- . $locale->text('Vendor')
- . qq| | |;
- $column_header{netamount} =
- qq|| . $locale->text('Amount') . qq| | |;
- $column_header{tax} =
- qq|| . $locale->text('Tax') . qq| | |;
- $column_header{amount} =
- qq|| . $locale->text('Total') . qq| | |;
- $column_header{paid} =
- qq|| . $locale->text('Paid') . qq| | |;
- $column_header{datepaid} =
- qq||
- . $locale->text('Date Paid')
- . qq| | |;
- $column_header{notes} =
- qq|| . $locale->text('Notes') . qq| | |;
- $column_header{employee} =
- ""
- . $locale->text('Employee') . " | ";
- $column_header{globalprojectnumber} =
- qq|| . $locale->text('Project Number') . qq| | |;
+ my $idx = 0;
- $form->{title} = $locale->text('AP Transactions');
+ foreach $ap (@{ $form->{AP} }) {
+ $ap->{tax} = $ap->{amount} - $ap->{netamount};
+ $ap->{due} = $ap->{amount} - $ap->{paid};
- $form->header;
+ map { $subtotals{$_} += $ap->{$_};
+ $totals{$_} += $ap->{$_} } @subtotal_columns;
- print qq|
-
+ map { $ap->{$_} = $form->format_amount(\%myconfig, $ap->{$_}, 2) } qw(netamount tax amount paid due);
-
-
- $form->{title} |
-
-
-
- $option |
-
-
-
-
-
-|;
-
- map { print "\n$column_header{$_}" } @column_index;
+ $ap->{type} =
+ $ap->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
+ $locale->text("AP Transaction (abbreviation)");
- print qq|
-
-|;
+ my $row = { };
- # add sort and escape callback
- $form->{callback} = "$callback&sort=$form->{sort}";
- $callback = $form->escape($form->{callback});
-
- if (@{ $form->{AP} }) {
- $sameitem = $form->{AP}->[0]->{ $form->{sort} };
- }
-
- # sums and tax on reports by Antonio Gallardo
- #
- foreach $ap (@{ $form->{AP} }) {
-
- if ($form->{l_subtotal} eq 'Y') {
- if ($sameitem ne $ap->{ $form->{sort} }) {
- &ap_subtotal;
- $sameitem = $ap->{ $form->{sort} };
- }
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $ap->{$column},
+ 'align' => $column_alignment{$column},
+ };
}
- $column_data{netamount} =
- ""
- . $form->format_amount(\%myconfig, $ap->{netamount}, 2, " ")
- . " | ";
- $column_data{tax} = ""
- . $form->format_amount(\%myconfig, $ap->{amount} - $ap->{netamount},
- 2, " ")
- . " | ";
- $column_data{amount} =
- ""
- . $form->format_amount(\%myconfig, $ap->{amount}, 2, " ") . " | ";
- $column_data{paid} =
- ""
- . $form->format_amount(\%myconfig, $ap->{paid}, 2, " ") . " | ";
- $column_data{due} = ""
- . $form->format_amount(\%myconfig, $ap->{amount} - $ap->{paid},
- 2, " ")
- . " | ";
-
- $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} = "$ap->{transdate} | ";
- $column_data{type} = "" .
- ($ap->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
- $locale->text("AP Transaction (abbreviation)"))
- . " | ";
- $column_data{duedate} = "$ap->{duedate} | ";
- $column_data{datepaid} = "$ap->{datepaid} | ";
-
- $module = ($ap->{invoice}) ? "ir.pl" : $form->{script};
-
- $column_data{invnumber} =
- qq|$ap->{invnumber} | |;
- $column_data{id} = "$ap->{id} | ";
- $column_data{ordnumber} = "$ap->{ordnumber} | ";
- $column_data{name} = "$ap->{name} | ";
- $ap->{notes} =~ s/\r\n/ /g;
- $column_data{notes} = "$ap->{notes} | ";
- $column_data{employee} = "$ap->{employee} | ";
- $column_data{globalprojectnumber} =
- "" . H($ap->{globalprojectnumber}) . " | ";
-
- $i++;
- $i %= 2;
- print "
-
-";
+ $row->{invnumber}->{link} = build_std_url("script=" . ($ap->{invoice} ? 'ir.pl' : 'ap.pl'), 'action=edit')
+ . "&id=" . E($ap->{id}) . "&callback=${callback}";
- map { print "\n$column_data{$_}" } @column_index;
+ my $row_set = [ $row ];
- print qq|
-
-|;
+ 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');
+ }
- }
+ $report->add_data($row_set);
- if ($form->{l_subtotal} eq 'Y') {
- &ap_subtotal;
+ $idx++;
}
- # print totals
- print qq|
-
-|;
-
- map { $column_data{$_} = " | " } @column_index;
-
- $column_data{netamount} =
- ""
- . $form->format_amount(\%myconfig, $totalnetamount, 2, " ") . " | ";
- $column_data{tax} = ""
- . $form->format_amount(\%myconfig, $totalamount - $totalnetamount,
- 2, " ")
- . " | ";
- $column_data{amount} =
- ""
- . $form->format_amount(\%myconfig, $totalamount, 2, " ") . " | ";
- $column_data{paid} =
- ""
- . $form->format_amount(\%myconfig, $totalpaid, 2, " ") . " | ";
- $column_data{due} =
- ""
- . $form->format_amount(\%myconfig, $totaldue, 2, " ") . " | ";
-
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-
- |
-
-
-
|
-
-
-
-
-
+ $report->add_separator();
+ $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
-
-