X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=c23abeb59abe7d258a2832a350647f7699637c92;hb=6f2050063ffa5417ab4495af84625385c766bc2d;hp=67ad8a5e379f4cedea7f1a20c6906f257981738e;hpb=18da4a96827fd65559a6f64334c3d8a313884f84;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 67ad8a5e3..c23abeb59 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -39,7 +39,6 @@ use POSIX qw(strftime); use SL::PE; use SL::RP; -use SL::USTVA; use SL::Iconv; use SL::ReportGenerator; @@ -92,9 +91,32 @@ 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', + 'ap_aging' => 'general_ledger', + 'receipts' => 'cash', + 'payments' => 'cash', + 'trial_balance' => 'report', + 'income_statement' => 'report', + 'bwa' => 'report', + 'balance_sheet' => 'report', +}; + +sub check_rp_access { + my $right = $rp_access_map->{$form->{report}}; + $right ||= 'DOES_NOT_EXIST'; + + $auth->assert($right); +} + sub report { $lxdebug->enter_sub(); + check_rp_access(); + %title = ('balance_sheet' => 'Balance Sheet', 'income_statement' => 'Income Statement', 'trial_balance' => 'Trial Balance', @@ -107,8 +129,7 @@ sub report { 'receipts' => 'Receipts', 'payments' => 'Payments', 'projects' => 'Project Transactions', - 'bwa' => 'Betriebswirtschaftliche Auswertung', - 'ustva' => 'Umsatzsteuervoranmeldung',); + 'bwa' => 'Betriebswirtschaftliche Auswertung',); $form->{title} = $locale->text($title{ $form->{report} }); @@ -153,49 +174,43 @@ sub report { # use JavaScript Calendar or not $form->{jsscript} = 1; $jsscript = ""; - if ($form->{report} eq "ustva") { - $department = ""; + if ($form->{report} eq "balance_sheet") { + $name_1 = "asofdate"; + $id_1 = "asofdate"; + $value_1 = "$form->{asofdate}"; + $trigger_1 = "trigger1"; + $name_2 = "compareasofdate"; + $id_2 = "compareasofdate"; + $value_2 = "$form->{compareasofdate}"; + $trigger_2 = "trigger2"; + } elsif ($form->{report} =~ /(receipts|payments)$/) { + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + } elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { + $name_1 = ""; + $id_1 = ""; + $value_1 = ""; + $trigger_1 = ""; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + } else { - if ($form->{report} eq "balance_sheet") { - $name_1 = "asofdate"; - $id_1 = "asofdate"; - $value_1 = "$form->{asofdate}"; - $trigger_1 = "trigger1"; - $name_2 = "compareasofdate"; - $id_2 = "compareasofdate"; - $value_2 = "$form->{compareasofdate}"; - $trigger_2 = "trigger2"; - } elsif ($form->{report} =~ /(receipts|payments)$/) { - $name_1 = "fromdate"; - $id_1 = "fromdate"; - $value_1 = "$form->{fromdate}"; - $trigger_1 = "trigger1"; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - } else { - if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { - $name_1 = ""; - $id_1 = ""; - $value_1 = ""; - $trigger_1 = ""; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - - } else { - $name_1 = "fromdate"; - $id_1 = "fromdate"; - $value_1 = "$form->{fromdate}"; - $trigger_1 = "trigger1"; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - } - } + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; } # with JavaScript Calendar @@ -524,17 +539,65 @@ $jsscript |; } - if ($form->{report} eq "ustva") { - + if ($form->{report} eq "balance_sheet") { print qq| + + + | . $locale->text('as at') . qq| + + $button1 + $button1_2 + + | . $locale->text('Compare to') . qq| + + $button2 + $button2_2 + + + + | . $locale->text('Decimalplaces') . qq| + + + + + + + + + + + + -
- + + + + + +$jsscript +|; + } + + if ($form->{report} eq "trial_balance") { + print qq| + + + + +
| . $locale->text('Method') . 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('Project') . qq|$projectnumber
+ . $locale->text('Customized Report') . qq| @@ -608,102 +671,39 @@ $checked> - - - - - - -|; - } - - if ($form->{report} eq "balance_sheet") { - print qq| - - - - - - + - + - - + -
| - . $locale->text('Zeitraum') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Method') . qq|| - . $locale->text('Accrual') . qq| -  | - . $locale->text('EUR') . qq|
|; -########## - - &print_options(); - print qq| -
| . $locale->text('as at') . qq| - $button1 - $button1_2 - | . $locale->text('Compare to') . qq| - $button2 - $button2_2 + | + . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  + $button1 + $button1_2  + | . $locale->text('Bis') . qq|  + $button2 + $button2_2
| . $locale->text('Decimalplaces') . qq|
- - - - - - + - - - - - - -$jsscript -|; - } - - if ($form->{report} eq "trial_balance") { - print qq| - - - - - - - -
| . $locale->text('Method') . qq|| . $locale->text('Method') . 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('From') . qq| - $button1 - $button1_2 - | . $locale->text('Bis') . qq| - $button2 - $button2_2 -
- - - - - - - - - - + + + + + + + + $jsscript |; } @@ -981,32 +981,9 @@ $jsscript
| . $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|

