X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FFU.pm;h=55f58f0e5a678497bad60c02f8747977d2a5ac71;hb=51264c4371793e3ac8990a54640f9e9b43e3f306;hp=ad6149d697b5bdfa721538319fb69c4ba10ff659;hpb=c510d88bbfea6818ffafaddb7286e88aec96d3b8;p=kivitendo-erp.git

diff --git a/SL/FU.pm b/SL/FU.pm
index ad6149d69..55f58f0e5 100644
--- a/SL/FU.pm
+++ b/SL/FU.pm
@@ -28,7 +28,7 @@ sub save {
     $query = qq|INSERT INTO follow_ups (created_by, done, note_id, follow_up_date, created_for_user, id)
                 VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?, ?)|;
 
-    push @values, $form->{login};
+    push @values, $::myconfig{login};
 
   } else {
     $query = qq|UPDATE follow_ups SET done = ?, note_id = ?, follow_up_date = ?, created_for_user = ? WHERE id = ?|;
@@ -119,7 +119,7 @@ sub retrieve {
   my $dbh      = $form->get_standard_dbh($myconfig);
   my ($query, @values);
 
-  my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
+  my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $::myconfig{login});
   $query            = qq|SELECT fu.*, n.subject, n.body, n.created_by
                          FROM follow_ups fu
                          LEFT JOIN notes n ON (fu.note_id = n.id)
@@ -183,7 +183,7 @@ sub follow_ups {
   my $dbh      = $form->get_standard_dbh($myconfig);
   my ($query, $where, $where_user);
 
-  my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
+  my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $::myconfig{login});
   my @values        = ();
   my @values_user   = ();
 
@@ -314,13 +314,13 @@ sub link_details {
 
   if ($params{trans_type} eq 'customer') {
     $link = {
-      'url'   => 'ct.pl?action=edit&db=customer&id=' . $form->quote($params{trans_id}) . '&edit_note_id=' . $form->quote($params{note_id}),
+      'url'   => 'controller.pl?action=CustomerVendor/edit&db=customer&id=' . $form->quote($params{trans_id}) . '&note_id=' . $form->quote($params{note_id}),
       'title' => $locale->text('Customer') . " '$params{trans_info}'",
     };
 
   } elsif ($params{trans_type} eq 'vendor') {
     $link = {
-      'url'   => 'ct.pl?action=edit&type=sales_quotation&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
+      'url'   => 'controller.pl?action=CustomerVendor/edit&db=vendor&id=' . $params{trans_id} . '&note_id=' . $form->quote($params{note_id}),
       'title' => $locale->text('Vendor') . " '$params{trans_info}'",
     };
 
@@ -330,6 +330,20 @@ sub link_details {
       'title' => $locale->text('Sales quotation') . " $params{trans_info}",
     };
 
+  } elsif ($params{trans_type} eq 'sales_delivery_order') {
+
+    $link = {
+      'url'   => 'do.pl?action=edit&type=sales_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
+      'title' => $locale->text('Sales delivery order') .' '. $params{trans_info},
+    };
+
+  } elsif ($params{trans_type} eq 'purchase_delivery_order') {
+
+    $link = {
+      'url'   => 'do.pl?action=edit&type=purchase_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
+      'title' => $locale->text('Purchase delivery order') .' '. $params{trans_info},
+    };
+
   } elsif ($params{trans_type} eq 'sales_order') {
     $link = {
       'url'   => 'oe.pl?action=edit&type=sales_order&id=' . $params{trans_id},
@@ -374,13 +388,13 @@ sub link_details {
 
   } elsif ($params{trans_type} eq 'ar_transaction') {
     $link = {
-      'url'   => 'ar.pl?action=editid=' . $params{trans_id},
+      'url'   => 'ar.pl?action=edit&id=' . $params{trans_id},
       'title' => $locale->text('AR Transaction') . " $params{trans_info}",
     };
 
   } elsif ($params{trans_type} eq 'ap_transaction') {
     $link = {
-      'url'   => 'ap.pl?action=editid=' . $params{trans_id},
+      'url'   => 'ap.pl?action=edit&id=' . $params{trans_id},
       'title' => $locale->text('AP Transaction') . " $params{trans_info}",
     };
 
@@ -410,13 +424,13 @@ sub save_access_rights {
 
   my $dbh      = $form->get_standard_dbh($myconfig);
 
-  my ($id)     = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
+  my ($id)     = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $::myconfig{login});
+
+  do_query($form, $dbh, qq|DELETE FROM follow_up_access WHERE what = ?|, $id);
 
   my $query    = qq|INSERT INTO follow_up_access (who, what) VALUES (?, ?)|;
   my $sth      = prepare_query($form, $dbh, $query);
 
-  do_query($form, $dbh, qq|DELETE FROM follow_up_access WHERE what = ?|, $id);
-
   while (my ($who, $access_allowed) = each %{ $params{access} }) {
     next unless ($access_allowed);
 
@@ -441,7 +455,7 @@ sub retrieve_access_rights {
 
   my $dbh      = $form->get_standard_dbh($myconfig);
 
-  my $sth      = prepare_execute_query($form, $dbh, qq|SELECT who FROM follow_up_access WHERE what = (SELECT id FROM employee WHERE login = ?)|, $form->{login});
+  my $sth      = prepare_execute_query($form, $dbh, qq|SELECT who FROM follow_up_access WHERE what = (SELECT id FROM employee WHERE login = ?)|, $::myconfig{login});
   my $access   = {};
 
   while (my $ref = $sth->fetchrow_hashref()) {