From f5c548f0aa2c76e2e6f2de3f0a755616e41b01e8 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 1 Aug 2007 11:46:58 +0000 Subject: [PATCH] Kosmetik/Vereinfachung --- SL/OE.pm | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/SL/OE.pm b/SL/OE.pm index 0df604e1c..8b3db20e2 100644 --- a/SL/OE.pm +++ b/SL/OE.pm @@ -588,7 +588,7 @@ sub retrieve { # connect to database my $dbh = $form->dbconnect_noauto($myconfig); - my ($query, @values, @ids); + my ($query, $query_add, @values, @ids, $sth); # translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later map { @@ -602,31 +602,19 @@ sub retrieve { undef @ids; } - if ($form->{id}) { - - # get default accounts and last order number - $query = qq|SELECT (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno, - (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id) AS income_accno, - (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id) AS expense_accno, - (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno, - (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno, - d.curr AS currencies - FROM defaults d|; - } else { - $query = qq|SELECT (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno, - (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id) AS income_accno, - (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id) AS expense_accno, - (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno, - (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno, - d.curr AS currencies, current_date AS transdate, current_date AS reqdate - FROM defaults d|; - } - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - my $ref = $sth->fetchrow_hashref(NAME_lc); + $query_add = qq|, current_date AS transdate, current_date AS reqdate| if (!$form->{id}); + + # get default accounts + $query = qq|SELECT (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno, + (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id) AS income_accno, + (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id) AS expense_accno, + (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno, + (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno, + d.curr AS currencies + $query_add + FROM defaults d|; + my $ref = selectfirst_hashref_query($form, $dbh, $query); map { $form->{$_} = $ref->{$_} } keys %$ref; - $sth->finish; ($form->{currency}) = split(/:/, $form->{currencies}); -- 2.20.1