X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=cf48de61cda01ee12944e8c792b6568bb4286958;hb=0d1bb5102f01eb03da55bc87b52ac52cd7ae7534;hp=61441faec220a905f42c6b551b072efc79255879;hpb=9c8450d924f0318190cf451a533e1ff883a2fa16;p=kivitendo-erp.git diff --git a/SL/AM.pm b/SL/AM.pm index 61441faec..cf48de61c 100644 --- a/SL/AM.pm +++ b/SL/AM.pm @@ -40,7 +40,11 @@ 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 strict; @@ -207,17 +211,15 @@ sub save_account { # connect to database, turn off AutoCommit my $dbh = $form->dbconnect_noauto($myconfig); - # 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} = ""; @@ -265,8 +267,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 = (); @@ -993,7 +995,7 @@ sub prepare_template_filename { $filename =~ s|.*/||; } $display_filename = $filename; - $filename = "$myconfig->{templates}/$filename"; + $filename = SL::DB::Default->get->templates . "/$filename"; } $main::lxdebug->leave_sub(); @@ -1019,7 +1021,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(); @@ -1036,7 +1038,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); @@ -1049,103 +1051,23 @@ 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); - - $form->{curr} =~ s/ //g; - my @currencies = grep { $_ ne '' } split m/:/, $form->{curr}; - my $currency = join ':', @currencies; - - # these defaults are database wide - - 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); - - $dbh->commit(); - - $main::lxdebug->leave_sub(); -} - - sub save_preferences { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; + my ($self, $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}); + my $employee = SL::DB::Manager::Employee->find_by(login => $form->{login}); + $employee->update_attributes(name => $form->{name}); - foreach my $item (keys %$form) { - $myconfig->{$item} = $form->{$item}; - } - - $myconfig->save_member; - - my $auth = $main::auth; + my $user = SL::DB::Manager::AuthUser->find_by(login => $form->{login}); + $user->update_attributes( + config_values => { + map { ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS(), + }); $main::lxdebug->leave_sub(); - return $rc; + return 1; } sub get_defaults { @@ -1168,152 +1090,6 @@ 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; - - #Get currencies: - $query = qq|SELECT curr FROM currencies ORDER BY id|; - - $form->{CURRENCIES} = []; - - $sth = prepare_execute_query($form, $dbh, $query); - $sth->execute || $form->dberror($query); - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - push @{ $form->{ CURRENCIES } } , $ref; - } - $sth->finish; - - #Which of them is the default currency? - $query = qq|SELECT curr AS defaultcurrency FROM currencies WHERE id = (SELECT curr FROM defaults LIMIT 1);|; - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - $form->{defaultcurrency} = ($sth->fetchrow_hashref("NAME_lc"))->{defaultcurrency}; - - $sth->finish; - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - sub closedto { $main::lxdebug->enter_sub(); @@ -1321,11 +1097,11 @@ sub closedto { my $dbh = $form->dbconnect($myconfig); - 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; @@ -1347,8 +1123,8 @@ sub closebooks { $query = qq|UPDATE defaults SET closedto = NULL, revtrans = '1'|; } elsif ($form->{closedto}) { - $query = qq|UPDATE defaults SET closedto = ?, revtrans = '0'|; - @values = (conv_date($form->{closedto})); + $query = qq|UPDATE defaults SET closedto = ?, max_future_booking_interval = ?, revtrans = '0'|; + @values = (conv_date($form->{closedto}), conv_date($form->{max_future_booking_interval})); } else { $query = qq|UPDATE defaults SET closedto = NULL, revtrans = '0'|; @@ -1740,7 +1516,7 @@ sub taxes { (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber, (SELECT description FROM chart WHERE id = chart_id) AS account_description FROM tax t - ORDER BY taxkey|; + ORDER BY taxkey, rate|; my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); @@ -1800,6 +1576,7 @@ sub get_tax { taxdescription, round(rate * 100, 2) AS rate, chart_id, + chart_categories, (id IN (SELECT tax_id FROM acc_trans)) AS tax_already_used FROM tax @@ -1857,14 +1634,23 @@ sub save_tax { $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}, $form->{chart_id}, $form->{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= ? ) + taxnumber = (SELECT accno FROM chart WHERE id= ? ), + chart_categories = ? WHERE id = ?|; push(@values, $form->{id}); @@ -1875,9 +1661,10 @@ sub save_tax { taxdescription, rate, chart_id, - taxnumber + taxnumber, + chart_categories ) - VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?) )|; + VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ? )|; } do_query($form, $dbh, $query, @values); @@ -2113,9 +1900,10 @@ sub get_warehouse { map { $form->{$_} = $ref->{$_} } keys %{ $ref }; $query = qq|SELECT b.*, EXISTS - (SELECT i.warehouse_id - FROM inventory i + (SELECT i.warehouse_id, p.warehouse_id + FROM inventory i, parts p WHERE i.bin_id = b.id + OR p.bin_id = b.id LIMIT 1) AS in_use FROM bin b