X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=b90209f948f79bd4edf3281eae992348b7b9fab4;hb=b71b35308c2f7c628666e4a69e6c3b90cefc5ed0;hp=aa75ebe25bd720b1c375f854c58a6db30a507672;hpb=1465da30be12244675541d59b22e94a0f90e0b33;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index aa75ebe25..b90209f94 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -157,7 +157,7 @@ sub invoice_links { } # Load data for a specific order and update form fields - my $order_data = OE->get_order_data_by_ordnumber(%$form); + my $order_data = OE->get_order_data_by_ordnumber(%$form) if $form->{ordnumber}; # Copy the fields we need to %form for my $key (qw(payment_id salesman_id orddate taxzone_id quonumber)) { @@ -293,7 +293,6 @@ sub form_header { $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); - $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; my $set_duedate_url = "$form->{script}?action=set_duedate"; @@ -312,6 +311,7 @@ sub form_header { "taxzones" => "ALL_TAXZONES", "currencies" => "ALL_CURRENCIES", "customers" => "ALL_CUSTOMERS", + "departments" => "all_departments", "price_factors" => "ALL_PRICE_FACTORS"); $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} }; @@ -917,10 +917,10 @@ sub yes { if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) { # saving the history - if(!exists $form->{addition}) { + if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text('Invoice deleted!'));