From: Moritz Bunkus Date: Mon, 18 Jun 2007 15:01:41 +0000 (+0000) Subject: Umstellung der Kontenübersicht und der Buchungslisten auf die Verwendung von ReportGe... X-Git-Tag: release-2.4.3^2~101 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ec022a581e19d03e34ae31e7ba53ee4dde66ea73;p=kivitendo-erp.git Umstellung der Kontenübersicht und der Buchungslisten auf die Verwendung von ReportGenerator. --- diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 23de61bca..497ee6157 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -32,7 +32,12 @@ # #====================================================================== +use POSIX qw(strftime); + use SL::CA; +use SL::ReportGenerator; + +require "bin/mozilla/report_generator.pl"; 1; @@ -69,107 +74,61 @@ use SL::CA; sub chart_of_accounts { $lxdebug->enter_sub(); - CA->all_accounts(\%myconfig, \%$form); - - @column_index = qw(accno description debit credit); - - $column_header{accno} = - qq|| . $locale->text('Account') . qq|\n|; - $column_header{description} = - qq|| . $locale->text('Description') . qq|\n|; - $column_header{debit} = - qq|| . $locale->text('Debit') . qq|\n|; - $column_header{credit} = - qq|| . $locale->text('Credit') . qq|\n|; - $form->{title} = $locale->text('Chart of Accounts'); - $colspan = $#column_index + 1; + CA->all_accounts(\%myconfig, \%$form); - $form->header; + my @columns = qw(accno description debit credit); + my %column_defs = ( + 'accno' => { 'text' => $locale->text('Account'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'debit' => { 'text' => $locale->text('Debit'), }, + 'credit' => { 'text' => $locale->text('Credit'), }, + ); - print qq| - + my $report = SL::ReportGenerator->new(\%myconfig, $form); - - - - |; + $report->set_options('output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $locale->text('chart_of_accounts') . strftime('_%Y%m%d', localtime time), + 'std_column_visibility' => 1, + ); + $report->set_options_from_form(); - map { print $column_header{$_} } @column_index; + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - print qq| - -|; + $report->set_export_options('chart_of_accounts'); - foreach $ca (@{ $form->{CA} }) { + $report->set_sort_indicator($form->{sort}, 1); - $description = $form->escape($ca->{description}); + my %totals = ('debit' => 0, 'credit' => 0); - $href = - qq|$form->{script}?action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description|; + foreach my $ca (@{ $form->{CA} }) { + my $row = { }; - if ($ca->{charttype} eq "H") { - print qq||; - map { $column_data{$_} = ""; } qw(accno description); - } else { - $i++; - $i %= 2; - print qq||; - $column_data{accno} = ""; - $column_data{description} = ""; - } - my $debit = ""; - my $credit = ""; - if ($ca->{debit}) { - $debit = $form->format_amount(\%myconfig, $ca->{debit}, 2, " "); + foreach (qw(debit credit)) { + $totals{$_} += $ca->{$_} * 1; + $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_}); } - if ($ca->{credit}) { - $credit = $form->format_amount(\%myconfig, $ca->{credit}, 2, " "); - } - $column_data{debit} = - "\n"; - $column_data{credit} = - "\n"; - - $totaldebit += $ca->{debit}; - $totalcredit += $ca->{credit}; - - map { print $column_data{$_} } @column_index; - - print qq| - -|; - } - map { $column_data{$_} = ""; } - qw(accno description); + map { $row->{$_} = { 'data' => $ca->{$_} } } @columns; - $column_data{debit} = - ""; - $column_data{credit} = - ""; + map { $row->{$_}->{align} = 'right' } qw(debit credit); + map { $row->{$_}->{class} = 'listheading' } @columns if ($ca->{charttype} eq "H"); - print ""; + $row->{accno}->{link} = build_std_url('action=list', 'accno=' . E($ca->{accno}), 'description=' . E($ca->{description})); - map { print $column_data{$_} } @column_index; + $report->add_data($row); + } - print qq| - - - - -

$form->{title}
$ca->{$_}
$ca->{accno}	$ca->{description}	" - . $debit - . "	" - . $credit - . "
	" - . $form->format_amount(\%myconfig, $totaldebit, 2, 0) . "	" - . $form->format_amount(\%myconfig, $totalcredit, 2, 0) . "

