- |.$locale->text('Include in Report').qq| |
+ | . $locale->text('Include in Report') . qq| |
- |.$locale->text('All').qq|
- |.$locale->text('Asset').qq|
- |.$locale->text('Contra').qq|
- |.$locale->text('Liability').qq|
- |.$locale->text('Equity').qq|
- |.$locale->text('Revenue').qq|
- |.$locale->text('Expense').qq|
+ |
+ . $locale->text('All') . qq|
+ |
+ . $locale->text('Asset') . qq|
+ |
+ . $locale->text('Liability') . qq|
+ |
+ . $locale->text('Revenue') . qq|
+ |
+ . $locale->text('Expense') . qq|
|
@@ -306,489 +389,339 @@ $jsscript
-{path}>
-{login}>
-{password}>
-
-
+
|;
+ $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 };
+
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
+
+ $lxdebug->leave_sub();
+
+ return $row;
+}
sub generate_report {
+ $lxdebug->enter_sub();
+
+ $auth->assert('general_ledger');
- $form->{sort} = "transdate" unless $form->{sort};
+ report_generator_set_default_sort('transdate', 1);
GL->all_transactions(\%myconfig, \%$form);
-
- $callback = "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
- $href = $callback;
-
- %acctype = ( 'A' => $locale->text('Asset'),
- 'C' => $locale->text('Contra'),
- 'L' => $locale->text('Liability'),
- 'Q' => $locale->text('Equity'),
- 'I' => $locale->text('Revenue'),
- 'E' => $locale->text('Expense'),
- );
-
- $form->{title} = $locale->text('General Ledger');
-
- $ml = ($form->{ml} =~ /(A|E)/) ? -1 : 1;
-
- unless ($form->{category} eq 'X') {
- $form->{title} .= " : ".$locale->text($acctype{$form->{category}});
- }
- if ($form->{accno}) {
- $href .= "&accno=".$form->escape($form->{accno});
- $callback .= "&accno=".$form->escape($form->{accno},1);
- $option = $locale->text('Account')." : $form->{accno} $form->{account_description}";
- }
- if ($form->{gifi_accno}) {
- $href .= "&gifi_accno=".$form->escape($form->{gifi_accno});
- $callback .= "&gifi_accno=".$form->escape($form->{gifi_accno},1);
- $option .= "\n " if $option;
- $option .= $locale->text('GIFI')." : $form->{gifi_accno} $form->{gifi_account_description}";
- }
- if ($form->{source}) {
- $href .= "&source=".$form->escape($form->{source});
- $callback .= "&source=".$form->escape($form->{source},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Source')." : $form->{source}";
- }
- if ($form->{reference}) {
- $href .= "&reference=".$form->escape($form->{reference});
- $callback .= "&reference=".$form->escape($form->{reference},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Reference')." : $form->{reference}";
+
+ my %acctype = ('A' => $locale->text('Asset'),
+ 'C' => $locale->text('Contra'),
+ 'L' => $locale->text('Liability'),
+ 'Q' => $locale->text('Equity'),
+ 'I' => $locale->text('Revenue'),
+ 'E' => $locale->text('Expense'),);
+
+ $form->{title} = $locale->text('Journal');
+ if ($form->{category} ne 'X') {
+ $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
}
+
+ $form->{landscape} = 1;
+
+ my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
+
+ my @columns = qw(
+ transdate id reference description
+ notes source debit debit_accno
+ credit credit_accno debit_tax debit_tax_accno
+ credit_tax credit_tax_accno projectnumbers balance
+ );
+
+ my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto category l_subtotal);
+ push @hidden_variables, map { "l_${_}" } @columns;
+
+ my (@options, @date_options);
+ push @options, $locale->text('Account') . " : $form->{accno} $form->{account_description}" if ($form->{accno});
+ push @options, $locale->text('Source') . " : $form->{source}" if ($form->{source});
+ push @options, $locale->text('Reference') . " : $form->{reference}" if ($form->{reference});
+ push @options, $locale->text('Description') . " : $form->{description}" if ($form->{description});
+ push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
+
+ push @date_options, $locale->text('From'), $locale->date(\%myconfig, $form->{datefrom}, 1) if ($form->{datefrom});
+ push @date_options, $locale->text('Bis'), $locale->date(\%myconfig, $form->{dateto}, 1) if ($form->{dateto});
+ push @options, join(' ', @date_options) if (scalar @date_options);
+
if ($form->{department}) {
- $href .= "&department=".$form->escape($form->{department});
- $callback .= "&department=".$form->escape($form->{department},1);
- ($department) = split /--/, $form->{department};
- $option .= "\n " if $option;
- $option .= $locale->text('Department')." : $department";
+ my ($department) = split /--/, $form->{department};
+ push @options, $locale->text('Department') . " : $department";
}
- if ($form->{description}) {
- $href .= "&description=".$form->escape($form->{description});
- $callback .= "&description=".$form->escape($form->{description},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Description')." : $form->{description}";
- }
- if ($form->{notes}) {
- $href .= "¬es=".$form->escape($form->{notes});
- $callback .= "¬es=".$form->escape($form->{notes},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Notes')." : $form->{notes}";
- }
-
- if ($form->{datefrom}) {
- $href .= "&datefrom=$form->{datefrom}";
- $callback .= "&datefrom=$form->{datefrom}";
- $option .= "\n " if $option;
- $option .= $locale->text('From')." ".$locale->date(\%myconfig, $form->{datefrom}, 1);
- }
- if ($form->{dateto}) {
- $href .= "&dateto=$form->{dateto}";
- $callback .= "&dateto=$form->{dateto}";
- if ($form->{datefrom}) {
- $option .= " ";
- } else {
- $option .= "\n " if $option;
- }
- $option .= $locale->text('Bis')." ".$locale->date(\%myconfig, $form->{dateto}, 1);
+
+ my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
+
+ $form->{l_credit_accno} = 'Y';
+ $form->{l_debit_accno} = 'Y';
+ $form->{l_credit_tax} = 'Y';
+ $form->{l_debit_tax} = 'Y';
+ $form->{l_credit_tax_accno} = 'Y';
+ $form->{l_debit_tax_accno} = 'Y';
+ $form->{l_balance} = $form->{accno} ? 'Y' : '';
+
+ my %column_defs = (
+ 'id' => { 'text' => $locale->text('ID'), },
+ 'transdate' => { 'text' => $locale->text('Date'), },
+ 'reference' => { 'text' => $locale->text('Reference'), },
+ 'source' => { 'text' => $locale->text('Source'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'notes' => { 'text' => $locale->text('Notes'), },
+ 'debit' => { 'text' => $locale->text('Debit'), },
+ 'debit_accno' => { 'text' => $locale->text('Debit Account'), },
+ 'credit' => { 'text' => $locale->text('Credit'), },
+ 'credit_accno' => { 'text' => $locale->text('Credit Account'), },
+ 'debit_tax' => { 'text' => $locale->text('Debit Tax'), },
+ 'debit_tax_accno' => { 'text' => $locale->text('Debit Tax Account'), },
+ 'credit_tax' => { 'text' => $locale->text('Credit Tax'), },
+ 'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), },
+ 'balance' => { 'text' => $locale->text('Balance'), },
+ 'projectnumbers' => { 'text' => $locale->text('Project Numbers'), },
+ );
+
+ foreach my $name (qw(id transdate reference source description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+ my $sortname = $name =~ m/accno/ ? 'accno' : $name;
+ my $sortdir = $sortname eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
}
+ map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+ map { $column_defs{$_}->{visible} = 0 } qw(debit_accno credit_accno debit_tax_accno credit_tax_accno) if $form->{accno};
- @columns = $form->sort_columns(qw(transdate id reference description notes source debit debit_accno credit credit_accno debit_tax debit_tax_accno credit_tax credit_tax_accno accno gifi_accno));
-
- if ($form->{accno} || $form->{gifi_accno}) {
- @columns = grep !/(accno|gifi_accno)/, @columns;
- push @columns, "balance";
- $form->{l_balance} = "Y";
-
- }
-
- $form->{l_credit_accno} = "Y";
- $form->{l_debit_accno} = "Y";
- $form->{l_credit_tax} = "Y";
- $form->{l_debit_tax} = "Y";
- $form->{l_credit_tax_accno} = "Y";
- $form->{l_debit_tax_accno} = "Y";
- $form->{l_accno} = "N";
- foreach $item (@columns) {
- if ($form->{"l_$item"} eq "Y") {
- push @column_index, $item;
-
- # add column to href and callback
- $callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
- }
- }
+ my %column_alignment;
+ map { $column_alignment{$_} = 'right' } qw(balance id debit credit debit_tax credit_tax);
+ map { $column_alignment{$_} = 'center' } qw(transdate reference description source notes debit_accno credit_accno debit_tax_accno credit_tax_accno);
+ map { $column_defs{$_}->{align} = $column_alignment{$_} } keys %column_alignment;
- if ($form->{l_subtotal} eq 'Y') {
- $callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
- }
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- $callback .= "&category=$form->{category}";
- $href .= "&category=$form->{category}";
-
- $column_header{id} = "".$locale->text('ID')." | ";
- $column_header{transdate} = "".$locale->text('Date')." | ";
- $column_header{reference} = "".$locale->text('Reference')." | ";
- $column_header{source} = "".$locale->text('Source')." | ";
- $column_header{description} = "".$locale->text('Description')." | ";
- $column_header{notes} = "".$locale->text('Notes')." | ";
- $column_header{debit} = "".$locale->text('Debit')." | ";
- $column_header{debit_accno} = "".$locale->text('Debit Account')." | ";
- $column_header{credit} = "".$locale->text('Credit')." | ";
- $column_header{credit_accno} = "".$locale->text('Credit Account')." | ";
- $column_header{debit_tax} = "".$locale->text('Debit Tax')." | ";
- $column_header{debit_tax_accno} = "".$locale->text('Debit Tax Account')." | ";
- $column_header{credit_tax} = "".$locale->text('Credit Tax')." | ";
- $column_header{credit_tax_accno} = "".$locale->text('Credit Tax Account')." | ";
- $column_header{gifi_accno} = "".$locale->text('GIFI')." | ";
- $column_header{balance} = "".$locale->text('Balance')." | ";
-
- $form->{landscape} = 1;
-
- $form->header;
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
- print qq|
-
+ $report->set_export_options('generate_report', @hidden_variables);
-
-
- $form->{title} |
-
-
-
- $option |
-
-
-
-
-
-
-|;
+ $report->set_sort_indicator($form->{sort} eq 'accno' ? 'debit_accno' : $form->{sort}, $form->{sortdir});
-map { print "$column_header{$_}\n" } @column_index;
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $locale->text('general_ledger_list') . strftime('_%Y%m%d', localtime time),
+ );
+ $report->set_options_from_form();
-print "
-
-
-
-
-";
-
# add sort to callback
- $form->{callback} = "$callback&sort=$form->{sort}";
- $callback = $form->escape($form->{callback});
-
- # initial item for subtotals
- if (@{ $form->{GL} }) {
- $sameitem = $form->{GL}->[0]->{$form->{sort}};
- }
-
- if (($form->{accno} || $form->{gifi_accno}) && $form->{balance}) {
+ $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
- map { $column_data{$_} = " | " } @column_index;
- $column_data{balance} = "".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)." | ";
-
- $i++; $i %= 2;
- print qq|
-
-|;
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-|;
+ $form->{balance} *= $ml;
+
+ if ($form->{accno} && $form->{balance}) {
+ my $row = {
+ 'balance' => {
+ 'data' => $form->format_amount(\%myconfig, $form->{balance}, 2),
+ 'align' => 'right',
+ },
+ };
+
+ $report->add_data($row);
}
-
- foreach $ref (@{ $form->{GL} }) {
- # if item ne sort print subtotal
- if ($form->{l_subtotal} eq 'Y') {
- if ($sameitem ne $ref->{$form->{sort}}) {
- &gl_subtotal;
- }
- }
- foreach $key (sort keys (%{$ref->{amount}})) {
- $form->{balance} += $ref->{amount}{$key};
- }
-
- $debit = "";
- foreach $key (sort keys (%{$ref->{debit}})) {
- $subtotaldebit += $ref->{debit}{$key};
- $totaldebit += $ref->{debit}{$key};
- if ($key == 0) {
- $debit = $form->format_amount(\%myconfig, $ref->{debit}{$key} , 2, 0);
- } else {
- $debit .= " ".$form->format_amount(\%myconfig, $ref->{debit}{$key} , 2, 0);
- }
- }
-
- $credit = "";
- foreach $key (sort keys (%{$ref->{credit}})) {
- $subtotalcredit += $ref->{credit}{$key};
- $totalcredit += $ref->{credit}{$key};
- if ($key == 0) {
- $credit = $form->format_amount(\%myconfig, $ref->{credit}{$key} , 2, 0);
- } else {
- $credit .= " ".$form->format_amount(\%myconfig, $ref->{credit}{$key} , 2, 0);
- }
- }
-
- $debittax = "";
- foreach $key (sort keys (%{$ref->{debit_tax}})) {
- $subtotaldebittax += $ref->{debit_tax}{$key};
- $totaldebittax += $ref->{debit_tax}{$key};
- if ($key == 0) {
- $debittax = $form->format_amount(\%myconfig, $ref->{debit_tax}{$key} , 2, 0);
- } else {
- $debittax .= " ".$form->format_amount(\%myconfig, $ref->{debit_tax}{$key} , 2, 0);
- }
- }
-
- $credittax = "";
- foreach $key (sort keys (%{$ref->{credit_tax}})) {
- $subtotalcredittax += $ref->{credit_tax}{$key};
- $totalcredittax += $ref->{credit_tax}{$key};
- if ($key == 0) {
- $credittax = $form->format_amount(\%myconfig, $ref->{credit_tax}{$key} , 2, 0);
- } else {
- $credittax .= " ".$form->format_amount(\%myconfig, $ref->{credit_tax}{$key} , 2, 0);
- }
- }
-
- $debitaccno = "";
- $debittaxkey = "";
- $taxaccno = "";
- foreach $key (sort keys (%{$ref->{debit_accno}})) {
- if ($key == 0) {
- $debitaccno = "{accno}&callback=$callback>$ref->{debit_accno}{$key}";
- } else {
- $debitaccno .= " {accno}&callback=$callback>$ref->{debit_accno}{$key}";
- }
- if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
- $ref->{debit_tax_accno}{$key} = $taxaccno;
- }
- $taxaccno = $ref->{debit_tax_accno}{$key};
- $debittaxkey = $ref->{debit_taxkey}{$key};
- }
-
- $creditaccno = "";
- $credittaxkey = "";
- $taxaccno = "";
- foreach $key (sort keys (%{$ref->{credit_accno}})) {
- if ($key == 0) {
- $creditaccno = "{accno}&callback=$callback>$ref->{credit_accno}{$key}";
- } else {
- $creditaccno .= " {accno}&callback=$callback>$ref->{credit_accno}{$key}";
- }
- if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
- $ref->{credit_tax_accno}{$key} = $taxaccno;
- }
- $taxaccno = $ref->{credit_tax_accno}{$key};
- $credittaxkey = $ref->{credit_taxkey}{$key};
- }
-
- $debittaxaccno = "";
- foreach $key (sort keys (%{$ref->{debit_tax_accno}})) {
- if ($key == 0) {
- $debittaxaccno = "{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}";
- } else {
- $debittaxaccno .= " {accno}&callback=$callback>$ref->{debit_tax_accno}{$key}";
+ my @totals_columns = qw(debit credit debit_tax credit_tax);
+ my %subtotals = map { $_ => 0 } @totals_columns;
+ my %totals = map { $_ => 0 } @totals_columns;
+ my $idx = 0;
+
+ foreach $ref (@{ $form->{GL} }) {
+ $form->{balance} *= $ml;
+
+ my %rows;
+
+ foreach my $key (qw(debit credit debit_tax credit_tax)) {
+ $rows{$key} = [];
+ foreach my $idx (sort keys(%{ $ref->{$key} })) {
+ my $value = $ref->{$key}->{$idx};
+ $subtotals{$key} += $value;
+ $totals{$key} += $value;
+ $form->{balance} = abs($form->{balance}) - abs($value);
+ push @{ $rows{$key} }, $form->format_amount(\%myconfig, $value, 2);
}
}
-
- $credittaxaccno = "";
- foreach $key (sort keys (%{$ref->{credit_tax_accno}})) {
- if ($key == 0) {
- $credittaxaccno = "{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}";
- } else {
- $credittaxaccno .= " {accno}&callback=$callback>$ref->{credit_tax_accno}{$key}";
- }
- }
-# $ref->{debit} = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
-# $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
-
- $column_data{id} = " $ref->{id} | ";
- $column_data{transdate} = " $ref->{transdate} | ";
- $column_data{reference} = "{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference} | ";
- $column_data{description} = "$ref->{description} | ";
- $column_data{source} = "$ref->{source} | ";
- $column_data{notes} = "$ref->{notes} | ";
- $column_data{debit} = "$debit | ";
- $column_data{debit_accno} = "$debitaccno | ";
- $column_data{credit} = "$credit | ";
- $column_data{credit_accno} = "$creditaccno | ";
- $column_data{debit_tax} = ($ref->{debit_tax_accno} ne "") ? "$debittax | " : " | ";
- $column_data{debit_tax_accno} = "$debittaxaccno | ";
- $column_data{gifi_accno} = "{gifi_accno}&callback=$callback>$ref->{gifi_accno} | ";
- $column_data{credit_tax} = ($ref->{credit_tax_accno} ne "") ? "$credittax | " : " | ";
- $column_data{credit_tax_accno} = "$credittaxaccno | ";
- $column_data{gifi_accno} = "{gifi_accno}&callback=$callback>$ref->{gifi_accno} | ";
- $column_data{balance} = "".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)." | ";
-
- $i++; $i %= 2;
- print "
- ";
- map { print "$column_data{$_}\n" } @column_index;
- print " ";
-
- }
+ foreach my $key (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno ac_transdate)) {
+ my $col = $key eq 'ac_transdate' ? 'transdate' : $key;
+ $rows{$col} = [ map { $ref->{$key}->{$_} } sort keys(%{ $ref->{$key} }) ];
+ }
- &gl_subtotal if ($form->{l_subtotal} eq 'Y');
+ my $row = { };
+ map { $row->{$_} = { 'data' => '', 'align' => $column_alignment{$_} } } @columns;
+ $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2);
+ $row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
- map { $column_data{$_} = " | " } @column_index;
-
- $column_data{debit} = "".$form->format_amount(\%myconfig, $totaldebit, 2, " ")." | ";
- $column_data{credit} = "".$form->format_amount(\%myconfig, $totalcredit, 2, " ")." | ";
- $column_data{debit_tax} = "".$form->format_amount(\%myconfig, $totaldebittax, 2, " ")." | ";
- $column_data{credit_tax} = "".$form->format_amount(\%myconfig, $totalcredittax, 2, " ")." | ";
- $column_data{balance} = "".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)." | ";
-
- print qq|
-
-|;
+ map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description source notes);
- map { print "$column_data{$_}\n" } @column_index;
+ map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno);
- print qq|
-
-
-
- |
-
-
-
|
-
-
-
-
+ foreach my $col (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+ $row->{$col}->{link} = [ map { "${callback}&accno=" . E($_) } @{ $rows{$col} } ];
+ }
-
+ # = 0 for balanced ledger
+ my $balanced_ledger = $totals{debit} + $totals{debit_tax} - $totals{credit} - $totals{credit_tax};
-
- |