X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=706860a1f983bdcf30dfe99c11018fd46aceb692;hb=637be9d46084bc19a08b91bc13ae541a6c36f9ef;hp=d532874a075f2f18652126095009d2193703a9a3;hpb=e3bd574690299326410cef943fe8f738cc49836b;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index d532874a0..706860a1f 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -68,16 +68,34 @@ sub add {
 sub search {
   $lxdebug->enter_sub();
 
-  $label = ucfirst $form->{db};
-  $form->{title} = $locale->text($label . "s");
+  my $vc_business_type = $form->{db} eq "customer" ?
+    $locale->text("Customer type") : $locale->text("Vendor type");
+
+  $form->get_lists("business_types" => "ALL_BUSINESS_TYPES");
+  my (%labels, @values);
+
+  my $business_types;
+  if (scalar(@{ $form->{ALL_BUSINESS_TYPES} }) != 0) {
+    push(@values, undef);
+    foreach my $item (@{ $form->{ALL_BUSINESS_TYPES} }) {
+      push(@values, $item->{id});
+      $labels{$item->{id}} = $item->{description};
+    }
 
-  if ($form->{db} eq 'vendor') {
-    $gifi = qq|
-		<td><input name="l_gifi_accno" type=checkbox class=checkbox value=Y> |
-      . $locale->text('GIFI') . qq|</td>
+    $business_types =
+      qq|  <tr>
+    <th align="right" nowrap>${vc_business_type}</th>
+    <td>|
+      . NTI($cgi->popup_menu('-name' => 'business_id', '-values' => \@values,
+                             '-labels' => \%labels))
+      . qq|</td>
+  </tr>
 |;
   }
 
+  $label = ucfirst $form->{db};
+  $form->{title} = $locale->text($label . "s");
+
   $form->header;
 
   print qq|
@@ -111,12 +129,22 @@ sub search {
 	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
 	  <td><input name=email size=35></td>
 	</tr>
+  $business_types
 	<tr>
 	  <td></td>
 	  <td><input name=status class=radio type=radio value=all checked>&nbsp;|
     . $locale->text('All') . qq|
 	  <input name=status class=radio type=radio value=orphaned>&nbsp;|
     . $locale->text('Orphaned') . qq|</td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td><input name="obsolete" class="radio" type="radio" value="all">&nbsp;|
+    . $locale->text('All') . qq|
+	  <input name="obsolete" class="radio" type="radio" value="Y">&nbsp;|
+    . $locale->text('Obsolete') . qq|
+	  <input name="obsolete" class="radio" type="radio" value="N" checked>&nbsp;|
+    . $locale->text('Not obsolete') . qq|</td>
 	</tr>
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
@@ -145,11 +173,10 @@ sub search {
 	      <tr>
 		<td><input name="l_taxnumber" type=checkbox class=checkbox value=Y> |
     . $locale->text('Tax Number') . qq|</td>
-		$gifi
 		<td><input name="l_sic_code" type=checkbox class=checkbox value=Y> |
     . $locale->text('SIC') . qq|</td>
 		<td><input name="l_business" type=checkbox class=checkbox value=Y> |
-    . $locale->text('Type of Business') . qq|</td>
+    . $vc_business_type . qq|</td>
 	      </tr>
 	      <tr>
 		<td><input name="l_invnumber" type=checkbox class=checkbox value=Y> |
@@ -193,13 +220,6 @@ sub search_delivery {
   $label = ucfirst $form->{db};
   $form->{title} = $locale->text($label . "s");
 
-  if ($form->{db} eq 'vendor') {
-    $gifi = qq|
-		<td><input name="l_gifi_accno" type=checkbox class=checkbox value=Y> |
-      . $locale->text('GIFI') . qq|</td>
-|;
-  }
-
   $form->header;
 
   print qq|
@@ -267,7 +287,6 @@ sub search_delivery {
 	      <tr>
 		<td><input name="l_taxnumber" type=checkbox class=checkbox value=Y> |
     . $locale->text('Tax Number') . qq|</td>
-		$gifi
 		<td><input name="l_sic_code" type=checkbox class=checkbox value=Y> |
     . $locale->text('SIC') . qq|</td>
 		<td><input name="l_business" type=checkbox class=checkbox value=Y> |
@@ -315,7 +334,7 @@ sub list_names {
   CT->search(\%myconfig, \%$form);
 
   $callback =
-    "$form->{script}?action=list_names&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+    "$form->{script}?action=list_names&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&obsolete=$form->{obsolete}";
   $href = $callback;
 
   @columns =
@@ -323,7 +342,7 @@ sub list_names {
                         "$form->{db}number", address,
                         contact,             phone,
                         fax,                 email,
-                        taxnumber,           gifi_accno,
+                        taxnumber,
                         sic_code,            business,
                         invnumber,           ordnumber,
                         quonumber);
@@ -412,10 +431,6 @@ sub list_names {
       qq|<th><a class=listheading href=$href&sort=taxnumber>|
     . $locale->text('Tax Number')
     . qq|</a></th>|;
-  $column_header{gifi_accno} =
-      qq|<th><a class=listheading href=$href&sort=gifi_accno>|
-    . $locale->text('GIFI')
-    . qq|</a></th>|;
   $column_header{sic_code} =
       qq|<th><a class=listheading href=$href&sort=sic_code>|
     . $locale->text('SIC')
@@ -736,7 +751,7 @@ sub form_header {
   if ($form->{db} eq 'vendor') {
     $customer = qq|
            <th align=right>| . $locale->text('Kundennummer') . qq|</th>
-           <td><input name=v_customer_id size=10 tabindex=18 maxlength=35 value="$form->{v_customer_id}"></td>
+           <td><input name=v_customer_id size=10 maxlength=35 value="$form->{v_customer_id}"></td>
 |;
   }
 
@@ -744,13 +759,13 @@ sub form_header {
 
     $customer = qq|
            <th align=right>| . $locale->text('KNr. beim Kunden') . qq|</th>
-           <td><input name=c_vendor_id size=10 tabindex=18 maxlength=35 value="$form->{c_vendor_id}"></td>
+           <td><input name=c_vendor_id size=10 maxlength=35 value="$form->{c_vendor_id}"></td>
 |;
   }
 
   $business = qq|
  	  <th align=right>| . $locale->text('Type of Business') . qq|</th>
-	  <td><select name=business tabindex=22>$form->{selectbusiness}</select></td>
+	  <td><select name=business>$form->{selectbusiness}</select></td>
       |;
 
   $salesman = "";
@@ -825,7 +840,7 @@ sub form_header {
         s/(<option value="\Q$form->{klass}\E")/$1 selected/;
 
       $pricegroup .=
-        qq|<select name=klass tabindex=24>$form->{selectpricegroup}</select>|;
+        qq|<select name=klass>$form->{selectpricegroup}</select>|;
 
     }
   }
@@ -948,7 +963,7 @@ sub form_header {
 	<tr>
           $business
 	  <th align=right>| . $locale->text('Language') . qq|</th>
-	  <td><select name=language_id tabindex=23>$lang
+	  <td><select name=language_id>$lang
                           </select></td>|;
 
   if ($form->{db} eq 'customer') {
@@ -1047,75 +1062,75 @@ $shipto
                 $ansprechpartner
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Greeting') . qq|</th>
-                  <td><input id=cp_greeting name=cp_greeting size=30 maxlength=30 value="$form->{cp_greeting}">&nbsp;
+                  <td><input id=cp_greeting name=cp_greeting size=40 maxlength=40 value="$form->{cp_greeting}">&nbsp;
                   $select_greeting</td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Title') . qq|</th>
-                  <td><input id=cp_title name=cp_title size=30 maxlength=30 value="$form->{cp_title}">&nbsp;
+                  <td><input id=cp_title name=cp_title size=40 maxlength=40 value="$form->{cp_title}">&nbsp;
                   $select_title</td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Department') . qq|</th>
-                  <td><input id=cp_abteilung name=cp_abteilung size=30 maxlength=40 value="$form->{cp_abteilung}">&nbsp;
+                  <td><input id=cp_abteilung name=cp_abteilung size=40 maxlength=40 value="$form->{cp_abteilung}">&nbsp;
                   $select_department</td>
                 </tr>
                 <tr>
                   <th align=left nowrap>|
     . $locale->text('Given Name') . qq|</th>
-                  <td><input id=cp_givenname name=cp_givenname size=30 maxlength=40 value="$form->{cp_givenname}"></td>
+                  <td><input id=cp_givenname name=cp_givenname size=40 maxlength=40 value="$form->{cp_givenname}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Name') . qq|</th>
-                  <td><input id=cp_name name=cp_name size=30 maxlength=40 value="$form->{cp_name}"></td>
+                  <td><input id=cp_name name=cp_name size=40 maxlength=40 value="$form->{cp_name}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Phone1') . qq|</th>
-                  <td><input id=cp_phone1 name=cp_phone1 size=30 maxlength=30 value="$form->{cp_phone1}"></td>
+                  <td><input id=cp_phone1 name=cp_phone1 size=40 maxlength=40 value="$form->{cp_phone1}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Phone2') . qq|</th>
-                  <td><input id=cp_phone2 name=cp_phone2 size=30 maxlength=30 value="$form->{cp_phone2}"></td>
+                  <td><input id=cp_phone2 name=cp_phone2 size=40 maxlength=40 value="$form->{cp_phone2}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Fax') . qq|</th>
-                  <td><input id=cp_fax name=cp_fax size=30 maxlength=30 value="$form->{cp_fax}"></td>
+                  <td><input id=cp_fax name=cp_fax size=40 maxlength=40 value="$form->{cp_fax}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Mobile1') . qq|</th>
-                  <td><input id=cp_mobile1 name=cp_mobile1 size=30 maxlength=30 value="$form->{cp_mobile1}"></td>
+                  <td><input id=cp_mobile1 name=cp_mobile1 size=40 maxlength=40 value="$form->{cp_mobile1}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Mobile2') . qq|</th>
-                  <td><input id=cp_mobile2 name=cp_mobile2 size=30 maxlength=30 value="$form->{cp_mobile2}"></td>
+                  <td><input id=cp_mobile2 name=cp_mobile2 size=40 maxlength=40 value="$form->{cp_mobile2}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Sat. Phone') . qq|</th>
-                  <td><input id=cp_satphone name=cp_satphone size=30 maxlength=30 value="$form->{cp_satphone}"></td>
+                  <td><input id=cp_satphone name=cp_satphone size=40 maxlength=40 value="$form->{cp_satphone}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Sat. Fax') . qq|</th>
-                  <td><input id=cp_satfax name=cp_satfax size=30 maxlength=30 value="$form->{cp_satfax}"></td>
+                  <td><input id=cp_satfax name=cp_satfax size=40 maxlength=40 value="$form->{cp_satfax}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Project') . qq|</th>
-                  <td><input id=cp_project name=cp_project size=30 maxlength=40 value="$form->{cp_project}"></td>
+                  <td><input id=cp_project name=cp_project size=40 maxlength=40 value="$form->{cp_project}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('E-mail') . qq|</th>
-                  <td><input id=cp_email name=cp_email size=30 maxlength=40 value="$form->{cp_email}"></td>
+                  <td><input id=cp_email name=cp_email size=40 maxlength=40 value="$form->{cp_email}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Private Phone') . qq|</th>
-                  <td><input id=cp_privatphone name=cp_privatphone size=30 maxlength=40 value="$form->{cp_privatphone}"></td>
+                  <td><input id=cp_privatphone name=cp_privatphone size=40 maxlength=40 value="$form->{cp_privatphone}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Private E-mail') . qq|</th>
-                  <td><input id=cp_privatemail name=cp_privatemail size=30 maxlength=40 value="$form->{cp_privatemail}"></td>
+                  <td><input id=cp_privatemail name=cp_privatemail size=40 maxlength=40 value="$form->{cp_privatemail}"></td>
                 </tr>
                 <tr>
 	          <th align=left nowrap>| . $locale->text('Birthday') . qq|</th>
-                  <td><input id=cp_birthday name=cp_birthday size=30 maxlength=40 value="$form->{cp_birthday}"></td>
+                  <td><input id=cp_birthday name=cp_birthday size=40 maxlength=40 value="$form->{cp_birthday}"></td>
                 </tr>
                 
           </table>
@@ -1247,7 +1262,11 @@ sub add_transaction {
 #  # /saving the history
   
   $form->isblank("name", $locale->text("Name missing!"));
-  &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
+  if ($form->{"db"} eq "customer") {
+    CT->save_customer(\%myconfig, \%$form);
+  } else {
+    CT->save_vendor(\%myconfig, \%$form);
+  }
 
   $form->{callback} = $form->escape($form->{callback}, 1);
   $name = $form->escape("$form->{name}", 1);
@@ -1265,6 +1284,7 @@ sub save_and_ap_transaction {
   $form->{script} = "ap.pl";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1279,6 +1299,7 @@ sub save_and_ar_transaction {
   $form->{script} = "ar.pl";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1294,6 +1315,7 @@ sub save_and_invoice {
   $form->{type} = "invoice";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1309,6 +1331,7 @@ sub save_and_rfq {
   $form->{type}   = "request_quotation";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1324,6 +1347,7 @@ sub save_and_quotation {
   $form->{type}   = "sales_quotation";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1340,6 +1364,7 @@ sub save_and_order {
     ($form->{db} eq 'customer') ? "sales_order" : "purchase_order";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1358,13 +1383,18 @@ sub save_and_close {
   $imsg .= " saved!";
 
   $form->isblank("name", $locale->text("Name missing!"));
-  $rc = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
+  if ($form->{"db"} eq "customer") {
+    $rc = CT->save_customer(\%myconfig, \%$form);
+  } else {
+    $rc = CT->save_vendor(\%myconfig, \%$form);
+  }
   if ($rc == 3) {
     $form->error($locale->text('customernumber not unique!'));
   }
   # saving the history
   if(!exists $form->{addition}) {
-  	$form->{addition} = "SAVED";
+    $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
+    $form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
@@ -1384,7 +1414,12 @@ sub save {
 
   $form->isblank("name", $locale->text("Name missing!"));
 
-  my $res = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
+  my $res;
+  if ($form->{"db"} eq "customer") {
+    $res = CT->save_customer(\%myconfig, \%$form);
+  } else {
+    $res = CT->save_customer(\%myconfig, \%$form);
+  }
 
   if (3 == $res) {
     if ($form->{"db"} eq "customer") {
@@ -1395,6 +1430,7 @@ sub save {
   }
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1418,6 +1454,7 @@ sub delete {
   $msg .= " deleted!";
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
   	$form->{addition} = "DELETED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1557,4 +1594,4 @@ sub get_delivery {
 
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{nextsub}); }