X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FVK.pm;h=c056aac6516d94e37bc7081e7b7d667e69886c2e;hb=b632cee8434442efd8ae3962126c34123172daac;hp=458c351583d775622aadf8acc4d8d344a45a3aa5;hpb=79398e65cd6534ca6ccd22f8ff7c67617e6ccc53;p=kivitendo-erp.git

diff --git a/SL/VK.pm b/SL/VK.pm
index 458c35158..c056aac65 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -51,30 +51,77 @@ sub invoice_transactions {
   my @values;
 
   my $query =
-    qq|SELECT cus.name,ar.invnumber,ar.id,ar.transdate,p.partnumber,i.parts_id,i.qty,i.price_factor,i.discount,i.description,i.lastcost,i.sellprice,i.marge_total,i.marge_percent,i.unit | .
+    qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.id,ar.transdate,p.partnumber,pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as description,i.lastcost,i.sellprice,i.fxsellprice,i.marge_total,i.marge_percent,i.unit,b.description as business,e.name as employee,e2.name as salesman, to_char(ar.transdate,'Month') as month, to_char(ar.transdate, 'YYYYMM') as nummonth, p.unit as parts_unit, p.weight | .
     qq|FROM invoice i | .  
-    qq|join ar on (i.trans_id = ar.id) | .
-    qq|join parts p on (i.parts_id = p.id) | .
-    qq|join customer cus on (cus.id = ar.customer_id) |;
+    qq|JOIN ar on (i.trans_id = ar.id) | .
+    qq|JOIN parts p on (i.parts_id = p.id) | .
+    qq|LEFT JOIN partsgroup pg on (p.partsgroup_id = pg.id) | .
+    qq|LEFT JOIN customer ct on (ct.id = ar.customer_id) | .
+    qq|LEFT JOIN business b on (ct.business_id = b.id) | .
+    qq|LEFT JOIN employee e ON (ar.employee_id = e.id) | .
+    qq|LEFT JOIN employee e2 ON (ar.salesman_id = e2.id) |;
 
   my $where = "1 = 1";
 
+  # if employee can only see his own invoices, make sure this also holds for sales report
+  # limits by employees (Bearbeiter), not salesmen!
+  if (!$main::auth->assert('sales_all_edit', 1)) {
+    $where .= " AND ar.employee_id = (select id from employee where login= ?)";
+    push (@values, $form->{login});
+  }
+
   # Stornierte Rechnungen und Stornorechnungen in invoice rausfiltern
+  # was ist mit Gutschriften?
   $where .= " AND ar.storno is not true ";
 
-  my $sortorder = "cus.name,i.parts_id,ar.transdate";
-  if ($form->{sortby} eq 'artikelsort') {
-    $sortorder = "i.parts_id,cus.name,ar.transdate";
+  # Bestandteile von Erzeugnissen herausfiltern
+  $where .= " AND i.assemblyitem is not true ";
+
+  # filter allowed parameters for mainsort and subsort as passed by POST
+  my @databasefields = qw(description customername country partsgroup business salesman month);
+  my ($mainsort) = grep { /^$form->{mainsort}$/ } @databasefields;
+  my ($subsort) = grep { /^$form->{subsort}$/ } @databasefields;
+  die "illegal parameter for mainsort or subsort" unless $mainsort and $subsort;
+
+  my $sortorder;
+  # sorting by month is a special case, we don't want to sort alphabetically by
+  # month name, so we also extract a numerical month in the from YYYYMM to sort
+  # by in case of month sorting
+  # Sorting by month, using description as an example:
+  # Sorting with month as mainsort: ORDER BY nummonth,description,ar.transdate,ar.invnumber
+  # Sorting with month as subsort:  ORDER BY description,nummonth,ar.transdate,ar.invnumber
+  if ($form->{mainsort} eq 'month') {
+    $sortorder .= "nummonth,"
+  } else {
+    $sortorder .= $mainsort . ",";
   };
+  if ($form->{subsort} eq 'month') {
+    $sortorder .= "nummonth,"
+  } else {
+    $sortorder .= $subsort . ",";
+  };
+  $sortorder .= 'ar.transdate,ar.invnumber';  # Default sorting order after mainsort und subsort
 
   if ($form->{customer_id}) {
     $where .= " AND ar.customer_id = ?";
     push(@values, $form->{customer_id});
   };
+  if ($form->{customernumber}) {
+    $where .= qq| AND ct.customernumber = ? |;
+    push(@values, $form->{customernumber});
+  }
   if ($form->{partnumber}) {
     $where .= qq| AND (p.partnumber ILIKE ?)|;
     push(@values, '%' . $form->{partnumber} . '%');
   }
+  if ($form->{partsgroup_id}) {
+    $where .= qq| AND (pg.id = ?)|;
+    push(@values, $form->{partsgroup_id});
+  }
+  if ($form->{country}) {
+    $where .= qq| AND (ct.country ILIKE ?)|;
+    push(@values, '%' . $form->{country} . '%');
+  }
   # nimmt man description am Besten aus invoice oder parts?
   if ($form->{description}) {
     $where .= qq| AND (i.description ILIKE ?)|;
@@ -93,6 +140,15 @@ sub invoice_transactions {
     $where .= " AND ar.department_id = ?";
     push(@values, $department_id);
   }
+  if ($form->{employee_id}) {
+    $where .= " AND ar.employee_id = ?";
+    push @values, conv_i($form->{employee_id});
+  }
+
+  if ($form->{salesman_id}) {
+    $where .= " AND ar.salesman_id = ?";
+    push @values, conv_i($form->{salesman_id});
+  }
   if ($form->{project_id}) {
     $where .=
       qq|AND ((ar.globalproject_id = ?) OR EXISTS | .
@@ -100,8 +156,31 @@ sub invoice_transactions {
       qq|   WHERE i.project_id = ? AND i.trans_id = ar.id))|;
     push(@values, $form->{"project_id"}, $form->{"project_id"});
   }
+  if ($form->{business_id}) {
+    $where .= qq| AND ct.business_id = ? |; 
+    push(@values, $form->{"business_id"});
+  }
+
+  my ($cvar_where_ct, @cvar_values_ct) = CVar->build_filter_query('module'    => 'CT',
+                                                                  'trans_id_field' => 'ct.id',
+                                                                  'filter'         => $form);
+
+  if ($cvar_where_ct) {
+    $where .= qq| AND ($cvar_where_ct)|;
+    push @values, @cvar_values_ct;
+  }
+
 
-  $query .= " WHERE $where ORDER BY $sortorder";
+  my ($cvar_where_ic, @cvar_values_ic) = CVar->build_filter_query('module'         => 'IC',
+                                                                  'trans_id_field' => 'p.id',
+                                                                  'filter'         => $form);
+
+  if ($cvar_where_ic) {
+    $where .= qq| AND ($cvar_where_ic)|;
+    push @values, @cvar_values_ic;
+  }
+  
+  $query .= " WHERE $where ORDER BY $sortorder "; # LIMIT 5000";
 
   my @result = selectall_hashref_query($form, $dbh, $query, @values);