# 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
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.pos_er, 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");
+ # 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
- foreach my $key (keys %$ref) {
- $form->{"$key"} = $ref->{"$key"};
- }
-
- $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;
for (qw(AR_include_in_dropdown AP_include_in_dropdown summary_account)) {
$form->{$form->{$_}} = $form->{$_} if $form->{$_};
}
}
- $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") {
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 {
+ my ($self, $myconfig, $form) = @_;
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_delete_account, $self, $myconfig, $form);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _delete_account {
my ($self, $myconfig, $form) = @_;
- # connect to database, turn off AutoCommit
- my $dbh = $form->dbconnect_noauto($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) {
- $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});
- }
-
$query = qq|DELETE FROM tax
WHERE chart_id = ?|;
do_query($form, $dbh, $query, $form->{id});
WHERE 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();
+ return 1;
}
sub get_language_details {
my ($self, $myconfig, $form, $id) = @_;
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
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 prepare_template_filename {
$main::lxdebug->enter_sub();
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 = SL::DB::Default->get->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();
return $error;
}
+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,
+ },
+ };
+}
+
+sub positions_scrollbar_height {
+ SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height();
+}
+
+sub purchase_search_makemodel {
+ SL::Helper::UserPreferences::PartPickerSearch->new()->get_purchase_search_makemodel();
+}
+
+sub sales_search_customer_partnumber {
+ SL::Helper::UserPreferences::PartPickerSearch->new()->get_sales_search_customer_partnumber();
+}
+
+sub positions_show_update_button {
+ SL::Helper::UserPreferences::UpdatePositions->new()->get_show_update_button();
+}
+
+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, $form) = @_;
- my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login});
+ my $employee = SL::DB::Manager::Employee->current;
$employee->update_attributes(name => $form->{name});
my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login});
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});
+ }
+ }
+
+ 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 1;
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|) || {};
my ($self, $myconfig, $form) = @_;
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
my $query = qq|SELECT closedto, max_future_booking_interval, revtrans FROM defaults|;
my $sth = $dbh->prepare($query);
$sth->finish;
- $dbh->disconnect;
-
$main::lxdebug->leave_sub();
}
my ($self, $myconfig, $form) = @_;
- my $dbh = $form->dbconnect($myconfig);
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
- my ($query, @values);
+ my ($query, @values);
- # 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
+ # 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
- $query = qq|UPDATE defaults SET closedto = ?, max_future_booking_interval = ?, revtrans = '0'|;
- @values = (conv_date($form->{closedto}), conv_i($form->{max_future_booking_interval}));
+ $query = qq|UPDATE defaults SET closedto = ?, max_future_booking_interval = ?, revtrans = '0'|;
+ @values = (conv_date($form->{closedto}), conv_i($form->{max_future_booking_interval}));
- # set close in defaults
- do_query($form, $dbh, $query, @values);
-
- $dbh->disconnect;
+ # set close in defaults
+ do_query($form, $dbh, $query, @values);
+ 1;
+ }) or do { die SL::DB->client->error };
$main::lxdebug->leave_sub();
}
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";
my ($self, $myconfig, $form, $units) = @_;
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
map({ $_->{"in_use"} = 0; } values(%{$units}));
}
}
- $dbh->disconnect();
-
$main::lxdebug->leave_sub();
}
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);
$sth->finish();
$sth_lang->finish();
- $dbh->commit();
- $dbh->disconnect();
- $main::lxdebug->leave_sub();
+ return 1;
}
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,
- (SELECT accno FROM chart WHERE id = skonto_sales_chart_id) AS skonto_chart_accno,
- (SELECT description FROM chart WHERE id = skonto_sales_chart_id) AS skonto_chart_description,
- (SELECT accno FROM chart WHERE id = skonto_purchase_chart_id) AS skonto_chart_purchase_accno,
- (SELECT description FROM chart WHERE id = skonto_purchase_chart_id) AS skonto_chart_purchase_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
+ 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->finish;
- $dbh->disconnect;
$main::lxdebug->leave_sub();
}
my ($self, $myconfig, $form) = @_;
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
# get Accounts from chart
my $query = qq{ SELECT
$sth->finish;
- $dbh->disconnect;
-
$main::lxdebug->leave_sub();
}
my ($self, $myconfig, $form) = @_;
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
my $query = qq|SELECT
taxkey,
$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;
$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->{chart_id}), conv_i($form->{skonto_sales_chart_id}), conv_i($form->{skonto_purchase_chart_id}), $chart_categories);
+ 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 = ? ),
skonto_sales_chart_id = ?,
skonto_purchase_chart_id = ?,
chart_categories = ?
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);
'language_id' => $language_id,
'translation' => $form->{translations}->{$language_id});
}
-
- $dbh->commit();
-
- $main::lxdebug->leave_sub();
}
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();
}
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}) {
- 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);
+ 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 + $num_existing_bins));
- }
+ 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();
}
my ($self, $myconfig, $form) = @_;
- # connect to database
- my $dbh = $form->get_standard_dbh($myconfig);
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
- my ($query, @values, $commit_necessary, $sth);
-
- @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();
}
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 {
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
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
map { $form->{$_} = $ref->{$_} } keys %{ $ref };
$query = <<SQL;
- SELECT b.*,
- ( EXISTS(SELECT i.bin_id FROM inventory i WHERE i.bin_id = b.id LIMIT 1)
- OR EXISTS(SELECT p.bin_id FROM parts p WHERE p.bin_id = b.id LIMIT 1))
- AS in_use
- FROM bin b
- WHERE b.warehouse_id = ?
+ SELECT b.*, use.in_use
+ FROM bin b
+ LEFT JOIN (
+ SELECT DISTINCT bin_id, TRUE AS in_use FROM inventory
+ UNION
+ SELECT DISTINCT bin_id, TRUE AS in_use FROM parts
+ ) use ON use.bin_id = b.id
+ WHERE b.warehouse_id = ?;
SQL
$form->{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;
projects / kivitendo-erp.git / blobdiff