X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=7ccccadcc41425e8c5f79c783ee9ec8b87d962c8;hb=c9a7e79e10591ae95b1523f2c7f249eae8439580;hp=d9a7ac704508930d5521299ccb2d1a36587037fd;hpb=93a4e424476aae2551b2d070133cd42d5d2f3d52;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index d9a7ac704..7ccccadcc 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -36,8 +36,14 @@
 #======================================================================
 
 package CT;
+
 use Data::Dumper;
+
+use SL::Common;
+use SL::CVar;
 use SL::DBUtils;
+use SL::FU;
+use SL::Notes;
 
 sub get_tuple {
   $main::lxdebug->enter_sub();
@@ -70,6 +76,52 @@ sub get_tuple {
       selectrow_query($form, $dbh, $query, $form->{salesman_id});
   }
 
+  my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
+  $query =
+    qq|SELECT n.*, n.itime::DATE AS created_on,
+         e.name AS created_by_name, e.login AS created_by_login
+       FROM notes n
+       LEFT JOIN employee e ON (n.created_by = e.id)
+       WHERE (n.trans_id = ?) AND (n.trans_module = 'ct')|;
+  $form->{NOTES} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
+
+  $query =
+    qq|SELECT fu.follow_up_date, fu.done AS follow_up_done, e.name AS created_for_name, e.name AS created_for_login
+       FROM follow_ups fu
+       LEFT JOIN employee e ON (fu.created_for_user = e.id)
+       WHERE (fu.note_id = ?)
+         AND NOT COALESCE(fu.done, FALSE)
+         AND (   (fu.created_by = ?)
+              OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?)))|;
+  $sth = prepare_query($form, $dbh, $query);
+
+  foreach my $note (@{ $form->{NOTES} }) {
+    do_statement($form, $sth, $query, conv_i($note->{id}), conv_i($note->{created_by}), conv_i($employee_id));
+    $ref = $sth->fetchrow_hashref();
+
+    map { $note->{$_} = $ref->{$_} } keys %{ $ref } if ($ref);
+  }
+
+  $sth->finish();
+
+  if ($form->{edit_note_id}) {
+    $query =
+      qq|SELECT n.id AS NOTE_id, n.subject AS NOTE_subject, n.body AS NOTE_body,
+           fu.id AS FU_id, fu.follow_up_date AS FU_date, fu.done AS FU_done, fu.created_for_user AS FU_created_for_user
+         FROM notes n
+         LEFT JOIN follow_ups fu ON ((n.id = fu.note_id) AND NOT COALESCE(fu.done, FALSE))
+         WHERE n.id = ?|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{edit_note_id}));
+
+    if ($ref) {
+      foreach my $key (keys %{ $ref }) {
+        my $new_key       =  $key;
+        $new_key          =~ s/^([^_]+)/\U\1\E/;
+        $form->{$new_key} =  $ref->{$key};
+      }
+    }
+  }
+
   # check if it is orphaned
   my $arap = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
   $query =
