X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fct.pl;h=bfeacf45c531d0ad61ea6b94b7f63b900aa59a6d;hb=4671a79f086eb9031d0715d24ed4338aa190b163;hp=767d0e87d5625f8b70c40d8ffdb9ef7b09ae92af;hpb=2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 767d0e87d..bfeacf45c 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -42,6 +42,8 @@ use CGI::Ajax;
 use CGI;
 use Data::Dumper;
 
+require "bin/mozilla/common.pl";
+
 1;
 
 # end of main
@@ -583,6 +585,8 @@ sub edit {
 sub form_header {
   $lxdebug->enter_sub();
 
+  $form->get_lists("employees" => "ALL_SALESMEN");
+
   $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
   $form->{creditlimit} =
     $form->format_amount(\%myconfig, $form->{creditlimit}, 0);
@@ -638,11 +642,10 @@ sub form_header {
   }
 
   $taxzone = qq|
-	      <tr>
 		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
 		<td><select name=taxzone_id>$form->{selecttaxzone}</select></td>
 		<input type=hidden name=selecttaxzone value="$form->{selecttaxzone}">
-	      </tr>|;
+|;
 
   $get_contact_url =
     "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_contact";
@@ -772,32 +775,28 @@ sub form_header {
            <td><input name=c_vendor_id size=10 tabindex=18 maxlength=35 value="$form->{c_vendor_id}"></td>
 |;
   }
-  $business_salesman = "";
-  $business          = "<th></th><td></td>";
-  if ($vertreter) {
-    $business_salesman = qq|
-	<tr>
-          <td colspan=3>
-            <table>
-	     <th align=right>| . $locale->text('Type of Business') . qq|</th>
-	     <td><select name=business tabindex=1>$form->{selectbusiness}</select></td>
-	     <th align=right>| . $locale->text('Salesman') . qq|</th>
-	     <td><input name=salesman tabindex=2 value="$form->{salesman}"></td>
-             <input type=hidden name=salesman_id value="$form->{salesman_id}">
-             <input type=hidden name=oldsalesman value="$form->{oldsalesman}">
-            </table>
-          </td>
-       <tr>|;
-    $business = qq|
-	     <th align=right>| . $locale->text('Username') . qq|</th>
-	     <td><input name=username maxlength=50 tabindex=22 value="$form->{username}"></td>
- 	     <th align=right>| . $locale->text('Password') . qq|</th>
-	     <td><input name=user_password maxlength=12 tabindex=23 value="$form->{user_password}"></td>|;
-  } else {
-    $business = qq|
+
+  $business = qq|
  	  <th align=right>| . $locale->text('Type of Business') . qq|</th>
 	  <td><select name=business tabindex=22>$form->{selectbusiness}</select></td>
       |;
+
+  $salesman = "";
+
+  if ($form->{db} eq "customer") {
+    my (@salesman_values, %salesman_labels);
+    push(@salesman_values, undef);
+    foreach my $item (@{ $form->{ALL_SALESMEN} }) {
+      push(@salesman_values, $item->{id});
+      $salesman_labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
+    }
+
+    $salesman =
+      qq| <th align="right">| . $locale->text('Salesman') . qq|</th>
+          <td>| .
+      NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
+                           '-values' => \@salesman_values, '-labels' => \%salesman_labels))
+      . qq|</td>|;
   }
 
 ## LINET: Create a drop-down box with all prior titles and greetings.
@@ -895,7 +894,6 @@ sub form_header {
 
       <table width=100%>
 	<tr height="5"></tr>
-        $business_salesman
 	<tr>
 	  <th align=right nowrap>| . $locale->text($label . ' Number') . qq|</th>
 	  <td><input name="$form->{db}number" size=35 maxlength=35 value="$form->{"$form->{db}number"}"></td>
@@ -992,7 +990,10 @@ sub form_header {
           <td align=right>| . $locale->text('Obsolete') . qq|</td>
           <td><input name=obsolete class=checkbox type=checkbox value=1 $form->{obsolete}></td>
 	</tr>
-        $taxzone
+        <tr>
+          $taxzone
+          $salesman
+        </tr>
       </table>
   <table>
   <tr>
@@ -1199,13 +1200,6 @@ sub form_footer {
     ($form->{db} eq 'customer')
     ? $locale->text('Save and AR Transaction')
     : $locale->text('Save and AP Transaction');
-  if ($vertreter) {
-    $update_button =
-      qq|<input class=submit type=submit name=action accesskey="u" value="|
-      . $locale->text("Update") . qq|">|;
-  } else {
-    $update_button = "";
-  }
 
 ##<input class=submit type=submit name=action value="|.$locale->text("Save and Quotation").qq|">
 ##<input class=submit type=submit name=action value="|.$locale->text("Save and RFQ").qq|">
@@ -1228,7 +1222,6 @@ sub form_footer {
 
 
 <br>
-$update_button
 <input class=submit type=submit name=action accesskey="s" value="|
     . $locale->text("Save") . qq|">
 <input class=submit type=submit name=action accesskey="s" value="|
@@ -1283,9 +1276,6 @@ sub add_transaction {
 #  # /saving the history
   
   $form->isblank("name", $locale->text("Name missing!"));
-  if ($vertreter && $form->{db} eq "customer") {
-    $form->isblank("salesman_id", $locale->text("Salesman missing!"));
-  }
   &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
 
   $form->{callback} = $form->escape($form->{callback}, 1);
@@ -1397,9 +1387,6 @@ sub save_and_close {
   $imsg .= " saved!";
 
   $form->isblank("name", $locale->text("Name missing!"));
-  if ($vertreter && $form->{db} eq "customer") {
-    $form->isblank("salesman_id", $locale->text("Salesman missing!"));
-  }
   $rc = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
   if ($rc == 3) {
     $form->error($locale->text('customernumber not unique!'));
@@ -1425,9 +1412,6 @@ sub save {
   $imsg .= " saved!";
 
   $form->isblank("name", $locale->text("Name missing!"));
-  if ($vertreter && $form->{db} eq "customer") {
-    $form->isblank("salesman_id", $locale->text("Salesman missing!"));
-  }
 
   my $res = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
 
@@ -1487,179 +1471,10 @@ sub display {
 sub update {
   $lxdebug->enter_sub();
 
-  &check_salesman($form->{salesman});
-
-  #  $form->get_salesman(\%myconfig, $form->{salesman});
   &display();
   $lxdebug->leave_sub();
 }
 
-sub check_salesman {
-  $lxdebug->enter_sub();
-
-  my ($name) = @_;
-
-  my ($new_name, $new_id) = split /--/, $form->{$name};
-  my $i = 0;
-
-  # check name, combine name and id
-  if ($form->{"oldsalesman"} ne $form->{"salesman"}) {
-
-    # return one name or a list of names in $form->{name_list}
-    if (($i = $form->get_salesman(\%myconfig, $name)) > 1) {
-      &select_salesman($name);
-      exit;
-    }
-
-    if ($i == 1) {
-
-      # we got one name
-      $form->{"salesman_id"} = $form->{salesman_list}[0]->{id};
-      $form->{salesman}      = $form->{salesman_list}[0]->{name};
-      $form->{"oldsalesman"} = $form->{salesman};
-
-    } else {
-
-      # name is not on file
-      # $locale->text('Customer not on file!')
-      # $locale->text('Vendor not on file!')
-      $msg = ucfirst $name . " not on file or locked!";
-      $form->error($locale->text($msg));
-    }
-  }
-
-  $lxdebug->leave_sub();
-
-  return $i;
-}
-
-sub select_salesman {
-  $lxdebug->enter_sub();
-
-  my ($table) = @_;
-
-  @column_index = qw(ndx name);
-
-  $label             = ucfirst $table;
-  $column_data{ndx}  = qq|<th>&nbsp;</th>|;
-  $column_data{name} =
-    qq|<th class=listheading>| . $locale->text($label) . qq|</th>|;
-
-  # list items with radio button on a form
-  $form->header;
-
-  $title = $locale->text('Select from one of the names below');
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$title</th>
-  </tr>
-  <tr space=5></tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
-
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print qq|
-	</tr>
-|;
-
-  my $i = 0;
-  foreach $ref (@{ $form->{salesman_list} }) {
-    $checked = ($i++) ? "" : "checked";
-
-    $ref->{name} =~ s/\"/&quot;/g;
-
-    $column_data{ndx} =
-      qq|<td><input name=ndx class=radio type=radio value=$i $checked></td>|;
-    $column_data{name} =
-      qq|<td><input name="new_name_$i" type=hidden value="$ref->{name}">$ref->{name}</td>|;
-
-    $j++;
-    $j %= 2;
-    print qq|
-	<tr class=listrow$j>|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-	</tr>
-
-<input name="new_id_$i" type=hidden value=$ref->{id}>
-
-|;
-
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<input name=lastndx type=hidden value=$i>
-
-|;
-
-  # delete variables
-  map { delete $form->{$_} } qw(action name_list header);
-
-  # save all other form variables
-  foreach $key (keys %${form}) {
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input name=$key type=hidden value="$form->{$key}">\n|;
-  }
-
-  print qq|
-<input type=hidden name=nextsub value=salesman_selected>
-
-<input type=hidden name=vc value=$table>
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub salesman_selected {
-  $lxdebug->enter_sub();
-
-  # replace the variable with the one checked
-
-  # index for new item
-  $i = $form->{ndx};
-
-  $form->{salesman}      = $form->{"new_name_$i"};
-  $form->{"salesman_id"} = $form->{"new_id_$i"};
-  $form->{"oldsalesman"} = $form->{salesman};
-
-  # delete all the new_ variables
-  for $i (1 .. $form->{lastndx}) {
-    map { delete $form->{"new_${_}_$i"} } (id, name);
-  }
-
-  map { delete $form->{$_} } qw(ndx lastndx nextsub);
-
-  &update(1);
-
-  $lxdebug->leave_sub();
-}
-
 sub get_contact {
   $lxdebug->enter_sub();