X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=a04cf5e5bdc08699dd00722eac1f6533e2789863;hb=7743b3ab885b485ae317338c55da427b62ab457d;hp=49672ab54e8ecf1a084dee22fdf1c1a1a24eac70;hpb=a14a3ff56b00e22c39a2cfb0e465f8c7764a4cd4;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 49672ab54..a04cf5e5b 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -543,14 +543,8 @@ sub list_names {
 <input type=hidden name=password value=$form->{password}>
 
 <input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">|;
+    . $locale->text('Add') . qq|">
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
   </form>
 
 </body>
@@ -1167,10 +1161,10 @@ $shipto
     <tr>
       <th align=left nowrap>| . $locale->text('From') . qq|</th>
       <td><input id=from name=from size=10 maxlength=10 value="$form->{from}">
-        <input type="button" name="from" id="trigger_from" value="?"></td>
+        <input type="button" name="fromB" id="trigger_from" value="?"></td>
       <th align=left nowrap>| . $locale->text('To (time)') . qq|</th>
       <td><input id=to name=to size=10 maxlength=10 value="$form->{to}">
-        <input type="button" name="to" id="trigger_to" value="?"></td>
+        <input type="button" name="toB" id="trigger_to" value="?"></td>
     </tr>       
     <tr>
      <td colspan=4>
@@ -1183,8 +1177,8 @@ $shipto
 
 </div>
 
-| . $form->write_trigger(\%myconfig, 2, "from", "BL", "trigger_from",
-                         "to", "BL", "trigger_to");
+| . $form->write_trigger(\%myconfig, 2, "fromB", "BL", "trigger_from",
+                         "toB", "BL", "trigger_to");
 
   $lxdebug->leave_sub();
 }
@@ -1249,11 +1243,6 @@ $update_button
       . qq|">\n|;
   }
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
   print qq|
 
   </form>
@@ -1382,8 +1371,16 @@ sub save {
   if ($vertreter && $form->{db} eq "customer") {
     $form->isblank("salesman_id", $locale->text("Salesman missing!"));
   }
-  print(STDERR "SHIPTO in sub save $form->{shipto_id}\n");
-  &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
+
+  my $res = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
+
+  if (3 == $res) {
+    if ($form->{"db"} eq "customer") {
+      $form->error($locale->text('This customer number is already in use.'));
+    } else {
+      $form->error($locale->text('This vendor number is already in use.'));
+    }
+  }
 
   &edit;
   exit;