X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIC.pm;h=b9ad62c585a3b33d90792a3c9063bb085aae50e4;hb=6f2893dcf199d5e5147cc2020c2ab6984f4274dc;hp=dd7c08df18fb7c464ed3e5be03b5a697b02c9b2e;hpb=df956e31b1c10d194b1a2784147344684ec0efff;p=kivitendo-erp.git diff --git a/SL/IC.pm b/SL/IC.pm index dd7c08df1..b9ad62c58 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -1,4 +1,4 @@ -#===================================================================== + #===================================================================== # LX-Office ERP # Copyright (C) 2004 # Based on SQL-Ledger Version 2.1.9 @@ -350,7 +350,7 @@ sub save { } ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|); - do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber) VALUES (?, '')|, $form->{id}); + do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber, unit) VALUES (?, '', '')|, $form->{id}); $form->{orphaned} = 1; if ($form->{partnumber} eq "" && $form->{"item"} eq "service") { @@ -818,7 +818,7 @@ sub all_parts { ordnumber => 'apoe.', make => 'mm.', quonumber => 'apoe.', model => 'mm.', invnumber => 'apoe.', partsgroup => 'pg.', - lastcost => ' ', + lastcost => ' ', , soldtotal => ' ', factor => 'pfac.', 'SUM(ioi.qty)' => ' ', description => 'p.', @@ -1021,8 +1021,6 @@ sub all_parts { sub_module => $bsooqr ? [ uniq grep { $oe_flag_to_cvar{$form->{$_}} } @oe_flags ] : undef, ); - $::lxdebug->dump(0, "\@cvar_val", \@cvar_values); - if ($cvar_where) { $where_clause .= qq| AND ($cvar_where)|; push @bind_vars, @cvar_values; @@ -1455,17 +1453,17 @@ sub follow_account_chain { my ($query, $sth); - $query = - qq|SELECT c.new_chart_id, date($transdate) >= c.valid_from AS is_valid, | . - qq| cnew.accno | . - qq|FROM chart c | . - qq|LEFT JOIN chart cnew ON c.new_chart_id = cnew.id | . - qq|WHERE (c.id = ?) AND NOT c.new_chart_id IS NULL AND (c.new_chart_id > 0)|; - $sth = prepare_query($form, $dbh, $query); + $form->{ACCOUNT_CHAIN_BY_ID} ||= { + map { $_->{id} => $_ } + selectall_hashref_query($form, $dbh, <= c.valid_from AS is_valid, cnew.accno + FROM chart c + LEFT JOIN chart cnew ON c.new_chart_id = cnew.id + WHERE NOT c.new_chart_id IS NULL AND (c.new_chart_id > 0) +SQL while (1) { - do_statement($form, $sth, $query, $accno_id); - my $ref = $sth->fetchrow_hashref(); + my $ref = $form->{ACCOUNT_CHAIN_BY_ID}->{$accno_id}; last unless ($ref && $ref->{"is_valid"} && !grep({ $_ == $ref->{"new_chart_id"} } @visited_accno_ids)); $accno_id = $ref->{"new_chart_id"}; @@ -1479,16 +1477,19 @@ sub follow_account_chain { } sub retrieve_accounts { - $main::lxdebug->enter_sub(2); + $main::lxdebug->enter_sub; - my ($self, $myconfig, $form, $parts_id, $index) = @_; - - my ($query, $sth, $dbh); + my $self = shift; + my $myconfig = shift; + my $form = shift; + my $dbh = $form->get_standard_dbh; + my %args = @_; # index => part_id - $form->{"taxzone_id"} *= 1; + $form->{taxzone_id} *= 1; - $dbh = $form->get_standard_dbh($myconfig); + return unless grep $_, values %args; # shortfuse if no part_id supplied + # transdate madness. my $transdate = ""; if ($form->{type} eq "invoice") { if (($form->{vc} eq "vendor") || !$form->{deliverydate}) { @@ -1507,73 +1508,67 @@ sub retrieve_accounts { } else { $transdate = $dbh->quote($transdate); } + #/transdate + my $inc_exp = $form->{"vc"} eq "customer" ? "income_accno_id" : "expense_accno_id"; + + my @part_ids = grep { $_ } values %args; + my $in = join ',', ('?') x @part_ids; + + my %accno_by_part = map { $_->{id} => $_ } + selectall_hashref_query($form, $dbh, <{taxzone_id} AS income_accno_id, + bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id, + c1.accno AS inventory_accno, + c2.accno AS income_accno, + c3.accno AS expense_accno + FROM parts p + LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id + LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id + LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id + LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id + WHERE p.id IN ($in) +SQL + + my $sth_tax = prepare_query($::form, $dbh, < $part_id) = each %args) { + my $ref = $accno_by_part{$part_id} or next; + + $ref->{"inventory_accno_id"} = undef unless $ref->{"is_part"}; + + my %accounts; + for my $type (qw(inventory income expense)) { + next unless $ref->{"${type}_accno_id"}; + ($accounts{"${type}_accno_id"}, $accounts{"${type}_accno"}) = + $self->follow_account_chain($form, $dbh, $transdate, $ref->{"${type}_accno_id"}, $ref->{"${type}_accno"}); + } - $query = - qq|SELECT | . - qq| p.inventory_accno_id AS is_part, | . - qq| bg.inventory_accno_id, | . - qq| bg.income_accno_id_$form->{taxzone_id} AS income_accno_id, | . - qq| bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id, | . - qq| c1.accno AS inventory_accno, | . - qq| c2.accno AS income_accno, | . - qq| c3.accno AS expense_accno | . - qq|FROM parts p | . - qq|LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id | . - qq|LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id | . - qq|LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id | . - qq|LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id | . - qq|WHERE p.id = ?|; - my $ref = selectfirst_hashref_query($form, $dbh, $query, $parts_id); - - return $main::lxdebug->leave_sub(2) if (!$ref); - - $ref->{"inventory_accno_id"} = undef unless ($ref->{"is_part"}); - - my %accounts; - foreach my $type (qw(inventory income expense)) { - next unless ($ref->{"${type}_accno_id"}); - ($accounts{"${type}_accno_id"}, $accounts{"${type}_accno"}) = - $self->follow_account_chain($form, $dbh, $transdate, - $ref->{"${type}_accno_id"}, - $ref->{"${type}_accno"}); - } - - map({ $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} } - qw(inventory income expense)); + $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense); - my $inc_exp = $form->{"vc"} eq "customer" ? "income" : "expense"; - my $accno_id = $accounts{"${inc_exp}_accno_id"}; + $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate)); + $ref = $sth_tax->fetchrow_hashref or next; - $query = - qq|SELECT c.accno, t.taxdescription AS description, t.rate, t.taxnumber | . - qq|FROM tax t | . - qq|LEFT JOIN chart c ON c.id = t.chart_id | . - qq|WHERE t.id IN | . - qq| (SELECT tk.tax_id | . - qq| FROM taxkeys tk | . - qq| WHERE tk.chart_id = ? AND startdate <= | . quote_db_date($transdate) . - qq| ORDER BY startdate DESC LIMIT 1) |; - $ref = selectfirst_hashref_query($form, $dbh, $query, $accno_id); - - unless ($ref) { - $main::lxdebug->leave_sub(2); - return; - } + $form->{"taxaccounts_$index"} = $ref->{"accno"}; + $form->{"taxaccounts"} .= "$ref->{accno} "if $form->{"taxaccounts"} !~ /$ref->{accno}/; - $form->{"taxaccounts_$index"} = $ref->{"accno"}; - if ($form->{"taxaccounts"} !~ /$ref->{accno}/) { - $form->{"taxaccounts"} .= "$ref->{accno} "; + $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber); } - map({ $form->{"$ref->{accno}_${_}"} = $ref->{$_}; } - qw(rate description taxnumber)); -# $main::lxdebug->message(0, "formvars: rate " . $form->{"$ref->{accno}_rate"} . -# " description " . $form->{"$ref->{accno}_description"} . -# " taxnumber " . $form->{"$ref->{accno}_taxnumber"} . -# " || taxaccounts_$index " . $form->{"taxaccounts_$index"} . -# " || taxaccounts " . $form->{"taxaccounts"}); + $sth_tax->finish; - $main::lxdebug->leave_sub(2); + $::lxdebug->leave_sub; } sub get_basic_part_info { @@ -1638,7 +1633,7 @@ sub prepare_parts_for_printing { my $placeholders = join ', ', ('?') x scalar(@part_ids); my $query = qq|SELECT mm.parts_id, mm.model, v.name AS make FROM makemodel mm - LEFT JOIN vendor v ON (mm.make = cast (v.id as text)) + LEFT JOIN vendor v ON (mm.make = v.id) WHERE mm.parts_id IN ($placeholders)|; my %makemodel = ();