require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
-require "bin/mozilla/report_generator.pl";
+require "bin/mozilla/reportgenerator.pl";
1;
$form->{title} = $locale->text('Project Transactions');
RP->trial_balance(\%myconfig, \%$form);
- &list_accounts;
+ list_accounts('generate_projects');
$lxdebug->leave_sub();
}
$form->{nextsub} = "generate_trial_balance";
$form->{title} = $locale->text('Trial Balance');
- &list_accounts;
+ list_accounts('generate_trial_balance');
$lxdebug->leave_sub();
}
+sub create_list_accounts_subtotal_row {
+ $lxdebug->enter_sub();
+
+ my ($subtotals, $columns, $fields, $class) = @_;
+
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
+
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $subtotals->{$_}, 2) } @{ $fields };
+
+ $lxdebug->leave_sub();
+
+ return $row;
+}
+
sub list_accounts {
$lxdebug->enter_sub();
- $title = $form->escape($form->{title});
+ my ($action) = @_;
+ my @options;
if ($form->{department}) {
- ($department) = split /--/, $form->{department};
- $options = $locale->text('Department') . " : $department<br>";
- $department = $form->escape($form->{department});
+ my ($department) = split /--/, $form->{department};
+ push @options, $locale->text('Department') . " : $department";
}
if ($form->{projectnumber}) {
- $options .=
- $locale->text('Project Number') . " : $form->{projectnumber}<br>";
- $projectnumber = $form->escape($form->{projectnumber});
+ push @options, $locale->text('Project Number') . " : $form->{projectnumber}";
}
# if there are any dates
if ($form->{fromdate} || $form->{todate}) {
+ my ($fromdate, $todate);
+
if ($form->{fromdate}) {
$fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
}
$todate = $locale->date(\%myconfig, $form->{todate}, 1);
}
- $form->{period} = "$fromdate - $todate";
- } else {
- $form->{period} =
- $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+ push @options, "$fromdate - $todate";
+ } else {
+ push @options, $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
}
- $options .= $form->{period};
- @column_index = qw(accno description begbalance debit credit endbalance);
+ my @columns = qw(accno description begbalance debit credit endbalance);
+ my %column_defs = (
+ 'accno' => { 'text' => $locale->text('Account'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'debit' => { 'text' => $locale->text('Debit'), },
+ 'credit' => { 'text' => $locale->text('Credit'), },
+ 'begbalance' => { 'text' => $locale->text('Balance'), },
+ 'endbalance' => { 'text' => $locale->text('Balance'), },
+ );
+ my %column_alignment = map { $_ => 'right' } qw(debit credit begbalance endbalance);
- $column_header{accno} =
- qq|<th class=listheading>| . $locale->text('Account') . qq|</th>|;
- $column_header{description} =
- qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
- $column_header{debit} =
- qq|<th class=listheading>| . $locale->text('Debit') . qq|</th>|;
- $column_header{credit} =
- qq|<th class=listheading>| . $locale->text('Credit') . qq|</th>|;
- $column_header{begbalance} =
- qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
- $column_header{endbalance} =
- qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
+ my @hidden_variables = qw(fromdate todate department l_heading l_subtotal all_accounts sort accounttype eur projectnumber project_id title nextsub);
- $form->header;
+ $form->{callback} = build_std_url("action=$action", grep { $form->{$_} } @hidden_variables);
- print qq|
-<body>
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>$options</td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr>|;
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $locale->text('list_of_transactions') . strftime('_%Y%m%d', localtime time),
+ 'std_column_visibility' => 1,
+ );
+ $report->set_options_from_form();
- map { print "$column_header{$_}\n" } @column_index;
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
- print qq|
- </tr>
-|;
+ $report->set_export_options($action, @hidden_variables);
- # sort the whole thing by account numbers and display
- foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) {
-
- $description = $form->escape($ref->{description});
-
- $href =
- qq|ca.pl?action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|;
-
- $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
-
- $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " ";
- $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " ";
- $begbalance =
- $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " ");
- $endbalance =
- $form->format_amount(\%myconfig,
- ($ref->{balance} + $ref->{amount}) * $ml,
- 2, " ");
-
- # next if ($ref->{debit} == 0 && $ref->{credit} == 0);
-
- if ($ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal}) {
- map { $column_data{$_} = "<th> </th>" }
- qw(accno begbalance endbalance);
-
- $subtotalbegbalance =
- $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " ");
- $subtotalendbalance =
- $form->format_amount(\%myconfig, $subtotalendbalance, 2, " ");
- $subtotaldebit =
- $form->format_amount(\%myconfig, $subtotaldebit, 2, " ");
- $subtotalcredit =
- $form->format_amount(\%myconfig, $subtotalcredit, 2, " ");
-
- $column_data{description} = "<th>$subtotaldescription</th>";
- $column_data{begbalance} = "<th align=right>$subtotalbegbalance</th>";
- $column_data{endbalance} = "<th align=right>$subtotalendbalance</th>";
- $column_data{debit} = "<th align=right>$subtotaldebit</th>";
- $column_data{credit} = "<th align=right>$subtotalcredit</th>";
-
- print qq|
- <tr class=listsubtotal>
-|;
- map { print "$column_data{$_}\n" } @column_index;
+ $report->set_sort_indicator('accno', 1);
- print qq|
- </tr>
-|;
- }
+ my @totals_columns = qw(credit debit begbalance endbalance);
+ my %subtotals = map { $_ => 0 } @totals_columns;
+ my %totals = map { $_ => 0 } @totals_columns;
+ my $found_heading = 0;
+ my @tb = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} };
- if ($ref->{charttype} eq "H") {
- $subtotal = 1;
- $subtotaldescription = $ref->{description};
- $subtotaldebit = $ref->{debit};
- $subtotalcredit = $ref->{credit};
- $subtotalbegbalance = 0;
- $subtotalendbalance = 0;
+ # sort the whole thing by account numbers and display
+ foreach my $idx (0 .. scalar(@tb) - 1) {
+ my $ref = $tb[$idx];
+ my $href = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($ref->{accno}), 'description=' . E($ref->{description}), @hidden_variables);
- next unless $form->{l_heading};
+ my $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
- map { $column_data{$_} = "<th> </th>" }
- qw(accno debit credit begbalance endbalance);
- $column_data{description} =
- "<th class=listheading>$ref->{description}</th>";
- }
+ my $row = { map { $_ => { 'align' => $column_alignment{$_} } } @columns };
- if ($ref->{charttype} eq "A") {
- $column_data{accno} = "<td><a href=$href>$ref->{accno}</a></td>";
- $column_data{description} = "<td>$ref->{description}</td>";
- $column_data{debit} = "<td align=right>$debit</td>";
- $column_data{credit} = "<td align=right>$credit</td>";
- $column_data{begbalance} = "<td align=right>$begbalance</td>";
- $column_data{endbalance} = "<td align=right>$endbalance</td>";
+ if ($ref->{charttype} eq 'H') {
+ next unless ($form->{l_heading});
- $totaldebit += $ref->{debit};
- $totalcredit += $ref->{credit};
+ %subtotals = map { $_ => 0 } @totals_columns;
+ $found_heading = 1;
+ $row->{description}->{class} = 'listheading';
+ $row->{description}->{data} = $ref->{description};
- $subtotalbegbalance += $ref->{balance} * $ml;
- $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml;
+ $report->add_data($row);
+ next;
}
- if ($ref->{charttype} eq "H") {
- print qq|
- <tr class=listheading>
-|;
- }
- if ($ref->{charttype} eq "A") {
- $i++;
- $i %= 2;
- print qq|
- <tr class=listrow$i>
-|;
+ foreach (qw(debit credit)) {
+ $subtotals{$_} += $ref->{$_};
+ $totals{$_} += $ref->{$_};
}
- map { print "$column_data{$_}\n" } @column_index;
+ $subtotals{begbalance} += $ref->{balance} * $ml;
+ $subtotals{endbalance} += ($ref->{balance} + $ref->{amount}) * $ml;
- print qq|
- </tr>
-|;
- }
+ map { $row->{$_}->{data} = $ref->{$_} } qw(accno description);
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $ref->{$_}, 2) if ($ref->{$_} != 0) } qw(credit debit);
- # print last subtotal
- if ($subtotal && $form->{l_subtotal}) {
- map { $column_data{$_} = "<th> </th>" }
- qw(accno begbalance endbalance);
- $subtotalbegbalance =
- $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " ");
- $subtotalendbalance =
- $form->format_amount(\%myconfig, $subtotalendbalance, 2, " ");
- $subtotaldebit =
- $form->format_amount(\%myconfig, $subtotaldebit, 2, " ");
- $subtotalcredit =
- $form->format_amount(\%myconfig, $subtotalcredit, 2, " ");
- $column_data{description} = "<th>$subdescription</th>";
- $column_data{begbalance} = "<th align=right>$subtotalbegbalance</th>";
- $column_data{endbalance} = "<th align=right>$subtotalendbalance</th>";
- $column_data{debit} = "<th align=right>$subtotaldebit</th>";
- $column_data{credit} = "<th align=right>$subtotalcredit</th>";
+ $row->{begbalance}->{data} = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2);
+ $row->{endbalance}->{data} = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2);
- print qq|
- <tr class=listsubtotal>
-|;
- map { print "$column_data{$_}\n" } @column_index;
+ $report->add_data($row);
- print qq|
- </tr>
-|;
+ if ($form->{l_heading} && $found_heading &&
+ (($idx == scalar(@tb) - 1) || ('H' eq $tb[$idx + 1]->{charttype}))) {
+ $report->add_data(create_list_accounts_subtotal_row(\%subtotals, \@columns, \@totals_columns, 'listsubtotal'));
+ }
}
- $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, " ");
- $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, " ");
-
- map { $column_data{$_} = "<th> </th>" }
- qw(accno description begbalance endbalance);
+ $report->add_separator();
- $column_data{debit} = qq|<th align=right class=listtotal>$totaldebit</th>|;
- $column_data{credit} = qq|<th align=right class=listtotal>$totalcredit</th>|;
-
- print qq|
- <tr class=listtotal>
-|;
-
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
+ $report->add_data(create_list_accounts_subtotal_row(\%totals, \@columns, [ qw(debit credit) ], 'listtotal'));
-</body>
-</html>
-|;
+ $report->generate_with_headers();
$lxdebug->leave_sub();
}
RP->payments(\%myconfig, \%$form);
- @columns =
- $form->sort_columns(qw(transdate reference name paid source memo));
+ my @hidden_variables = qw(account title department reference source memo fromdate todate
+ fx_transaction db prepayment paymentaccounts sort);
- # construct href
- $account = $form->escape($form->{account});
- $title = $form->escape($form->{title});
- $department = $form->escape($form->{department});
- $form->{paymentaccounts} =~ s/ /%20/g;
- $reference = $form->escape($form->{reference});
- $source = $form->escape($form->{source});
- $memo = $form->escape($form->{memo});
-
- $href =
- "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo";
-
- # construct callback
- $account = $form->escape($form->{account}, 1);
- $title = $form->escape($form->{title}, 1);
- $department = $form->escape($form->{department}, 1);
- $reference = $form->escape($form->{reference}, 1);
- $source = $form->escape($form->{source}, 1);
- $memo = $form->escape($form->{memo}, 1);
+ my $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables);
+ $form->{callback} = $href;
- $form->{callback} =
- "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}";
- $callback = $form->escape($form->{callback});
+ my @columns = qw(transdate invnumber name paid source memo);
+ my %column_defs = (
+ 'name' => { 'text' => $locale->text('Description'), },
+ 'invnumber' => { 'text' => $locale->text('Reference'), },
+ 'transdate' => { 'text' => $locale->text('Date'), },
+ 'paid' => { 'text' => $locale->text('Amount'), },
+ 'source' => { 'text' => $locale->text('Source'), },
+ 'memo' => { 'text' => $locale->text('Memo'), },
+ );
+ my %column_alignment = ('paid' => 'right');
- $column_header{name} =
- "<th><a class=listheading href=$href&sort=name>"
- . $locale->text('Description')
- . "</a></th>";
- $column_header{reference} =
- "<th><a class=listheading href=$href&sort=invnumber>"
- . $locale->text('Reference')
- . "</a></th>";
- $column_header{transdate} =
- "<th><a class=listheading href=$href&sort=transdate>"
- . $locale->text('Date')
- . "</a></th>";
- $column_header{paid} =
- "<th class=listheading>" . $locale->text('Amount') . "</a></th>";
- $column_header{source} =
- "<th><a class=listheading href=$href&sort=source>"
- . $locale->text('Source')
- . "</a></th>";
- $column_header{memo} =
- "<th><a class=listheading href=$href&sort=memo>"
- . $locale->text('Memo')
- . "</a></th>";
+ map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns;
+ my @options;
if ($form->{fromdate}) {
- $option .= "\n<br>" if ($option);
- $option .=
- $locale->text('From') . " "
- . $locale->date(\%myconfig, $form->{fromdate}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
}
if ($form->{todate}) {
- $option .= "\n<br>" if ($option);
- $option .=
- $locale->text('bis') . " "
- . $locale->date(\%myconfig, $form->{todate}, 1);
+ push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
}
- @column_index = @columns;
- $colspan = $#column_index + 1;
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- $form->header;
+ my $attachment_basename = $form->{db} eq 'ar' ? $locale->text('list_of_receipts') : $locale->text('list_of_payments');
- print qq|
-<body>
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ 'std_column_visibility' => 1,
+ );
+ $report->set_options_from_form();
-<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>
-|;
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
- map { print "\n$column_header{$_}" } @column_index;
+ $report->set_export_options('list_payments', @hidden_variables);
- print qq|
- </tr>
-|;
+ $report->set_sort_indicator($form->{sort}, 1);
- foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+ my $total_paid = 0;
+ foreach my $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
next unless @{ $form->{ $ref->{id} } };
- print qq|
- <tr>
- <th colspan=$colspan align=left>$ref->{accno}--$ref->{description}</th>
- </tr>
-|;
+ $report->add_control({ 'type' => 'colspan_data', 'data' => "$ref->{accno}--$ref->{description}" });
- foreach $payment (@{ $form->{ $ref->{id} } }) {
+ my $subtotal_paid = 0;
- $module = $payment->{module};
+ foreach my $payment (@{ $form->{ $ref->{id} } }) {
+ my $module = $payment->{module};
$module = 'is' if ($payment->{invoice} && $payment->{module} eq 'ar');
$module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
- $href =
- qq|${module}.pl?action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
+ $subtotal_paid += $payment->{paid};
+ $total_paid += $payment->{paid};
- $column_data{name} = "<td>$payment->{name} </td>";
- $column_data{reference} =
- qq|<td><a href=$href>$payment->{invnumber}</a></td>|;
- $column_data{transdate} = "<td>$payment->{transdate} </td>";
- $column_data{paid} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $payment->{paid}, 2, " ")
- . "</td>";
- $column_data{source} = "<td>$payment->{source} </td>";
- $column_data{memo} = "<td>$payment->{memo} </td>";
+ $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2);
- $subtotalpaid += $payment->{paid};
- $totalpaid += $payment->{paid};
+ my $row = { };
- $i++;
- $i %= 2;
- print qq|
- <tr class=listrow$i>
-|;
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $payment->{$column},
+ 'align' => $column_alignment{$column},
+ };
+ }
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
+ $row->{invnumber}->{link} = build_std_url("script=${module}.pl", 'action=edit', 'id=' . E($payment->{id}), 'callback');
+ $report->add_data($row);
}
- # print subtotals
- map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{paid} =
- "<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotalpaid, 2, " ") . "</th>";
-
- print qq|
- <tr class=listsubtotal>
-|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- $subtotalpaid = 0;
+ my $row = { map { $_ => { 'class' => 'listsubtotal' } } @columns };
+ $row->{paid} = {
+ 'data' => $form->format_amount(\%myconfig, $subtotal_paid, 2),
+ 'align' => 'right',
+ 'class' => 'listsubtotal',
+ };
+ $report->add_data($row);
}
- # print total
- map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{paid} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totalpaid, 2, " ") . "</th>";
+ $report->add_separator();
- print qq|
- <tr class=listtotal>
-|;
+ my $row = { map { $_ => { 'class' => 'listtotal' } } @columns };
+ $row->{paid} = {
+ 'data' => $form->format_amount(\%myconfig, $total_paid, 2),
+ 'align' => 'right',
+ 'class' => 'listtotal',
+ };
- map { print "\n$column_data{$_}" } @column_index;
+ $report->add_data($row);
- print qq|
- </tr>
-
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-</body>
-</html>
-|;
+ $report->generate_with_headers();
$lxdebug->leave_sub();
}
projects / kivitendo-erp.git / blobdiff