-
-
|
@@ -691,39 +656,39 @@ print qq|
- |.$locale->text('Include in Report').qq| |
+ | . $locale->text('Include in Report') . qq| |
|
@@ -732,12 +697,9 @@ print qq|
}
-
if ($form->{report} =~ /^nontaxable_/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
-
+
print qq|
@@ -746,48 +708,50 @@ print qq|
{report}>
- |.$locale->text('From').qq| |
+ | . $locale->text('From') . qq| |
{fromdate}> |
- |.$locale->text('Bis').qq| |
+ | . $locale->text('Bis') . qq| |
|
- |.$locale->text('Method').qq| |
- |.$locale->text('Accrual').qq|
- |.$locale->text('EUR').qq| |
+ | . $locale->text('Method') . qq| |
+ |
+ . $locale->text('Accrual') . qq|
+ |
+ . $locale->text('EUR') . qq| |
- |.$locale->text('Include in Report').qq| |
+ | . $locale->text('Include in Report') . qq| |
|
@@ -796,11 +760,7 @@ print qq|
}
-
-
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';
@@ -808,26 +768,33 @@ print qq|
$label = $locale->text('Vendor');
$form->{vc} = 'vendor';
}
-
+
$nextsub = "generate_$form->{report}";
-
+
# setup vc selection
- $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
+ $form->all_vc(\%myconfig, $form->{vc},
+ ($form->{vc} eq 'customer') ? "AR" : "AP");
+
+ map { $vc .= "$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} };
-
- $vc = ($vc) ? qq|| : qq|{vc} size=35>|;
-
print qq|
- |.$locale->text($label).qq| |
+ | . $locale->text($label) . qq| |
$vc |
- |.$locale->text('Bis').qq| |
-
- $button1
- $button1_2
+ | | . $locale->text('From') . qq|
+ $button1
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
|
@@ -836,17 +803,14 @@ print qq|
-
+
$jsscript
|;
}
-# above action can be removed if there is more than one input field
-
+ # 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);
@@ -854,38 +818,38 @@ $jsscript
$selection = "\n";
foreach $ref (@{ $form->{PR} }) {
$paymentaccounts .= "$ref->{accno} ";
- $selection .= "$ref->{accno}--$ref->{description}\n";
+ $selection .= "$ref->{accno}--$ref->{description}\n";
}
-
+
chop $paymentaccounts;
print qq|
- |.$locale->text('Account').qq| |
+ | . $locale->text('Account') . qq| |
|
- |.$locale->text('Reference').qq| |
+ | . $locale->text('Reference') . qq| |
|
- |.$locale->text('Source').qq| |
+ | . $locale->text('Source') . qq| |
|
- |.$locale->text('Memo').qq| |
+ | . $locale->text('Memo') . qq| |
|
- |.$locale->text('From').qq| |
+ | . $locale->text('From') . qq| |
$button1
$button1_2
|
- |.$locale->text('Bis').qq| |
+ | . $locale->text('Bis') . qq| |
$button2
$button2_2
@@ -893,11 +857,11 @@ $jsscript
|
|
- |.$locale->text('Include Exchangerate Difference').qq|
+ | | . $locale->text('Include Exchangerate Difference') . qq|
|
-$jsscript
-
+$jsscript
+
{db}>
|;
@@ -915,31 +879,8 @@ $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|
@@ -949,22 +890,23 @@ print qq|
$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};
if ($form->{projectnumber} && !$form->{project_id}) {
$form->{rowcount} = 1;
# call this instead of update
- $form->{update} = $nextsub;
+ $form->{update} = $nextsub;
$form->{projectnumber_1} = $form->{projectnumber};
-
+
delete $form->{sort};
&check_project;
@@ -975,184 +917,196 @@ sub get_project {
$lxdebug->leave_sub();
}
-
sub generate_income_statement {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{padding} = " ";
- $form->{bold} = "";
+ $form->{bold} = "";
$form->{endbold} = "";
- $form->{br} = " ";
-
- &get_project(generate_income_statement);
+ $form->{br} = " ";
+
+ if ($form->{reporttype} eq "custom") {
- $form->{projectnumber} = $form->{projectnumber_1};
-
- if ($form->{reporttype} eq "custom"){
-
#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;
+ if ($form->{year} !~ m/^\d\d\d\d$/) {
+ $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~
+ /(\d\d\d\d)/;
+ $form->{year} = $1;
}
+
#yearly report
- if ($form->{duetyp} eq "13" ){
- $form->{fromdate}="1.1.$form->{year}";
- $form->{todate}="31.12.$form->{year}";
+ if ($form->{duetyp} eq "13") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
}
- #Quater reports
- if ($form->{duetyp} eq "A" ){
- $form->{fromdate}="1.1.$form->{year}";
- $form->{todate}="31.3.$form->{year}";
+
+ #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 "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 "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}";
+ 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;
- };
- }
- }
-
+ 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;
+ };
+ }
+ }
+
RP->income_statement(\%myconfig, \%$form);
($form->{department}) = split /--/, $form->{department};
-
- $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+
+ $form->{period} =
+ $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
$form->{todate} = $form->current_date(\%myconfig) unless $form->{todate};
# if there are any dates construct a where
if ($form->{fromdate} || $form->{todate}) {
-
+
unless ($form->{todate}) {
$form->{todate} = $form->current_date(\%myconfig);
}
- $longtodate = $locale->date(\%myconfig, $form->{todate}, 1);
+ $longtodate = $locale->date(\%myconfig, $form->{todate}, 1);
$shorttodate = $locale->date(\%myconfig, $form->{todate}, 0);
-
- $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
+
+ $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
-
- $form->{this_period} = "$shortfromdate \n$shorttodate";
- $form->{period} = $locale->text('for Period').qq| \n$longfromdate |.$locale->text('Bis').qq| $longtodate|;
+
+ $form->{this_period} = "$shortfromdate\n$shorttodate";
+ $form->{period} =
+ $locale->text('for Period')
+ . qq|\n$longfromdate |
+ . $locale->text('Bis')
+ . qq| $longtodate|;
}
if ($form->{comparefromdate} || $form->{comparetodate}) {
- $longcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 1);
- $shortcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 0);
-
- $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
+ $longcomparefromdate =
+ $locale->date(\%myconfig, $form->{comparefromdate}, 1);
+ $shortcomparefromdate =
+ $locale->date(\%myconfig, $form->{comparefromdate}, 0);
+
+ $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
$shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
-
- $form->{last_period} = "$shortcomparefromdate \n$shortcomparetodate";
- $form->{period} .= " \n$longcomparefromdate ".$locale->text('Bis').qq| $longcomparetodate|;
+
+ $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
+ $form->{period} .=
+ "\n$longcomparefromdate "
+ . $locale->text('Bis')
+ . qq| $longcomparetodate|;
}
# setup variables for the form
@a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
- $form->{address} =~ s/\\n/ /g;
$form->{templates} = $myconfig{templates};
$form->{IN} = "income_statement.html";
-
+
$form->parse_template;
$lxdebug->leave_sub();
}
-
sub generate_balance_sheet {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
+ $form->{decimalplaces} = $form->{decimalplaces} * 1 || 2;
$form->{padding} = " ";
- $form->{bold} = "";
+ $form->{bold} = "";
$form->{endbold} = "";
- $form->{br} = " ";
-
- RP->balance_sheet(\%myconfig, \%$form);
+ $form->{br} = " ";
+
+ my $data = RP->balance_sheet(\%myconfig, \%$form);
$form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
$form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-
+
($form->{department}) = split /--/, $form->{department};
-
+
# define Current Earnings account
$padding = ($form->{l_heading}) ? $form->{padding} : "";
- push(@{$form->{equity_account}}, $padding.$locale->text('Current Earnings'));
+ push(@{ $form->{equity_account} }, $padding . $locale->text('Current Earnings'));
$form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
$form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0);
@@ -1160,33 +1114,34 @@ sub generate_balance_sheet {
$form->{IN} = "balance_sheet.html";
# setup company variables for the form
- map { $form->{$_} = $myconfig{$_} } (qw(company address businessnumber nativecurr));
- $form->{address} =~ s/\\n/ /g;
+ map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
$form->{templates} = $myconfig{templates};
-
- $form->parse_template;
+
+ $form->header();
+ print $form->parse_html_template('rp/balance_sheet', $data);
+# $form->parse_template();
$lxdebug->leave_sub();
}
-
sub generate_projects {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
&get_project(generate_projects);
$form->{projectnumber} = $form->{projectnumber_1};
$form->{nextsub} = "generate_projects";
- $form->{title} = $locale->text('Project Transactions');
+ $form->{title} = $locale->text('Project Transactions');
RP->trial_balance(\%myconfig, \%$form);
-
- &list_accounts;
+
+ list_accounts('generate_projects');
$lxdebug->leave_sub();
}
-
# Antonio Gallardo
#
# D.S. Feb 16, 2001
@@ -1195,622 +1150,586 @@ sub generate_projects {
#
sub generate_trial_balance {
$lxdebug->enter_sub();
-
+
+ $auth->assert('report');
+
+ if ($form->{reporttype} eq "custom") {
+
+ #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;
+ }
+
+ #yearly report
+ if ($form->{duetyp} eq "13") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ }
+
+ #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;
+ };
+ }
+ }
+
+
# get for each account initial balance, debits and credits
- RP->trial_balance(\%myconfig, \%$form);
+ RP->trial_balance(\%myconfig, \%$form, 'beginning_balances' => 1);
+
+
+ $form->{rowcount} = scalar @{ $form->{TB} };
+ $form->{title} = sprintf($locale->text('Trial balance between %s and %s'), $form->{fromdate}, $form->{todate});
+
+ my @columns = (
+ "accno", "description",
+ "last_transaction", "soll_eb",
+ "haben_eb",
+ "soll", "haben",
+ "soll_kumuliert", "haben_kumuliert",
+ "soll_saldo", "haben_saldo"
+ );
+
+
+ my $attachment_basename = $locale->text('trial_balance');
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+ my @hidden_variables = qw(fromdate todate year cash);
+
+ my $href = build_std_url('action=generate_trial_balance', 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);
- $form->{nextsub} = "generate_trial_balance";
- $form->{title} = $locale->text('Trial Balance');
- &list_accounts;
+ map { $column_defs{$_}->{visible} = 1 } @columns;
+
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
+
+ $report->set_export_options('generate_trial_balance', @hidden_variables);
+
+ my @options;
+
+
+ $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0);
+
+ $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0);
+ push (@options, $form->{print_date});
+
+ $form->{company} = $locale->text('Company') . " " . $myconfig{company};
+ push (@options, $form->{company});
+
+
+ $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+ $report->set_options('output_format' => 'HTML',
+ 'top_info_text' => join("\n", @options),
+ '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();
+
+ # 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}";
+ $row->{accno}->{link} = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($accno->{accno}), 'description=' . E($accno->{description}), 'fromdate=' . E($form->{fromdate}), 'todate=' . E($form->{todate}), 'method=' . E($form->{method}));
+
+ 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 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 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 ";
- $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} ";
- $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);
}
if ($form->{todate}) {
$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| | |.$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| | |;
+ my @hidden_variables = qw(fromdate todate department l_heading l_subtotal all_accounts sort accounttype eur projectnumber project_id title nextsub);
+ $form->{callback} = build_std_url("action=$action", grep { $form->{$_} } @hidden_variables);
- if ($form->{accounttype} eq 'gifi') {
- $column_header{accno} = qq||.$locale->text('GIFI').qq| | |;
- }
-
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- $form->header;
+ $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();
- print qq|
-
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
-
-
- $form->{title} |
-
-
-
- $options |
-
-
-
-
- |;
+ $report->set_export_options($action, @hidden_variables);
- map { print "$column_header{$_}\n" } @column_index;
+ 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} };
- print qq|
-
-|;
+ # 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);
+ my $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
-
- # 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?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}|;
-
- 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 $row = { map { $_ => { 'align' => $column_alignment{$_} } } @columns };
- $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;
-
- print qq|
-
-|;
- }
-
- 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} | ";
- }
+ if ($ref->{charttype} eq 'H') {
+ next unless ($form->{l_heading});
- 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 | ";
-
- $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|
-
-|;
- }
- if ($ref->{charttype} eq "A") {
- $i++; $i %= 2;
- print qq|
-
-|;
+
+ foreach (qw(debit credit)) {
+ $subtotals{$_} += $ref->{$_};
+ $totals{$_} += $ref->{$_};
}
-
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-|;
- }
+ $subtotals{begbalance} += $ref->{balance} * $ml;
+ $subtotals{endbalance} += ($ref->{balance} + $ref->{amount}) * $ml;
- # 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 | ";
-
- print qq|
-
-|;
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-|;
+ map { $row->{$_}->{data} = $ref->{$_} } qw(accno description);
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $ref->{$_}, 2) if ($ref->{$_} != 0) } qw(credit debit);
+
+ $row->{begbalance}->{data} = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2);
+ $row->{endbalance}->{data} = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2);
+
+ $report->add_data($row);
+
+ 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{$_} = " | " } qw(accno description begbalance endbalance);
-
- $column_data{debit} = qq|$totaldebit | |;
- $column_data{credit} = qq|$totalcredit | |;
-
- print qq|
-
-|;
- map { print "$column_data{$_}\n" } @column_index;
+ $report->add_separator();
- print qq|
-
-
- |
-
-
-
|
-
-
+ $report->add_data(create_list_accounts_subtotal_row(\%totals, \@columns, [ qw(debit credit) ], 'listtotal'));
-
-
-|;
+ $report->generate_with_headers();
$lxdebug->leave_sub();
}
-
sub generate_ar_aging {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
# split customer
($form->{customer}) = split(/--/, $form->{customer});
- $customer = $form->escape($form->{customer},1);
- $title = $form->escape($form->{title},1);
- $form->{ct} = "customer";
+ $form->{ct} = "customer";
$form->{arap} = "ar";
- $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|;
+ $form->{callback} = build_std_url('action=generate_ar_aging', qw(todate customer title));
RP->aging(\%myconfig, \%$form);
- &aging;
-
+ aging();
+
$lxdebug->leave_sub();
}
-
sub generate_ap_aging {
$lxdebug->enter_sub();
-
+
+ $auth->assert('general_ledger');
+
# split vendor
($form->{vendor}) = split(/--/, $form->{vendor});
- $vendor = $form->escape($form->{vendor},1);
- $title = $form->escape($form->{title},1);
- $form->{ct} = "vendor";
+ $form->{ct} = "vendor";
$form->{arap} = "ap";
-
- $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|;
+
+ $form->{callback} = build_std_url('action=generate_ap_aging', qw(todate vendor title));
RP->aging(\%myconfig, \%$form);
- &aging;
-
+ aging();
+
$lxdebug->leave_sub();
}
-
-sub aging {
+sub create_aging_subtotal_row {
$lxdebug->enter_sub();
+ my ($subtotals, $columns, $periods, $class) = @_;
- $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 $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
- 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";
- }
-
- if ($form->{arap} eq 'ar') {
- if ($form->{customer}) {
- $option .= "\n
" if $option;
- $option .= $form->{customer};
- }
- }
- if ($form->{arap} eq 'ap') {
- shift @column_index;
- if ($form->{vendor}) {
- $option .= "\n
" if $option;
- $option .= $form->{vendor};
- }
+ foreach (@{ $periods }) {
+ $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+ $subtotals->{$_} = 0;
}
-
- $todate = $locale->date(\%myconfig, $form->{todate}, 1);
- $option .= "\n
" if $option;
- $option .= $locale->text('for Period')." ".$locale->text('Bis')." $todate";
- print qq|
-
-
-
+ my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
-
-