X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=84e49512275ede22c39b40553d07ae90dc277fca;hb=a751b16cead5e56b62e18ee616e04323919f5fe1;hp=923a18a1aed5a97f3d40f49eac24d2e80c2951e4;hpb=e7214232350249fdab6da3445442ff85891a0d7c;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 923a18a1a..84e495122 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
@@ -543,14 +545,8 @@ sub list_names {
 <input type=hidden name=password value=$form->{password}>
 
 <input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
+    . $locale->text('Add') . qq|">
 
-  print qq|
   </form>
 
 </body>
@@ -563,6 +559,10 @@ sub list_names {
 sub edit {
   $lxdebug->enter_sub();
 
+  # show history button
+  $form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
+  #/show hhistory button
+  
   # $locale->text('Edit Customer')
   # $locale->text('Edit Vendor')
 
@@ -585,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);
@@ -640,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";
@@ -675,6 +676,7 @@ sub form_header {
 
   my $pjy = new CGI::Ajax( 'get_shipto' => $get_shipto_url );
   $form->{selectshipto} = "<option value=0></option>";
+  $form->{selectshipto} .= "<option value=0>Alle</option>";
   if (@{ $form->{SHIPTO} }) {
     foreach $item (@{ $form->{SHIPTO} }) {
       if ($item->{shipto_id} == $form->{shipto_id}) {
@@ -773,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.
@@ -863,6 +861,7 @@ sub form_header {
   # $locale->text('Customer Number')
   # $locale->text('Vendor Number')
   $form->{fokus} = "ct.greeting";
+  $form->{jsscript} = 1;
   $form->header;
 
   print qq|
@@ -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>
@@ -953,9 +951,9 @@ sub form_header {
 	<tr>
 	  <th align=right>| . $locale->text('Credit Limit') . qq|</th>
 	  <td><input name=creditlimit size=9 value="$form->{creditlimit}"></td>
-	  <th align=right>| . $locale->text('Terms: Net') . qq|</th>
-	  <td><input name=terms size=2 value="$form->{terms}">|
-    . $locale->text('days') . qq|</td>
+	  <input type="hidden" name="terms" value="$form->{terms}">
+	  <th align=right>| . $locale->text('Payment Terms') . qq|</th>
+	  <td><select name=payment_id>$payment</select></td>
 	  <th align=right>| . $locale->text('Discount') . qq|</th>
 	  <td><input name=discount size=4 value="$form->{discount}">
 	  %</td>
@@ -964,7 +962,7 @@ sub form_header {
 	  <th align=right>| . $locale->text('Tax Number / SSN') . qq|</th>
 	  <td><input name=taxnumber size=20 value="$form->{taxnumber}"></td>
           <th align=right>| . $locale->text('USt-IdNr.') . qq|</th>
-	  <td><input name=ustid size=20 value="$form->{ustid}"></td>
+	  <td><input name="ustid" maxlength="14" size="20" value="$form->{ustid}"></td>
           $customer
 	</tr>
         <tr>
@@ -991,11 +989,11 @@ sub form_header {
         <tr>
           <td align=right>| . $locale->text('Obsolete') . qq|</td>
           <td><input name=obsolete class=checkbox type=checkbox value=1 $form->{obsolete}></td>
-	  <th align=right>| . $locale->text('Payment Terms') . qq|</th>
-	  <td><select name=payment_id>$payment
-                          </select></td>
 	</tr>
-        $taxzone
+        <tr>
+          $taxzone
+          $salesman
+        </tr>
       </table>
   <table>
   <tr>
@@ -1167,9 +1165,11 @@ $shipto
     $delivery
     <tr>
       <th align=left nowrap>| . $locale->text('From') . qq|</th>
-      <td><input id=from name=from size=10 maxlength=10 value="$form->{from}"></td>
-      <th align=left nowrap>| . $locale->text('Bis') . qq|</th>
-      <td><input id=to name=to size=10 maxlength=10 value="$form->{to}"></td>
+      <td><input id=from name=from size=10 maxlength=10 value="$form->{from}">
+        <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="toB" id="trigger_to" value="?"></td>
     </tr>       
     <tr>
      <td colspan=4>
@@ -1182,7 +1182,8 @@ $shipto
 
 </div>
 
-|;
+| . $form->write_trigger(\%myconfig, 2, "fromB", "BL", "trigger_from",
+                         "toB", "BL", "trigger_to");
 
   $lxdebug->leave_sub();
 }
@@ -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="|
@@ -1247,10 +1240,16 @@ $update_button
       . qq|">\n|;
   }
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+  # button for saving history
+  if($form->{id} ne "") {
+    print qq|
+  	  <input type=button class=submit onclick=set_history_window(|
+  	  . $form->{id} 
+  	  . qq|); name=history id=history value=|
+  	  . $locale->text('history') 
+  	  . qq|>|;
   }
+  # /button for saving history
 
   print qq|
 
@@ -1269,10 +1268,14 @@ initializetabcontent("maintab")
 sub add_transaction {
   $lxdebug->enter_sub();
 
+#  # saving the history
+#  if(!exists $form->{addition}) {
+#  	$form->{addition} = "ADD TRANSACTION";
+#  	$form->save_history($form->dbconnect(\%myconfig));
+#  }
+#  # /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);
@@ -1280,7 +1283,6 @@ sub add_transaction {
 
   $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->redirect;
 
   $lxdebug->leave_sub();
@@ -1290,8 +1292,13 @@ sub save_and_ap_transaction {
   $lxdebug->enter_sub();
 
   $form->{script} = "ap.pl";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &add_transaction;
-
   $lxdebug->leave_sub();
 }
 
@@ -1299,8 +1306,13 @@ sub save_and_ar_transaction {
   $lxdebug->enter_sub();
 
   $form->{script} = "ar.pl";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &add_transaction;
-
   $lxdebug->leave_sub();
 }
 
@@ -1309,8 +1321,13 @@ sub save_and_invoice {
 
   $form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl";
   $form->{type} = "invoice";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &add_transaction;
-
   $lxdebug->leave_sub();
 }
 
@@ -1319,8 +1336,13 @@ sub save_and_rfq {
 
   $form->{script} = "oe.pl";
   $form->{type}   = "request_quotation";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &add_transaction;
-
   $lxdebug->leave_sub();
 }
 
@@ -1329,8 +1351,13 @@ sub save_and_quotation {
 
   $form->{script} = "oe.pl";
   $form->{type}   = "sales_quotation";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &add_transaction;
-
   $lxdebug->leave_sub();
 }
 
@@ -1340,8 +1367,13 @@ sub save_and_order {
   $form->{script} = "oe.pl";
   $form->{type}   =
     ($form->{db} eq 'customer') ? "sales_order" : "purchase_order";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &add_transaction;
-
   $lxdebug->leave_sub();
 }
 
@@ -1355,13 +1387,16 @@ 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!'));
   }
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   $form->redirect($locale->text($msg));
 
   $lxdebug->leave_sub();
@@ -1377,12 +1412,22 @@ 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!"));
-  }
-  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.'));
+    }
+  }
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   &edit;
   exit;
   $lxdebug->leave_sub();
@@ -1400,6 +1445,12 @@ sub delete {
 
   $msg = ucfirst $form->{db};
   $msg .= " deleted!";
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "DELETED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
   $form->redirect($locale->text($msg));
 
   $msg = "Cannot delete $form->{db}";
@@ -1454,8 +1505,8 @@ sub check_salesman {
     } else {
 
       # name is not on file
-      # $locale->text('Customer not on file!')
-      # $locale->text('Vendor not on file!')
+      # $locale->text('Customer not on file or locked!')
+      # $locale->text('Vendor not on file or locked!')
       $msg = ucfirst $name . " not on file or locked!";
       $form->error($locale->text($msg));
     }
@@ -1607,7 +1658,6 @@ sub get_contact {
 
 }
 
-
 sub get_shipto {
   $lxdebug->enter_sub();