X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=0cac83f02b908f5961ce4ba22a7bb403d0f3586f;hb=8815371268e0e1f627835d5f8344f04730cbf0af;hp=3e7834795d5bdb0008c5c83280c029eb5fa859b9;hpb=e0e6a9bb9c297b31a5846c7a01aff7d246773981;p=kivitendo-erp.git diff --git a/SL/AM.pm b/SL/AM.pm index 3e7834795..0cac83f02 100644 --- a/SL/AM.pm +++ b/SL/AM.pm @@ -38,6 +38,7 @@ package AM; use Data::Dumper; +use SL::DBUtils; sub get_account { $main::lxdebug->enter_sub(); @@ -80,11 +81,11 @@ sub get_account { # get taxkeys and description $query = qq§SELECT id, taxkey,id||'--'||taxkey AS tax, taxdescription - FROM tax§; + FROM tax ORDER BY taxkey§; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - $ref = $sth->fetchrow_hashref(NAME_lc); + $form->{TAXKEY} = []; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{TAXKEY} }, $ref; @@ -94,18 +95,18 @@ sub get_account { if ($form->{id}) { $where = " WHERE link='$form->{link}'"; - - + + # get new accounts $query = qq|SELECT id, accno,description FROM chart $where|; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - + while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{NEWACCOUNT} }, $ref; } - + $sth->finish; } # check if we have any transactions @@ -216,7 +217,7 @@ sub save_account { #Save Taxes if (!$form->{id}) { - $query = qq|INSERT INTO taxkeys (chart_id,tax_id,taxkey_id, pos_ustva, startdate) VALUES ((SELECT id FROM chart where accno='$form->{accno}'), $tax_id, $taxkey,$form->{pos_ustva}, $startdate)|; + $query = qq|INSERT INTO taxkeys (chart_id,tax_id,taxkey_id, pos_ustva, startdate) VALUES ((SELECT id FROM chart where accno='$form->{accno}'), $tax_id, $taxkey,$form->{pos_ustva}, $startdate)|; $dbh->do($query) || $form->dberror($query); } else { $query = qq|DELETE FROM taxkeys WHERE chart_id=$form->{id} AND tax_id=$tax_id|; @@ -226,32 +227,32 @@ sub save_account { } # if ($form->{IC_taxpart} || $form->{IC_taxservice} || $form->{CT_tax}) { -# +# # my $chart_id = $form->{id}; -# +# # unless ($form->{id}) { -# +# # # get id from chart # $query = qq|SELECT c.id # FROM chart c # WHERE c.accno = '$form->{accno}'|; # $sth = $dbh->prepare($query); # $sth->execute || $form->dberror($query); -# +# # ($chart_id) = $sth->fetchrow_array; # $sth->finish; # } -# +# # # add account if it doesn't exist in tax # $query = qq|SELECT t.chart_id # FROM tax t # WHERE t.chart_id = $chart_id|; # $sth = $dbh->prepare($query); # $sth->execute || $form->dberror($query); -# +# # my ($tax_id) = $sth->fetchrow_array; # $sth->finish; -# +# # # add tax if it doesn't exist # unless ($tax_id) { # $query = qq|INSERT INTO tax (chart_id, rate) @@ -259,7 +260,7 @@ sub save_account { # $dbh->do($query) || $form->dberror($query); # } # } else { -# +# # # remove tax # if ($form->{id}) { # $query = qq|DELETE FROM tax @@ -851,26 +852,35 @@ sub delete_business { sub language { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; + my ($self, $myconfig, $form, $return_list) = @_; # connect to database my $dbh = $form->dbconnect($myconfig); - my $query = qq|SELECT id, description, template_code, article_code - FROM language - ORDER BY 2|; + my $query = + "SELECT id, description, template_code, article_code, " . + " output_numberformat, output_dateformat, output_longdates " . + "FROM language ORDER BY description"; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); + my $ary = []; + while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{ALL} }, $ref; + push(@{ $ary }, $ref); } $sth->finish; $dbh->disconnect; $main::lxdebug->leave_sub(); + + if ($return_list) { + return @{$ary}; + } else { + $form->{ALL} = $ary; + } } sub get_language { @@ -882,11 +892,11 @@ sub get_language { my $dbh = $form->dbconnect($myconfig); my $query = - qq|SELECT l.description, l.template_code, l.article_code - FROM language l - WHERE l.id = $form->{id}|; + "SELECT description, template_code, article_code, " . + " output_numberformat, output_dateformat, output_longdates " . + "FROM language WHERE id = ?"; my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})"); my $ref = $sth->fetchrow_hashref(NAME_lc); @@ -899,6 +909,26 @@ sub get_language { $main::lxdebug->leave_sub(); } +sub get_language_details { + $main::lxdebug->enter_sub(); + + my ($self, $myconfig, $form, $id) = @_; + + # connect to database + my $dbh = $form->dbconnect($myconfig); + + my $query = + "SELECT template_code, " . + " output_numberformat, output_dateformat, output_longdates " . + "FROM language WHERE id = ?"; + my @res = $dbh->selectrow_array($query, undef, $id); + $dbh->disconnect; + + $main::lxdebug->leave_sub(); + + return @res; +} + sub save_language { $main::lxdebug->enter_sub(); @@ -906,25 +936,30 @@ sub save_language { # connect to database my $dbh = $form->dbconnect($myconfig); + my (@values, $query); - $form->{description} =~ s/\'/\'\'/g; - $form->{article_code} =~ s/\'/\'\'/g; - $form->{template_code} =~ s/\'/\'\'/g; - + map({ push(@values, $form->{$_}); } + qw(description template_code article_code + output_numberformat output_dateformat output_longdates)); # id is the old record if ($form->{id}) { - $query = qq|UPDATE language SET - description = '$form->{description}', - template_code = '$form->{template_code}', - article_code = '$form->{article_code}' - WHERE id = $form->{id}|; + $query = + "UPDATE language SET " . + " description = ?, template_code = ?, article_code = ?, " . + " output_numberformat = ?, output_dateformat = ?, " . + " output_longdates = ? " . + "WHERE id = ?"; + push(@values, $form->{id}); } else { - $query = qq|INSERT INTO language - (description, template_code, article_code) - VALUES ('$form->{description}', '$form->{template_code}', '$form->{article_code}')|; + $query = + "INSERT INTO language (" . + " description, template_code, article_code, " . + " output_numberformat, output_dateformat, output_longdates" . + ") VALUES (?, ?, ?, ?, ?, ?)"; } - $dbh->do($query) || $form->dberror($query); + $dbh->do($query, undef, @values) || + $form->dberror($query . " (" . join(", ", @values) . ")"); $dbh->disconnect; @@ -937,12 +972,17 @@ sub delete_language { my ($self, $myconfig, $form) = @_; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = $form->dbconnect_noauto($myconfig); - $query = qq|DELETE FROM language - WHERE id = $form->{id}|; - $dbh->do($query) || $form->dberror($query); + my $query = "DELETE FROM units_language WHERE language_id = ?"; + $dbh->do($query, undef, $form->{"id"}) || + $form->dberror($query . " ($form->{id})"); + + $query = "DELETE FROM language WHERE id = ?"; + $dbh->do($query, undef, $form->{"id"}) || + $form->dberror($query . " ($form->{id})"); + $dbh->commit(); $dbh->disconnect; $main::lxdebug->leave_sub(); @@ -957,13 +997,32 @@ sub buchungsgruppe { # connect to database my $dbh = $form->dbconnect($myconfig); - my $query = qq|SELECT id, description, inventory_accno_id, (select accno from chart where id=inventory_accno_id) as inventory_accno, income_accno_id_0, (select accno from chart where id=income_accno_id_0) as income_accno_0, expense_accno_id_0, (select accno from chart where id=expense_accno_id_0) as expense_accno_0, income_accno_id_1, (select accno from chart where id=income_accno_id_1) as income_accno_1, expense_accno_id_1, (select accno from chart where id=expense_accno_id_1) as expense_accno_1, income_accno_id_2, (select accno from chart where id=income_accno_id_2) as income_accno_2, expense_accno_id_2, (select accno from chart where id=expense_accno_id_2) as expense_accno_2, income_accno_id_3, (select accno from chart where id=income_accno_id_3) as income_accno_3, expense_accno_id_3, (select accno from chart where id=expense_accno_id_3) as expense_accno_3 - FROM buchungsgruppen - ORDER BY id|; + my $query = qq|SELECT id, description, + inventory_accno_id, + (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno, + income_accno_id_0, + (SELECT accno FROM chart WHERE id = income_accno_id_0) AS income_accno_0, + expense_accno_id_0, + (SELECT accno FROM chart WHERE id = expense_accno_id_0) AS expense_accno_0, + income_accno_id_1, + (SELECT accno FROM chart WHERE id = income_accno_id_1) AS income_accno_1, + expense_accno_id_1, + (SELECT accno FROM chart WHERE id = expense_accno_id_1) AS expense_accno_1, + income_accno_id_2, + (SELECT accno FROM chart WHERE id = income_accno_id_2) AS income_accno_2, + expense_accno_id_2, + (select accno FROM chart WHERE id = expense_accno_id_2) AS expense_accno_2, + income_accno_id_3, + (SELECT accno FROM chart WHERE id = income_accno_id_3) AS income_accno_3, + expense_accno_id_3, + (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3 + FROM buchungsgruppen + ORDER BY id|; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); + $form->{ALL} = []; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{ALL} }, $ref; } @@ -984,35 +1043,47 @@ sub get_buchungsgruppe { if ($form->{id}) { my $query = - qq|SELECT description, inventory_accno_id, (select accno from chart where id=inventory_accno_id) as inventory_accno, income_accno_id_0, (select accno from chart where id=income_accno_id_0) as income_accno_0, expense_accno_id_0, (select accno from chart where id=expense_accno_id_0) as expense_accno_0, income_accno_id_1, (select accno from chart where id=income_accno_id_1) as income_accno_1, expense_accno_id_1, (select accno from chart where id=expense_accno_id_1) as expense_accno_1, income_accno_id_2, (select accno from chart where id=income_accno_id_2) as income_accno_2, expense_accno_id_2, (select accno from chart where id=expense_accno_id_2) as expense_accno_2, income_accno_id_3, (select accno from chart where id=income_accno_id_3) as income_accno_3, expense_accno_id_3, (select accno from chart where id=expense_accno_id_3) as expense_accno_3 - FROM buchungsgruppen - WHERE id = $form->{id}|; + qq|SELECT description, inventory_accno_id, + (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno, + income_accno_id_0, + (SELECT accno FROM chart WHERE id = income_accno_id_0) AS income_accno_0, + expense_accno_id_0, + (SELECT accno FROM chart WHERE id = expense_accno_id_0) AS expense_accno_0, + income_accno_id_1, + (SELECT accno FROM chart WHERE id = income_accno_id_1) AS income_accno_1, + expense_accno_id_1, + (SELECT accno FROM chart WHERE id = expense_accno_id_1) AS expense_accno_1, + income_accno_id_2, + (SELECT accno FROM chart WHERE id = income_accno_id_2) AS income_accno_2, + expense_accno_id_2, + (select accno FROM chart WHERE id = expense_accno_id_2) AS expense_accno_2, + income_accno_id_3, + (SELECT accno FROM chart WHERE id = income_accno_id_3) AS income_accno_3, + expense_accno_id_3, + (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3 + FROM buchungsgruppen + WHERE id = ?|; my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - + $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})"); + my $ref = $sth->fetchrow_hashref(NAME_lc); - + map { $form->{$_} = $ref->{$_} } keys %$ref; - - $sth->finish; - - my $query = - qq|SELECT count(id) as anzahl - FROM parts - WHERE buchungsgruppen_id = $form->{id}|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - my $ref = $sth->fetchrow_hashref(NAME_lc); - if (!$ref->{anzahl}) { - $form->{orphaned} = 1; - } + $sth->finish; + my $query = + qq|SELECT count(id) = 0 AS orphaned + FROM parts + WHERE buchungsgruppen_id = ?|; + ($form->{orphaned}) = $dbh->selectrow_array($query, undef, $form->{id}); + $form->dberror($query . " ($form->{id})") if ($dbh->err); } - $query = "SELECT inventory_accno_id FROM defaults"; - ($form->{"std_inventory_accno_id"}) = $dbh->selectrow_array($query); + $query = "SELECT inventory_accno_id, income_accno_id, expense_accno_id ". + "FROM defaults"; + ($form->{"std_inventory_accno_id"}, $form->{"std_income_accno_id"}, + $form->{"std_expense_accno_id"}) = $dbh->selectrow_array($query); my $module = "IC"; $query = qq|SELECT c.accno, c.description, c.link, c.id, @@ -1064,29 +1135,32 @@ sub save_buchungsgruppe { # connect to database my $dbh = $form->dbconnect($myconfig); - $form->{description} =~ s/\'/\'\'/g; - + my @values = ($form->{description}, $form->{inventory_accno_id}, + $form->{income_accno_id_0}, $form->{expense_accno_id_0}, + $form->{income_accno_id_1}, $form->{expense_accno_id_1}, + $form->{income_accno_id_2}, $form->{expense_accno_id_2}, + $form->{income_accno_id_3}, $form->{expense_accno_id_3}); # id is the old record if ($form->{id}) { $query = qq|UPDATE buchungsgruppen SET - description = '$form->{description}', - inventory_accno_id = '$form->{inventory_accno_id}', - income_accno_id_0 = '$form->{income_accno_id_0}', - expense_accno_id_0 = '$form->{expense_accno_id_0}', - income_accno_id_1 = '$form->{income_accno_id_1}', - expense_accno_id_1 = '$form->{expense_accno_id_1}', - income_accno_id_2 = '$form->{income_accno_id_2}', - expense_accno_id_2 = '$form->{expense_accno_id_2}', - income_accno_id_3 = '$form->{income_accno_id_3}', - expense_accno_id_3 = '$form->{expense_accno_id_3}' - WHERE id = $form->{id}|; + description = ?, inventory_accno_id = ?, + income_accno_id_0 = ?, expense_accno_id_0 = ?, + income_accno_id_1 = ?, expense_accno_id_1 = ?, + income_accno_id_2 = ?, expense_accno_id_2 = ?, + income_accno_id_3 = ?, expense_accno_id_3 = ? + WHERE id = ?|; + push(@values, $form->{id}); } else { $query = qq|INSERT INTO buchungsgruppen - (description, inventory_accno_id, income_accno_id_0, expense_accno_id_0, income_accno_id_1, expense_accno_id_1, income_accno_id_2, expense_accno_id_2, income_accno_id_3, expense_accno_id_3) - VALUES ('$form->{description}', '$form->{inventory_accno_id}', '$form->{income_accno_id_0}', '$form->{expense_accno_id_0}', '$form->{income_accno_id_1}', '$form->{expense_accno_id_1}', '$form->{income_accno_id_2}', '$form->{expense_accno_id_2}', '$form->{income_accno_id_3}', '$form->{expense_accno_id_3}')|; + (description, inventory_accno_id, + income_accno_id_0, expense_accno_id_0, + income_accno_id_1, expense_accno_id_1, + income_accno_id_2, expense_accno_id_2, + income_accno_id_3, expense_accno_id_3) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; } - $dbh->do($query) || $form->dberror($query); + do_query($form, $dbh, $query, @values); $dbh->disconnect; @@ -1101,9 +1175,8 @@ sub delete_buchungsgruppe { # connect to database my $dbh = $form->dbconnect($myconfig); - $query = qq|DELETE FROM buchungsgruppe - WHERE id = $form->{id}|; - $dbh->do($query) || $form->dberror($query); + $query = qq|DELETE FROM buchungsgruppen WHERE id = ?|; + do_query($form, $dbh, $query, $form->{id}); $dbh->disconnect; @@ -1125,6 +1198,7 @@ sub printer { $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); + $form->{"ALL"} = []; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{ALL} }, $ref; } @@ -1225,7 +1299,7 @@ sub payment { $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100)); push @{ $form->{ALL} }, $ref; } @@ -1496,7 +1570,6 @@ sub save_preferences { servicenumber = '$form->{servicenumber}', yearend = '$form->{yearend}', curr = '$form->{curr}', - weightunit = '$form->{weightunit}', businessnumber = '$form->{businessnumber}' |; $dbh->do($query) || $form->dberror($query); @@ -2014,9 +2087,35 @@ sub retrieve_units { } $sth->finish(); - foreach my $unit (keys(%{$units})) { - ($units->{$unit}->{"${prefix}base_unit"}, $units->{$unit}->{"${prefix}factor"}) = AM->get_base_unit($units, $unit); + my $query_lang = "SELECT id, template_code FROM language ORDER BY description"; + $sth = $dbh->prepare($query_lang); + $sth->execute() || $form->dberror($query_lang); + my @languages; + while ($ref = $sth->fetchrow_hashref()) { + push(@languages, $ref); } + $sth->finish(); + + $query_lang = "SELECT ul.localized, ul.localized_plural, l.id, l.template_code " . + "FROM units_language ul " . + "LEFT JOIN language l ON ul.language_id = l.id " . + "WHERE ul.unit = ?"; + $sth = $dbh->prepare($query_lang); + + foreach my $unit (values(%{$units})) { + ($unit->{"${prefix}base_unit"}, $unit->{"${prefix}factor"}) = AM->get_base_unit($units, $unit->{"name"}); + + $unit->{"LANGUAGES"} = {}; + foreach my $lang (@languages) { + $unit->{"LANGUAGES"}->{$lang->{"template_code"}} = { "template_code" => $lang->{"template_code"} }; + } + + $sth->execute($unit->{"name"}) || $form->dberror($query_lang . " (" . $unit->{"name"} . ")"); + while ($ref = $sth->fetchrow_hashref()) { + map({ $unit->{"LANGUAGES"}->{$ref->{"template_code"}}->{$_} = $ref->{$_} } keys(%{$ref})); + } + } + $sth->finish(); $dbh->disconnect(); @@ -2025,6 +2124,28 @@ sub retrieve_units { return $units; } +sub translate_units { + $main::lxdebug->enter_sub(); + + my ($self, $form, $template_code, $unit, $amount) = @_; + + my $units = $self->retrieve_units(\%main::myconfig, $form); + + my $h = $units->{$unit}->{"LANGUAGES"}->{$template_code}; + my $new_unit = $unit; + if ($h) { + if (($amount != 1) && $h->{"localized_plural"}) { + $new_unit = $h->{"localized_plural"}; + } elsif ($h->{"localized"}) { + $new_unit = $h->{"localized"}; + } + } + + $main::lxdebug->leave_sub(); + + return $new_unit; +} + sub units_in_use { $main::lxdebug->enter_sub(); @@ -2116,12 +2237,24 @@ sub unit_select_html { sub add_unit { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form, $name, $base_unit, $factor, $type) = @_; + my ($self, $myconfig, $form, $name, $base_unit, $factor, $type, $languages) = @_; - my $dbh = $form->dbconnect($myconfig); + my $dbh = $form->dbconnect_noauto($myconfig); my $query = "INSERT INTO units (name, base_unit, factor, type) VALUES (?, ?, ?, ?)"; $dbh->do($query, undef, $name, $base_unit, $factor, $type) || $form->dberror($query . " ($name, $base_unit, $factor, $type)"); + + if ($languages) { + $query = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)"; + my $sth = $dbh->prepare($query); + foreach my $lang (@{$languages}) { + my @values = ($name, $lang->{"id"}, $lang->{"localized"}, $lang->{"localized_plural"}); + $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")"); + } + $sth->finish(); + } + + $dbh->commit(); $dbh->disconnect(); $main::lxdebug->leave_sub(); @@ -2136,16 +2269,23 @@ sub save_units { my ($base_unit, $unit, $sth, $query); + $query = "DELETE FROM units_language"; + $dbh->do($query) || $form->dberror($query); + if ($delete_units && (0 != scalar(@{$delete_units}))) { - $query = "DELETE FROM units WHERE name = ?"; - $sth = $dbh->prepare($query); - map({ $sth->execute($_) || $form->dberror($query . " ($_)"); } @{$delete_units}); - $sth->finish(); + $query = "DELETE FROM units WHERE name IN ("; + map({ $query .= "?," } @{$delete_units}); + substr($query, -1, 1) = ")"; + $dbh->do($query, undef, @{$delete_units}) || + $form->dberror($query . " (" . join(", ", @{$delete_units}) . ")"); } $query = "UPDATE units SET name = ?, base_unit = ?, factor = ? WHERE name = ?"; $sth = $dbh->prepare($query); + my $query_lang = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)"; + my $sth_lang = $dbh->prepare($query_lang); + foreach $unit (values(%{$units})) { $unit->{"depth"} = 0; my $base_unit = $unit; @@ -2156,6 +2296,14 @@ sub save_units { } foreach $unit (sort({ $a->{"depth"} <=> $b->{"depth"} } values(%{$units}))) { + if ($unit->{"LANGUAGES"}) { + foreach my $lang (@{$unit->{"LANGUAGES"}}) { + next unless ($lang->{"id"} && $lang->{"localized"}); + my @values = ($unit->{"name"}, $lang->{"id"}, $lang->{"localized"}, $lang->{"localized_plural"}); + $sth_lang->execute(@values) || $form->dberror($query_lang . " (" . join(", ", @values) . ")"); + } + } + next if ($unit->{"unchanged_unit"}); my @values = ($unit->{"name"}, $unit->{"base_unit"}, $unit->{"factor"}, $unit->{"old_name"}); @@ -2163,6 +2311,7 @@ sub save_units { } $sth->finish(); + $sth_lang->finish(); $dbh->commit(); $dbh->disconnect();