X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=e5ba1ddf8ff48d4fe44667b360a374b20a20699b;hb=f5ab83507b71d551147835d84ec8317afd2842e9;hp=4ad5c3bf8cdade070cb2d52e9b01a4eba2011a74;hpb=c7bffefd26718a316f989fefa780a7edd95444f9;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 4ad5c3bf8..e5ba1ddf8 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -54,7 +54,7 @@ sub add {
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add&db=$form->{db}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
@@ -68,6 +68,31 @@ sub add {
 sub search {
   $lxdebug->enter_sub();
 
+  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};
+    }
+
+    $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");
 
@@ -104,6 +129,7 @@ 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;|
@@ -150,7 +176,7 @@ sub search {
 		<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> |
@@ -173,7 +199,6 @@ sub search {
 
 <input type=hidden name=nextsub value=list_names>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -287,7 +312,6 @@ sub search_delivery {
 
 <input type=hidden name=nextsub value=list_names>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -308,7 +332,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}&obsolete=$form->{obsolete}";
+    "$form->{script}?action=list_names&db=$form->{db}&login=$form->{login}&password=$form->{password}&status=$form->{status}&obsolete=$form->{obsolete}";
   $href = $callback;
 
   @columns =
@@ -470,7 +494,7 @@ sub list_names {
         (invnumber, ordnumber, quonumber);
 
       $column_data{name} =
-        "<td align=left><a href=$form->{script}?action=edit&id=$ref->{id}&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name}&nbsp;</td>";
+        "<td align=left><a href=$form->{script}?action=edit&id=$ref->{id}&db=$form->{db}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name}&nbsp;</td>";
 
       if ($ref->{email}) {
         $email = $ref->{email};
@@ -485,17 +509,17 @@ sub list_names {
 
     if ($ref->{formtype} eq 'invoice') {
       $column_data{invnumber} =
-        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}&nbsp;</td>";
+        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}&nbsp;</td>";
     }
 
     if ($ref->{formtype} eq 'order') {
       $column_data{ordnumber} =
-        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}&nbsp;</td>";
+        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}&nbsp;</td>";
     }
 
     if ($ref->{formtype} eq 'quotation') {
       $column_data{quonumber} =
-        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}&nbsp;</td>";
+        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}&nbsp;</td>";
     }
 
     $i++;
@@ -529,7 +553,6 @@ sub list_names {
 <input name=callback type=hidden value="$form->{callback}">
 <input name=db type=hidden value=$form->{db}>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -575,7 +598,8 @@ sub edit {
 sub form_header {
   $lxdebug->enter_sub();
 
-  $form->get_lists("employees" => "ALL_SALESMEN");
+  $form->get_lists("employees" => "ALL_SALESMEN",
+                   "taxzones" => "ALL_TAXZONES");
 
   $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
   $form->{creditlimit} =
@@ -618,27 +642,23 @@ sub form_header {
     }
   }
 
-  if (@{ $form->{TAXZONE} }) {
-    foreach $item (@{ $form->{TAXZONE} }) {
-      if ($item->{id} == $form->{taxzone_id}) {
-        $form->{selecttaxzone} .=
-          "<option value=$item->{id} selected>$item->{description}\n";
-      } else {
-        $form->{selecttaxzone} .=
-          "<option value=$item->{id}>$item->{description}\n";
-      }
-
-    }
+  %labels = ();
+  @values = ();
+  foreach my $item (@{ $form->{"ALL_TAXZONES"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"description"};
   }
 
   $taxzone = qq|
 		<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}">
+      <td>| .
+        NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
+                             '-values' => \@values, '-labels' => \%labels)) . qq|
+      </td>
 |;
 
   $get_contact_url =
-    "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_contact";
+    "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_contact";
 
   my $pjx = new CGI::Ajax( 'get_contact' => $get_contact_url );
   $form->{selectcontact} = "<option value=0></option>";
@@ -662,7 +682,7 @@ sub form_header {
 		<input type=hidden name=selectcontact value="$form->{selectcontact}">
 	      </tr>|;
   $get_shipto_url =
-    "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_shipto";
+    "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_shipto";
 
   my $pjy = new CGI::Ajax( 'get_shipto' => $get_shipto_url );
   $form->{selectshipto} = "<option value=0></option>";
@@ -690,7 +710,7 @@ sub form_header {
 
 
   $get_delivery_url =
-    "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_delivery";
+    "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_delivery";
 
   my $pjz = new CGI::Ajax( 'get_delivery' => $get_delivery_url );
 
@@ -1172,7 +1192,6 @@ sub form_footer {
 <input name=business_save type=hidden value="$form->{selectbusiness}">
 <input name=title_save type=hidden value="$form->{title}">
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -1236,13 +1255,17 @@ 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);
 
   $form->{callback} =
-    "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}";
+    "$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}";
   $form->redirect;
 
   $lxdebug->leave_sub();
@@ -1254,6 +1277,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));
   }
@@ -1268,6 +1292,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));
   }
@@ -1283,6 +1308,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));
   }
@@ -1298,6 +1324,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));
   }
@@ -1313,6 +1340,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));
   }
@@ -1329,6 +1357,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));
   }
@@ -1347,13 +1376,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
@@ -1373,7 +1407,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_vendor(\%myconfig, \%$form);
+  }
 
   if (3 == $res) {
     if ($form->{"db"} eq "customer") {
@@ -1384,6 +1423,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));
   }
@@ -1407,6 +1447,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));
   }
@@ -1546,4 +1587,4 @@ sub get_delivery {
 
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{nextsub}); }