@@ -101,10 +153,6 @@ sub populate_drop_down_boxes {
   $query = qq|SELECT id, description FROM business ORDER BY id|;
   $form->{all_business} = selectall_hashref_query($form, $dbh, $query);
 
-  # get tax zones
-  $query = qq|SELECT id, description FROM tax_zones|;
-  $form->{TAXZONE} = selectall_hashref_query($form, $dbh, $query);
-
   # get shipto address
   $query =
     qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
@@ -303,7 +351,7 @@ sub save_customer {
     conv_i($form->{salesman_id}),
     conv_i($form->{language_id}),
     conv_i($form->{payment_id}),
-    conv_i($form->{taxzone_id}),
+    conv_i($form->{taxzone_id}, 0),
     $form->{user_password},
     $form->{c_vendor_id},
     conv_i($form->{klass}),
@@ -385,6 +433,14 @@ sub save_customer {
   # add shipto
   $form->add_shipto( $dbh, $form->{id}, "CT" );
 
+  $self->_save_note('dbh' => $dbh);
+  $self->_delete_selected_notes('dbh' => $dbh);
+
+  CVar->save_custom_variables('dbh'       => $dbh,
+                              'module'    => 'CT',
+                              'trans_id'  => $form->{id},
+                              'variables' => $form);
+
   $rc = $dbh->commit();
   $dbh->disconnect();
 
@@ -499,26 +555,35 @@ sub save_vendor {
     $form->{obsolete} ? 't' : 'f',
     $form->{ustid},
     conv_i($form->{payment_id}),
-    conv_i($form->{taxzone_id}),
+    conv_i($form->{taxzone_id}, 0),
     conv_i( $form->{language_id}),
     $form->{username},
     $form->{user_password},
-    conv_i($form->{v_customer_id}),
+    $form->{v_customer_id},
     $form->{id}
     );
   do_query($form, $dbh, $query, @values);
 
   $query = undef;
   if ( $form->{cp_id} ) {
-    $query =
-      qq|UPDATE contacts SET | .
-      qq|  cp_greeting = ?, | .
-      qq|  cp_title = ?, | .
-      qq|  cp_givenname = ?, | .
-      qq|  cp_name = ?, | .
-      qq|  cp_email = ?, | .
-      qq|  cp_phone1 = ?, | .
-      qq|  cp_phone2 = ? | .
+    $query = qq|UPDATE contacts SET | .
+      qq|cp_greeting = ?, | .
+      qq|cp_title = ?,  | .
+      qq|cp_givenname = ?, | .
+      qq|cp_name = ?, | .
+      qq|cp_email = ?, | .
+      qq|cp_phone1 = ?, | .
+      qq|cp_phone2 = ?, | .
+      qq|cp_abteilung = ?, | .
+      qq|cp_fax = ?, | .
+      qq|cp_mobile1 = ?, | .
+      qq|cp_mobile2 = ?, | .
+      qq|cp_satphone = ?, | .
+      qq|cp_satfax = ?, | .
+      qq|cp_project = ?, | .
+      qq|cp_privatphone = ?, | .
+      qq|cp_privatemail = ?, | .
+      qq|cp_birthday = ? | .
       qq|WHERE cp_id = ?|;
     @values = (
       $form->{cp_greeting},
@@ -528,26 +593,59 @@ sub save_vendor {
       $form->{cp_email},
       $form->{cp_phone1},
       $form->{cp_phone2},
-      $form->{cp_id});
+      $form->{cp_abteilung},
+      $form->{cp_fax},
+      $form->{cp_mobile1},
+      $form->{cp_mobile2},
+      $form->{cp_satphone},
+      $form->{cp_satfax},
+      $form->{cp_project},
+      $form->{cp_privatphone},
+      $form->{cp_privatemail},
+      $form->{cp_birthday},
+      $form->{cp_id}
+      );
   } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
     $query =
-      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname, cp_name, cp_email, cp_phone1, cp_phone2) | .
-      qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?)|;
+      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname,  | .
+      qq|  cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
+      qq|  cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
+      qq|  cp_birthday) | .
+      qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = (
-      conv_i($form->{id}),
+      $form->{id},
       $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
       $form->{cp_email},
       $form->{cp_phone1},
-      $form->{cp_phone2});
+      $form->{cp_phone2},
+      $form->{cp_abteilung},
+      $form->{cp_fax},
+      $form->{cp_mobile1},
+      $form->{cp_mobile2},
+      $form->{cp_satphone},
+      $form->{cp_satfax},
+      $form->{cp_project},
+      $form->{cp_privatphone},
+      $form->{cp_privatemail},
+      $form->{cp_birthday}
+      );
   }
   do_query($form, $dbh, $query, @values) if ($query);
 
   # add shipto
   $form->add_shipto( $dbh, $form->{id}, "CT" );
 
+  $self->_save_note('dbh' => $dbh);
+  $self->_delete_selected_notes('dbh' => $dbh);
+
+  CVar->save_custom_variables('dbh'       => $dbh,
+                              'module'    => 'CT',
+                              'trans_id'  => $form->{id},
+                              'variables' => $form);
+
   $rc = $dbh->commit();
   $dbh->disconnect();
 
