X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=2d8ed4cff168c52942304db708cd37b65c80a599;hb=94f5cb152afa9210162295b6727801c296af0631;hp=5645c4dd79337dbe43bc253ed7c4dc46bc0ddfab;hpb=6061749dc0ece2873ef61a0c14af1b8a9e46034a;p=kivitendo-erp.git diff --git a/SL/AM.pm b/SL/AM.pm index 5645c4dd7..2d8ed4cff 100644 --- a/SL/AM.pm +++ b/SL/AM.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. #====================================================================== # # Administration module @@ -40,203 +41,134 @@ package AM; use Carp; use Data::Dumper; use Encode; +use List::MoreUtils qw(any); use SL::DBUtils; +use SL::DB::AuthUser; +use SL::DB::Default; +use SL::DB::Employee; +use SL::DB::Chart; +use SL::DB::Customer; +use SL::DB::Part; +use SL::DB::Vendor; +use SL::DB; +use SL::GenericTranslations; +use SL::Helper::UserPreferences::DisplayPreferences; +use SL::Helper::UserPreferences::PositionsScrollbar; +use SL::Helper::UserPreferences::PartPickerSearch; +use SL::Helper::UserPreferences::TimeRecording; +use SL::Helper::UserPreferences::UpdatePositions; use strict; sub get_account { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - my $query = qq{ - SELECT c.accno, c.description, c.charttype, c.category, - c.link, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from, - c.pos_bwa, datevautomatik, - tk.taxkey_id, tk.pos_ustva, tk.tax_id, - tk.tax_id || '--' || tk.taxkey_id AS tax, tk.startdate - FROM chart c - LEFT JOIN taxkeys tk - ON (c.id=tk.chart_id AND tk.id = - (SELECT id FROM taxkeys - WHERE taxkeys.chart_id = c.id AND startdate <= current_date - ORDER BY startdate DESC LIMIT 1)) - WHERE c.id = ? - }; - - - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - my $sth = $dbh->prepare($query); - $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})"); - - my $ref = $sth->fetchrow_hashref("NAME_lc"); - - foreach my $key (keys %$ref) { - $form->{"$key"} = $ref->{"$key"}; - } + # fetch chart-related data and set form fields + # get_account is called by add_account in am.pl + # always sets $form->{TAXKEY} and default_accounts + # loads chart data when $form->{id} is passed - $sth->finish; + my ($self, $myconfig, $form) = @_; # get default accounts - $query = qq|SELECT inventory_accno_id, income_accno_id, expense_accno_id - FROM defaults|; - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - $ref = $sth->fetchrow_hashref("NAME_lc"); - - map { $form->{$_} = $ref->{$_} } keys %{ $ref }; - - $sth->finish; - - - - # get taxkeys and description - $query = qq{ - SELECT - id, - (SELECT accno FROM chart WHERE id=tax.chart_id) AS chart_accno, - taxkey, - id||'--'||taxkey AS tax, - taxdescription, - rate - FROM tax ORDER BY taxkey - }; - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + map { $form->{$_} = $::instance_conf->{$_} } qw(inventory_accno_id income_accno_id expense_accno_id); + require SL::DB::Tax; + my $taxes = SL::DB::Manager::Tax->get_all( with_objects => ['chart'] , sort_by => 'taxkey' ); $form->{TAXKEY} = []; + foreach my $tk ( @{$taxes} ) { + push @{ $form->{TAXKEY} }, { id => $tk->id, + chart_accno => $tk->chart_id ? $tk->chart->accno : undef, + taxkey => $tk->taxkey, + tax => $tk->id . '--' . $tk->taxkey, + rate => $tk->rate + }; + }; - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push @{ $form->{TAXKEY} }, $ref; - } - - $sth->finish; if ($form->{id}) { - # get new accounts - $query = qq|SELECT id, accno,description - FROM chart - WHERE link = ? - ORDER BY accno|; - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - $sth = $dbh->prepare($query); - $sth->execute($form->{link}) || $form->dberror($query . " ($form->{link})"); - $form->{NEWACCOUNT} = []; - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push @{ $form->{NEWACCOUNT} }, $ref; + my $chart_obj = SL::DB::Manager::Chart->find_by(id => $form->{id}) || die "Can't open chart"; + + my @chart_fields = qw(accno description charttype category link pos_bilanz + pos_eur pos_er new_chart_id valid_from pos_bwa datevautomatik); + foreach my $cf ( @chart_fields ) { + $form->{"$cf"} = $chart_obj->$cf; } - $sth->finish; + my $active_taxkey = $chart_obj->get_active_taxkey; + $form->{$_} = $active_taxkey->$_ foreach qw(taxkey_id pos_ustva tax_id startdate); + $form->{tax} = $active_taxkey->tax_id . '--' . $active_taxkey->taxkey_id; - # get the taxkeys of account - - $query = qq{ - SELECT - tk.id, - tk.chart_id, - c.accno, - tk.tax_id, - t.taxdescription, - t.rate, - tk.taxkey_id, - tk.pos_ustva, - tk.startdate - FROM taxkeys tk - LEFT JOIN tax t ON (t.id = tk.tax_id) - LEFT JOIN chart c ON (c.id = t.chart_id) - - WHERE tk.chart_id = ? - ORDER BY startdate DESC - }; - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - $sth = $dbh->prepare($query); + # check if there are any transactions for this chart + $form->{orphaned} = $chart_obj->has_transaction ? 0 : 1; - $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})"); + # check if new account is active + # The old sql query was broken since at least 2006 and always returned 0 + $form->{new_chart_valid} = $chart_obj->new_chart_valid; + # get the taxkeys of the account $form->{ACCOUNT_TAXKEYS} = []; - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push @{ $form->{ACCOUNT_TAXKEYS} }, $ref; + foreach my $taxkey ( sort { $b->startdate <=> $a->startdate } @{ $chart_obj->taxkeys } ) { + push @{ $form->{ACCOUNT_TAXKEYS} }, { id => $taxkey->id, + chart_id => $taxkey->chart_id, + tax_id => $taxkey->tax_id, + taxkey_id => $taxkey->taxkey_id, + pos_ustva => $taxkey->pos_ustva, + startdate => $taxkey->startdate->to_kivitendo, + taxdescription => $taxkey->tax->taxdescription, + rate => $taxkey->tax->rate, + accno => defined $taxkey->tax->chart_id ? $taxkey->tax->chart->accno : undef, + }; } - $sth->finish; - - } - # check if we have any transactions - $query = qq|SELECT a.trans_id FROM acc_trans a - WHERE a.chart_id = ?|; - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - $sth = $dbh->prepare($query); - $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})"); - - ($form->{orphaned}) = $sth->fetchrow_array; - $form->{orphaned} = !$form->{orphaned}; - $sth->finish; - - # check if new account is active - $form->{new_chart_valid} = 0; - if ($form->{new_chart_id}) { - $query = qq|SELECT current_date-valid_from FROM chart - WHERE id = ?|; - $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query"); - my ($count) = selectrow_query($form, $dbh, $query, $form->{id}); - if ($count >=0) { - $form->{new_chart_valid} = 1; - } - $sth->finish; - } + # get new accounts (Folgekonto). Find all charts with the same link + $form->{NEWACCOUNT} = $chart_obj->db->dbh->selectall_arrayref('select id, accno,description from chart where link = ? and id != ? order by accno', {Slice => {}}, $chart_obj->link, $form->{id}); - $dbh->disconnect; + } else { # set to orphaned for new charts, so chart_type can be changed (needed by $AccountIsPosted) + $form->{orphaned} = 1; + }; $main::lxdebug->leave_sub(); } sub save_account { + my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); + my $rc = SL::DB->client->with_transaction(\&_save_account, $self, $myconfig, $form); + + $::lxdebug->leave_sub; + return $rc; +} + +sub _save_account { # TODO: it should be forbidden to change an account to a heading if there # have been bookings to this account in the past my ($self, $myconfig, $form) = @_; - # connect to database, turn off AutoCommit - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; - # sanity check, can't have AR with AR_... - if ($form->{AR} || $form->{AP} || $form->{IC}) { - map { delete $form->{$_} } - qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice); + for (qw(AR_include_in_dropdown AP_include_in_dropdown summary_account)) { + $form->{$form->{$_}} = $form->{$_} if $form->{$_}; } - if ($form->{AR_include_in_dropdown}) { - $form->{$form->{AR_include_in_dropdown}} = $form->{AR_include_in_dropdown}; - } - if ($form->{AP_include_in_dropdown}) { - $form->{$form->{AP_include_in_dropdown}} = $form->{AP_include_in_dropdown}; + # sanity check, can't have AR with AR_... + if ($form->{AR} || $form->{AP} || $form->{IC}) { + if (any { $form->{$_} } qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice)) { + $form->error($::locale->text('It is not allowed that a summary account occurs in a drop-down menu!')); + } } - $form->{link} = ""; - foreach my $item ($form->{AR}, $form->{AR_amount}, - $form->{AR_tax}, $form->{AR_paid}, - $form->{AP}, $form->{AP_amount}, - $form->{AP_tax}, $form->{AP_paid}, - $form->{IC}, $form->{IC_sale}, - $form->{IC_cogs}, $form->{IC_taxpart}, - $form->{IC_income}, $form->{IC_expense}, - $form->{IC_taxservice} - ) { - $form->{link} .= "${item}:" if ($item); - } - chop $form->{link}; + my @link_order = qw(AR AR_amount AR_tax AR_paid AP AP_amount AP_tax AP_paid IC IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice); + $form->{link} = join ':', grep $_, map $form->{$_}, @link_order; # strip blanks from accno map { $form->{$_} =~ s/ //g; } qw(accno); + # collapse multiple (horizontal) whitespace in chart description (Ticket 148) + map { $form->{$_} =~ s/\h+/ /g } qw(description); + my ($query, $sth); if ($form->{id} eq "NULL") { @@ -265,8 +197,8 @@ sub save_account { if (!$form->{id} || $form->{id} eq "") { $query = qq|SELECT nextval('id')|; ($form->{"id"}) = selectrow_query($form, $dbh, $query); - $query = qq|INSERT INTO chart (id, accno) VALUES (?, ?)|; - do_query($form, $dbh, $query, $form->{"id"}, $form->{"accno"}); + $query = qq|INSERT INTO chart (id, accno, link) VALUES (?, ?, ?)|; + do_query($form, $dbh, $query, $form->{"id"}, $form->{"accno"}, ''); } @values = (); @@ -297,6 +229,7 @@ sub save_account { pos_bwa = ?, pos_bilanz = ?, pos_eur = ?, + pos_er = ?, new_chart_id = ?, valid_from = ?, datevautomatik = ? @@ -311,6 +244,7 @@ sub save_account { conv_i($form->{pos_bwa}), conv_i($form->{pos_bilanz}), conv_i($form->{pos_eur}), + conv_i($form->{pos_er}), conv_i($form->{new_chart_id}), conv_date($form->{valid_from}), ($form->{datevautomatik} eq 'T') ? 'true':'false', @@ -439,531 +373,67 @@ SQL do_query($form, $dbh, $query, $form->{id}); - # commit - my $rc = $dbh->commit; - $dbh->disconnect; - - $main::lxdebug->leave_sub(); - - return $rc; + return 1; } sub delete_account { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database, turn off AutoCommit - my $dbh = $form->dbconnect_noauto($myconfig); - - my $query = qq|SELECT count(*) FROM acc_trans a - WHERE a.chart_id = ?|; - my ($count) = selectrow_query($form, $dbh, $query, $form->{id}); - - if ($count) { - $dbh->disconnect; - $main::lxdebug->leave_sub(); - return; - } - - # set inventory_accno_id, income_accno_id, expense_accno_id to defaults - foreach my $type (qw(inventory income expense)) { - $query = - qq|UPDATE parts | . - qq|SET ${type}_accno_id = (SELECT ${type}_accno_id FROM defaults) | . - qq|WHERE ${type}_accno_id = ?|; - do_query($form, $dbh, $query, $form->{id}); - } - - foreach my $table (qw(partstax customertax vendortax tax)) { - $query = qq|DELETE FROM $table - WHERE chart_id = ?|; - do_query($form, $dbh, $query, $form->{id}); - } - - # delete chart of account record - $query = qq|DELETE FROM chart - WHERE id = ?|; - do_query($form, $dbh, $query, $form->{id}); - - # delete account taxkeys - $query = qq|DELETE FROM taxkeys - WHERE chart_id = ?|; - do_query($form, $dbh, $query, $form->{id}); - - # commit and redirect - my $rc = $dbh->commit; - $dbh->disconnect; - - $main::lxdebug->leave_sub(); - - return $rc; -} - -sub lead { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my $query = qq|SELECT id, lead - FROM leads - ORDER BY 2|; - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push @{ $form->{ALL} }, $ref; - } - - $sth->finish; - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub get_lead { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my $query = - qq|SELECT l.id, l.lead | . - qq|FROM leads l | . - qq|WHERE l.id = ?|; - my $sth = $dbh->prepare($query); - $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})"); - - my $ref = $sth->fetchrow_hashref("NAME_lc"); - - map { $form->{$_} = $ref->{$_} } keys %$ref; - - $sth->finish; - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub save_lead { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - my ($query); - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my @values = ($form->{description}); - # id is the old record - if ($form->{id}) { - $query = qq|UPDATE leads SET - lead = ? - WHERE id = ?|; - push(@values, $form->{id}); - } else { - $query = qq|INSERT INTO leads - (lead) - VALUES (?)|; - } - do_query($form, $dbh, $query, @values); - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub delete_lead { - $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; - my ($query); - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - $query = qq|DELETE FROM leads - WHERE id = ?|; - do_query($form, $dbh, $query, $form->{id}); - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub language { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form, $return_list) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my $query = - "SELECT id, description, template_code, article_code, " . - " output_numberformat, output_dateformat, output_longdates " . - "FROM language ORDER BY description"; - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - my $ary = []; - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push(@{ $ary }, $ref); - } - - $sth->finish; - $dbh->disconnect; - - $main::lxdebug->leave_sub(); - - if ($return_list) { - return @{$ary}; - } else { - $form->{ALL} = $ary; - } -} - -sub get_language { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my $query = - "SELECT description, template_code, article_code, " . - " output_numberformat, output_dateformat, output_longdates " . - "FROM language WHERE id = ?"; - my $sth = $dbh->prepare($query); - $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})"); - - my $ref = $sth->fetchrow_hashref("NAME_lc"); - - map { $form->{$_} = $ref->{$_} } keys %$ref; - - $sth->finish; - - $dbh->disconnect; - - $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 = selectrow_query($form, $dbh, $query, $id); - $dbh->disconnect; - - $main::lxdebug->leave_sub(); - - return @res; -} - -sub save_language { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - my (@values, $query); - - 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 = - "UPDATE language SET " . - " description = ?, template_code = ?, article_code = ?, " . - " output_numberformat = ?, output_dateformat = ?, " . - " output_longdates = ? " . - "WHERE id = ?"; - push(@values, $form->{id}); - } else { - $query = - "INSERT INTO language (" . - " description, template_code, article_code, " . - " output_numberformat, output_dateformat, output_longdates" . - ") VALUES (?, ?, ?, ?, ?, ?)"; - } - do_query($form, $dbh, $query, @values); - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub delete_language { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - my $query; - - # connect to database - my $dbh = $form->dbconnect_noauto($myconfig); - - foreach my $table (qw(generic_translations units_language)) { - $query = qq|DELETE FROM $table WHERE language_id = ?|; - do_query($form, $dbh, $query, $form->{"id"}); - } - - $query = "DELETE FROM language WHERE id = ?"; - do_query($form, $dbh, $query, $form->{"id"}); - - $dbh->commit(); - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - - -sub buchungsgruppe { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # 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 sortkey|; - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - $form->{ALL} = []; - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push @{ $form->{ALL} }, $ref; - } - - $sth->finish; - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub get_buchungsgruppe { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - my $query; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - if ($form->{id}) { - $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 = ?|; - my $sth = $dbh->prepare($query); - $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})"); - - my $ref = $sth->fetchrow_hashref("NAME_lc"); - - map { $form->{$_} = $ref->{$_} } keys %$ref; - - $sth->finish; - - $query = - qq|SELECT count(id) = 0 AS orphaned - FROM parts - WHERE buchungsgruppen_id = ?|; - ($form->{orphaned}) = selectrow_query($form, $dbh, $query, $form->{id}); - } - - $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"}) = selectrow_query($form, $dbh, $query); - - my $module = "IC"; - $query = qq|SELECT c.accno, c.description, c.link, c.id, - d.inventory_accno_id, d.income_accno_id, d.expense_accno_id - FROM chart c, defaults d - WHERE c.link LIKE '%$module%' - ORDER BY c.accno|; - - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - foreach my $key (split(/:/, $ref->{link})) { - if (!$form->{"std_inventory_accno_id"} && ($key eq "IC")) { - $form->{"std_inventory_accno_id"} = $ref->{"id"}; - } - if ($key =~ /$module/) { - if ( ($ref->{id} eq $ref->{inventory_accno_id}) - || ($ref->{id} eq $ref->{income_accno_id}) - || ($ref->{id} eq $ref->{expense_accno_id})) { - push @{ $form->{"${module}_links"}{$key} }, - { accno => $ref->{accno}, - description => $ref->{description}, - selected => "selected", - id => $ref->{id} }; - } else { - push @{ $form->{"${module}_links"}{$key} }, - { accno => $ref->{accno}, - description => $ref->{description}, - selected => "", - id => $ref->{id} }; - } - } - } - } - $sth->finish; - - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub save_buchungsgruppe { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - 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}); - - my $query; - - # id is the old record - if ($form->{id}) { - $query = qq|UPDATE buchungsgruppen SET - 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|SELECT COALESCE(MAX(sortkey) + 1, 1) FROM buchungsgruppen|; - my ($sortkey) = $dbh->selectrow_array($query); - $form->dberror($query) if ($dbh->err); - push(@values, $sortkey); - $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, - sortkey) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; - } - do_query($form, $dbh, $query, @values); + $main::lxdebug->enter_sub(); - $dbh->disconnect; + my $rc = SL::DB->client->with_transaction(\&_delete_account, $self, $myconfig, $form); - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; + return $rc; } -sub delete_buchungsgruppe { - $main::lxdebug->enter_sub(); - +sub _delete_account { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; + + my $query = qq|SELECT count(*) FROM acc_trans a + WHERE a.chart_id = ?|; + my ($count) = selectrow_query($form, $dbh, $query, $form->{id}); + + if ($count) { + return; + } + + $query = qq|DELETE FROM tax + WHERE chart_id = ?|; + do_query($form, $dbh, $query, $form->{id}); - my $query = qq|DELETE FROM buchungsgruppen WHERE id = ?|; + # delete account taxkeys + $query = qq|DELETE FROM taxkeys + WHERE chart_id = ?|; do_query($form, $dbh, $query, $form->{id}); - $dbh->disconnect; + # delete chart of account record + # last step delete chart, because we have a constraint + # to taxkeys + $query = qq|DELETE FROM chart + WHERE id = ?|; + do_query($form, $dbh, $query, $form->{id}); - $main::lxdebug->leave_sub(); + return 1; } -sub swap_sortkeys { +sub get_language_details { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form, $table) = @_; + my ($self, $myconfig, $form, $id) = @_; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; my $query = - qq|SELECT - (SELECT sortkey FROM $table WHERE id = ?) AS sortkey1, - (SELECT sortkey FROM $table WHERE id = ?) AS sortkey2|; - my @values = ($form->{"id1"}, $form->{"id2"}); - my @sortkeys = selectrow_query($form, $dbh, $query, @values); - - $query = qq|UPDATE $table SET sortkey = ? WHERE id = ?|; - my $sth = prepare_query($form, $dbh, $query); - - do_statement($form, $sth, $query, $sortkeys[1], $form->{"id1"}); - do_statement($form, $sth, $query, $sortkeys[0], $form->{"id2"}); - - $sth->finish(); - - $dbh->commit(); + "SELECT template_code, " . + " output_numberformat, output_dateformat, output_longdates " . + "FROM language WHERE id = ?"; + my @res = selectrow_query($form, $dbh, $query, $id); $main::lxdebug->leave_sub(); + + return @res; } sub prepare_template_filename { @@ -973,30 +443,24 @@ sub prepare_template_filename { my ($filename, $display_filename); - if ($form->{type} eq "stylesheet") { - $filename = "css/$myconfig->{stylesheet}"; - $display_filename = $myconfig->{stylesheet}; - - } else { - $filename = $form->{formname}; + $filename = $form->{formname}; - if ($form->{language}) { - my ($id, $template_code) = split(/--/, $form->{language}); - $filename .= "_${template_code}"; - } + if ($form->{language}) { + my ($id, $template_code) = split(/--/, $form->{language}); + $filename .= "_${template_code}"; + } - if ($form->{printer}) { - my ($id, $template_code) = split(/--/, $form->{printer}); - $filename .= "_${template_code}"; - } + if ($form->{printer}) { + my ($id, $template_code) = split(/--/, $form->{printer}); + $filename .= "_${template_code}"; + } - $filename .= "." . ($form->{format} eq "html" ? "html" : "tex"); - if ($form->{"formname"} =~ m|\.\.| || $form->{"formname"} =~ m|^/|) { - $filename =~ s|.*/||; - } - $display_filename = $filename; - $filename = "$myconfig->{templates}/$filename"; + $filename .= "." . ($form->{format} eq "html" ? "html" : "tex"); + if ($form->{"formname"} =~ m|\.\.| || $form->{"formname"} =~ m|^/|) { + $filename =~ s|.*/||; } + $display_filename = $filename; + $filename = SL::DB::Default->get->templates . "/$filename"; $main::lxdebug->leave_sub(); @@ -1021,7 +485,7 @@ sub load_template { close(TEMPLATE); } - $content = Encode::decode('utf-8-strict', $content) if $::locale->is_utf8; + $content = Encode::decode('utf-8-strict', $content); $main::lxdebug->leave_sub(); @@ -1038,7 +502,7 @@ sub save_template { my $error = ""; if (open(TEMPLATE, ">", $filename)) { - $content = Encode::encode('utf-8-strict', $content) if $::locale->is_utf8; + $content = Encode::encode('utf-8-strict', $content); $content =~ s/\r\n/\n/g; print(TEMPLATE $content); close(TEMPLATE); @@ -1051,103 +515,94 @@ sub save_template { return $error; } -sub save_defaults { - $main::lxdebug->enter_sub(); - - my $self = shift; - my %params = @_; - - my $myconfig = \%main::myconfig; - my $form = $main::form; - - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); - - my %accnos; - map { ($accnos{$_}) = split(m/--/, $form->{$_}) } qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno ar_paid_accno); +sub displayable_name_specs_by_module { + +{ + 'SL::DB::Customer' => { + specs => SL::DB::Customer->displayable_name_specs, + prefs => SL::DB::Customer->displayable_name_prefs, + }, + 'SL::DB::Vendor' => { + specs => SL::DB::Vendor->displayable_name_specs, + prefs => SL::DB::Vendor->displayable_name_prefs, + }, + 'SL::DB::Part' => { + specs => SL::DB::Part->displayable_name_specs, + prefs => SL::DB::Part->displayable_name_prefs, + }, + }; +} - $form->{curr} =~ s/ //g; - my @currencies = grep { $_ ne '' } split m/:/, $form->{curr}; - my $currency = join ':', @currencies; +sub positions_scrollbar_height { + SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height(); +} - # these defaults are database wide +sub purchase_search_makemodel { + SL::Helper::UserPreferences::PartPickerSearch->new()->get_purchase_search_makemodel(); +} - my $query = - qq|UPDATE defaults SET - inventory_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), - income_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), - expense_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), - fxgain_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), - fxloss_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), - ar_paid_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), - invnumber = ?, - cnnumber = ?, - sonumber = ?, - ponumber = ?, - sqnumber = ?, - rfqnumber = ?, - customernumber = ?, - vendornumber = ?, - articlenumber = ?, - servicenumber = ?, - sdonumber = ?, - pdonumber = ?, - curr = ?, - businessnumber = ?, - weightunit = ?, - language_id = ?|; - my @values = ($accnos{inventory_accno}, $accnos{income_accno}, $accnos{expense_accno}, - $accnos{fxgain_accno}, $accnos{fxloss_accno}, $accnos{ar_paid_accno}, - $form->{invnumber}, $form->{cnnumber}, - $form->{sonumber}, $form->{ponumber}, - $form->{sqnumber}, $form->{rfqnumber}, - $form->{customernumber}, $form->{vendornumber}, - $form->{articlenumber}, $form->{servicenumber}, - $form->{sdonumber}, $form->{pdonumber}, - $currency, - $form->{businessnumber}, $form->{weightunit}, - conv_i($form->{language_id})); - do_query($form, $dbh, $query, @values); +sub sales_search_customer_partnumber { + SL::Helper::UserPreferences::PartPickerSearch->new()->get_sales_search_customer_partnumber(); +} - $dbh->commit(); +sub positions_show_update_button { + SL::Helper::UserPreferences::UpdatePositions->new()->get_show_update_button(); +} - $main::lxdebug->leave_sub(); +sub time_recording_use_duration { + SL::Helper::UserPreferences::TimeRecording->new()->get_use_duration(); } +sub longdescription_dialog_size_percentage { + SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage(); +} sub save_preferences { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; - - my $dbh = $form->get_standard_dbh($myconfig); - - my ($currency, $businessnumber) = selectrow_query($form, $dbh, qq|SELECT curr, businessnumber FROM defaults|); - - # update name - my $query = qq|UPDATE employee SET name = ? WHERE login = ?|; - do_query($form, $dbh, $query, $form->{name}, $form->{login}); - - my $rc = $dbh->commit(); - - # save first currency in myconfig - $currency =~ s/:.*//; - $form->{currency} = $currency; - - $form->{businessnumber} = $businessnumber; - - $myconfig = User->new(login => $form->{login}); - - foreach my $item (keys %$form) { - $myconfig->{$item} = $form->{$item}; + my ($self, $form) = @_; + + my $employee = SL::DB::Manager::Employee->current; + $employee->update_attributes(name => $form->{name}); + + my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login}); + $user->update_attributes( + config_values => { + %{ $user->config_values }, + map { ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS(), + }); + + # Displayable name preferences + my $displayable_name_specs_by_module = displayable_name_specs_by_module(); + foreach my $specs (@{ $form->{displayable_name_specs} }) { + if (!$specs->{value} || $specs->{value} eq $displayable_name_specs_by_module->{$specs->{module}}->{prefs}->get_default()) { + $displayable_name_specs_by_module->{$specs->{module}}->{prefs}->delete($specs->{value}); + } else { + $displayable_name_specs_by_module->{$specs->{module}}->{prefs}->store_value($specs->{value}); + } } - $myconfig->save_member; - - my $auth = $main::auth; + if (exists $form->{positions_scrollbar_height}) { + SL::Helper::UserPreferences::PositionsScrollbar->new()->store_height($form->{positions_scrollbar_height}) + } + if (exists $form->{purchase_search_makemodel}) { + SL::Helper::UserPreferences::PartPickerSearch->new()->store_purchase_search_makemodel($form->{purchase_search_makemodel}) + } + if (exists $form->{sales_search_customer_partnumber}) { + SL::Helper::UserPreferences::PartPickerSearch->new()->store_sales_search_customer_partnumber($form->{sales_search_customer_partnumber}) + } + if (exists $form->{positions_show_update_button}) { + SL::Helper::UserPreferences::UpdatePositions->new()->store_show_update_button($form->{positions_show_update_button}) + } + if (exists $form->{time_recording_use_duration}) { + SL::Helper::UserPreferences::TimeRecording->new()->store_use_duration($form->{time_recording_use_duration}) + } + if (exists $form->{longdescription_dialog_size_percentage}) { + SL::Helper::UserPreferences::DisplayPreferences->new()->store_longdescription_dialog_size_percentage($form->{longdescription_dialog_size_percentage}) + } $main::lxdebug->leave_sub(); - return $rc; + return 1; } sub get_defaults { @@ -1159,7 +614,7 @@ sub get_defaults { my $myconfig = \%main::myconfig; my $form = $main::form; - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); + my $dbh = $params{dbh} || SL::DB->client->dbh; my $defaults = selectfirst_hashref_query($form, $dbh, qq|SELECT * FROM defaults|) || {}; @@ -1170,147 +625,21 @@ sub get_defaults { return $defaults; } -sub defaultaccounts { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - # get defaults from defaults table - my $query = qq|SELECT * FROM defaults|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - $form->{defaults} = $sth->fetchrow_hashref("NAME_lc"); - $form->{defaults}{IC} = $form->{defaults}{inventory_accno_id}; - $form->{defaults}{IC_income} = $form->{defaults}{income_accno_id}; - $form->{defaults}{IC_expense} = $form->{defaults}{expense_accno_id}; - $form->{defaults}{FX_gain} = $form->{defaults}{fxgain_accno_id}; - $form->{defaults}{FX_loss} = $form->{defaults}{fxloss_accno_id}; - $form->{defaults}{AR_paid} = $form->{defaults}{ar_paid_accno_id}; - - $form->{defaults}{weightunit} ||= 'kg'; - - $sth->finish; - - $query = qq|SELECT c.id, c.accno, c.description, c.link - FROM chart c - WHERE c.link LIKE '%IC%' - ORDER BY c.accno|; - $sth = $dbh->prepare($query); - $sth->execute || $self->dberror($query); - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - foreach my $key (split(/:/, $ref->{link})) { - if ($key =~ /IC/) { - my $nkey = $key; - if ($key =~ /cogs/) { - $nkey = "IC_expense"; - } - if ($key =~ /sale/) { - $nkey = "IC_income"; - } - %{ $form->{IC}{$nkey}{ $ref->{accno} } } = ( - id => $ref->{id}, - description => $ref->{description} - ); - } - } - } - $sth->finish; - - $query = qq|SELECT c.id, c.accno, c.description - FROM chart c - WHERE c.category = 'I' - AND c.charttype = 'A' - ORDER BY c.accno|; - $sth = $dbh->prepare($query); - $sth->execute || $self->dberror($query); - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - %{ $form->{IC}{FX_gain}{ $ref->{accno} } } = ( - id => $ref->{id}, - description => $ref->{description} - ); - } - $sth->finish; - - $query = qq|SELECT c.id, c.accno, c.description - FROM chart c - WHERE c.category = 'E' - AND c.charttype = 'A' - ORDER BY c.accno|; - $sth = $dbh->prepare($query); - $sth->execute || $self->dberror($query); - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - %{ $form->{IC}{FX_loss}{ $ref->{accno} } } = ( - id => $ref->{id}, - description => $ref->{description} - ); - } - $sth->finish; - - # now get the tax rates and numbers - $query = qq|SELECT c.id, c.accno, c.description, - t.rate * 100 AS rate, t.taxnumber - FROM chart c, tax t - WHERE c.id = t.chart_id|; - - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - $form->{taxrates}{ $ref->{accno} }{id} = $ref->{id}; - $form->{taxrates}{ $ref->{accno} }{description} = $ref->{description}; - $form->{taxrates}{ $ref->{accno} }{taxnumber} = $ref->{taxnumber} - if $ref->{taxnumber}; - $form->{taxrates}{ $ref->{accno} }{rate} = $ref->{rate} if $ref->{rate}; - } - # Abfrage für Standard Umlaufvermögenskonto - $query = - qq|SELECT id, accno, description, link | . - qq|FROM chart | . - qq|WHERE link LIKE ? |. - qq|ORDER BY accno|; - $sth = prepare_execute_query($form, $dbh, $query, '%AR%'); - $sth->execute || $form->dberror($query);# - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - foreach my $item (split(/:/, $ref->{link})) { - if ($item eq "AR_paid") { - %{ $form->{IC}{AR_paid}{ $ref->{accno} } } = ( - id => $ref->{id}, - description => $ref->{description} - ); - } - } - } - - $sth->finish; - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - sub closedto { $main::lxdebug->enter_sub(); my ($self, $myconfig, $form) = @_; - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; - my $query = qq|SELECT closedto, revtrans FROM defaults|; + my $query = qq|SELECT closedto, max_future_booking_interval, revtrans FROM defaults|; my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - ($form->{closedto}, $form->{revtrans}) = $sth->fetchrow_array; + ($form->{closedto}, $form->{max_future_booking_interval}, $form->{revtrans}) = $sth->fetchrow_array; $sth->finish; - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -1319,25 +648,24 @@ sub closebooks { my ($self, $myconfig, $form) = @_; - my $dbh = $form->dbconnect($myconfig); - - my ($query, @values); + SL::DB->client->with_transaction(sub { + my $dbh = SL::DB->client->dbh; - if ($form->{revtrans}) { - $query = qq|UPDATE defaults SET closedto = NULL, revtrans = '1'|; + my ($query, @values); - } elsif ($form->{closedto}) { - $query = qq|UPDATE defaults SET closedto = ?, revtrans = '0'|; - @values = (conv_date($form->{closedto})); + # is currently NEVER trueish (no more hidden revtrans in $form) + # if ($form->{revtrans}) { + # $query = qq|UPDATE defaults SET closedto = NULL, revtrans = '1'|; + # -> therefore you can only set this to false (which is already the default) + # and this flag is currently only checked in gl.pl. TOOD Can probably be removed - } else { - $query = qq|UPDATE defaults SET closedto = NULL, revtrans = '0'|; - } - - # set close in defaults - do_query($form, $dbh, $query, @values); + $query = qq|UPDATE defaults SET closedto = ?, max_future_booking_interval = ?, revtrans = '0'|; + @values = (conv_date($form->{closedto}), conv_i($form->{max_future_booking_interval})); - $dbh->disconnect; + # set close in defaults + do_query($form, $dbh, $query, @values); + 1; + }) or do { die SL::DB->client->error }; $main::lxdebug->leave_sub(); } @@ -1363,7 +691,7 @@ sub retrieve_units { my ($self, $myconfig, $form, $prefix) = @_; $prefix ||= ''; - my $dbh = $form->get_standard_dbh; + my $dbh = SL::DB->client->dbh; my $query = "SELECT *, base_unit AS original_base_unit FROM units"; @@ -1452,7 +780,7 @@ sub units_in_use { my ($self, $myconfig, $form, $units) = @_; - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; map({ $_->{"in_use"} = 0; } values(%{$units})); @@ -1489,8 +817,6 @@ sub units_in_use { } } - $dbh->disconnect(); - $main::lxdebug->leave_sub(); } @@ -1613,7 +939,7 @@ sub sum_with_unit { $main::lxdebug->leave_sub(); - return wantarray ? ($sum, $base_unit) : $sum; + return $sum; } sub add_unit { @@ -1621,37 +947,45 @@ sub add_unit { my ($self, $myconfig, $form, $name, $base_unit, $factor, $languages) = @_; - my $dbh = $form->dbconnect_noauto($myconfig); + SL::DB->client->with_transaction(sub { + my $dbh = SL::DB->client->dbh; - my $query = qq|SELECT COALESCE(MAX(sortkey), 0) + 1 FROM units|; - my ($sortkey) = selectrow_query($form, $dbh, $query); + my $query = qq|SELECT COALESCE(MAX(sortkey), 0) + 1 FROM units|; + my ($sortkey) = selectrow_query($form, $dbh, $query); - $query = "INSERT INTO units (name, base_unit, factor, sortkey) " . - "VALUES (?, ?, ?, ?)"; - do_query($form, $dbh, $query, $name, $base_unit, $factor, $sortkey); + $query = "INSERT INTO units (name, base_unit, factor, sortkey) " . + "VALUES (?, ?, ?, ?)"; + do_query($form, $dbh, $query, $name, $base_unit, $factor, $sortkey); - 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) . ")"); + 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(); } - $sth->finish(); - } - - $dbh->commit(); - $dbh->disconnect(); + 1; + }) or do { die SL::DB->client->error }; $main::lxdebug->leave_sub(); } sub save_units { + my ($self, $myconfig, $form, $units, $delete_units) = @_; $main::lxdebug->enter_sub(); + my $rc = SL::DB->client->with_transaction(\&_save_units, $self, $myconfig, $form, $units, $delete_units); + + $::lxdebug->leave_sub; + return $rc; +} + +sub _save_units { my ($self, $myconfig, $form, $units, $delete_units) = @_; - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; my ($base_unit, $unit, $sth, $query); @@ -1698,10 +1032,8 @@ sub save_units { $sth->finish(); $sth_lang->finish(); - $dbh->commit(); - $dbh->disconnect(); - $main::lxdebug->leave_sub(); + return 1; } sub taxes { @@ -1709,18 +1041,24 @@ sub taxes { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $query = qq|SELECT t.id, t.taxkey, t.taxdescription, round(t.rate * 100, 2) AS rate, - (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber, - (SELECT description FROM chart WHERE id = chart_id) AS account_description + tc.accno AS taxnumber, + tc.description AS account_description, + ssc.accno AS skonto_chart_accno, + ssc.description AS skonto_chart_description, + spc.accno AS skonto_chart_purchase_accno, + spc.description AS skonto_chart_purchase_description FROM tax t - ORDER BY taxkey|; + LEFT JOIN chart tc ON (tc.id = t.chart_id) + LEFT JOIN chart ssc ON (ssc.id = t.skonto_sales_chart_id) + LEFT JOIN chart spc ON (spc.id = t.skonto_purchase_chart_id) + ORDER BY taxkey, rate|; my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); @@ -1731,7 +1069,6 @@ sub taxes { } $sth->finish; - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -1741,7 +1078,7 @@ sub get_tax_accounts { my ($self, $myconfig, $form) = @_; - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; # get Accounts from chart my $query = qq{ SELECT @@ -1760,9 +1097,18 @@ sub get_tax_accounts { push @{ $form->{ACCOUNTS} }, $ref; } - $sth->finish; + $form->{AR_PAID} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AR_paid%' } ], sort_by => 'accno ASC'); + $form->{AP_PAID} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AP_paid%' } ], sort_by => 'accno ASC'); + + $form->{skontochart_value_title_sub} = sub { + my $item = shift; + return [ + $item->{id}, + $item->{accno} .' '. $item->{description}, + ]; + }; - $dbh->disconnect; + $sth->finish; $main::lxdebug->leave_sub(); } @@ -1772,16 +1118,18 @@ sub get_tax { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $query = qq|SELECT taxkey, taxdescription, round(rate * 100, 2) AS rate, - chart_id, - (id IN (SELECT tax_id - FROM acc_trans)) AS tax_already_used + chart_id, + chart_categories, + (id IN (SELECT tax_id + FROM acc_trans)) AS tax_already_used, + skonto_sales_chart_id, + skonto_purchase_chart_id FROM tax WHERE id = ? |; @@ -1821,49 +1169,72 @@ sub get_tax { $sth->finish; } - $dbh->disconnect; - $main::lxdebug->leave_sub(); } sub save_tax { + my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); + my $rc = SL::DB->client->with_transaction(\&_save_tax, $self, $myconfig, $form); + + $::lxdebug->leave_sub; + return $rc; +} + +sub _save_tax { my ($self, $myconfig, $form) = @_; my $query; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; $form->{rate} = $form->{rate} / 100; - my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id} ); + my $chart_categories = ''; + $chart_categories .= 'A' if $form->{asset}; + $chart_categories .= 'L' if $form->{liability}; + $chart_categories .= 'Q' if $form->{equity}; + $chart_categories .= 'I' if $form->{revenue}; + $chart_categories .= 'E' if $form->{expense}; + $chart_categories .= 'C' if $form->{costs}; + + my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, conv_i($form->{chart_id}), conv_i($form->{skonto_sales_chart_id}), conv_i($form->{skonto_purchase_chart_id}), $chart_categories); if ($form->{id} ne "") { $query = qq|UPDATE tax SET - taxkey = ?, - taxdescription = ?, - rate = ?, - chart_id = ?, - taxnumber = (SELECT accno FROM chart WHERE id= ? ) + taxkey = ?, + taxdescription = ?, + rate = ?, + chart_id = ?, + skonto_sales_chart_id = ?, + skonto_purchase_chart_id = ?, + chart_categories = ? WHERE id = ?|; - push(@values, $form->{id}); } else { #ok + ($form->{id}) = selectfirst_array_query($form, $dbh, qq|SELECT nextval('id')|); $query = qq|INSERT INTO tax ( taxkey, taxdescription, rate, chart_id, - taxnumber + skonto_sales_chart_id, + skonto_purchase_chart_id, + chart_categories, + id ) - VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?) )|; + VALUES (?, ?, ?, ?, ?, ?, ?, ?)|; } + push(@values, $form->{id}); do_query($form, $dbh, $query, @values); - $dbh->commit(); - - $main::lxdebug->leave_sub(); + foreach my $language_id (keys %{ $form->{translations} }) { + GenericTranslations->save('dbh' => $dbh, + 'translation_type' => 'SL::DB::Tax/taxdescription', + 'translation_id' => $form->{id}, + 'language_id' => $language_id, + 'translation' => $form->{translations}->{$language_id}); + } } sub delete_tax { @@ -1872,86 +1243,11 @@ sub delete_tax { my ($self, $myconfig, $form) = @_; my $query; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); - - $query = qq|DELETE FROM tax - WHERE id = ?|; - do_query($form, $dbh, $query, $form->{id}); - - $dbh->commit(); - - $main::lxdebug->leave_sub(); -} - -sub save_price_factor { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); - - my $query; - my @values = ($form->{description}, conv_i($form->{factor})); - - if ($form->{id}) { - $query = qq|UPDATE price_factors SET description = ?, factor = ? WHERE id = ?|; - push @values, conv_i($form->{id}); - - } else { - $query = qq|INSERT INTO price_factors (description, factor, sortkey) VALUES (?, ?, (SELECT COALESCE(MAX(sortkey), 0) + 1 FROM price_factors))|; - } - - do_query($form, $dbh, $query, @values); - - $dbh->commit(); - - $main::lxdebug->leave_sub(); -} - -sub get_all_price_factors { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); - - $form->{PRICE_FACTORS} = selectall_hashref_query($form, $dbh, qq|SELECT * FROM price_factors ORDER BY sortkey|); - - $main::lxdebug->leave_sub(); -} - -sub get_price_factor { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); - - my $query = qq|SELECT description, factor, - ((SELECT COUNT(*) FROM parts WHERE price_factor_id = ?) + - (SELECT COUNT(*) FROM invoice WHERE price_factor_id = ?) + - (SELECT COUNT(*) FROM orderitems WHERE price_factor_id = ?)) = 0 AS orphaned - FROM price_factors WHERE id = ?|; - - ($form->{description}, $form->{factor}, $form->{orphaned}) = selectrow_query($form, $dbh, $query, (conv_i($form->{id})) x 4); - - $main::lxdebug->leave_sub(); -} - -sub delete_price_factor { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); - - do_query($form, $dbh, qq|DELETE FROM price_factors WHERE id = ?|, conv_i($form->{id})); - $dbh->commit(); + SL::DB->client->with_transaction(sub { + $query = qq|DELETE FROM tax WHERE id = ?|; + do_query($form, SL::DB->client->dbh, $query, $form->{id}); + 1; + }) or do { die SL::DB->client->error }; $main::lxdebug->leave_sub(); } @@ -1961,34 +1257,37 @@ sub save_warehouse { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); + croak('Need at least one new bin') unless $form->{number_of_new_bins} > 0; - my ($query, @values, $sth); + SL::DB->client->with_transaction(sub { + my $dbh = SL::DB->client->dbh; - if (!$form->{id}) { - $query = qq|SELECT nextval('id')|; - ($form->{id}) = selectrow_query($form, $dbh, $query); + my ($query, @values, $sth); - $query = qq|INSERT INTO warehouse (id, sortkey) VALUES (?, (SELECT COALESCE(MAX(sortkey), 0) + 1 FROM warehouse))|; - do_query($form, $dbh, $query, $form->{id}); - } + if (!$form->{id}) { + $query = qq|SELECT nextval('id')|; + ($form->{id}) = selectrow_query($form, $dbh, $query); - do_query($form, $dbh, qq|UPDATE warehouse SET description = ?, invalid = ? WHERE id = ?|, - $form->{description}, $form->{invalid} ? 't' : 'f', conv_i($form->{id})); + $query = qq|INSERT INTO warehouse (id, sortkey) VALUES (?, (SELECT COALESCE(MAX(sortkey), 0) + 1 FROM warehouse))|; + do_query($form, $dbh, $query, $form->{id}); + } - if (0 < $form->{number_of_new_bins}) { - $query = qq|INSERT INTO bin (warehouse_id, description) VALUES (?, ?)|; - $sth = prepare_query($form, $dbh, $query); + do_query($form, $dbh, qq|UPDATE warehouse SET description = ?, invalid = ? WHERE id = ?|, + $form->{description}, $form->{invalid} ? 't' : 'f', conv_i($form->{id})); - foreach my $i (1..$form->{number_of_new_bins}) { - do_statement($form, $sth, $query, conv_i($form->{id}), "$form->{prefix}${i}"); - } + if (0 < $form->{number_of_new_bins}) { + my ($num_existing_bins) = selectfirst_array_query($form, $dbh, qq|SELECT COUNT(*) FROM bin WHERE warehouse_id = ?|, $form->{id}); + $query = qq|INSERT INTO bin (warehouse_id, description) VALUES (?, ?)|; + $sth = prepare_query($form, $dbh, $query); - $sth->finish(); - } + foreach my $i (1..$form->{number_of_new_bins}) { + do_statement($form, $sth, $query, conv_i($form->{id}), "$form->{prefix}" . ($i + $num_existing_bins)); + } - $dbh->commit(); + $sth->finish(); + } + 1; + }) or do { die SL::DB->client->error }; $main::lxdebug->leave_sub(); } @@ -1998,34 +1297,30 @@ sub save_bins { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); - - my ($query, @values, $commit_necessary, $sth); + SL::DB->client->with_transaction(sub { + my $dbh = SL::DB->client->dbh; - @values = map { $form->{"id_${_}"} } grep { $form->{"delete_${_}"} } (1..$form->{rowcount}); - - if (@values) { - $query = qq|DELETE FROM bin WHERE id IN (| . join(', ', ('?') x scalar(@values)) . qq|)|; - do_query($form, $dbh, $query, @values); - - $commit_necessary = 1; - } + my ($query, @values, $sth); - $query = qq|UPDATE bin SET description = ? WHERE id = ?|; - $sth = prepare_query($form, $dbh, $query); + @values = map { $form->{"id_${_}"} } grep { $form->{"delete_${_}"} } (1..$form->{rowcount}); - foreach my $row (1..$form->{rowcount}) { - next if ($form->{"delete_${row}"}); + if (@values) { + $query = qq|DELETE FROM bin WHERE id IN (| . join(', ', ('?') x scalar(@values)) . qq|)|; + do_query($form, $dbh, $query, @values); + } - do_statement($form, $sth, $query, $form->{"description_${row}"}, conv_i($form->{"id_${row}"})); + $query = qq|UPDATE bin SET description = ? WHERE id = ?|; + $sth = prepare_query($form, $dbh, $query); - $commit_necessary = 1; - } + foreach my $row (1..$form->{rowcount}) { + next if ($form->{"delete_${row}"}); - $sth->finish(); + do_statement($form, $sth, $query, $form->{"description_${row}"}, conv_i($form->{"id_${row}"})); + } - $dbh->commit() if ($commit_necessary); + $sth->finish(); + 1; + }) or do { die SL::DB->client->error }; $main::lxdebug->leave_sub(); } @@ -2035,26 +1330,26 @@ sub delete_warehouse { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); + my $rc = SL::DB->client->with_transaction(sub { + my $dbh = SL::DB->client->dbh; - my $id = conv_i($form->{id}); - my $query = qq|SELECT i.bin_id FROM inventory i WHERE i.bin_id IN (SELECT b.id FROM bin b WHERE b.warehouse_id = ?) LIMIT 1|; - my ($count) = selectrow_query($form, $dbh, $query, $id); + my $id = conv_i($form->{id}); + my $query = qq|SELECT i.bin_id FROM inventory i WHERE i.bin_id IN (SELECT b.id FROM bin b WHERE b.warehouse_id = ?) LIMIT 1|; + my ($count) = selectrow_query($form, $dbh, $query, $id); - if ($count) { - $main::lxdebug->leave_sub(); - return 0; - } + if ($count) { + return 0; + } - do_query($form, $dbh, qq|DELETE FROM bin WHERE warehouse_id = ?|, conv_i($form->{id})); - do_query($form, $dbh, qq|DELETE FROM warehouse WHERE id = ?|, conv_i($form->{id})); + do_query($form, $dbh, qq|DELETE FROM bin WHERE warehouse_id = ?|, conv_i($form->{id})); + do_query($form, $dbh, qq|DELETE FROM warehouse WHERE id = ?|, conv_i($form->{id})); - $dbh->commit(); + return 1; + }); $main::lxdebug->leave_sub(); - return 1; + return $rc; } sub get_all_warehouses { @@ -2062,8 +1357,7 @@ sub get_all_warehouses { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; my $query = qq|SELECT w.id, w.description, w.invalid, (SELECT COUNT(b.description) FROM bin b WHERE b.warehouse_id = w.id) AS number_of_bins @@ -2080,8 +1374,7 @@ sub get_warehouse { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; my $id = conv_i($form->{id}); my $query = qq|SELECT w.description, w.invalid @@ -2092,18 +1385,38 @@ sub get_warehouse { map { $form->{$_} = $ref->{$_} } keys %{ $ref }; - $query = qq|SELECT b.*, EXISTS - (SELECT i.warehouse_id - FROM inventory i - WHERE i.bin_id = b.id - LIMIT 1) - AS in_use - FROM bin b - WHERE b.warehouse_id = ?|; + $query = <{BINS} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id})); $main::lxdebug->leave_sub(); } +sub get_eur_categories { + my ($self, $myconfig, $form) = @_; + + my $dbh = SL::DB->client->dbh; + my %eur_categories = selectall_as_map($form, $dbh, "select * from eur_categories order by id", 'id', 'description'); + + return \%eur_categories; +} + +sub get_bwa_categories { + my ($self, $myconfig, $form) = @_; + + my $dbh = SL::DB->client->dbh; + my %bwa_categories = selectall_as_map($form, $dbh, "select * from bwa_categories order by id", 'id', 'description'); + + return \%bwa_categories; +} + 1;