X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=767d0e87d5625f8b70c40d8ffdb9ef7b09ae92af;hb=db68b6fd72b9f0d7d8be953746c0e7d6154f5eaf;hp=896bc4aef0ffe7963d307ea4c31e7246e95d677a;hpb=f7c5820cdac7e13d95586b9ff2775ca5198118c6;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 896bc4aef..767d0e87d 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>
@@ -563,6 +557,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')
 
@@ -675,6 +673,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}) {
@@ -863,6 +862,7 @@ sub form_header {
   # $locale->text('Customer Number')
   # $locale->text('Vendor Number')
   $form->{fokus} = "ct.greeting";
+  $form->{jsscript} = 1;
   $form->header;
 
   print qq|
@@ -953,9 +953,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>
@@ -991,9 +991,6 @@ 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
       </table>
@@ -1167,9 +1164,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 +1181,8 @@ $shipto
 
 </div>
 
-|;
+| . $form->write_trigger(\%myconfig, 2, "fromB", "BL", "trigger_from",
+                         "toB", "BL", "trigger_to");
 
   $lxdebug->leave_sub();
 }
@@ -1247,10 +1247,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,6 +1275,13 @@ 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!"));
@@ -1280,7 +1293,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 +1302,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 +1316,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 +1331,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 +1346,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 +1361,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 +1377,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();
 }
 
@@ -1362,6 +1404,12 @@ sub save_and_close {
   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();
@@ -1380,9 +1428,22 @@ 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.'));
+    }
+  }
+  # 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 +1461,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}";
@@ -1607,7 +1674,6 @@ sub get_contact {
 
 }
 
-
 sub get_shipto {
   $lxdebug->enter_sub();