X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=b5cd79d636621c7baad5e47d73daca7b742a4c9a;hb=4536d0a7bc1b0b014cdac7211dcc171973678dbf;hp=3c55ee58f60248b7c6e95be9e63c1c421652b71a;hpb=ce3ce404919a3e39c4b966db7b7d02076cd8c7e5;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 3c55ee58f..b5cd79d63 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -157,7 +157,6 @@ sub edit {
 
 sub order_links {
   $lxdebug->enter_sub();
-
   # get customer/vendor
   $form->all_vc(\%myconfig, $form->{vc},
                 ($form->{vc} eq 'customer') ? "AR" : "AP");
@@ -231,6 +230,7 @@ sub order_links {
 
   }
   $form->{cp_id} = $cp_id;
+
   if ($payment_id) {
     $form->{payment_id} = $payment_id;
   }
@@ -269,13 +269,6 @@ sub order_links {
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
-  # sales staff
-  if (@{ $form->{all_employees} }) {
-    $form->{selectemployee} = "";
-    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}</option>\n" }
-      (@{ $form->{all_employees} });
-  }
-
   # forex
   $form->{forex} = $form->{exchangerate};
 
@@ -341,14 +334,6 @@ sub form_header {
   $form->{jsscript} = $form->{jscalendar};
   $jsscript = "";
 
-  $payment = qq|<option value=""></option>|;
-  foreach $item (@{ $form->{payment_terms} }) {
-    if ($form->{payment_id} eq $item->{id}) {
-      $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-    } else {
-      $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
-    }
-  }
   if ($form->{jsscript}) {
 
     # with JavaScript Calendar
@@ -372,9 +357,9 @@ sub form_header {
 
     # without JavaScript Calendar
     $button1 = qq|
-                              <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>|;
+                              <td><input name="transdate" id="transdate" size="11" title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>|;
     $button2 = qq|
-                              <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\"></td>|;
+                              <td width="13"><input name="reqdate" id="reqdate" size="11" title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\"></td>|;
   }
 
   my @tmp;
@@ -402,7 +387,7 @@ sub form_header {
   }
 
   # set option selected
-  foreach $item ($form->{vc}, currency, department, employee) {
+  foreach $item ($form->{vc}, currency, department, employee, ($form->{vc} eq "customer" ? customer : vendor)) {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -418,6 +403,7 @@ sub form_header {
   map({ push(@old_project_ids, $form->{"project_id_$_"})
           if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
 
+  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
   $form->get_lists("contacts" => "ALL_CONTACTS",
                    "shipto" => "ALL_SHIPTO",
                    "projects" => { "key" => "ALL_PROJECTS",
@@ -425,7 +411,9 @@ sub form_header {
                                    "old_id" => \@old_project_ids },
                    "employees" => "ALL_SALESMEN",
                    "taxzones" => "ALL_TAXZONES",
-                   "currencies" => "ALL_CURRENCIES");
+                   "payments" => "ALL_PAYMENTS",
+                   "currencies" => "ALL_CURRENCIES",
+                   $vc => "ALL_" . uc($vc));
 
   my %labels;
   my @values = (undef);
@@ -438,6 +426,41 @@ sub form_header {
     NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
                          '-labels' => \%labels, '-default' => $form->{"cp_id"}));
 
+  %labels = ();
+  @values = ();
+
+  foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) {
+    push(@values, $item->{name}.qq|--|.$item->{"id"});
+    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+  }
+
+  $vc = qq|
+      <input type="hidden" name="$form->{vc}_id" value="| . H($form->{"$form->{vc}_id"}) . qq|">
+      <input type="hidden" name="old$form->{vc}" value="| . H($form->{"old$form->{vc}"}) . qq|">
+      <th align="right">| . $locale->text(ucfirst($form->{vc})) . qq|</th>
+      <td>| . 
+        (($myconfig{vclimit} <=  scalar(@values)) 
+              ? qq|<input type="text" value="| . H($form->{"old$form->{vc}"}) . qq|" name="$form->{vc}">| 
+              : (NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"}, 
+                             '-onChange' => 'document.getElementById(\'update_button\').click();',
+                             '-values' => \@values, '-labels' => \%labels)))) . qq|
+      </td><input type=hidden name="select$form->{vc}" value="| .
+    Q($form->{"select$form->{vc}"}) . qq|">|;
+
+  %labels = ();
+  @values = ("");
+  foreach my $item (@{ $form->{"ALL_PAYMENTS"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"description"};
+  }
+  
+  $payments = qq|
+    <th align="right">| . $locale->text('Payment Terms') . qq|</th>
+    <td>| .
+    NTI($cgi->popup_menu('-name' => 'payment_id', '-values' => \@values,
+                         '-labels' => \%labels, '-default' => $form->{payment_id}))
+    . qq|</td>|;
+
   %labels = ();
   @values = ("");
   foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
@@ -483,6 +506,21 @@ sub form_header {
          </tr>|;
   }
 
+  %labels = ();
+  @values = ();
+  foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"name"};
+  }
+
+  my $employees = qq|
+    <tr>
+      <th align="right">| . $locale->text('Employee') . qq|</th>
+      <td>| .
+        NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee"},
+                             '-values' => \@values, '-labels' => \%labels)) . qq|
+      </td>
+    </tr>|;
 
   %labels = ();
   @values = ();
@@ -553,11 +591,6 @@ sub form_header {
     }
   }
 
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
-
-
-
   if ($form->{business}) {
     $business = qq|
 	      <tr>
@@ -677,48 +710,25 @@ sub form_header {
                           </tr>|;
   }
 
-  $vc =
-    ($form->{"select$form->{vc}"})
-    ? qq|<select name="$form->{vc}"
-onchange="document.getElementById('update_button').click();">| .
-    qq|$form->{"select$form->{vc}"}</select>\n<input type=hidden name="select$form->{vc}" value="| .
-    Q($form->{"select$form->{vc}"}) . qq|">|
-    : qq|<input name=$form->{vc} value="$form->{$form->{vc}}" size=35>|;
-
   $department = qq|
               <tr>
 	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
 		<td colspan=3><select name=department>$form->{selectdepartment}</select>
 		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
 		</td>
-	      </tr>
-| if $form->{selectdepartment};
-
-  $employee = qq|
-              <input type=hidden name=employee value="$form->{employee}">
-|;
+	      </tr> | if $form->{selectdepartment};
 
   if ($form->{type} eq 'sales_order') {
     if ($form->{selectemployee}) {
       $employee = qq|
     <input type=hidden name=customer_klass value=$form->{customer_klass}>
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Employee') . qq|</th>
-		<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-                <td></td>
-	      </tr>
+        $employees
 |;
     }
   } else {
     $employee = qq|
     <input type=hidden name=customer_klass value=$form->{customer_klass}>
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Employee') . qq|</th>
-		<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-                <td></td>
-	      </tr>
+        $employees
 |;
   }
   if ($form->{resubmit} && ($form->{format} eq "html")) {
@@ -790,10 +800,7 @@ onchange="document.getElementById('update_button').click();">| .
 	  <td>
 	    <table width=100%>
 	      <tr>
-		<th align=right>$vclabel</th>
-		<td colspan=3>$vc</td>
-		<input type=hidden name=$form->{vc}_id value=$form->{"$form->{vc}_id"}>
-		<input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
+        $vc
                 <th align=richt nowrap>|
     . $locale->text('Contact Person') . qq|</th>
                 <td colspan=3>$contact</td>
@@ -1009,10 +1016,10 @@ sub form_footer {
 		<td>$notes</td>
 		<td>$intnotes</td>
 	      </tr>
-	  <th align=right>| . $locale->text('Payment Terms') . qq|</th>
-	  <td><select name=payment_id>$payment
-                          </select></td>
-	    </table>
+	  <tr>
+    $payments
+	    </tr>
+      </table>
 	  </td>
 	  <td align=right width=100%>
 	    $taxincluded
@@ -1185,9 +1192,17 @@ sub update {
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
   $form->{update} = 1;
-
+      
+  if($form->{payment_id}) { 
+    $payment_id = $form->{payment_id};
+  }
+  
   &check_name($form->{vc});
-
+  
+  if($form->{payment_id} eq "") { 
+    $form->{payment_id} = $payment_id;
+  }
+  
   $buysell              = 'buy';
   $buysell              = 'sell' if ($form->{vc} eq 'vendor');
   $form->{exchangerate} = $exchangerate
@@ -1354,20 +1369,6 @@ sub search {
   $form->all_vc(\%myconfig, $form->{vc},
                 ($form->{vc} eq 'customer') ? "AR" : "AP");
 
-  map { $vc .= "<option>$_->{name}--$_->{id}</option>\n" }
-    @{ $form->{"all_$form->{vc}"} };
-
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
-
-  # $locale->text('Vendor')
-  # $locale->text('Customer')
-
-  $vc =
-    ($vc)
-    ? qq|<select name=$form->{vc}><option>\n$vc</option></select>|
-    : qq|<input name=$form->{vc} size=35>|;
-
   # departments
   if (@{ $form->{all_departments} }) {
     $form->{selectdepartment} = "<option>\n";
@@ -1428,8 +1429,11 @@ sub search {
                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\></td>|;
   }
 
+  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
+
   $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
-                                   "all" => 1 });
+                                   "all" => 1 },
+                   $vc => "ALL_" . uc($vc));
 
   my %labels = ();
   my @values = ("");
@@ -1441,6 +1445,24 @@ sub search {
     NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
                          '-labels' => \%labels));
 
+  %labels = ();
+  @values = ("");
+
+  foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) {
+    push(@values, $item->{name}.qq|--|.$item->{"id"});
+    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+  }
+
+  my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor');
+  $vc =
+    $myconfig{vclimit} <=  scalar(@values)
+    ? qq|<input type="text" value="| . H($form->{"old$form->{vc}"}) . qq|" name="$form->{vc}">|
+    : NTI($cgi->popup_menu('-name' => "$form->{vc}",
+                           '-default' => $form->{"old$form->{vc}"},
+                           '-onChange' => 'document.getElementById(\'update_button\').click();',
+                           '-values' => \@values,
+                           '-labels' => \%labels));
+
   $form->header;
 
   print qq|
@@ -1457,8 +1479,8 @@ sub search {
     <td>
       <table>
         <tr>
-          <th align=right>$vclabel</th>
-          <td colspan="3">$vc</td>
+          <th align=right>$vc_label</th>
+          <td colspan=3>$vc</td>
         </tr>
 	$department
         <tr>
@@ -1501,7 +1523,7 @@ sub search {
     . $locale->text('Required by') . qq|</td>
 	      </tr>
 	      <tr>
-	        <td><input name="l_name" class=checkbox type=checkbox value=Y checked> $vclabel</td>
+	        <td><input name="l_name" class=checkbox type=checkbox value=Y checked> ucfirst($form->{vc})</td>
 	        <td><input name="l_employee" class=checkbox type=checkbox value=Y checked> $employee</td>
 		<td><input name="l_shipvia" class=checkbox type=checkbox value=Y> |
     . $locale->text('Ship via') . qq|</td>
@@ -1557,12 +1579,6 @@ $jsscript
 sub orders {
   $lxdebug->enter_sub();
 
-  # split vendor / customer
-  ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) =
-    split(/--/, $form->{ $form->{vc} });
-
-  OE->transactions(\%myconfig, \%$form);
-
   $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber";
 
   # construct href
@@ -1570,11 +1586,18 @@ sub orders {
     qw(type vc login password transdatefrom transdateto
        open closed notdelivered delivered department
        transaction_description);
+  push @fields, $form->{vc};
   $href = "$form->{script}?action=orders&"
     . join("&", map { "${_}=" . E($form->{$_}) } @fields)
     . "&${ordnumber}=" . E($form->{$ordnumber});
   $callback = $href;
 
+  # split vendor / customer
+  ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) =
+    split(/--/, $form->{ $form->{vc} });
+
+  OE->transactions(\%myconfig, \%$form);
+
   @columns = (
     "transdate",               "reqdate",
     "id",                      "$ordnumber",
@@ -1928,6 +1951,10 @@ sub save_and_close {
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
   }
 
+  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+  $form->{$idx} =~ s/^\s*//g;
+  $form->{$idx} =~ s/\s*$//g;
+
   $msg = ucfirst $form->{vc};
   $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
 
@@ -1938,9 +1965,16 @@ sub save_and_close {
     if ($form->{currency} ne $form->{defaultcurrency});
 
   &validate_items;
-
+  
+  if($form->{payment_id}) { 
+    $payment_id = $form->{payment_id};
+  }
+  
   # if the name changed get new values
   if (&check_name($form->{vc})) {
+    if($form->{payment_id} eq "") { 
+      $form->{payment_id} = $payment_id;
+    }
     &update;
     exit;
   }
@@ -2012,6 +2046,10 @@ sub save {
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
   }
 
+  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+  $form->{$idx} =~ s/^\s*//g;
+  $form->{$idx} =~ s/\s*$//g;
+
   $msg = ucfirst $form->{vc};
   $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
 
@@ -2022,9 +2060,16 @@ sub save {
     if ($form->{currency} ne $form->{defaultcurrency});
 
   &validate_items;
-
+  
+  if($form->{payment_id}) { 
+    $payment_id = $form->{payment_id};
+  }
+  
   # if the name changed get new values
   if (&check_name($form->{vc})) {
+    if($form->{payment_id} eq "") { 
+      $form->{payment_id} = $payment_id;
+    }
     &update;
     exit;
   }
@@ -2177,9 +2222,16 @@ sub invoice {
     $form->{ordnumber} = "";
     $form->{quodate} = $form->{transdate};
   }
-
+  
+  if($form->{payment_id}) { 
+    $payment_id = $form->{payment_id};
+  }
+  
   # if the name changed get new values
   if (&check_name($form->{vc})) {
+    if($form->{payment_id} eq "") { 
+      $form->{payment_id} = $payment_id;
+    }
     &update;
     exit;
   }
@@ -2475,6 +2527,8 @@ sub save_as_new {
   # Let Lx-Office assign a new order number if the user hasn't changed the
   # previous one. If it has been changed manually then use it as-is.
   my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+  $form->{$idx} =~ s/^\s*//g;
+  $form->{$idx} =~ s/\s*$//g;
   if ($form->{saved_xyznumber} &&
       ($form->{saved_xyznumber} eq $form->{$idx})) {
     delete($form->{$idx});