X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=77f911d1694070298505aea6f906317d6a89aa77;hb=e436a6b05600897aed8c5420d44bf4e1b39cb74f;hp=158a4e46c8e1fd43f836a2074c5b338cb8672dea;hpb=4d20c18172f57d1cb809334683f5b844ca02a5e6;p=kivitendo-erp.git diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 158a4e46c..77f911d16 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -46,6 +46,7 @@ require "bin/mozilla/drafts.pl"; sub add { $lxdebug->enter_sub(); + $form->{"Watchdog::invdate,duedate,vendor,vendor_id"} = 1; return $lxdebug->leave_sub() if (load_draft_maybe()); @@ -122,13 +123,6 @@ sub invoice_links { $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}"; - # vendors - if (@{ $form->{all_vendor} }) { - $form->{vendor} = "$form->{vendor}--$form->{vendor_id}"; - map { $form->{selectvendor} .= "$_->{name}--$_->{id}\n" } - (@{ $form->{all_vendor} }); - } - # departments if ($form->{all_departments}) { $form->{selectdepartment} = "\n"; @@ -227,15 +221,19 @@ sub form_header { s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } + if ($form->{old_employee_id}) { + $form->{employee_id} = $form->{old_employee_id}; + } + if ($form->{old_salesman_id}) { + $form->{salesman_id} = $form->{old_salesman_id}; + } + + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + + $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; - #quote selectvendor Bug 133 - $form->{"selectvendor"} = $form->quote($form->{"selectvendor"}); - - #substitute \n and \r to \s (bug 543) - $form->{"selectvendor"} =~ s/[\n\r]/ /g; - $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); @@ -353,12 +351,17 @@ sub form_header { push(@values, $item->{name}.qq|--|.$item->{"id"}); $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"}; } + + $form->{selectvendor} = ($myconfig{vclimit} > scalar(@values)); + my $vendors = qq| | . $locale->text('Vendor') . qq| | . - NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{"vendor"}, + (($myconfig{vclimit} <= scalar(@values)) + ? qq|| + : (NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{oldvendor}, '-onChange' => 'document.getElementById(\'update_button\').click();', - '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq| + '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq| |; @@ -457,7 +460,7 @@ sub form_header { $vendors - + $contact | . $locale->text('Credit Limit') . qq| @@ -866,7 +869,12 @@ sub form_footer { . qq|">|; } # /button for saving history - + # mark_as_paid button + if($form->{id} ne "") { + print qq||; + } + # /mark_as_paid button print qq|