-{login}> -{password}> - -|; - - # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten - USTVA->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| @@ -1020,6 +997,9 @@ 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}; @@ -1043,6 +1023,8 @@ sub get_project { sub generate_income_statement { $lxdebug->enter_sub(); + $auth->assert('report'); + $form->{padding} = "  "; $form->{bold} = ""; $form->{endbold} = ""; @@ -1210,6 +1192,8 @@ sub generate_income_statement { sub generate_balance_sheet { $lxdebug->enter_sub(); + $auth->assert('report'); + $form->{padding} = "  "; $form->{bold} = ""; $form->{endbold} = ""; @@ -1235,9 +1219,7 @@ sub generate_balance_sheet { $form->{IN} = "balance_sheet.html"; # setup company variables for the form - map { $form->{$_} = $myconfig{$_}; - $form->{$_} =~ s/\\n/\n/g; } - (qw(company address businessnumber nativecurr)); + map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr)); $form->{templates} = $myconfig{templates}; @@ -1249,6 +1231,8 @@ sub generate_balance_sheet { sub generate_projects { $lxdebug->enter_sub(); + $auth->assert('report'); + &get_project(generate_projects); $form->{projectnumber} = $form->{projectnumber_1}; @@ -1256,7 +1240,7 @@ sub generate_projects { $form->{title} = $locale->text('Project Transactions'); RP->trial_balance(\%myconfig, \%$form); - &list_accounts; + list_accounts('generate_projects'); $lxdebug->leave_sub(); } @@ -1270,34 +1254,278 @@ 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); - $form->{nextsub} = "generate_trial_balance"; - $form->{title} = $locale->text('Trial Balance'); - &list_accounts; + + $form->{rowcount} = scalar @{ $form->{TB} }; + + my @columns = ( + "accno", "description", + "last_transaction", "soll_eb", + "haben_eb", + "soll", "haben", + "soll_kumuliert", "haben_kumuliert", + "soll_saldo", "haben_saldo" + ); + + + my $attachment_basename; + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + 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), + 'html_template' => 'report_generator/html_report_susa', + 'pdf_template' => 'report_generator/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 { + $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); } @@ -1305,211 +1533,99 @@ sub list_accounts { $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); - - $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||; - $form->header; + 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); - print qq| - + my @hidden_variables = qw(fromdate todate department l_heading l_subtotal all_accounts sort accounttype eur projectnumber project_id title nextsub); - - - - - - - - - - - - - - -
$form->{title}
$options
- - |; + $form->{callback} = build_std_url("action=$action", grep { $form->{$_} } @hidden_variables); + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + $report->set_options('top_info_text' => join("\n", @options), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $locale->text('list_of_transactions') . strftime('_%Y%m%d', localtime time), + 'std_column_visibility' => 1, + ); + $report->set_options_from_form(); - map { print "$column_header{$_}\n" } @column_index; + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - print qq| - -|; + $report->set_export_options($action, @hidden_variables); - # sort the whole thing by account numbers and display - foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) { - - $description = $form->escape($ref->{description}); - - $href = - qq|ca.pl?action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|; - - $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; - - $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " "; - $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " "; - $begbalance = - $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " "); - $endbalance = - $form->format_amount(\%myconfig, - ($ref->{balance} + $ref->{amount}) * $ml, - 2, " "); - - # next if ($ref->{debit} == 0 && $ref->{credit} == 0); - - if ($ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal}) { - map { $column_data{$_} = "" } - 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} = ""; - $column_data{begbalance} = ""; - $column_data{endbalance} = ""; - $column_data{debit} = ""; - $column_data{credit} = ""; - - print qq| - -|; - map { print "$column_data{$_}\n" } @column_index; + $report->set_sort_indicator('accno', 1); - print qq| - -|; - } + my @totals_columns = qw(credit debit begbalance endbalance); + my %subtotals = map { $_ => 0 } @totals_columns; + my %totals = map { $_ => 0 } @totals_columns; + my $found_heading = 0; + my @tb = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }; - if ($ref->{charttype} eq "H") { - $subtotal = 1; - $subtotaldescription = $ref->{description}; - $subtotaldebit = $ref->{debit}; - $subtotalcredit = $ref->{credit}; - $subtotalbegbalance = 0; - $subtotalendbalance = 0; + # sort the whole thing by account numbers and display + foreach my $idx (0 .. scalar(@tb) - 1) { + my $ref = $tb[$idx]; + my $href = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($ref->{accno}), 'description=' . E($ref->{description}), @hidden_variables); - next unless $form->{l_heading}; + my $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; - map { $column_data{$_} = "" } - qw(accno debit credit begbalance endbalance); - $column_data{description} = - ""; - } + my $row = { map { $_ => { 'align' => $column_alignment{$_} } } @columns }; - if ($ref->{charttype} eq "A") { - $column_data{accno} = ""; - $column_data{description} = ""; - $column_data{debit} = ""; - $column_data{credit} = ""; - $column_data{begbalance} = ""; - $column_data{endbalance} = ""; + if ($ref->{charttype} eq 'H') { + next unless ($form->{l_heading}); - $totaldebit += $ref->{debit}; - $totalcredit += $ref->{credit}; + %subtotals = map { $_ => 0 } @totals_columns; + $found_heading = 1; + $row->{description}->{class} = 'listheading'; + $row->{description}->{data} = $ref->{description}; - $subtotalbegbalance += $ref->{balance} * $ml; - $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml; + $report->add_data($row); + next; } - if ($ref->{charttype} eq "H") { - print qq| - -|; - } - 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; + $subtotals{begbalance} += $ref->{balance} * $ml; + $subtotals{endbalance} += ($ref->{balance} + $ref->{amount}) * $ml; - print qq| - -|; - } + map { $row->{$_}->{data} = $ref->{$_} } qw(accno description); + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $ref->{$_}, 2) if ($ref->{$_} != 0) } qw(credit debit); - # print last subtotal - if ($subtotal && $form->{l_subtotal}) { - map { $column_data{$_} = "" } - 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} = ""; - $column_data{begbalance} = ""; - $column_data{endbalance} = ""; - $column_data{debit} = ""; - $column_data{credit} = ""; + $row->{begbalance}->{data} = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2); + $row->{endbalance}->{data} = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2); - print qq| - -|; - map { print "$column_data{$_}\n" } @column_index; + $report->add_data($row); - print qq| - -|; + 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||; - $column_data{credit} = qq||; - - print qq| - -|; - - map { print "$column_data{$_}\n" } @column_index; + $report->add_separator(); - print qq| - -
 $subtotaldescription$subtotalbegbalance$subtotalendbalance$subtotaldebit$subtotalcredit
 $ref->{description}$ref->{accno}$ref->{description}$debit$credit$begbalance$endbalance
 $subdescription$subtotalbegbalance$subtotalendbalance$subtotaldebit$subtotalcredit
 $totaldebit$totalcredit
