X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=fc260c6da819dd0c7c68b184f2fe978d00e8c101;hb=33fd3fa62717f07004f7533679d95f5084caf728;hp=c1bd16e2106096c2ffbf554b6427ef3195cc2c93;hpb=07d71c33315605fcfc450d3b9abf0fd10e92bed5;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index c1bd16e21..fc260c6da 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -463,6 +463,7 @@ sub form_header {
   $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
   $form->{creditlimit} =
     $form->format_amount(\%myconfig, $form->{creditlimit}, 0);
+  $form->{discount} = $form->format_amount(\%myconfig, $form->{discount});
 
   if ($myconfig{role} eq 'admin') {
     $bcc = qq|
@@ -585,36 +586,38 @@ sub form_header {
 ## /LINET
 
   if ($form->{db} eq 'customer') {
-  #get pricegroup and form it
-  $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  $form->{pricegroup}    = "$form->{klass}";
-  $form->{pricegroup_id} = "$form->{klass}";
+    #get pricegroup and form it
+    $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  if (@{ $form->{all_pricegroup} }) {
+    $form->{pricegroup}    = "$form->{klass}";
+    $form->{pricegroup_id} = "$form->{klass}";
 
-    $form->{selectpricegroup} = qq|<option>\n|;
-    map {
-      $form->{selectpricegroup} .=
-        qq|<option value="$_->{id}">$_->{pricegroup}\n|
-    } @{ $form->{all_pricegroup} };
-  }
+    if (@{ $form->{all_pricegroup} }) {
+
+      $form->{selectpricegroup} = qq|<option>\n|;
+      map {
+        $form->{selectpricegroup} .=
+          qq|<option value="$_->{id}">$_->{pricegroup}\n|
+      } @{ $form->{all_pricegroup} };
+    }
 
-  if ($form->{selectpricegroup}) {
-    $form->{selectpricegroup} = $form->unescape($form->{selectpricegroup});
+    if ($form->{selectpricegroup}) {
+      $form->{selectpricegroup} = $form->unescape($form->{selectpricegroup});
 
-    $pricegroup =
-      qq|<input type=hidden name=selectpricegroup value="|
-      . $form->escape($form->{selectpricegroup}, 1) . qq|">|;
+      $pricegroup =
+        qq|<input type=hidden name=selectpricegroup value="|
+        . $form->escape($form->{selectpricegroup}, 1) . qq|">|;
 
-    $form->{selectpricegroup} =~
-      s/(<option value="\Q$form->{klass}\E")/$1 selected/;
+      $form->{selectpricegroup} =~
+        s/(<option value="\Q$form->{klass}\E")/$1 selected/;
 
-    $pricegroup .= qq|<select name=klass>$form->{selectpricegroup}</select>|;
+      $pricegroup .=
+        qq|<select name=klass tabindex=24>$form->{selectpricegroup}</select>|;
 
-    $group = $locale->text('Hola');
+    }
   }
- }
+
   # $locale->text('Customer Number')
   # $locale->text('Vendor Number')
   $form->{fokus} = "ct.name";
@@ -645,7 +648,7 @@ sub form_header {
 	</tr>
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Company Name') . qq|</th>
-	  <td><input name=name size=35 maxlength=35 tabindex=1 value="$form->{name}"></td>
+	  <td><input name=name size=35 maxlength=75 tabindex=1 value="$form->{name}"></td>
 	  <td><input name=shiptoname size=35 maxlength=75 value="$form->{shiptoname}"></td>
 	</tr>
 	<tr>
@@ -658,7 +661,7 @@ sub form_header {
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Street') . qq|</th>
 	  <td><input name=street size=35 tabindex=4 maxlength=75 value="$form->{street}"></td>
-	  <td><input name=shiptostreet size=35 maxlength=35 value="$form->{shiptostreet}"></td>
+	  <td><input name=shiptostreet size=35 maxlength=75 value="$form->{shiptostreet}"></td>
 	</tr>
 	<tr>
 	  <th align=right nowrap>|
@@ -781,12 +784,13 @@ sub form_header {
 	  <th align=right>| . $locale->text('Language') . qq|</th>
 	  <td><select name=language tabindex=23>$lang
                           </select></td>|;
-if ($form->{db} eq 'customer'){
 
-print qq|
+  if ($form->{db} eq 'customer') {
+
+    print qq|
           <th align=right>| . $locale->text('Preisklasse') . qq|</th>
           <td>$pricegroup</td>|;
-}
+  }
   print qq|        </tr>
         <tr>
           <td align=right>| . $locale->text('Obsolete') . qq|</td>
@@ -973,8 +977,10 @@ sub save {
   if ($vertreter && $form->{db} eq "customer") {
     $form->isblank("salesman_id", $locale->text("Salesman missing!"));
   }
-  &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
-
+  $rc = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
+  if ($rc == 3) {
+    $form->error($locale->text('customernumber not unique!'));
+  }
   $form->redirect($locale->text($msg));
 
   $lxdebug->leave_sub();