@@ -591,6 +689,7 @@ sub search {
   $sortorder =
     $form->{sort} && $allowed_sort_columns{$form->{sort}} ?
     $form->{sort} : "name";
+  $form->{sort} = $sortorder;
   $sortorder = "country,city,street" if ($sortorder eq "address");
 
   if ($form->{"${cv}number"}) {
@@ -624,12 +723,33 @@ sub search {
     $form->{l_invnumber} = $form->{l_ordnumber} = $form->{l_quonumber} = "";
   }
 
+  if ($form->{obsolete} eq "Y") {
+    $where .= qq| AND obsolete|;
+  } elsif ($form->{obsolete} eq "N") {
+    $where .= qq| AND NOT obsolete|;
+  }
+
+  if ($form->{business_id}) {
+    $where .= qq| AND (business_id = ?)|;
+    push(@values, conv_i($form->{business_id}));
+  }
+
+  my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
+                                                            'trans_id_field' => 'ct.id',
+                                                            'filter'         => $form);
+
+  if ($cvar_where) {
+    $where .= qq| AND ($cvar_where)|;
+    push @values, @cvar_values;
+  }
+
   my $query =
     qq|SELECT ct.*, b.description AS business | .
     qq|FROM $cv ct | .
     qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
     qq|WHERE $where|;
 
+  my @saved_values = @values;
   # redo for invoices, orders and quotations
   if ($form->{l_invnumber} || $form->{l_ordnumber} || $form->{l_quonumber}) {
     my ($ar, $union, $module);
@@ -653,6 +773,9 @@ sub search {
     }
 
     if ( $form->{l_ordnumber} ) {
+      if ($union eq "UNION") {
+        push(@values, @saved_values);
+      }
       $query .=
         qq| $union | .
         qq|SELECT ct.*, b.description AS business,| .
@@ -667,6 +790,9 @@ sub search {
     }
 
     if ( $form->{l_quonumber} ) {
+      if ($union eq "UNION") {
+        push(@values, @saved_values);
+      }
       $query .=
         qq| $union | .
         qq|SELECT ct.*, b.description AS business, | .
@@ -756,7 +882,7 @@ sub get_delivery {
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .
     qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  invoice.description, invoice.unit | .
+    qq|  i.description, i.unit, i.sellprice | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
@@ -774,4 +900,83 @@ sub get_delivery {
   $main::lxdebug->leave_sub();
 }
 
+sub _save_note {
+  $main::lxdebug->enter_sub();
+
+  my $self   = shift;
+  my %params = @_;
+
+  my $form   = $main::form;
+
+  Common::check_params(\%params, 'dbh');
+
+  if (!$form->{NOTE_subject}) {
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
+  my $dbh = $params{dbh};
+
+  my %follow_up;
+  my %note = (
+    'id'           => $form->{NOTE_id},
+    'subject'      => $form->{NOTE_subject},
+    'body'         => $form->{NOTE_body},
+    'trans_id'     => $form->{id},
+    'trans_module' => 'ct',
+  );
+
+  $note{id} = Notes->save(%note);
+
+  if ($form->{FU_date}) {
+    %follow_up = (
+      'id'               => $form->{FU_id},
+      'note_id'          => $note{id},
+      'follow_up_date'   => $form->{FU_date},
+      'created_for_user' => $form->{FU_created_for_user},
+      'done'             => $form->{FU_done} ? 1 : 0,
+      'subject'          => $form->{NOTE_subject},
+      'body'             => $form->{NOTE_body},
+      'LINKS'            => [
+        {
+          'trans_id'     => $form->{id},
+          'trans_type'   => $form->{db} eq 'customer' ? 'customer' : 'vendor',
+          'trans_info'   => $form->{name},
+        },
+      ],
+    );
+
+    $follow_up{id} = FU->save(%follow_up);
+
+  } elsif ($form->{FU_id}) {
+    do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|, conv_i($form->{FU_id}));
+    do_query($form, $dbh, qq|DELETE FROM follow_ups      WHERE id = ?|,           conv_i($form->{FU_id}));
+  }
+
+  delete @{$form}{grep { /^NOTE_|^FU_/ } keys %{ $form }};
+
+  $main::lxdebug->leave_sub();
+}
+
+sub _delete_selected_notes {
+  $main::lxdebug->enter_sub();
+
+  my $self   = shift;
+  my %params = @_;
+
+  Common::check_params(\%params, 'dbh');
+
+  my $form = $main::form;
+  my $dbh  = $params{dbh};
+
+  foreach my $i (1 .. $form->{NOTES_rowcount}) {
+    next unless ($form->{"NOTE_delete_$i"} && $form->{"NOTE_id_$i"});
+
+    Notes->delete('dbh' => $params{dbh},
+                  'id'  => $form->{"NOTE_id_$i"});
+  }
+
+  $main::lxdebug->leave_sub();
+}
+
 1;