X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fir.pl;h=b986b7383db0f42341bda0f931b4e3e6bcec13ad;hb=2c5603bb853ba7892d98c295e1f00641d7c13ef3;hp=39b4b88a14edb0517cd58119f4714d4a8501076d;hpb=408a65ca75b941501bc630b144288dd466676248;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 39b4b88a1..b986b7383 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -78,10 +78,8 @@ sub invoice_links {
$lxdebug->enter_sub();
# create links
- $form->{webdav} = $webdav;
-
- # set jscalendar
- $form->{jscalendar} = $jscalendar;
+ $form->{webdav} = $webdav;
+ $form->{jsscript} = 1;
$form->create_links("AP", \%myconfig, "vendor");
@@ -286,9 +284,19 @@ sub form_header {
$labels{$item->{"cp_id"}} = $item->{"cp_name"} .
($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
}
- my $contact =
- NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
- '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+
+ my $contact;
+ if (scalar @values > 1) {
+ $contact = qq|
+
+ | . $locale->text('Contact Person') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+ . qq|
+ |
+
|;
+ }
%labels = ();
@values = ("");
@@ -309,8 +317,10 @@ sub form_header {
$labels{$item} = $item;
}
- $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
- my $currencies = qq|
+ $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
+ my $currencies;
+ if (scalar @values) {
+ $currencies = qq|
| . $locale->text('Currency') . qq| |
| .
@@ -318,7 +328,8 @@ sub form_header {
'-values' => \@values, '-labels' => \%labels)) . qq|
|
|;
-
+ }
+
%labels = ();
@values = ();
my $i = 0;
@@ -334,7 +345,7 @@ sub form_header {
'-values' => \@values, '-labels' => \%labels)) . qq|
|;
-
+
%labels = ();
@values = ();
my $i = 0;
@@ -348,6 +359,7 @@ sub form_header {
NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{"vendor"},
'-onChange' => 'document.getElementById(\'update_button\').click();',
'-values' => \@values, '-labels' => \%labels)) . qq|
+
|;
%labels = ();
@@ -390,37 +402,28 @@ sub form_header {
$n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
# use JavaScript Calendar or not
- $form->{jsscript} = $form->{jscalendar};
+ $form->{jsscript} = 1;
$jsscript = "";
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- |
- text('button') . qq|> |
- |;
- $button2 = qq|
- |
- text('button') . qq|> |
+
+ $button1 = qq|
+
+ text('button') . qq|> |
|;
+ $button2 = qq|
+
+ text('button') . qq|> |
+ |;
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
- "duedate", "BL", "trigger2");
- } else {
-
- # without JavaScript Calendar
- $button1 =
- qq| | |;
- $button2 =
- qq| | |;
- }
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
+ "duedate", "BL", "trigger2");
$form->{"javascript"} .= qq||;
$form->{"javascript"} .= qq||;
+ $form->{javascript} .= qq||;
$jsscript .=
$form->write_trigger(\%myconfig, 2,
@@ -435,59 +438,31 @@ sub form_header {