X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/3314d7c2247d46033fcd7cd1e1663a705db02fea..51fa09f29ebea609f58d14506d6938c0e0ee1ab0:/bin/mozilla/bp.pl

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 10acafdaa..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')
@@ -95,7 +86,7 @@ sub search {
   # setup customer/vendor selection
   BP->get_vc(\%myconfig, \%$form);
 
-  if (@{ $form->{"all_$form->{vc}"} }) {
+  if (@{ $form->{"all_$form->{vc}"} || [] }) {
     map { $name .= "<option>$_->{name}--$_->{id}\n" }
       @{ $form->{"all_$form->{vc}"} };
     $name = qq|<select name=$form->{vc}><option>\n$name</select>|;
@@ -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 =>
@@ -123,33 +112,31 @@ sub search {
        receipt => { title => 'Receipts', name => 'Customer' });
 
   $label{invoice}{invnumber} = qq|
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-	  <td colspan=3><input name=invnumber size=20></td>
-	</tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
+          <td colspan=3><input name=invnumber size=20></td>
+        </tr>
 |;
   $label{invoice}{ordnumber} = qq|
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-	  <td colspan=3><input name=ordnumber size=20></td>
-	</tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
+          <td colspan=3><input name=ordnumber size=20></td>
+        </tr>
 |;
   $label{sales_quotation}{quonumber} = qq|
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
-	  <td colspan=3><input name=quonumber size=20></td>
-	</tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
+          <td colspan=3><input name=quonumber size=20></td>
+        </tr>
 |;
 
   $label{check}{chknumber} = qq|
-  	<tr>
-	  <th align=right nowrap>| . $locale->text('Reference') . qq|</th>
-	  <td colspan=3><input name=chknumber size=20></td>
-	</tr>
+          <tr>
+          <th align=right nowrap>| . $locale->text('Reference') . qq|</th>
+          <td colspan=3><input name=chknumber size=20></td>
+        </tr>
 |;
 
-  $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};
@@ -164,12 +151,12 @@ sub search {
     if (BP->payment_accounts(\%myconfig, \%$form)) {
       $account = qq|
         <tr>
-      	  <th align=right>| . $locale->text('Account') . qq|</th>
+          <th align=right>| . $locale->text('Account') . qq|</th>
 |;
 
       if ($form->{accounts}) {
         $account .= qq|
-	  <td colspan=3><select name=account>
+          <td colspan=3><select name=account>
 |;
         foreach my $ref (@{ $form->{accounts} }) {
           $account .= qq|
@@ -182,13 +169,13 @@ sub search {
 |;
       } else {
         $account .= qq|
-	  <td colspan=3><input name=account></td>
+          <td colspan=3><input name=account></td>
 |;
 
       }
 
       $account .= qq|
-	</tr>
+         </tr>
 |;
 
     }
@@ -243,23 +230,23 @@ sub search {
   <tr>
     <td>
       <table>
-	<tr>
-	  <th align=right>Kunde</th>
-	  <td colspan=3>$name</td>
-	</tr>
-	$account
-	$label{$form->{type}}{invnumber}
-	$label{$form->{type}}{ordnumber}
-	$label{$form->{type}}{quonumber}
-	$label{$form->{type}}{chknumber}
-	$label{$form->{type}}{rctnumber}
-	<tr>
-	  <th align=right nowrap>| . $locale->text('From') . qq|</th>
+        <tr>
+          <th align=right>Kunde</th>
+          <td colspan=3>$name</td>
+        </tr>
+        $account
+        $label{$form->{type}}{invnumber}
+        $label{$form->{type}}{ordnumber}
+        $label{$form->{type}}{quonumber}
+        $label{$form->{type}}{chknumber}
+        $label{$form->{type}}{rctnumber}
+        <tr>
+          <th align=right nowrap>| . $locale->text('From') . qq|</th>
           $button1
-	  <th align=right>| . $locale->text('Bis') . qq|</th>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
           $button2
-	</tr>
-	<input type=hidden name=sort value=transdate>
+        </tr>
+        <input type=hidden name=sort value=transdate>
       </table>
     </td>
   </tr>
@@ -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";
   }
@@ -535,13 +519,13 @@ sub list_spool {
   <tr>
     <td>
       <table width=100%>
-	<tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "\n$column_header{$_}" } @column_index;
 
   print qq|
-	</tr>
+        </tr>
 |;
 
   # add sort and escape callback, this one we use for the add sub
@@ -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 {
       "<td><a href=$module?action=edit&id=$ref->{id}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
     $column_data{name}      = "<td>$ref->{name}</td>";
     $column_data{spoolfile} =
-      qq|<td><a href=$main::spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
+      qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
 <input type=hidden name="spoolfile_$i" value=$ref->{spoolfile}>
 |;