X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fbp.pl;h=9ce49155ab6dbd84545dcabcdaf909bb86b753bf;hb=1e0d413084100ccd892e8c5be95703be5d965de7;hp=1445eba05c40dcc049435ddc362c1e9e2b33ea27;hpb=b65a230d60e86d2c18a3ab7222379905aea5ecd7;p=kivitendo-erp.git diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl index 1445eba05..9ce49155a 100644 --- a/bin/mozilla/bp.pl +++ b/bin/mozilla/bp.pl @@ -59,14 +59,6 @@ sub assert_bp_access { if ($form->{type} && $access_map{$form->{type}}) { $main::auth->assert($access_map{$form->{type}}); - } elsif ($form->{type} eq 'packing_list') { - $main::lxdebug->message(0, "1"); - if (!$main::auth->assert('sales_order_edit', 1)) { - $main::lxdebug->message(0, "2"); - $main::auth->assert('invoice_edit') ; - } - $main::lxdebug->message(0, "3"); - } else { $main::auth->assert('DOES_NOT_EXIST'); } @@ -84,7 +76,6 @@ sub search { assert_bp_access(); # $locale->text('Sales Invoices') - # $locale->text('Packing Lists') # $locale->text('Sales Orders') # $locale->text('Purchase Orders') # $locale->text('Quotations') @@ -109,8 +100,6 @@ sub search { my %label = ( invoice => { title => 'Sales Invoices', name => 'Customer', l_invnumber => 'Y' }, - packing_list => - { title => 'Packing Lists', name => 'Customer', l_invnumber => 'Y' }, sales_order => { title => 'Sales Orders', name => 'Customer', l_ordnumber => 'Y' }, purchase_order => @@ -148,8 +137,6 @@ sub search { |; - $label{packing_list}{invnumber} = $label{invoice}{invnumber}; - $label{packing_list}{ordnumber} = $label{invoice}{ordnumber}; $label{sales_order}{ordnumber} = $label{invoice}{ordnumber}; $label{purchase_order}{ordnumber} = $label{invoice}{ordnumber}; $label{request_quotation}{quonumber} = $label{sales_quotation}{quonumber}; @@ -354,7 +341,7 @@ sub yes { $form->{callback} .= "&header=1" if $form->{callback}; $form->redirect($locale->text('Removed spoolfiles!')) - if (BP->delete_spool(\%myconfig, \%$form, $main::spool)); + if (BP->delete_spool(\%myconfig, \%$form)); $form->error($locale->text('Cannot remove files!')); $main::lxdebug->leave_sub(); @@ -386,11 +373,11 @@ sub print { if ($form->{"checked_$i"}) { $form->info($locale->text('Printing ... ')); - if (BP->print_spool(\%myconfig, \%$form, $main::spool, "| $selected_printer")) { + if (BP->print_spool(\%myconfig, \%$form, "| $selected_printer")) { print $locale->text('done'); $form->redirect($locale->text('Marked entries printed!')); } - exit; + ::end_of_request(); } } @@ -476,9 +463,6 @@ sub list_spool { my $name = ucfirst $form->{vc}; my @columns = qw(transdate); - if ($form->{type} =~ /(invoice|packing_list|check|receipt)/) { - push @columns, "invnumber"; - } if ($form->{type} =~ /_order$/) { push @columns, "ordnumber"; } @@ -553,6 +537,7 @@ sub list_spool { my $i = 0; my $j = 0; my $spoolfile; + my $spool = $::lx_office_conf{paths}->{spool}; foreach my $ref (@{ $form->{SPOOL} }) { @@ -582,7 +567,7 @@ sub list_spool { "