X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=SL%2FGL.pm;fp=SL%2FGL.pm;h=46c2d49b193b5f2bbdafcb2b7726d6286d2fac3a;hp=01417aac969da255b598151596d548a7dc0f5e47;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44 diff --git a/SL/GL.pm b/SL/GL.pm index 01417aac9..46c2d49b1 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -25,7 +25,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # General ledger backend code @@ -38,9 +39,15 @@ package GL; +use List::Util qw(first); + use Data::Dumper; use SL::DATEV qw(:CONSTANTS); use SL::DBUtils; +use SL::DB::Chart; +use SL::DB::Draft; +use SL::Util qw(trim); +use SL::DB; use strict; @@ -48,22 +55,25 @@ sub delete_transaction { my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); - # connect to database - my $dbh = $form->dbconnect_noauto($myconfig); - - # acc_trans entries are deleted by database triggers. - do_query($form, $dbh, qq|DELETE FROM gl WHERE id = ?|, conv_i($form->{id})); + SL::DB->client->with_transaction(sub { + do_query($form, SL::DB->client->dbh, qq|DELETE FROM gl WHERE id = ?|, conv_i($form->{id})); + 1; + }) or do { die SL::DB->client->error }; - # commit and redirect - my $rc = $dbh->commit; - $dbh->disconnect; $main::lxdebug->leave_sub(); +} + +sub post_transaction { + my ($self, $myconfig, $form) = @_; + $main::lxdebug->enter_sub(); - $rc; + my $rc = SL::DB->client->with_transaction(\&_post_transaction, $self, $myconfig, $form); + $::lxdebug->leave_sub; + return $rc; } -sub post_transaction { +sub _post_transaction { my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); @@ -72,8 +82,7 @@ sub post_transaction { my $i; - # connect to database, turn off AutoCommit - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; # post the transaction # make up a unique handle and store in reference field @@ -108,28 +117,26 @@ sub post_transaction { do_query($form, $dbh, $query, @values); } - my ($null, $department_id) = split(/--/, $form->{department}); - $form->{ob_transaction} *= 1; $form->{cb_transaction} *= 1; $query = qq|UPDATE gl SET reference = ?, description = ?, notes = ?, - transdate = ?, department_id = ?, taxincluded = ?, - storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ? + transdate = ?, deliverydate = ?, tax_point = ?, department_id = ?, taxincluded = ?, + storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?, + transaction_description = ? WHERE id = ?|; @values = ($form->{reference}, $form->{description}, $form->{notes}, - conv_date($form->{transdate}), conv_i($department_id), $form->{taxincluded} ? 't' : 'f', + conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f', $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', + $form->{transaction_description}, conv_i($form->{id})); do_query($form, $dbh, $query, @values); # insert acc_trans transactions for $i (1 .. $form->{rowcount}) { - # extract accno - my ($accno) = split(/--/, $form->{"accno_$i"}); ($form->{"tax_id_$i"}) = split(/--/, $form->{"taxchart_$i"}); if ($form->{"tax_id_$i"} ne "") { $query = qq|SELECT taxkey, rate FROM tax WHERE id = ?|; @@ -158,10 +165,9 @@ sub post_transaction { $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey, ob_transaction, cb_transaction, tax_id, chart_link) - VALUES (?, (SELECT id FROM chart WHERE accno = ?), - ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE accno = ?))|; - @values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}), - $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}), $accno); + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE id = ?))|; + @values = (conv_i($form->{id}), $form->{"accno_id_$i"}, $amount, conv_date($form->{transdate}), + $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}), $form->{"accno_id_$i"}); do_query($form, $dbh, $query, @values); } @@ -187,40 +193,34 @@ sub post_transaction { do_query($form, $dbh, qq|UPDATE gl SET storno = 't' WHERE id = ?|, conv_i($form->{storno_id})); } + if ($form->{draft_id}) { + SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]); + } + # safety check datev export if ($::instance_conf->get_datev_check_on_gl_transaction) { - my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef; - $transdate ||= DateTime->today; + # create datev object my $datev = SL::DATEV->new( - exporttype => DATEV_ET_BUCHUNGEN, - format => DATEV_FORMAT_KNE, dbh => $dbh, trans_id => $form->{id}, ); - $datev->export; + $datev->generate_datev_data; if ($datev->errors) { - $dbh->rollback; die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors; } } - # commit and redirect - my $rc = $dbh->commit; - $dbh->disconnect; - $main::lxdebug->leave_sub(); - - return $rc; + return 1; } sub all_transactions { my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my ($query, $sth, $source, $null, $space); my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1"); @@ -230,58 +230,57 @@ sub all_transactions { $glwhere .= qq| AND g.reference ILIKE ?|; $arwhere .= qq| AND a.invnumber ILIKE ?|; $apwhere .= qq| AND a.invnumber ILIKE ?|; - push(@glvalues, '%' . $form->{reference} . '%'); - push(@arvalues, '%' . $form->{reference} . '%'); - push(@apvalues, '%' . $form->{reference} . '%'); + push(@glvalues, like($form->{reference})); + push(@arvalues, like($form->{reference})); + push(@apvalues, like($form->{reference})); } - if ($form->{department}) { - my ($null, $department) = split /--/, $form->{department}; + if ($form->{department_id}) { $glwhere .= qq| AND g.department_id = ?|; $arwhere .= qq| AND a.department_id = ?|; $apwhere .= qq| AND a.department_id = ?|; - push(@glvalues, $department); - push(@arvalues, $department); - push(@apvalues, $department); + push(@glvalues, $form->{department_id}); + push(@arvalues, $form->{department_id}); + push(@apvalues, $form->{department_id}); } if ($form->{source}) { $glwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)"; $arwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)"; $apwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)"; - push(@glvalues, '%' . $form->{source} . '%'); - push(@arvalues, '%' . $form->{source} . '%'); - push(@apvalues, '%' . $form->{source} . '%'); + push(@glvalues, like($form->{source})); + push(@arvalues, like($form->{source})); + push(@apvalues, like($form->{source})); } # default Datumseinschränkung falls nicht oder falsch übergeben (sollte nie passieren) $form->{datesort} = 'transdate' unless $form->{datesort} =~ /^(transdate|gldate)$/; - if ($form->{datefrom}) { + if (trim($form->{datefrom})) { $glwhere .= " AND ac.$form->{datesort} >= ?"; $arwhere .= " AND ac.$form->{datesort} >= ?"; $apwhere .= " AND ac.$form->{datesort} >= ?"; - push(@glvalues, $form->{datefrom}); - push(@arvalues, $form->{datefrom}); - push(@apvalues, $form->{datefrom}); + push(@glvalues, trim($form->{datefrom})); + push(@arvalues, trim($form->{datefrom})); + push(@apvalues, trim($form->{datefrom})); } - if ($form->{dateto}) { + if (trim($form->{dateto})) { $glwhere .= " AND ac.$form->{datesort} <= ?"; $arwhere .= " AND ac.$form->{datesort} <= ?"; $apwhere .= " AND ac.$form->{datesort} <= ?"; - push(@glvalues, $form->{dateto}); - push(@arvalues, $form->{dateto}); - push(@apvalues, $form->{dateto}); + push(@glvalues, trim($form->{dateto})); + push(@arvalues, trim($form->{dateto})); + push(@apvalues, trim($form->{dateto})); } - if ($form->{description}) { + if (trim($form->{description})) { $glwhere .= " AND g.description ILIKE ?"; $arwhere .= " AND ct.name ILIKE ?"; $apwhere .= " AND ct.name ILIKE ?"; - push(@glvalues, '%' . $form->{description} . '%'); - push(@arvalues, '%' . $form->{description} . '%'); - push(@apvalues, '%' . $form->{description} . '%'); + push(@glvalues, like($form->{description})); + push(@arvalues, like($form->{description})); + push(@apvalues, like($form->{description})); } if ($form->{employee_id}) { @@ -293,13 +292,22 @@ sub all_transactions { push(@apvalues, conv_i($form->{employee_id})); } - if ($form->{notes}) { + if (trim($form->{notes})) { $glwhere .= " AND g.notes ILIKE ?"; $arwhere .= " AND a.notes ILIKE ?"; $apwhere .= " AND a.notes ILIKE ?"; - push(@glvalues, '%' . $form->{notes} . '%'); - push(@arvalues, '%' . $form->{notes} . '%'); - push(@apvalues, '%' . $form->{notes} . '%'); + push(@glvalues, like($form->{notes})); + push(@arvalues, like($form->{notes})); + push(@apvalues, like($form->{notes})); + } + + if (trim($form->{transaction_description})) { + $glwhere .= " AND g.transaction_description ILIKE ?"; + $arwhere .= " AND a.transaction_description ILIKE ?"; + $apwhere .= " AND a.transaction_description ILIKE ?"; + push(@glvalues, like($form->{transaction_description})); + push(@arvalues, like($form->{transaction_description})); + push(@apvalues, like($form->{transaction_description})); } if ($form->{accno}) { @@ -331,10 +339,15 @@ sub all_transactions { push(@apvalues, $project_id, $project_id); } - my ($project_columns, $project_join); + my ($project_columns, $project_join); + my ($arap_globalproject_columns, $arap_globalproject_join); + my ($gl_globalproject_columns); if ($form->{"l_projectnumbers"}) { - $project_columns = qq|, ac.project_id, pr.projectnumber|; - $project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|; + $project_columns = qq|, ac.project_id, pr.projectnumber|; + $project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|; + $arap_globalproject_columns = qq|, a.globalproject_id, globalpr.projectnumber AS globalprojectnumber|; + $arap_globalproject_join = qq|LEFT JOIN project globalpr ON (a.globalproject_id = globalpr.id)|; + $gl_globalproject_columns = qq|, NULL AS globalproject_id, '' AS globalprojectnumber|; } if ($form->{accno}) { @@ -353,17 +366,20 @@ sub all_transactions { } my %sort_columns = ( - 'id' => [ qw(id) ], - 'transdate' => [ qw(transdate id) ], - 'gldate' => [ qw(gldate id) ], - 'reference' => [ qw(lower_reference id) ], - 'description' => [ qw(lower_description id) ], - 'accno' => [ qw(accno transdate id) ], + 'id' => [ qw(id) ], + 'transdate' => [ qw(transdate id) ], + 'gldate' => [ qw(gldate id) ], + 'reference' => [ qw(lower_reference id) ], + 'description' => [ qw(lower_description id) ], + 'accno' => [ qw(accno transdate id) ], + 'department' => [ qw(department transdate id) ], + 'transaction_description' => [ qw(lower_transaction_description id) ], ); my %lowered_columns = ( - 'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', }, - 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', }, - 'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', }, + 'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', }, + 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', }, + 'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', }, + 'transaction_description' => { 'gl' => 'g.transaction_description', 'arap' => 'a.transaction_description', }, ); # sortdir = sort direction (ascending or descending) @@ -384,11 +400,13 @@ sub all_transactions { ac.acc_trans_id, g.id, 'gl' AS type, FALSE AS invoice, g.reference, ac.taxkey, c.link, g.description, ac.transdate, ac.gldate, ac.source, ac.trans_id, ac.amount, c.accno, g.notes, t.chart_id, + d.description AS department, g.transaction_description, CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee - $project_columns + $project_columns $gl_globalproject_columns $columns_for_sorting{gl} FROM gl g - LEFT JOIN employee e ON (g.employee_id = e.id), + LEFT JOIN employee e ON (g.employee_id = e.id) + LEFT JOIN department d ON (g.department_id = d.id), acc_trans ac $project_join, chart c LEFT JOIN tax t ON (t.chart_id = c.id) WHERE $glwhere @@ -400,11 +418,14 @@ sub all_transactions { SELECT ac.acc_trans_id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link, ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id, ac.amount, c.accno, a.notes, t.chart_id, + d.description AS department, a.transaction_description, CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee - $project_columns + $project_columns $arap_globalproject_columns $columns_for_sorting{arap} FROM ar a - LEFT JOIN employee e ON (a.employee_id = e.id), + LEFT JOIN employee e ON (a.employee_id = e.id) + LEFT JOIN department d ON (a.department_id = d.id) + $arap_globalproject_join, acc_trans ac $project_join, customer ct, chart c LEFT JOIN tax t ON (t.chart_id=c.id) WHERE $arwhere @@ -417,11 +438,14 @@ sub all_transactions { SELECT ac.acc_trans_id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link, ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id, ac.amount, c.accno, a.notes, t.chart_id, + d.description AS department, a.transaction_description, CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee - $project_columns + $project_columns $arap_globalproject_columns $columns_for_sorting{arap} FROM ap a - LEFT JOIN employee e ON (a.employee_id = e.id), + LEFT JOIN employee e ON (a.employee_id = e.id) + LEFT JOIN department d ON (a.department_id = d.id) + $arap_globalproject_join, acc_trans ac $project_join, vendor ct, chart c LEFT JOIN tax t ON (t.chart_id=c.id) WHERE $apwhere @@ -487,7 +511,8 @@ sub all_transactions { } $ref->{"projectnumbers"} = {}; - $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref->{"globalprojectnumber"}} = 1 if ($ref->{"globalprojectnumber"}); $balance = $ref->{amount}; @@ -543,7 +568,8 @@ sub all_transactions { $balance = (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000; - $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref2->{"globalprojectnumber"}} = 1 if ($ref2->{"globalprojectnumber"}); if ($ref2->{chart_id} > 0) { # all tax accounts, following lines if ($ref2->{amount} < 0) { @@ -619,8 +645,6 @@ sub all_transactions { ($form->{account_description}) = selectrow_query($form, $dbh, $query, $form->{accno}); } - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -630,8 +654,7 @@ sub transaction { my ($query, $sth, $ref, @values); - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; $query = qq|SELECT closedto, revtrans FROM defaults|; ($form->{closedto}, $form->{revtrans}) = selectrow_query($form, $dbh, $query); @@ -643,9 +666,12 @@ sub transaction { if ($form->{id}) { $query = - qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id, - d.description AS department, e.name AS employee, g.taxincluded, g.gldate, - g.ob_transaction, g.cb_transaction + qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, g.tax_point, + g.storno, g.storno_id, + g.department_id, d.description AS department, + e.name AS employee, g.taxincluded, g.gldate, + g.ob_transaction, g.cb_transaction, + g.transaction_description FROM gl g LEFT JOIN department d ON (d.id = g.department_id) LEFT JOIN employee e ON (e.id = g.employee_id) @@ -657,7 +683,7 @@ sub transaction { $query = qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo, a.source, a.transdate, a.cleared, a.project_id, p.projectnumber, - a.taxkey, t.rate AS taxrate, t.id, + a.taxkey, t.rate AS taxrate, t.id, a.chart_id, (SELECT c1.accno FROM chart c1, tax t1 WHERE (t1.id = t.id) AND (c1.id = t.chart_id)) AS taxaccno, @@ -703,18 +729,24 @@ sub transaction { ORDER BY c.accno|; $form->{chart} = selectall_hashref_query($form, $dbh, $query, conv_date($form->{transdate})); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } sub storno { + my ($self, $form, $myconfig, $id) = @_; $main::lxdebug->enter_sub(); + my $rc = SL::DB->client->with_transaction(\&_storno, $self, $form, $myconfig, $id); + + $::lxdebug->leave_sub; + return $rc; +} + +sub _storno { my ($self, $form, $myconfig, $id) = @_; my ($query, $new_id, $storno_row, $acc_trans_rows); - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; $query = qq|SELECT nextval('glid')|; ($new_id) = selectrow_query($form, $dbh, $query); @@ -751,66 +783,96 @@ sub storno { do_query($form, $dbh, $query, (values %$row)); } - $dbh->commit; - - $main::lxdebug->leave_sub(); + return 1; } sub get_chart_balances { - $main::lxdebug->enter_sub(); - - my $self = shift; - my %params = @_; + my ($self, @chart_ids) = @_; - Common::check_params(\%params, qw(charts)); + return () unless @chart_ids; - my $myconfig = \%main::myconfig; - my $form = $main::form; + my $placeholders = join ', ', ('?') x scalar(@chart_ids); + my $query = qq|SELECT chart_id, SUM(amount) AS sum + FROM acc_trans + WHERE chart_id IN (${placeholders}) + GROUP BY chart_id|; - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); + my %balances = selectall_as_map($::form, $::form->get_standard_dbh(\%::myconfig), $query, 'chart_id', 'sum', @chart_ids); - my @ids = map { $_->{id} } @{ $params{charts} }; + return %balances; +} - if (!@ids) { - $main::lxdebug->leave_sub(); - return; - } +sub get_active_taxes_for_chart { + my ($self, $chart_id, $transdate, $tax_id) = @_; - my $query = qq|SELECT chart_id, SUM(amount) AS sum - FROM acc_trans - WHERE chart_id IN (| . join(', ', ('?') x scalar(@ids)) . qq|) - GROUP BY chart_id|; + my $chart = SL::DB::Chart->new(id => $chart_id)->load; + my $active_taxkey = $chart->get_active_taxkey($transdate); - my %balances = selectall_as_map($form, $dbh, $query, 'chart_id', 'sum', @ids); + my $where = [ chart_categories => { like => '%' . $chart->category . '%' } ]; - foreach my $chart (@{ $params{charts} }) { - $chart->{balance} = $balances{ $chart->{id} } || 0; + if ( defined $tax_id && $tax_id >= 0 ) { + $where = [ or => [ chart_categories => { like => '%' . $chart->category . '%' }, + id => $tax_id + ] + ]; } - $main::lxdebug->leave_sub(); + my $taxes = SL::DB::Manager::Tax->get_all( + where => $where, + sort_by => 'taxkey, rate', + ); + + my $default_tax = first { $active_taxkey->tax_id == $_->id } @{ $taxes }; + $default_tax->{is_default} = 1 if $default_tax; + + return @{ $taxes }; } -sub get_tax_dropdown { - my ($self, $accno) = @_; +1; - my $myconfig = \%main::myconfig; - my $form = $main::form; +__END__ - my $dbh = $form->get_standard_dbh($myconfig); +=pod - my $query = qq|SELECT category FROM chart WHERE accno = ?|; - my ($category) = selectrow_query($form, $dbh, $query, $accno); +=encoding utf8 - $query = qq|SELECT * FROM tax WHERE chart_categories like '%$category%' order by taxkey, rate|; +=head1 NAME - my $sth = prepare_execute_query($form, $dbh, $query); +SL::GL - some useful GL functions - my @tax_accounts = (); - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push(@tax_accounts, $ref); - } +=head1 FUNCTIONS - return @tax_accounts; -} +=over 4 -1; +=item C $transdate $tax_id + +Returns a list of valid taxes for a certain chart. + +If the optional param transdate exists one entry in the returning list +may get the attribute C for this specific tax-dependent date. +The possible entries are filtered by the charttype of the tax, i.e. only taxes +whose chart_categories match the category of the chart will be shown. + +In the case of existing records, e.g. when opening an old ar record, due to +changes in the configurations the desired tax might not be available in the +dropdown anymore. If we are loading an old record and know its tax_id (from +acc_trans), we can pass $tax_id as the third parameter and be sure that the +original tax always appears in the dropdown. + +The functions returns an array which may be used for building dropdowns in ar/ap/gl code. + +=back + +=head1 TODO + +Nothing here yet. + +=head1 BUGS + +Nothing here yet. + +=head1 AUTHOR + +G. Richardson Egrichardson@kivitec.deE + +=cut