X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fir.pl;h=440ee6e4064035e56fc3e861e193bd141c86a143;hb=ab875da135e7c44abb05eae5a136f6df4e09078c;hp=022c858406cae22b08af05b92bf93ba459170975;hpb=08ca74a8fe8fc1f9e528b0cc1172062c80283a36;p=kivitendo-erp.git diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 022c85840..440ee6e40 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -71,7 +71,7 @@ sub edit { # show history button $form->{javascript} = qq||; #/show hhistory button - + $form->{title} = $locale->text('Edit Vendor Invoice'); &invoice_links; @@ -116,7 +116,7 @@ sub invoice_links { IR->get_vendor(\%myconfig, \%$form); IR->retrieve_invoice(\%myconfig, \%$form); $form->{cp_id} = $cp_id; - + if ($payment_id) { $form->{payment_id} = $payment_id; } @@ -293,7 +293,7 @@ sub form_header { } my $globalprojectnumber = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, '-labels' => \%labels, '-default' => $form->{"globalproject_id"})); - + %labels = (); @values = (); my $i = 0; @@ -301,7 +301,7 @@ sub form_header { push(@values, $item); $labels{$item} = $item; } - + $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; my $currencies; if (scalar @values) { @@ -347,7 +347,7 @@ sub form_header { : (NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{oldvendor}, '-onChange' => 'document.getElementById(\'update_button\').click();', '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq| - + |; %labels = (); @@ -406,12 +406,12 @@ sub form_header { #write Trigger $jsscript = - Form->write_trigger(\%myconfig, "2", + Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1", "duedate", "BL", "trigger2"); my $follow_up_vc = $form->{vendor}; - $follow_up_vc =~ s/--.*?//; + $follow_up_vc =~ s/--\d*\s*$//; my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; $form->{javascript} .= qq||; @@ -469,7 +469,7 @@ sub form_header {
| . $locale->text('Invoice Number') . qq| | |; $column_data{"source_$i"} = - qq| | {"source_$i"}> | |; + qq||; $column_data{"memo_$i"} = - qq| | {"memo_$i"}> | |; + qq||; map { print qq|$column_data{"${_}_$i"}\n| } @column_index; @@ -826,7 +826,7 @@ sub form_footer { |; if ($form->{id}) { - my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap"); + my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap") && (($totalpaid == 0) || ($totalpaid eq "")); print qq| @@ -857,7 +857,7 @@ sub form_footer { } print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers); - $form->hide_form(qw(rowcount callback draft_id draft_description)); + $form->hide_form(qw(rowcount callback draft_id draft_description vendor_discount)); # button for saving history if($form->{id} ne "") { @@ -869,14 +869,13 @@ sub form_footer { . qq|">|; } # /button for saving history - # mark_as_paid button - if($form->{id} ne "") { - print qq| |; } # /mark_as_paid button print qq| - |
---|