X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBP.pm;h=4489b8dae07ad84467be0aaa01fed9765995372f;hb=d58f0807a72e7a791cded47b057e5f20116ca13f;hp=9365d23076ad92cffd015709e68cc2ff752d61d5;hpb=b5157f97d47413e5f33cced1d0de527979ff3d61;p=kivitendo-erp.git diff --git a/SL/BP.pm b/SL/BP.pm index 9365d2307..4489b8dae 100644 --- a/SL/BP.pm +++ b/SL/BP.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. #====================================================================== # # Batch printing module backend routines @@ -35,57 +36,9 @@ package BP; use SL::DBUtils; +use SL::DB; -sub get_vc { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my %arap = (invoice => 'ar', - packing_list => 'ar', - sales_order => 'oe', - purchase_order => 'oe', - sales_quotation => 'oe', - request_quotation => 'oe', - check => 'ap', - receipt => 'ar'); - - my $vc = $form->{vc} eq "customer" ? "customer" : "vendor"; - my $arap_type = defined($arap{$form->{type}}) ? $arap{$form->{type}} : 'ar'; - - $query = - qq|SELECT count(*) | . - qq|FROM (SELECT DISTINCT ON (vc.id) vc.id FROM $vc vc, $arap_type a, status s | . - qq| WHERE a.${vc}_id = vc.id AND s.trans_id = a.id AND s.formname = ? | . - qq| AND s.spoolfile IS NOT NULL) AS total|; - - my ($count) = selectrow_query($form, $dbh, $query, $form->{type}); - - # build selection list - if ($count < $myconfig->{vclimit}) { - $query = - qq|SELECT DISTINCT ON (vc.id) vc.id, vc.name | . - qq|FROM $vc vc, $arap_type a, status s | . - qq|WHERE a.${vc}_id = vc.id AND s.trans_id = a.id AND s.formname = ? | . - qq| AND s.spoolfile IS NOT NULL|; - - $sth = $dbh->prepare($query); - $sth->execute($form->{type}) || $form->dberror($query . " ($form->{type})"); - - $form->{"all_${vc}"} = []; - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{"all_${vc}"} }, $ref; - } - $sth->finish; - } - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} +use strict; sub payment_accounts { $main::lxdebug->enter_sub(); @@ -93,7 +46,7 @@ sub payment_accounts { my ($self, $myconfig, $form) = @_; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $query = qq|SELECT DISTINCT ON (s.chart_id) c.accno, c.description | . @@ -103,12 +56,11 @@ sub payment_accounts { $sth->execute($form->{type}) || $form->dberror($query . " ($form->{type})"); $form->{accounts} = []; - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { push @{ $form->{accounts} }, $ref; } $sth->finish; - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -118,8 +70,7 @@ sub get_spoolfiles { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my ($query, $arap, @values); my $invnumber = "invnumber"; @@ -148,6 +99,7 @@ sub get_spoolfiles { } else { $arap = "ar"; my $invoice = "a.invoice"; + my $quonumber = "a.quonumber"; if ($form->{type} =~ /_(order|quotation)$/) { $invnumber = "ordnumber"; @@ -155,16 +107,29 @@ sub get_spoolfiles { $invoice = '0'; } + if ($form->{type} eq 'packing_list') { + $invnumber = "donumber"; + $arap = "delivery_orders"; + $invoice = '0'; + $quonumber = '0'; + } + $query = - qq|SELECT a.id, a.$invnumber AS invnumber, a.ordnumber, a.quonumber, | . + qq|SELECT a.id, a.$invnumber AS invnumber, a.ordnumber, $quonumber, | . qq| a.transdate, $invoice AS invoice, '$arap' AS module, vc.name, | . qq| s.spoolfile | . qq|FROM $arap a, ${vc} vc, status s | . qq|WHERE s.trans_id = a.id | . qq| AND s.spoolfile IS NOT NULL | . - qq| AND s.formname = ? | . + ($form->{type} eq 'packing_list' + ? qq| AND s.formname IN (?, ?) | + : qq| AND s.formname = ? |) . qq| AND a.${vc}_id = vc.id|; @values = ($form->{type}); + + if ($form->{type} eq 'packing_list') { + @values = qw(sales_delivery_order purchase_delivery_order); + } } if ($form->{"${vc}_id"}) { @@ -172,16 +137,16 @@ sub get_spoolfiles { push(@values, conv_i($form->{"${vc}_id"})); } elsif ($form->{ $vc }) { $query .= " AND vc.name ILIKE ?"; - push(@values, $form->like($form->{ $vc })); + push(@values, like($form->{ $vc })); } - foreach my $column (qw(invnumber ordnumber quonumber)) { + foreach my $column (qw(invnumber ordnumber quonumber donumber)) { if ($form->{$column}) { $query .= " AND a.$column ILIKE ?"; - push(@values, $form->like($form->{$column})); + push(@values, like($form->{$column})); } } - if ($form->{type} =~ /(invoice|sales_order|sales_quotation|packing_list|puchase_order|request_quotation)$/) { + if ($form->{type} =~ /(invoice|sales_order|sales_quotation|purchase_order|request_quotation|packing_list)$/) { if ($form->{transdatefrom}) { $query .= " AND a.transdate >= ?"; push(@values, $form->{transdatefrom}); @@ -192,11 +157,11 @@ sub get_spoolfiles { } } - my @a = (transdate, $invnumber, name); + my @a = ("transdate", $invnumber, "name"); my $sortorder = join ', ', $form->sort_columns(@a); if (grep({ $_ eq $form->{sort} } - qw(transdate invnumber ordnumber quonumber name))) { + qw(transdate invnumber ordnumber quonumber donumber name))) { $sortorder = $form->{sort}; } @@ -207,12 +172,11 @@ sub get_spoolfiles { $form->dberror($query . " (" . join(", ", @values) . ")"); $form->{SPOOL} = []; - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { push @{ $form->{SPOOL} }, $ref; } $sth->finish; - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -220,53 +184,52 @@ sub get_spoolfiles { sub delete_spool { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form, $spool) = @_; + my ($self, $myconfig, $form) = @_; - # connect to database, turn AutoCommit off - my $dbh = $form->dbconnect_noauto($myconfig); + my $spool = $::lx_office_conf{paths}->{spool}; - my $query; + SL::DB->client->with_transaction(sub { + my $dbh = SL::DB->client->dbh; - if ($form->{type} =~ /(check|receipt)/) { - $query = qq|DELETE FROM status WHERE spoolfile = ?|; - } else { - $query = - qq|UPDATE status SET spoolfile = NULL, printed = '1' | . - qq|WHERE spoolfile = ?|; - } - my $sth = $dbh->prepare($query) || $form->dberror($query); + my $query; - foreach my $i (1 .. $form->{rowcount}) { - if ($form->{"checked_$i"}) { - $sth->execute($form->{"spoolfile_$i"}) || $form->dberror($query); - $sth->finish; + if ($form->{type} =~ /(check|receipt)/) { + $query = qq|DELETE FROM status WHERE spoolfile = ?|; + } else { + $query = + qq|UPDATE status SET spoolfile = NULL, printed = '1' | . + qq|WHERE spoolfile = ?|; } - } + my $sth = $dbh->prepare($query) || $form->dberror($query); - # commit - my $rc = $dbh->commit; - $dbh->disconnect; + foreach my $i (1 .. $form->{rowcount}) { + if ($form->{"checked_$i"}) { + $sth->execute($form->{"spoolfile_$i"}) || $form->dberror($query); + $sth->finish; + } + } - if ($rc) { foreach my $i (1 .. $form->{rowcount}) { if ($form->{"checked_$i"}) { unlink(qq|$spool/$form->{"spoolfile_$i"}|); } } - } + 1; + }) or do { die SL::DB->client->error }; $main::lxdebug->leave_sub(); - - return $rc; + return 1; } sub print_spool { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form, $spool, $output) = @_; + my ($self, $myconfig, $form, $output) = @_; + + my $spool = $::lx_office_conf{paths}->{spool}; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $query = qq|UPDATE status SET printed = '1' | . @@ -279,7 +242,7 @@ sub print_spool { open(OUT, $output) or $form->error("$output : $!"); $form->{"spoolfile_$i"} =~ s|.*/||; - $spoolfile = qq|$spool/$form->{"spoolfile_$i"}|; + my $spoolfile = qq|$spool/$form->{"spoolfile_$i"}|; # send file to printer open(IN, $spoolfile) or $form->error("$spoolfile : $!"); @@ -297,10 +260,7 @@ sub print_spool { } } - $dbh->disconnect; - $main::lxdebug->leave_sub(); } 1; -