X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=a6308c69308d7f25e07db0d969fc7f45a81e71e8;hb=1bfdd83b1ba9b0dca96105be0a32ff3ea9794584;hp=88283d0d0b06a3ee88f2b4445d6aef060ad7539d;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 88283d0d0..a6308c693 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -91,6 +91,8 @@ require "bin/mozilla/reportgenerator.pl"; # $locale->text('Non-taxable Sales') # $locale->text('Non-taxable Purchases') +# $form->parse_html_template('rp/html_report_susa') + my $rp_access_map = { 'projects' => 'report', 'ar_aging' => 'general_ledger', @@ -140,11 +142,7 @@ sub report { $form->all_departments(\%myconfig); if (@{ $form->{all_departments} }) { $form->{selectdepartment} = "\n"; - - map { - $form->{selectdepartment} .= - "$_->{description}--$_->{id}\n" - } (@{ $form->{all_departments} }); + map { $form->{selectdepartment} .= "$_->{description}--$_->{id}\n" } @{ $form->{all_departments} }; } $department = qq| @@ -214,45 +212,28 @@ sub report { # with JavaScript Calendar if ($form->{jsscript}) { if ($name_1 eq "") { - - $button1 = qq| - |; - $button1_2 = qq| - text('button') . qq|>|; + $button1 = qq| |; + $button1_2 = qq| text('button') . qq|>|; #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2"); + $jsscript = Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2"); } else { - $button1 = qq| - |; - $button1_2 = qq| - text('button') . qq|>|; - $button2 = qq| - |; - $button2_2 = qq| - text('button') . qq|> - |; + $button1 = qq| |; + $button1_2 = qq| text('button') . qq|>|; + $button2 = qq| |; + $button2_2 = qq| text('button') . qq|> |; #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1", - "$name_2", "BL", "$trigger_2"); + $jsscript = Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1", "$name_2", "BL", "$trigger_2"); } } else { # without JavaScript Calendar if ($name_1 eq "") { - $button1 = - qq||; + $button1 = qq||; } else { - $button1 = - qq||; - $button2 = - qq||; + $button1 = qq||; + $button2 = qq||; } } $form->{javascript} .= qq||; @@ -301,10 +282,8 @@ sub report { | . $locale->text('Include in Report') . qq| - | - . $locale->text('Heading') . qq| - | - . $locale->text('Subtotal') . qq| + | . $locale->text('Heading') . qq| + | . $locale->text('Subtotal') . qq| $jsscript @@ -321,83 +300,62 @@ $jsscript - | - . $locale->text('Customized Report') . qq| + | . $locale->text('Customized Report') . qq| | . $locale->text('Year') . qq| - + |; print qq| - - | . $locale->text('Yearly') . qq| + | . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq| | . $locale->text('Monthly') . qq| - - 1. | - . $locale->text('Quarter') . qq| + + 1. | . $locale->text('Quarter') . qq| |; $checked = ""; print qq| - | - . $locale->text('January') . qq| + | . $locale->text('January') . qq| |; $checked = ""; print qq| - | - . $locale->text('May') . qq| - | - . $locale->text('September') . qq| + | . $locale->text('May') . qq| + | . $locale->text('September') . qq| - 2. | - . $locale->text('Quarter') . qq| - | - . $locale->text('February') . qq| - | - . $locale->text('June') . qq| - | - . $locale->text('October') . qq| + 2. | . $locale->text('Quarter') . qq| + | . $locale->text('February') . qq| + | . $locale->text('June') . qq| + | . $locale->text('October') . qq| - 3. | - . $locale->text('Quarter') . qq| - | - . $locale->text('March') . qq| - | - . $locale->text('July') . qq| - | - . $locale->text('November') . qq| + 3. | . $locale->text('Quarter') . qq| + | . $locale->text('March') . qq| + | . $locale->text('July') . qq| + | . $locale->text('November') . qq| - 4. | - . $locale->text('Quarter') . qq| - | - . $locale->text('April') . qq| - | - . $locale->text('August') . qq| - | - . $locale->text('December') . qq| + 4. | . $locale->text('Quarter') . qq| + | . $locale->text('April') . qq| + | . $locale->text('August') . qq| + | . $locale->text('December') . qq| - | - . $locale->text('Free report period') . qq| + | . $locale->text('Free report period') . qq| | . $locale->text('From') . qq| $button1 $button1_2 @@ -411,10 +369,8 @@ $jsscript | . $locale->text('Method') . qq| - | - . $locale->text('Accrual') . qq| - | - . $locale->text('EUR') . qq| + | . $locale->text('Accrual') . qq| + | . $locale->text('EUR') . qq| $jsscript @@ -431,83 +387,63 @@ $jsscript - | - . $locale->text('Customized Report') . qq| + | . $locale->text('Customized Report') . qq| | . $locale->text('Year') . qq| - + |; print qq| - - | . $locale->text('Yearly') . qq| + | . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq| | . $locale->text('Monthly') . qq| - 1. | - . $locale->text('Quarter') . qq| + 1. | . $locale->text('Quarter') . qq| |; $checked = "checked"; print qq| - | - . $locale->text('January') . qq| + | . $locale->text('January') . qq| |; $checked = ""; print qq| - | - . $locale->text('May') . qq| - | - . $locale->text('September') . qq| + | . $locale->text('May') . qq| + | . $locale->text('September') . qq| - 2. | - . $locale->text('Quarter') . qq| - | - . $locale->text('February') . qq| - | - . $locale->text('June') . qq| - | - . $locale->text('October') . qq| + 2. | . $locale->text('Quarter') . qq| + | . $locale->text('February') . qq| + | . $locale->text('June') . qq| + | . $locale->text('October') . qq| - 3. | - . $locale->text('Quarter') . qq| - | - . $locale->text('March') . qq| - | - . $locale->text('July') . qq| - | - . $locale->text('November') . qq| + 3. | . $locale->text('Quarter') . qq| + | . $locale->text('March') . qq| + | . $locale->text('July') . qq| + | . $locale->text('November') . qq| - 4. | - . $locale->text('Quarter') . qq| - | - . $locale->text('April') . qq| - | - . $locale->text('August') . qq| - | - . $locale->text('December') . qq| + 4. | . $locale->text('Quarter') . qq| + | . $locale->text('April') . qq| + | . $locale->text('August') . qq| + | . $locale->text('December') . qq| - | - . $locale->text('Free report period') . qq| + | . $locale->text('Free report period') . qq| | . $locale->text('From') . qq| $button1 $button1_2 @@ -521,15 +457,11 @@ $checked> | . $locale->text('Method') . qq| - | - . $locale->text('Accrual') . qq| - | - . $locale->text('EUR') . qq| + | . $locale->text('Accrual') . qq| + | . $locale->text('EUR') . qq| - | - . $locale->text('Decimalplaces') - . qq| + | . $locale->text('Decimalplaces') . qq| @@ -564,20 +496,15 @@ $jsscript | . $locale->text('Method') . qq| - | - . $locale->text('Accrual') . qq| - | - . $locale->text('EUR') . qq| + | . $locale->text('Accrual') . qq| + | . $locale->text('EUR') . qq| | . $locale->text('Include in Report') . qq| - | - . $locale->text('Heading') . qq| - | - . $locale->text('Subtotal') . qq| - | - . $locale->text('Account Number') . qq| + | . $locale->text('Heading') . qq| + | . $locale->text('Subtotal') . qq| + | . $locale->text('Account Number') . qq| $jsscript @@ -586,36 +513,95 @@ $jsscript if ($form->{report} eq "trial_balance") { print qq| + + | . $locale->text('Project') . qq| + $projectnumber + - - - | . $locale->text('From') . qq| - - $button1 - $button1_2 - - | . $locale->text('Bis') . qq| - - $button2 - $button2_2 - + + + + | . $locale->text('Customized Report') . qq| - - - - - - - | . $locale->text('Include in Report') . qq| - | - . $locale->text('Heading') . qq| - | - . $locale->text('Subtotal') . qq| - | - . $locale->text('All Accounts') . qq| + | . $locale->text('Year') . qq| + + +|; + + print qq| + + | . $locale->text('Yearly') . qq| + | . $locale->text('Quarterly') . qq| + | . $locale->text('Monthly') . qq| + + + 1. | . $locale->text('Quarter') . qq| +|; + $checked = "checked"; + print qq| + | . $locale->text('January') . qq| +|; + $checked = ""; + print qq| + | . $locale->text('May') . qq| + | . $locale->text('September') . qq| + + + + 2. | . $locale->text('Quarter') . qq| + | . $locale->text('February') . qq| + | . $locale->text('June') . qq| + | . $locale->text('October') . qq| + + + + 3. | . $locale->text('Quarter') . qq| + | . $locale->text('March') . qq| + | . $locale->text('July') . qq| + | . $locale->text('November') . qq| + + + + + 4. | . $locale->text('Quarter') . qq| + | . $locale->text('April') . qq| + | . $locale->text('August') . qq| + | . $locale->text('December') . qq| + + + + + + + | . $locale->text('Free report period') . qq| + | . $locale->text('From') . qq| + $button1 + $button1_2 + | . $locale->text('Bis') . qq| + $button2 + $button2_2 + + + + + + + | . $locale->text('Method') . qq| + | . $locale->text('Accrual') . qq| + | . $locale->text('EUR') . qq| + + + | . $locale->text('All Accounts') . qq| + + + + | . $locale->text('Decimalplaces') . qq| + + + $jsscript |; } @@ -659,10 +645,8 @@ $jsscript | . $locale->text('Method') . qq| - | - . $locale->text('Accrual') . qq| - | - . $locale->text('EUR') . qq| + | . $locale->text('Accrual') . qq| + | . $locale->text('EUR') . qq| @@ -870,8 +854,7 @@ $jsscript - | - . $locale->text('Include Exchangerate Difference') . qq| + | . $locale->text('Include Exchangerate Difference') . qq| $jsscript @@ -893,8 +876,7 @@ $jsscript - + @@ -1106,11 +1088,6 @@ sub generate_balance_sheet { $auth->assert('report'); - $form->{padding} = " "; - $form->{bold} = ""; - $form->{endbold} = ""; - $form->{br} = ""; - RP->balance_sheet(\%myconfig, \%$form); $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate}; @@ -1128,14 +1105,103 @@ sub generate_balance_sheet { $form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0); - $form->{IN} = "balance_sheet.html"; + my $attachment_basename; + + my $report = SL::ReportGenerator->new(\%myconfig, $form); - # setup company variables for the form - map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr)); + my @hidden_variables = (); + push @hidden_variables, qw(fromdate todate year cash ); - $form->{templates} = $myconfig{templates}; + 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(); } @@ -1168,14 +1234,243 @@ sub generate_trial_balance { $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); - $form->{nextsub} = "generate_trial_balance"; - $form->{title} = $locale->text('Trial Balance'); - list_accounts('generate_trial_balance'); + + $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; + $attachment_basename = $locale->text('trial_balance'); + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + my @hidden_variables = (); + push @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); + + 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); + + $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), + '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}"; + + 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 { @@ -1360,7 +1655,7 @@ sub create_aging_subtotal_row { my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } }; foreach (@{ $periods }) { - $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : ''; + $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : ''; $subtotals->{$_} = 0; } @@ -1371,12 +1666,12 @@ sub create_aging_subtotal_row { sub aging { $lxdebug->enter_sub(); - + print(STDERR "Bin in Aging\n"); $auth->assert('general_ledger'); my $report = SL::ReportGenerator->new(\%myconfig, $form); - my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90); + my @columns = qw(statement ct invnumber transdate duedate amount open); my %column_defs = ( 'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, }, @@ -1384,14 +1679,12 @@ sub aging { 'invnumber' => { 'text' => $locale->text('Invoice'), }, 'transdate' => { 'text' => $locale->text('Date'), }, 'duedate' => { 'text' => $locale->text('Due'), }, - 'c0' => { 'text' => $locale->text('Current'), }, - 'c30' => { 'text' => '30', }, - 'c60' => { 'text' => '60', }, - 'c90' => { 'text' => '90', }, + 'amount' => { 'text' => $locale->text('Amount'), }, + 'open' => { 'text' => $locale->text('Open'), }, ); my %column_alignment = ('statement' => 'center', - map { $_ => 'right' } qw(c0 c30 c60 c90)); + map { $_ => 'right' } qw(open amount)); $report->set_options('std_column_visibility' => 1); $report->set_columns(%column_defs); @@ -1401,6 +1694,7 @@ sub aging { $report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables); my @options; + my $attachment_basename; if ($form->{department}) { my ($department) = split /--/, $form->{department}; @@ -1410,10 +1704,14 @@ sub aging { if (($form->{arap} eq 'ar') && $form->{customer}) { push @options, $form->{customer}; + $attachment_basename = $locale->text('ar_aging_list'); + $form->{title} = sprintf($locale->text('Ar aging on %s'), $form->{todate}); } if (($form->{arap} eq 'ap') && $form->{vendor}) { push @options, $form->{vendor}; + $attachment_basename = $locale->text('ap_aging_list'); + $form->{title} = sprintf($locale->text('Ap aging on %s'), $form->{todate}); } push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1); @@ -1428,7 +1726,7 @@ sub aging { my $previous_ctid = 0; my $row_idx = 0; - my @periods = qw(0 30 60 90); + my @periods = qw(open amount); my %subtotals = map { $_ => 0 } @periods; my %totals = map { $_ => 0 } @periods; @@ -1438,9 +1736,9 @@ sub aging { } foreach my $key (@periods) { - $subtotals{$key} += $ref->{"c${key}"}; - $totals{$key} += $ref->{"c${key}"}; - $ref->{"c${key}"} = $ref->{"c${key}"} != 0 ? $form->format_amount(\%myconfig, $ref->{"c${key}"}, 2) : ''; + $subtotals{$key} += $ref->{"$key"}; + $totals{$key} += $ref->{"$key"}; + $ref->{"$key"} = $ref->{"$key"} != 0 ? $form->format_amount(\%myconfig, $ref->{"$key"}, 2) : ''; } my $row = { }; @@ -1668,19 +1966,6 @@ sub print_form { $auth->assert('general_ledger'); - my %replacements = - ( - "ä" => "ae", "ö" => "oe", "ü" => "ue", - "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", - "ß" => "ss", - " " => "_" - ); - - foreach my $key (keys %replacements) { - my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key); - $replacements{$new_key} = $replacements{$key} if $new_key ne $key; - } - $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1); $form->{templates} = "$myconfig{templates}"; @@ -1759,8 +2044,8 @@ sub print_form { $form->format_amount(\%myconfig, $form->{"${_}total"}, 2) } (c0, c30, c60, c90, ""); - $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix"; - map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements)); + $form->{attachment_filename} = $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix"); + $form->{attachment_filename} =~ s/\s+/_/g; $form->parse_template(\%myconfig, $userspath); @@ -1885,27 +2170,14 @@ sub generate_tax_report { $option .= "" if $option; $option .= "$form->{period}"; - $column_header{id} = - qq|| - . $locale->text('ID') - . qq||; - $column_header{invnumber} = - qq|| - . $locale->text('Invoice') - . qq||; - $column_header{transdate} = - qq|| - . $locale->text('Date') - . qq||; - $column_header{netamount} = - qq|| . $locale->text('Amount') . qq||; - $column_header{tax} = - qq|| . $locale->text('Tax') . qq||; - $column_header{amount} = - qq|| . $locale->text('Total') . qq||; - - $column_header{name} = - qq|$name|; + $column_header{id} = qq|| . $locale->text('ID') . qq||; + $column_header{invnumber} = qq|| . $locale->text('Invoice') . qq||; + $column_header{transdate} = qq|| . $locale->text('Date') . qq||; + $column_header{netamount} = qq|| . $locale->text('Amount') . qq||; + $column_header{tax} = qq|| . $locale->text('Tax') . qq||; + $column_header{amount} = qq|| . $locale->text('Total') . qq||; + + $column_header{name} = qq|$name|; $form->header;