-
-
-
- | . $locale->text('Include in Report') . qq| |
- |
- . $locale->text('Heading') . qq|
- |
- . $locale->text('Subtotal') . qq|
- |
- . $locale->text('All Accounts') . qq| |
-
-
+ |
+ . $locale->text('All Accounts')
+ . qq| |
+ |
+
+
+ |
+ . $locale->text('Decimalplaces')
+ . qq| |
+ |
+
+
$jsscript
|;
}
if ($form->{report} =~ /^tax_/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap";
RP->get_taxaccounts(\%myconfig, \%$form);
@@ -725,32 +745,6 @@ $jsscript
-|;
-
- if (@{ $form->{gifi_taxaccounts} }) {
- print qq|
-
- | . $locale->text('GIFI') . qq| |
-
-|;
-
- foreach $ref (@{ $form->{gifi_taxaccounts} }) {
-
- print
- qq| $ref->{description}
-
-
- |;
-
- }
-
- print qq|
- |
-
-|;
- }
-
- print qq|
| . $locale->text('Method') . qq| |
|
@@ -807,8 +801,6 @@ $jsscript
}
if ($form->{report} =~ /^nontaxable_/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
print qq|
@@ -872,8 +864,6 @@ $jsscript
}
if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
- $gifi = "";
-
if ($form->{report} eq 'ar_aging') {
$label = $locale->text('Customer');
$form->{vc} = 'customer';
@@ -922,8 +912,6 @@ $jsscript
# above action can be removed if there is more than one input field
if ($form->{report} =~ /(receipts|payments)$/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
RP->paymentaccounts(\%myconfig, \%$form);
@@ -993,34 +981,9 @@ $jsscript
|
-{path}>
-{login}>
-{password}>
-
-|;
-
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
- # Einlesen der Finanzamtdaten
- get_config($userspath, 'finanzamt.ini');
-
- $disabled = qq|disabled="disabled"|;
- $disabled = '' if ($form->{elster} eq '1');
- if ($form->{report} eq 'ustva') {
- print qq|
-
-
- |;
- print qq|
-
- |;
- }
- print qq|
@@ -1030,10 +993,13 @@ $jsscript
$lxdebug->leave_sub();
}
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
sub get_project {
$lxdebug->enter_sub();
+
+ $auth->assert('report');
+
my $nextsub = shift;
$form->{project_id} = $form->{project_id_1};
@@ -1057,15 +1023,13 @@ sub get_project {
sub generate_income_statement {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{padding} = " ";
$form->{bold} = "";
$form->{endbold} = "";
$form->{br} = " ";
- &get_project(generate_income_statement);
-
- $form->{projectnumber} = $form->{projectnumber_1};
-
if ($form->{reporttype} eq "custom") {
#forgotten the year --> thisyear
@@ -1188,10 +1152,10 @@ sub generate_income_statement {
$longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
- $form->{this_period} = "$shortfromdate \n$shorttodate";
+ $form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
$locale->text('for Period')
- . qq| \n$longfromdate |
+ . qq|\n$longfromdate |
. $locale->text('Bis')
. qq| $longtodate|;
}
@@ -1205,9 +1169,9 @@ sub generate_income_statement {
$longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
$shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
- $form->{last_period} = "$shortcomparefromdate \n$shortcomparetodate";
+ $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
$form->{period} .=
- " \n$longcomparefromdate "
+ "\n$longcomparefromdate "
. $locale->text('Bis')
. qq| $longcomparetodate|;
}
@@ -1215,7 +1179,6 @@ sub generate_income_statement {
# setup variables for the form
@a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
- $form->{address} =~ s/\\n/ /g;
$form->{templates} = $myconfig{templates};
@@ -1229,10 +1192,7 @@ sub generate_income_statement {
sub generate_balance_sheet {
$lxdebug->enter_sub();
- $form->{padding} = " ";
- $form->{bold} = "";
- $form->{endbold} = "";
- $form->{br} = " ";
+ $auth->assert('report');
RP->balance_sheet(\%myconfig, \%$form);
@@ -1251,16 +1211,103 @@ sub generate_balance_sheet {
$form->{last_period} =
$locale->date(\%myconfig, $form->{compareasofdate}, 0);
- $form->{IN} = "balance_sheet.html";
+ my $attachment_basename;
- # setup company variables for the form
- map { $form->{$_} = $myconfig{$_} }
- (qw(company address businessnumber nativecurr));
- $form->{address} =~ s/\\n/ /g;
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- $form->{templates} = $myconfig{templates};
+ my @hidden_variables = ();
+ push @hidden_variables, qw(fromdate todate year cash );
+
+ my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
+
+ my %column_defs = (
+ 'accno' => { 'text' => $locale->text('Account Number'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'last_transaction' => { 'text' => $locale->text('Last Transaction'), },
+ 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), },
+ 'haben_eb' => { 'text' => $locale->text('Credit Starting Balance'), },
+ 'soll' => { 'text' => $locale->text('Debit'), },
+ 'haben' => { 'text' => $locale->text('Credit'), },
+ 'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), },
+ 'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), },
+ 'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), },
+ 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), }
+ );
+
+
+
+ my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ map { $column_defs{$_}->{visible} = 1 } @columns;
+
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
+
+ $report->set_export_options('trial_balance', @hidden_variables);
+
+ $report->set_sort_indicator($form->{sort}, 1);
+
+ my @options;
+
+
+ $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0);
+ $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+ $report->set_options('output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ );
+ $report->set_options_from_form();
+ # $form->parse_html_template('report_generator/html_report_bilanz', $variables));
+ $form->{report_template} = 'report_generator/html_report_bilanz';
+ # add sort and escape callback, this one we use for the add sub
+ $form->{callback} = $href .= "&sort=$form->{sort}";
+
+ # escape callback for href
+ $callback = $form->escape($href);
+
+ my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ my %totals = map { $_ => 0 } @subtotal_columns;
+
+ my $edit_url = build_std_url('action=edit', 'type', 'vc');
+
+# foreach $accno (@{ $form->{TB} }) {
+#
+# $accno->{soll} = $accno->{debit};
+# $accno->{haben} = $accno->{credit};
+# map { $totals{$_} += $accno->{$_} } @subtotal_columns;
+#
+# map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+#
+# map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+#
+# my $row = { };
+#
+# foreach my $column (@columns) {
+# $row->{$column} = {
+# 'data' => $accno->{$column},
+# 'align' => $column_alignment{$column},
+# };
+# }
+#
+#
+# $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+#
+# my $row_set = [ $row ];
+#
+#
+# $report->add_data($row_set);
+#
+# $idx++;
+# }
+#
+# $report->add_separator();
+#
+# $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+
+ $report->generate_with_headers();
- $form->parse_template;
$lxdebug->leave_sub();
}
@@ -1268,6 +1315,8 @@ sub generate_balance_sheet {
sub generate_projects {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
&get_project(generate_projects);
$form->{projectnumber} = $form->{projectnumber_1};
@@ -1275,7 +1324,7 @@ sub generate_projects {
$form->{title} = $locale->text('Project Transactions');
RP->trial_balance(\%myconfig, \%$form);
- &list_accounts;
+ list_accounts('generate_projects');
$lxdebug->leave_sub();
}
@@ -1289,656 +1338,562 @@ sub generate_projects {
sub generate_trial_balance {
$lxdebug->enter_sub();
- # get for each account initial balance, debits and credits
- RP->trial_balance(\%myconfig, \%$form);
-
- $form->{nextsub} = "generate_trial_balance";
- $form->{title} = $locale->text('Trial Balance');
- &list_accounts;
-
- $lxdebug->leave_sub();
-}
-
-sub list_accounts {
- $lxdebug->enter_sub();
-
- $title = $form->escape($form->{title});
+ $auth->assert('report');
- if ($form->{department}) {
- ($department) = split /--/, $form->{department};
- $options = $locale->text('Department') . " : $department ";
- $department = $form->escape($form->{department});
- }
- if ($form->{projectnumber}) {
- $options .=
- $locale->text('Project Number') . " : $form->{projectnumber} ";
- $projectnumber = $form->escape($form->{projectnumber});
- }
+ if ($form->{reporttype} eq "custom") {
- # if there are any dates
- if ($form->{fromdate} || $form->{todate}) {
- if ($form->{fromdate}) {
- $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
- }
- if ($form->{todate}) {
- $todate = $locale->date(\%myconfig, $form->{todate}, 1);
+ #forgotten the year --> thisyear
+ if ($form->{year} !~ m/^\d\d\d\d$/) {
+ $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~
+ /(\d\d\d\d)/;
+ $form->{year} = $1;
}
- $form->{period} = "$fromdate - $todate";
- } else {
- $form->{period} =
- $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+ #yearly report
+ if ($form->{duetyp} eq "13") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ }
- }
- $options .= $form->{period};
-
- @column_index = qw(accno description begbalance debit credit endbalance);
-
- $column_header{accno} =
- qq| | | . $locale->text('Account') . qq| | |;
- $column_header{description} =
- qq|| . $locale->text('Description') . qq| | |;
- $column_header{debit} =
- qq|| . $locale->text('Debit') . qq| | |;
- $column_header{credit} =
- qq|| . $locale->text('Credit') . qq| | |;
- $column_header{begbalance} =
- qq|| . $locale->text('Balance') . qq| | |;
- $column_header{endbalance} =
- qq|| . $locale->text('Balance') . qq| | |;
-
- if ($form->{accounttype} eq 'gifi') {
- $column_header{accno} =
- qq|| . $locale->text('GIFI') . qq| | |;
+ #Quater reports
+ if ($form->{duetyp} eq "A") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.3.$form->{year}";
+ }
+ if ($form->{duetyp} eq "B") {
+ $form->{fromdate} = "1.4.$form->{year}";
+ $form->{todate} = "30.6.$form->{year}";
+ }
+ if ($form->{duetyp} eq "C") {
+ $form->{fromdate} = "1.7.$form->{year}";
+ $form->{todate} = "30.9.$form->{year}";
+ }
+ if ($form->{duetyp} eq "D") {
+ $form->{fromdate} = "1.10.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ }
+
+ #Monthly reports
+ SWITCH: {
+ $form->{duetyp} eq "1" && do {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.1.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "2" && do {
+ $form->{fromdate} = "1.2.$form->{year}";
+
+ #this works from 1901 to 2099, 1900 and 2100 fail.
+ $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ $form->{todate} = "$leap.2.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "3" && do {
+ $form->{fromdate} = "1.3.$form->{year}";
+ $form->{todate} = "31.3.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "4" && do {
+ $form->{fromdate} = "1.4.$form->{year}";
+ $form->{todate} = "30.4.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "5" && do {
+ $form->{fromdate} = "1.5.$form->{year}";
+ $form->{todate} = "31.5.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "6" && do {
+ $form->{fromdate} = "1.6.$form->{year}";
+ $form->{todate} = "30.6.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "7" && do {
+ $form->{fromdate} = "1.7.$form->{year}";
+ $form->{todate} = "31.7.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "8" && do {
+ $form->{fromdate} = "1.8.$form->{year}";
+ $form->{todate} = "31.8.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "9" && do {
+ $form->{fromdate} = "1.9.$form->{year}";
+ $form->{todate} = "30.9.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "10" && do {
+ $form->{fromdate} = "1.10.$form->{year}";
+ $form->{todate} = "31.10.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "11" && do {
+ $form->{fromdate} = "1.11.$form->{year}";
+ $form->{todate} = "30.11.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "12" && do {
+ $form->{fromdate} = "1.12.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ last SWITCH;
+ };
+ }
}
- $form->header;
- print qq|
-
+ # get for each account initial balance, debits and credits
+ RP->trial_balance(\%myconfig, \%$form);
-
-
- $form->{title} |
-
-
-
- $options |
-
-
-
-
- |;
- map { print "$column_header{$_}\n" } @column_index;
+ $form->{rowcount} = scalar @{ $form->{TB} };
- print qq|
-
-|;
+ my @columns = (
+ "accno", "description",
+ "last_transaction", "soll_eb",
+ "haben_eb",
+ "soll", "haben",
+ "soll_kumuliert", "haben_kumuliert",
+ "soll_saldo", "haben_saldo"
+ );
- # sort the whole thing by account numbers and display
- foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) {
- $description = $form->escape($ref->{description});
+ my $attachment_basename;
- $href =
- qq|ca.pl?path=$form->{path}&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}|;
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- if ($form->{accounttype} eq 'gifi') {
- $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
- $na = $locale->text('N/A');
- map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno};
- } else {
- $href .= "&accno=$ref->{accno}&description=$description";
- }
+ my @hidden_variables = ();
+ push @hidden_variables, qw(fromdate todate year cash );
- $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
-
- $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
- $credit = $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{$_} = " | " }
- 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} = "$subtotaldescription | ";
- $column_data{begbalance} = "$subtotalbegbalance | ";
- $column_data{endbalance} = "$subtotalendbalance | ";
- $column_data{debit} = "$subtotaldebit | ";
- $column_data{credit} = "$subtotalcredit | ";
-
- print qq|
-
-|;
- map { print "$column_data{$_}\n" } @column_index;
+ my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
- print qq|
-
-|;
- }
+ my %column_defs = (
+ 'accno' => { 'text' => $locale->text('Account Number'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'last_transaction' => { 'text' => $locale->text('Last Transaction'), },
+ 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), },
+ 'haben_eb' => { 'text' => $locale->text('Credit Starting Balance'), },
+ 'soll' => { 'text' => $locale->text('Debit'), },
+ 'haben' => { 'text' => $locale->text('Credit'), },
+ 'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), },
+ 'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), },
+ 'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), },
+ 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), }
+ );
- if ($ref->{charttype} eq "H") {
- $subtotal = 1;
- $subtotaldescription = $ref->{description};
- $subtotaldebit = $ref->{debit};
- $subtotalcredit = $ref->{credit};
- $subtotalbegbalance = 0;
- $subtotalendbalance = 0;
- next unless $form->{l_heading};
- map { $column_data{$_} = " | " }
- qw(accno debit credit begbalance endbalance);
- $column_data{description} =
- "$ref->{description} | ";
- }
+ my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
- if ($ref->{charttype} eq "A") {
- $column_data{accno} = "$ref->{accno} | ";
- $column_data{description} = "$ref->{description} | ";
- $column_data{debit} = "$debit | ";
- $column_data{credit} = "$credit | ";
- $column_data{begbalance} = "$begbalance | ";
- $column_data{endbalance} = "$endbalance | ";
+ map { $column_defs{$_}->{visible} = 1 } @columns;
- $totaldebit += $ref->{debit};
- $totalcredit += $ref->{credit};
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
- $subtotalbegbalance += $ref->{balance} * $ml;
- $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml;
+ $report->set_export_options('trial_balance', @hidden_variables);
- }
+ $report->set_sort_indicator($form->{sort}, 1);
- if ($ref->{charttype} eq "H") {
- print qq|
-
-|;
- }
- if ($ref->{charttype} eq "A") {
- $i++;
- $i %= 2;
- print qq|
-
-|;
- }
+ my @options;
- map { print "$column_data{$_}\n" } @column_index;
- print qq|
-
-|;
- }
+ $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0);
+ $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
- # print last subtotal
- if ($subtotal && $form->{l_subtotal}) {
- map { $column_data{$_} = " | " }
- 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} = "$subdescription | ";
- $column_data{begbalance} = "$subtotalbegbalance | ";
- $column_data{endbalance} = "$subtotalendbalance | ";
- $column_data{debit} = "$subtotaldebit | ";
- $column_data{credit} = "$subtotalcredit | ";
+ $report->set_options('output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ 'html_template' => 'rp/html_report_susa',
+ 'pdf_template' => 'rp/html_report_susa',
+ );
+ $report->set_options_from_form();
- print qq|
-
-|;
- map { print "$column_data{$_}\n" } @column_index;
+ # add sort and escape callback, this one we use for the add sub
+ $form->{callback} = $href .= "&sort=$form->{sort}";
- print qq|
-
-|;
- }
+ # escape callback for href
+ $callback = $form->escape($href);
- $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, " ");
- $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, " ");
+ my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
- map { $column_data{$_} = " | " }
- qw(accno description begbalance endbalance);
+ my %totals = map { $_ => 0 } @subtotal_columns;
- $column_data{debit} = qq|$totaldebit | |;
- $column_data{credit} = qq|$totalcredit | |;
+ my $edit_url = build_std_url('action=edit', 'type', 'vc');
- print qq|
-
-|;
+ foreach $accno (@{ $form->{TB} }) {
- map { print "$column_data{$_}\n" } @column_index;
+ $accno->{soll} = $accno->{debit};
+ $accno->{haben} = $accno->{credit};
+ map { $totals{$_} += $accno->{$_} } @subtotal_columns;
- print qq|
-
-
- |
-
-
-
|
-
-
+ map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
-
-
-|;
+ map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ my $row = { };
+
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $accno->{$column},
+ 'align' => $column_alignment{$column},
+ };
+ }
+
+
+ $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+
+ my $row_set = [ $row ];
+
+
+ $report->add_data($row_set);
+
+ $idx++;
+ }
+
+ $report->add_separator();
+
+ $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+
+ $report->generate_with_headers();
$lxdebug->leave_sub();
+
}
-sub generate_ar_aging {
+sub create_subtotal_row {
$lxdebug->enter_sub();
- # split customer
- ($form->{customer}) = split(/--/, $form->{customer});
- $customer = $form->escape($form->{customer}, 1);
- $title = $form->escape($form->{title}, 1);
+ my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
- $form->{ct} = "customer";
- $form->{arap} = "ar";
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
- $form->{callback} =
- qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|;
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
- RP->aging(\%myconfig, \%$form);
- &aging;
+ $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
$lxdebug->leave_sub();
+
+ return $row;
}
-sub generate_ap_aging {
+sub create_list_accounts_subtotal_row {
$lxdebug->enter_sub();
- # split vendor
- ($form->{vendor}) = split(/--/, $form->{vendor});
- $vendor = $form->escape($form->{vendor}, 1);
- $title = $form->escape($form->{title}, 1);
+ my ($subtotals, $columns, $fields, $class) = @_;
- $form->{ct} = "vendor";
- $form->{arap} = "ap";
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
- $form->{callback} =
- qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|;
-
- RP->aging(\%myconfig, \%$form);
- &aging;
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $subtotals->{$_}, 2) } @{ $fields };
$lxdebug->leave_sub();
+
+ return $row;
}
-sub aging {
+sub list_accounts {
$lxdebug->enter_sub();
- $form->header;
-
- $column_header{statement} = qq| | |;
- $column_header{ct} =
- qq||
- . $locale->text(ucfirst $form->{ct})
- . qq| | |;
- $column_header{invnumber} =
- qq|| . $locale->text('Invoice') . qq| | |;
- $column_header{transdate} =
- qq|| . $locale->text('Date') . qq| | |;
- $column_header{duedate} =
- qq|| . $locale->text('Due') . qq| | |;
- $column_header{c0} =
- qq|| . $locale->text('Current') . qq| | |;
- $column_header{c30} = qq|30 | |;
- $column_header{c60} = qq|60 | |;
- $column_header{c90} = qq|90 | |;
-
- @column_index =
- (qw(statement ct invnumber transdate duedate c0 c30 c60 c90));
+ my ($action) = @_;
+ my @options;
if ($form->{department}) {
- $option .= "\n
" if $option;
- ($department) = split /--/, $form->{department};
- $option .= $locale->text('Department') . " : $department";
- $department = $form->escape($form->{department}, 1);
- $form->{callback} .= "&department=$department";
+ my ($department) = split /--/, $form->{department};
+ push @options, $locale->text('Department') . " : $department";
+ }
+ if ($form->{projectnumber}) {
+ push @options, $locale->text('Project Number') . " : $form->{projectnumber}";
}
- if ($form->{arap} eq 'ar') {
- if ($form->{customer}) {
- $option .= "\n
" if $option;
- $option .= $form->{customer};
+ # if there are any dates
+ if ($form->{fromdate} || $form->{todate}) {
+ my ($fromdate, $todate);
+
+ if ($form->{fromdate}) {
+ $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
}
- }
- if ($form->{arap} eq 'ap') {
- shift @column_index;
- if ($form->{vendor}) {
- $option .= "\n
" if $option;
- $option .= $form->{vendor};
+ if ($form->{todate}) {
+ $todate = $locale->date(\%myconfig, $form->{todate}, 1);
}
- }
- $todate = $locale->date(\%myconfig, $form->{todate}, 1);
- $option .= "\n
" if $option;
- $option .=
- $locale->text('for Period') . " " . $locale->text('Bis') . " $todate";
+ push @options, "$fromdate - $todate";
- print qq|
-
+ } else {
+ push @options, $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+ }
-
+ if (($form->{arap} eq 'ar') && $form->{customer}) {
+ push @options, $form->{customer};
+ }
-
-