+ my $row = { map { $_ => { 'class' => 'listtotal', 'align' => 'right' } } @columns }; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals{$_}, 2) } qw(debit credit); - - -|; + $report->add_separator(); + $report->add_data($row); + + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -255,63 +214,23 @@ sub list { sub list_transactions { $lxdebug->enter_sub(); - CA->all_transactions(\%myconfig, \%$form); - - $description = $form->escape($form->{description}); - $department = $form->escape($form->{department}); - $projectnumber = $form->escape($form->{projectnumber}); - $title = $form->escape($form->{title}); - - # construct href - $href = - "$form->{script}?action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; - - $description = $form->escape($form->{description}, 1); - $department = $form->escape($form->{department}, 1); - $projectnumber = $form->escape($form->{projectnumber}, 1); - $title = $form->escape($form->{title}, 1); - - # construct callback - $callback = - "$form->{script}?action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; - - # figure out which column comes first - $column_header{transdate} = - qq|| - . $locale->text('Date') - . qq||; - $column_header{reference} = - qq|| - . $locale->text('Reference') - . 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{balance} = qq|| . $locale->text('Balance') . qq||; - - @column_index = - $form->sort_columns(qw(transdate reference description debit credit)); - - if ($form->{accno}) { - push @column_index, "balance"; - } + $form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}"; - $form->{title} = $locale->text('Account') . - " $form->{accno} - $form->{description}"; + CA->all_transactions(\%myconfig, \%$form); + my @options; if ($form->{department}) { - ($department) = split /--/, $form->{department}; - $options = $locale->text('Department') . " : $department
"; + my ($department) = split /--/, $form->{department}; + push @options, $locale->text('Department') . " : $department"; } if ($form->{projectnumber}) { - $options .= $locale->text('Project Number'); - $options .= " : $form->{projectnumber}
"; + push @options, $locale->text('Project Number') . " : $form->{projectnumber}
"; } + my $period; if ($form->{fromdate} || $form->{todate}) { + my ($fromdate, $todate); + if ($form->{fromdate}) { $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); } @@ -319,181 +238,126 @@ sub list_transactions { $todate = $locale->date(\%myconfig, $form->{todate}, 1); } - $form->{period} = "$fromdate - $todate"; + $period = "$fromdate - $todate"; + } else { - $form->{period} = - $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + $period = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); } - $options .= $form->{period}; + push @options, $period; - $form->header; + my @columns = qw(transdate reference description debit credit balance); + my %column_defs = ( + 'transdate' => { 'text' => $locale->text('Date'), }, + 'reference' => { 'text' => $locale->text('Reference'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'debit' => { 'text' => $locale->text('Debit'), }, + 'credit' => { 'text' => $locale->text('Credit'), }, + 'balance' => { 'text' => $locale->text('Balance'), }, + ); + my %column_alignment = map { $_ => 'right' } qw(debit credit balance); - print qq| - + my @hidden_variables = qw(accno fromdate todate description accounttype l_heading l_subtotal department projectnumber project_id sort); - - - - - - - - - - - - - - -

$form->{title}

$options

- - -|; + my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables); + map { $column_defs{$_}->{link} = $link . "&sort=$_" } qw(transdate reference description); - map { print "$column_header{$_}\n" } @column_index; + $form->{callback} = $link . '&sort=' . E($form->{sort}); - print qq| - -|; + my $report = SL::ReportGenerator->new(\%myconfig, $form); - # add sort to callback - $callback = $form->escape($callback . "&sort=$form->{sort}"); + $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(); - if (@{ $form->{CA} }) { - $sameitem = $form->{CA}->[0]->{ $form->{sort} }; - } + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; - if ($form->{accno} && $form->{balance}) { + $report->set_export_options('list_transactions', @hidden_variables); - map { $column_data{$_} = "" } @column_index; + $report->set_sort_indicator($form->{sort}, 1); - $column_data{balance} = - ""; + $column_defs->{balance}->{visible} = $form->{accno} ? 1 : 0; - $i++; - $i %= 2; - print qq| - -|; - map { print $column_data{$_} } @column_index; - print qq| - -|; + my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; + + if ($form->{accno} && $form->{balance}) { + my $row = { + 'balance' => { + 'data' => $form->format_amount(\%myconfig, $form->{balance} * $ml, 2), + 'align' => 'right', + }, + }; + + $report->add_data($row); } - foreach $ca (@{ $form->{CA} }) { + my $idx = 0; + my %totals = ( 'debit' => 0, 'credit' => 0 ); + my %subtotals = ( 'debit' => 0, 'credit' => 0 ); - if ($form->{l_subtotal} eq 'Y') { - if ($sameitem ne $ca->{ $form->{sort} }) { - &ca_subtotal; - } + foreach my $ca (@{ $form->{CA} }) { + $form->{balance} += $ca->{amount}; + + foreach (qw(debit credit)) { + $subtotals{$_} += $ca->{$_}; + $totals{$_} += $ca->{$_}; + $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_} != 0); } - # construct link to source - $href = - "{module}.pl?action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; - my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") : " "; - $column_data{debit} = - ""; - my $credit = ($ca->{credit} != 0) ? $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") : " "; - $column_data{credit} = - ""; + $ca->{balance} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2); - $form->{balance} += $ca->{amount}; - $column_data{balance} = - ""; - - $subtotaldebit += $ca->{debit}; - $subtotalcredit += $ca->{credit}; - - $totaldebit += $ca->{debit}; - $totalcredit += $ca->{credit}; - - $column_data{transdate} = ($ca->{"index"} ne $last || $form->{sort} ne "transdate") ? qq|| : qq||; - $column_data{reference} = ($ca->{"index"} ne $last) ? qq|| : qq||; - $column_data{description} = ($ca->{"index"} ne $last) ? qq|| : qq||; - - $i++ if($ca->{"index"} ne $last); - $i %= 2; - $last=$ca->{"index"}; - print qq| - -|; + my $row = { }; - map { print $column_data{$_} } @column_index; + foreach (@columns) { + $row->{$_} = { + 'data' => $ca->{$_}, + 'align' => $column_alignment{$_}, + }; + } - print qq| - -|; + $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback'); - } + $report->add_data($row); - if ($form->{l_subtotal} eq 'Y') { - &ca_subtotal; - } - - map { $column_data{$_} = "" } @column_index; + if (($form->{l_subtotal} eq 'Y') + && (($idx == scalar @{ $form->{CA} } - 1) + || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) { + $report->add_data(create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal')); + } - $column_data{debit} = - ""; - $column_data{credit} = - ""; - $column_data{balance} = - ""; + $idx++; + } - print qq| - -|; + $report->add_data($row_set) if ($row_set); - map { print $column_data{$_} } @column_index; + $report->add_separator(); - print qq| - -

	" - . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) - . "
$debit	$credit	" - . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) - . "	$ca->{transdate}	$href	$ca->{description}
	" - . $form->format_amount(\%myconfig, $totaldebit, 2, " ") . "	" - . $form->format_amount(\%myconfig, $totalcredit, 2, " ") . "	" - . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) . "

+ my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, 'listtotal'); + $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2); + $report->add_data($row); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } -sub ca_subtotal { +sub create_subtotal_row { $lxdebug->enter_sub(); - map { $column_data{$_} = " " } @column_index; - - $column_data{debit} = - "" - . $form->format_amount(\%myconfig, $subtotaldebit, 2, " ") . ""; - $column_data{credit} = - "" - . $form->format_amount(\%myconfig, $subtotalcredit, 2, " ") . ""; - - $subtotaldebit = 0; - $subtotalcredit = 0; + my ($totals, $columns, $column_alignment, $class) = @_; - $sameitem = $ca->{ $form->{sort} }; + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } }; - print qq| - -|; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } qw(credit debit); - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; + map { $totals->{$_} = 0 } qw(debit credit); $lxdebug->leave_sub(); + + return $row; } diff --git a/locale/de/all b/locale/de/all index 8450e454f..1f69bc957 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1267,6 +1267,7 @@ aktualisieren wollen?', 'bis' => 'bis', 'button' => '?', 'cash' => 'E/Ü-Rechnung (Ist-Versteuerung)', + 'chart_of_accounts' => 'kontenuebersicht', 'choice' => 'auswählen', 'choice part' => 'Artikel auswählen', 'close' => 'schließen', @@ -1298,6 +1299,7 @@ aktualisieren wollen?', 'list' => 'auflisten', 'list_of_payments' => 'zahlungsausgaenge', 'list_of_receipts' => 'zahlungseingaenge', + 'list_of_transactions' => 'buchungsliste', 'localhost' => 'lokaler Rechner', 'logout' => 'abmelden', 'mark as paid' => 'als bezahlt markieren', diff --git a/locale/de/ca b/locale/de/ca index cf4ef00ae..0e3d2d4e9 100644 --- a/locale/de/ca +++ b/locale/de/ca @@ -1,22 +1,39 @@ $self->{texts} = { + 'ADDED' => 'Hinzugefügt', 'Account' => 'Konto', 'Apr' => 'Apr', 'April' => 'April', 'Aug' => 'Aug', 'August' => 'August', 'Balance' => 'Bilanz', + 'Bin List' => 'Lagerliste', + 'CANCELED' => 'Storniert', + 'CSV export -- options' => 'CSV-Export -- Optionen', 'Chart of Accounts' => 'Kontenübersicht', + 'Confirmation' => 'Auftragsbestätigung', + 'Could not spawn html2ps or GhostScript.' => 'html2ps oder GhostScript konnte nicht gestartet werden.', + 'Could not spawn the printer command.' => 'Die Druckanwendung konnte nicht gestartet werden.', + 'Could not write the html2ps config file.' => 'Die temporäre html2ps-Konfigurationsdatei konnte nicht geschrieben werden.', + 'Could not write the temporary HTML file.' => 'Eine temporäre HTML-Datei konnte nicht geschrieben werden.', 'Credit' => 'Haben', + 'Credit Note' => 'Gutschrift', + 'DELETED' => 'Gelöscht', + 'DUNNING STARTED' => 'Mahnprozess gestartet', + 'Dataset upgrade' => 'Datenbankaktualisierung', 'Date' => 'Datum', 'Debit' => 'Soll', 'Dec' => 'Dez', 'December' => 'Dezember', 'Department' => 'Abteilung', + 'Dependency loop detected:' => 'Schleife in den Abhängigkeiten entdeckt:', 'Description' => 'Beschreibung', + 'ELSE' => 'Zusatz', + 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', 'Feb' => 'Feb', 'February' => 'Februar', 'From' => 'Von', 'Include in Report' => 'In Bericht aufnehmen', + 'Invoice' => 'Rechnung', 'Jan' => 'Jan', 'January' => 'Januar', 'Jul' => 'Jul', @@ -24,27 +41,69 @@ $self->{texts} = { 'Jun' => 'Jun', 'June' => 'Juni', 'List Transactions' => 'Buchungsliste', + 'MAILED' => 'Gesendet', 'Mar' => 'März', 'March' => 'März', 'May' => 'Mai', 'May ' => 'Mai', + 'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.', + 'Missing \'tag\' field.' => 'Fehlendes Feld \'tag\'.', + 'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.', 'Nov' => 'Nov', 'November' => 'November', 'Oct' => 'Okt', 'October' => 'Oktober', + 'PAYMENT POSTED' => 'Rechung gebucht', + 'PDF export -- options' => 'PDF-Export -- Optionen', + 'POSTED' => 'Gebucht', + 'POSTED AS NEW' => 'Als neu gebucht', + 'PRINTED' => 'Gedruckt', + 'Packing List' => 'Lieferschein', + 'Pick List' => 'Sammelliste', + 'Proforma Invoice' => 'Proformarechnung', 'Project Number' => 'Projektnummer', + 'Purchase Order' => 'Lieferantenauftrag', + 'Quotation' => 'Angebot', + 'RFQ' => 'Anfrage', 'Reference' => 'Referenz', + 'SAVED' => 'Gespeichert', + 'SAVED FOR DUNNING' => 'Gespeichert', + 'SCREENED' => 'Angezeigt', 'Sep' => 'Sep', 'September' => 'September', + 'Storno Invoice' => 'Stornorechnung', + 'Storno Packing List' => 'Stornolieferschein', 'Subtotal' => 'Zwischensumme', + 'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.', + 'The list has been printed.' => 'Die Liste wurde ausgedruckt.', 'To' => 'An', + 'Unknown dependency \'%s\'.' => 'Unbekannte Abhängigkeit \'%s\'.', + 'bin_list' => 'Lagerliste', + 'chart_of_accounts' => 'kontenuebersicht', + 'invoice' => 'Rechnung', + 'list_of_transactions' => 'buchungsliste', + 'packing_list' => 'Versandliste', + 'pick_list' => 'Entnahmeliste', + 'proforma' => 'Proforma', + 'purchase_order' => 'Auftrag', + 'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.', + 'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.', + 'request_quotation' => 'Angebotsanforderung', + 'sales_order' => 'Kundenauftrag', + 'sales_quotation' => 'Verkaufsangebot', }; $self->{subs} = { - 'ca_subtotal' => 'ca_subtotal', 'chart_of_accounts' => 'chart_of_accounts', + 'create_subtotal_row' => 'create_subtotal_row', 'list' => 'list', 'list_transactions' => 'list_transactions', + 'report_generator_back' => 'report_generator_back', + 'report_generator_dispatcher' => 'report_generator_dispatcher', + 'report_generator_do' => 'report_generator_do', + 'report_generator_export_as_csv' => 'report_generator_export_as_csv', + 'report_generator_export_as_pdf' => 'report_generator_export_as_pdf', + 'weiter' => 'continue', 'buchungsliste' => 'list_transactions', };