X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fir.pl;h=c9624ccb3035b25ea14f1f0406e0195a006a8f68;hb=dc45f08f06586e0e6edc5a88f808d60daf0ba266;hp=1fcc25cfe51acb893fe8f127066edd07d8246ea0;hpb=1c72997a75092b0be98d66884efea080acbb25b0;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 1fcc25cfe..c9624ccb3 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");
@@ -223,7 +221,7 @@ sub form_header {
$lxdebug->enter_sub();
# set option selected
- foreach $item (qw(AP vendor currency department employee)) {
+ foreach $item (qw(AP vendor currency department)) {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -276,7 +274,8 @@ sub form_header {
"old_id" => \@old_project_ids },
"taxzones" => "ALL_TAXZONES",
"employees" => "ALL_SALESMEN",
- "currencies" => "ALL_CURRENCIES");
+ "currencies" => "ALL_CURRENCIES",
+ "vendors" => "ALL_VENDORS");
my %labels;
my @values = (undef);
@@ -285,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, '-style' => 'width: 250px',
+ '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+ . qq|
+ |
+
|;
+ }
%labels = ();
@values = ("");
@@ -308,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| |
| .
@@ -317,8 +328,8 @@ sub form_header {
'-values' => \@values, '-labels' => \%labels)) . qq|
|
|;
-
-
+ }
+
%labels = ();
@values = ();
my $i = 0;
@@ -330,11 +341,27 @@ sub form_header {
| . $locale->text('Employee') . qq| |
| .
- NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee"},
+ NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
'-values' => \@values, '-labels' => \%labels)) . qq|
|
|;
-
+
+ %labels = ();
+ @values = ();
+ my $i = 0;
+ foreach my $item (@{ $form->{"ALL_VENDORS"} }) {
+ push(@values, $item->{name}.qq|--|.$item->{"id"});
+ $labels{$item->{"id"}} = $item->{"name"}.qq|--|.$item->{"id"};
+ }
+ my $vendors = qq|
+ | . $locale->text('Vendor') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{"vendor"},
+ '-onChange' => 'document.getElementById(\'update_button\').click();',
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq|
+
+ | |;
+
%labels = ();
@values = ();
foreach my $item (@{ $form->{"ALL_TAXZONES"} }) {
@@ -348,7 +375,7 @@ sub form_header {
| . $locale->text('Steuersatz') . qq| |
| .
NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
- '-values' => \@values, '-labels' => \%labels)) . qq|
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq|
|
|;
@@ -363,18 +390,10 @@ sub form_header {
|;
}
- $vendor =
- ($form->{selectvendor})
- ? qq|\n|
- : qq||;
-
$department = qq|
| . $locale->text('Department') . qq| |
-
+ |
|
@@ -383,37 +402,28 @@ onchange="document.getElementById('update_button').click();">| .
$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|> |
- |;
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
- "duedate", "BL", "trigger2");
- } else {
+ $button1 = qq|
+
+ text('button') . qq|> |
+ |;
+ $button2 = qq|
+
+ text('button') . qq|> |
+ |;
- # 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,
@@ -428,63 +438,34 @@ onchange="document.getElementById('update_button').click();">| .