X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fbp.pl;h=173f8b6c182b858b10ea18ebdaab10679f63a9bf;hb=f8b476b8f9814fdee4685df9b2b5b78e91d9b184;hp=421667da8415ee051db202ea6f68c6f62bdfe8c9;hpb=09fe7f33a735ecc3f4a3112ad716f674983b00cc;p=kivitendo-erp.git
diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 421667da8..173f8b6c1 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 =>
@@ -123,33 +112,31 @@ sub search {
receipt => { title => 'Receipts', name => 'Customer' });
$label{invoice}{invnumber} = qq|
-
- | . $locale->text('Invoice Number') . qq| |
- |
-
+
+ | . $locale->text('Invoice Number') . qq| |
+ |
+
|;
$label{invoice}{ordnumber} = qq|
-
- | . $locale->text('Order Number') . qq| |
- |
-
+
+ | . $locale->text('Order Number') . qq| |
+ |
+
|;
$label{sales_quotation}{quonumber} = qq|
-
- | . $locale->text('Quotation Number') . qq| |
- |
-
+
+ | . $locale->text('Quotation Number') . qq| |
+ |
+
|;
$label{check}{chknumber} = qq|
-
- | . $locale->text('Reference') . qq| |
- |
-
+
+ | . $locale->text('Reference') . qq| |
+ |
+
|;
- $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|
- | . $locale->text('Account') . qq| |
+ | . $locale->text('Account') . qq| |
|;
if ($form->{accounts}) {
$account .= qq|
- |
+
|;
}
@@ -243,23 +230,23 @@ sub search {
-
- Kunde |
- $name |
-
- $account
- $label{$form->{type}}{invnumber}
- $label{$form->{type}}{ordnumber}
- $label{$form->{type}}{quonumber}
- $label{$form->{type}}{chknumber}
- $label{$form->{type}}{rctnumber}
-
- | . $locale->text('From') . qq| |
+
+ Kunde |
+ $name |
+
+ $account
+ $label{$form->{type}}{invnumber}
+ $label{$form->{type}}{ordnumber}
+ $label{$form->{type}}{quonumber}
+ $label{$form->{type}}{chknumber}
+ $label{$form->{type}}{rctnumber}
+
+ | . $locale->text('From') . qq| |
$button1
- | . $locale->text('Bis') . qq| |
+ | . $locale->text('Bis') . qq| |
$button2
-
-
+
+
|
@@ -390,7 +377,7 @@ sub print {
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 {
-
+
|;
map { print "\n$column_header{$_}" } @column_index;
print qq|
-
+
|;
# add sort and escape callback, this one we use for the add sub
|