X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FVK.pm;h=2c0ce67259df4bdea355ef5182eca6445f7d9b9c;hb=429072104757330f631498ce97423c015cd88cf4;hp=63eecfd85bb829afe2ecd989f8a7c2a225d845ed;hpb=a521b29b7f07b940afb392ccbd22f6373dfa0b7e;p=kivitendo-erp.git

diff --git a/SL/VK.pm b/SL/VK.pm
index 63eecfd85..2c0ce6725 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -50,9 +50,13 @@ sub invoice_transactions {
 
   my @values;
 
+  # default usage: always use parts.description for (sub-)totalling and in header and subheader lines
+  # but use invoice.description in article mode
+  # so we extract both versions in our query and later overwrite the description in article mode
+
   my $query =
-    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.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 | .
-    qq|FROM invoice i | .  
+    qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.id,ar.transdate,p.partnumber,p.description as description, pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as invoice_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|LEFT JOIN partsgroup pg on (p.partsgroup_id = pg.id) | .
@@ -77,25 +81,30 @@ sub invoice_transactions {
   # 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:
-  # Sorting by month, using salesman as an example:
-  # Sorting with month as mainsort: ORDER BY month,salesman,ar.transdate,ar.invnumber
-  # Sorting with month as subsort:  ORDER BY salesman,ar.transdate,month,ar.invnumber
+  # 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 .= "ar.transdate,month,"
+    $sortorder .= "nummonth,"
   } else {
-    $sortorder .= $form->{mainsort} . ",";
+    $sortorder .= $mainsort . ",";
   };
   if ($form->{subsort} eq 'month') {
-    $sortorder .= "ar.transdate,month,"
+    $sortorder .= "nummonth,"
   } else {
-    $sortorder .= $form->{subsort} . ",";
+    $sortorder .= $subsort . ",";
   };
-  $sortorder .= 'ar.transdate,' unless $form->{subsort} eq 'month';
-  $sortorder .= 'ar.invnumber';
-
-#  $sortorder =~ s/month/ar.transdate/;
+  $sortorder .= 'ar.transdate,ar.invnumber';  # Default sorting order after mainsort und subsort
 
   if ($form->{customer_id}) {
     $where .= " AND ar.customer_id = ?";
@@ -117,9 +126,12 @@ sub invoice_transactions {
     $where .= qq| AND (ct.country ILIKE ?)|;
     push(@values, '%' . $form->{country} . '%');
   }
-  # nimmt man description am Besten aus invoice oder parts?
+
+  # when filtering for parts by description we probably want to filter by the description of the part as per the master data
+  # invoice.description may differ due to manually changing the description in the invoice or because of translations of the description
+  # at least in the translation case we probably want the report to also include translated articles, so we have to filter via parts.description
   if ($form->{description}) {
-    $where .= qq| AND (i.description ILIKE ?)|;
+    $where .= qq| AND (p.description ILIKE ?)|;
     push(@values, '%' . $form->{description} . '%');
   }
   if ($form->{transdatefrom}) {
@@ -152,7 +164,7 @@ sub invoice_transactions {
     push(@values, $form->{"project_id"}, $form->{"project_id"});
   }
   if ($form->{business_id}) {
-    $where .= qq| AND ct.business_id = ? |; 
+    $where .= qq| AND ct.business_id = ? |;
     push(@values, $form->{"business_id"});
   }
 
@@ -174,7 +186,7 @@ sub invoice_transactions {
     $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);