X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=9140574546d40dd3c2ed513f4cb6269b711a701c;hb=a200453a04fc89fdf02dbe39e1d951cb1b55191c;hp=59d4b479053bcbc73252bce6aefbad24de0aa59e;hpb=83d48a07af73da318458780e40814cf89579cb94;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 59d4b4790..914057454 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -170,9 +170,8 @@ sub invoice_links {
$form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
if (@{ $form->{all_customer} }) {
- $form->{customer} = "$form->{customer}--$form->{customer_id}";
- map { $form->{selectcustomer} .= "\n" }
- (@{ $form->{all_customer} });
+ $form->{customer} = "$form->{customer}--$form->{customer_id}";
+ $form->{selectcustomer} = "$form->{customer}--$form->{customer_id}";
}
# departments
@@ -188,13 +187,6 @@ sub invoice_links {
$form->{employee} = "$form->{employee}--$form->{employee_id}";
- # sales staff
- if ($form->{all_employees}) {
- $form->{selectemployee} = "";
- map { $form->{selectemployee} .= "\n" }
- (@{ $form->{all_employees} });
- }
-
# forex
$form->{forex} = $form->{exchangerate};
$exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
@@ -338,7 +330,8 @@ sub form_header {
"old_id" => \@old_project_ids },
"employees" => "ALL_SALESMEN",
"taxzones" => "ALL_TAXZONES",
- "currencies" => "ALL_CURRENCIES");
+ "currencies" => "ALL_CURRENCIES",
+ "customers" => "ALL_CUSTOMERS");
my %labels;
my @values = (undef);
@@ -351,6 +344,40 @@ sub form_header {
NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
'-labels' => \%labels, '-default' => $form->{"cp_id"}));
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"name"};
+ }
+
+ my $employees = qq|
+
+ | . $locale->text('Employee') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee_id"},
+ '-values' => \@values, '-labels' => \%labels)) . qq|
+ |
+
|;
+
+
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_CUSTOMERS"} }) {
+ push(@values, $item->{name}.qq|--|.$item->{"id"});
+ $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+ }
+
+ my $customers = qq|
+ | . $locale->text('Customer') . qq| |
+ | .
+ (($myconfig{vclimit} == 1 )
+ ? qq||
+ : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
+ '-onChange' => 'document.getElementById(\'update_button\').click();',
+ '-values' => \@values, '-labels' => \%labels)))) . qq|
+ | |;
+
%labels = ();
@values = ("");
foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
@@ -369,8 +396,8 @@ sub form_header {
%labels = ();
@values = ();
foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) {
- push(@values, $item->{"currency"});
- $labels{$item->{"currency"}} = $item->{"currency"};
+ push(@values, $item);
+ $labels{$item} = $item;
}
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
@@ -483,14 +510,6 @@ sub form_header {
|;
- $customer =
- ($form->{selectcustomer})
- ? qq|\n|
- : qq||;
-
$department = qq|
| . $locale->text('Department') . qq| |
@@ -653,11 +672,11 @@ print qq|
- | . $locale->text('Customer') . qq| |
- $customer |
+ $customers
-
+
+
|
. $locale->text('Contact Person') . qq| |
$contact |
@@ -725,12 +744,7 @@ print qq|
|
-
- | . $locale->text('Employee') . qq| |
- |
-
- |
-
+ $employees
$salesman
|;
if ($form->{type} eq "credit_note") {
|