X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fbp.pl;h=78a343852e44cc7888ff56fcc8db5b47e95cfba6;hb=f0747a2f9c8d7a9d261c20b0d2a9d5911a6ad9b5;hp=1d9d79fae1adba3ca5989a0d28a0cb2e2b97dcc8;hpb=8f84155d7599f51cb9da4aa8b03c554ad13244ee;p=kivitendo-erp.git diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl index 1d9d79fae..78a343852 100644 --- a/bin/mozilla/bp.pl +++ b/bin/mozilla/bp.pl @@ -24,7 +24,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 @@ -49,6 +50,7 @@ sub assert_bp_access { 'sales_order' => 'sales_order_edit', 'sales_quotation' => 'sales_quotation_edit', 'purchase_order' => 'purchase_order_edit', + 'packing_list' => 'sales_delivery_order_edit|purchase_delivery_order_edit', 'request_quotation' => 'request_quotation_edit', 'check' => 'cash', 'receipt' => 'cash', @@ -76,6 +78,7 @@ sub search { purchase_order => { title => $::locale->text('Purchase Orders'), ordnumber => 1, }, sales_quotation => { title => $::locale->text('Quotations'), quonumber => 1, }, request_quotation => { title => $::locale->text('RFQs'), quonumber => 1, }, + packing_list => { title => $::locale->text('Delivery Orders'), donumber => 1, ordnumber => 1 }, check => { title => $::locale->text('Checks'), chknumber => 1, }, receipt => { title => $::locale->text('Receipts'), rctnumber => 1, }, ); @@ -133,7 +136,7 @@ sub print { print $::locale->text('done'); $::form->redirect($::locale->text('Marked entries printed!')); } - ::end_of_request(); + $::dispatcher->end_request; } } @@ -161,12 +164,13 @@ sub list_spool { invnumber => sub { $::locale->text('Invoice Number') . " : $::form->{invnumber}" }, ordnumber => sub { $::locale->text('Order Number') . " : $::form->{ordnumber}" }, quonumber => sub { $::locale->text('Quotation Number') . " : $::form->{quonumber}" }, + donumber => sub { $::locale->text('Delivery Order Number') . " : $::form->{donumber}" }, transdatefrom => sub { $::locale->text('From') . " " . $::locale->date(\%::myconfig, $::form->{transdatefrom}, 1) }, transdateto => sub { $::locale->text('To') . " " . $::locale->date(\%::myconfig, $::form->{transdateto}, 1) }, ); my @options; - for my $key ($::form->{vc}, qw(account invnumber ordnumber quonumber transdatefrom transdateto)) { + for my $key ($::form->{vc}, qw(account invnumber ordnumber quonumber donumber transdatefrom transdateto)) { next unless $::form->{$key}; push @href_options, $key; push @options, $option_texts{$key} ? $option_texts{$key}->() : ''; @@ -184,7 +188,6 @@ sub list_spool { $::form->header; print $::form->parse_html_template('bp/list_spool', { - spool => $::lx_office_conf{paths}->{spool}, href => build_std_url('bp.pl', @href_options), is_invoice => scalar ($::form->{type} =~ /^invoice$/), is_order => scalar ($::form->{type} =~ /_order$/), @@ -196,4 +199,3 @@ sub list_spool { } sub continue { call_sub($::form->{"nextsub"}); } -