-
+ $report->add_data(create_list_accounts_subtotal_row(\%totals, \@columns, [ qw(debit credit) ], 'listtotal')); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -1517,6 +1633,8 @@ sub list_accounts { sub generate_ar_aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # split customer ($form->{customer}) = split(/--/, $form->{customer}); @@ -1534,6 +1652,8 @@ sub generate_ar_aging { sub generate_ap_aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # split vendor ($form->{vendor}) = split(/--/, $form->{vendor}); @@ -1568,6 +1688,8 @@ sub create_aging_subtotal_row { sub aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + my $report = SL::ReportGenerator->new(\%myconfig, $form); my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90); @@ -1670,7 +1792,7 @@ sub aging { if ($form->{arap} eq 'ar') { $raw_top_info_text = $form->parse_html_template('rp/aging_ar_top'); $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx, - 'PRINT_OPTIONS' => print_options(1), }); + 'PRINT_OPTIONS' => print_options(inline => 1), }); $report->set_options('raw_top_info_text' => $raw_top_info_text, 'raw_bottom_info_text' => $raw_bottom_info_text); } @@ -1697,6 +1819,8 @@ sub select_all { sub e_mail { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # get name and email addresses for $i (1 .. $form->{rowcount}) { if ($form->{"statement_$i"}) { @@ -1772,6 +1896,7 @@ sub e_mail { # save all other variables foreach $key (keys %$form) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); $form->{$key} =~ s/\"/"/g; print qq|\n|; } @@ -1801,6 +1926,8 @@ sub e_mail { sub send_email { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}| unless $form->{subject}; @@ -1819,6 +1946,8 @@ sub send_email { sub print { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + if ($form->{media} eq 'printer') { $form->error($locale->text('Select postscript or PDF!')) if ($form->{format} !~ /(postscript|pdf)/); @@ -1853,6 +1982,8 @@ sub print { sub print_form { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + my %replacements = ( "ä" => "ae", "ö" => "oe", "ü" => "ue", @@ -1883,9 +2014,7 @@ sub print_form { } $form->{IN} = "$form->{type}.$suffix"; - $form->{OUT} = - $form->{media} eq 'email' ? $sendmail : - $form->{media} eq 'printer' ? "| $myconfig{printer}" : ""; + $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : ""; # Save $form->{email} because it will be overwritten. $form->{EMAIL_RECIPIENT} = $form->{email}; @@ -1967,6 +2096,9 @@ sub print_form { sub statement_details { $lxdebug->enter_sub(); + + $auth->assert('general_ledger'); + my ($ref) = @_; push @{ $form->{invnumber} }, $ref->{invnumber}; @@ -1990,6 +2122,8 @@ sub statement_details { sub generate_tax_report { $lxdebug->enter_sub(); + $auth->assert('report'); + RP->tax_report(\%myconfig, \%$form); $descvar = "$form->{accno}_description"; @@ -2000,13 +2134,13 @@ sub generate_tax_report { # construct href $href = - "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; + "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; # construct callback $description = $form->escape($form->{$descvar}, 1); $department = $form->escape($form->{department}, 1); $callback = - "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; + "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; $title = $form->escape($form->{title}); $href .= "&title=$title"; @@ -2145,7 +2279,7 @@ sub generate_tax_report { $column_data{id} = qq|$ref->{id}|; $column_data{invnumber} = - qq|{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}|; + qq|{id}&callback=$callback>$ref->{invnumber}|; $column_data{transdate} = qq|$ref->{transdate}|; $column_data{name} = qq|$ref->{name} |; @@ -2242,6 +2376,8 @@ sub tax_subtotal { sub list_payments { $lxdebug->enter_sub(); + $auth->assert('cash'); + if ($form->{account}) { ($form->{paymentaccounts}) = split /--/, $form->{account}; } @@ -2357,30 +2493,6 @@ sub list_payments { $lxdebug->leave_sub(); } -sub config { - $lxdebug->enter_sub(); - edit(); - - #$form->header; - #print qq|Hallo|; - $lxdebug->leave_sub(); -} - -sub debug { - - $form->debug(); - -} - -sub winston_export { - $lxdebug->enter_sub(); - - #create_winston(); - $form->{winston} = 1; - &generate_ustva(); - $lxdebug->leave_sub(); -} - sub print_options { $lxdebug->enter_sub(); @@ -2403,14 +2515,9 @@ sub print_options { $form->{OP}{ $form->{media} } = "selected"; $form->{SM}{ $form->{sendmode} } = "selected"; - if ($form->{report} eq 'ustva') { - $type = qq| -