From ac86ce0822fb544d3080509343bdbcbb3eb6009a Mon Sep 17 00:00:00 2001
From: Thomas Heck <theck@linet-services.de>
Date: Mon, 5 Aug 2013 16:09:52 +0200
Subject: [PATCH] =?utf8?q?CustomerVendor:=20=C3=84ndern=20von=20Wiedervorl?=
 =?utf8?q?agen=20erlauben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Controller/CustomerVendor.pm | 50 +++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 767ffa51d..1002a2e25 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -133,10 +133,6 @@ sub _save {
       $self->{note_followup_link}->save();
 
       SL::Helper::Flash::flash_later('info', $::locale->text('Follow-Up saved.'));
-
-      $self->{note} = SL::DB::Note->new();
-      $self->{note_followup} = SL::DB::FollowUp->new();
-      $self->{note_followup_link} = SL::DB::FollowUpLink->new();
     }
 
     $self->{shipto}->trans_id($self->{cv}->id);
@@ -174,6 +170,10 @@ sub action_save {
     push(@redirect_params, shipto_id => $self->{shipto}->shipto_id);
   }
 
+  if ( $self->{note}->id ) {
+    push(@redirect_params, note_id => $self->{note}->id);
+  }
+
   $self->redirect_to(@redirect_params);
 }
 
@@ -622,22 +622,33 @@ sub _instantiate_args {
 
   if ( $::form->{note}->{id} ) {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
+
+    $self->{note_followup_link} = SL::DB::Manager::FollowUpLink->get_all(
+      query => [
+        'follow_up.note_id' => $self->{note}->id,
+        trans_id => $self->{cv}->id,
+        trans_type => ($self->is_vendor() ? 'vendor' : 'customer'),
+      ],
+      with_objects => ['follow_up'],
+    )->[0];
+
+    $self->{note_followup} = $self->{note_followup_link}->follow_up;
   } else {
     $self->{note} = SL::DB::Note->new();
+    $self->{note_followup} = SL::DB::FollowUp->new();
+    $self->{note_followup_link} = SL::DB::FollowUpLink->new();
   }
+
   $self->{note}->assign_attributes(%{$::form->{note}});
   $self->{note}->created_by($curr_employee->id);
   $self->{note}->trans_module('ct');
 
-  $self->{note_followup} = SL::DB::FollowUp->new();
   $self->{note_followup}->assign_attributes(%{$::form->{note_followup}});
   $self->{note_followup}->note($self->{note});
   $self->{note_followup}->created_by($curr_employee->id);
 
-  $self->{note_followup_link} = SL::DB::FollowUpLink->new(
-    trans_type => ($self->is_vendor() ? 'vendor' : 'customer'),
-    trans_info => $self->{cv}->name
-  );
+  $self->{note_followup_link}->trans_type($self->is_vendor() ? 'vendor' : 'customer');
+  $self->{note_followup_link}->trans_info($self->{cv}->name);
 
   if ( $::form->{shipto}->{shipto_id} ) {
     $self->{shipto} = SL::DB::Shipto->new(shipto_id => $::form->{shipto}->{shipto_id})->load();
@@ -674,9 +685,24 @@ sub _load_customer_vendor {
     $self->{cv} = SL::DB::Customer->new(id => $::form->{id})->load();
   }
 
-  $self->{note} = SL::DB::Note->new();
-  $self->{note_followup} = SL::DB::FollowUp->new();
-  $self->{note_followup_link} = SL::DB::FollowUpLink->new();
+  if ( $::form->{note_id} ) {
+    $self->{note} = SL::DB::Note->new(id => $::form->{note_id})->load();
+
+    $self->{note_followup_link} = SL::DB::Manager::FollowUpLink->get_all(
+      query => [
+        'follow_up.note_id' => $self->{note}->id,
+        trans_id => $self->{cv}->id,
+        trans_type => ($self->is_vendor() ? 'vendor' : 'customer'),
+      ],
+      with_objects => ['follow_up'],
+    )->[0];
+
+    $self->{note_followup} = $self->{note_followup_link}->follow_up;
+  } else {
+    $self->{note} = SL::DB::Note->new();
+    $self->{note_followup} = SL::DB::FollowUp->new();
+    $self->{note_followup_link} = SL::DB::FollowUpLink->new();
+  }
 
   if ( $::form->{shipto_id} ) {
     $self->{shipto} = SL::DB::Shipto->new(shipto_id => $::form->{shipto_id})->load();
-- 
2.20.1