Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / SL / VK.pm

diff --git a/SL/VK.pm b/SL/VK.pm
index f20414c..5a3db9c 100644 (file)
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # Sold Items report
@@ -55,11 +56,12 @@ sub invoice_transactions {
   # 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,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, ar.taxincluded | .
-    qq|, COALESCE((SELECT e.buy FROM exchangerate e WHERE e.transdate = ar.transdate and ar.currency_id = e.currency_id),1) as exchangerate | .
+    qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.shipvia,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, ar.taxincluded | .
+    qq|, COALESCE(er.buy, 1) | .
     qq|FROM invoice i | .
-    qq|JOIN ar on (i.trans_id = ar.id) | .
+    qq|RIGHT JOIN ar on (i.trans_id = ar.id) | .
     qq|JOIN parts p on (i.parts_id = p.id) | .
+    qq|LEFT JOIN exchangerate er on (er.transdate = ar.transdate and ar.currency_id = er.currency_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) | .
@@ -83,7 +85,7 @@ sub invoice_transactions {
   $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 @databasefields = qw(description customername country partsgroup business salesman month shipvia);
   my ($mainsort) = grep { /^$form->{mainsort}$/ } @databasefields;
   my ($subsort) = grep { /^$form->{subsort}$/ } @databasefields;
   die "illegal parameter for mainsort or subsort" unless $mainsort and $subsort;
@@ -112,7 +114,7 @@ sub invoice_transactions {
     push(@values, $form->{customer_id});
   } elsif ($form->{customer}) {
     $where .= " AND ct.name ILIKE ?";
-    push(@values, $form->like($form->{customer}));
+    push(@values, like($form->{customer}));
   }
   if ($form->{customernumber}) {
     $where .= qq| AND ct.customernumber = ? |;
@@ -120,7 +122,7 @@ sub invoice_transactions {
   }
   if ($form->{partnumber}) {
     $where .= qq| AND (p.partnumber ILIKE ?)|;
-    push(@values, '%' . $form->{partnumber} . '%');
+    push(@values, like($form->{partnumber}));
   }
   if ($form->{partsgroup_id}) {
     $where .= qq| AND (pg.id = ?)|;
@@ -128,7 +130,7 @@ sub invoice_transactions {
   }
   if ($form->{country}) {
     $where .= qq| AND (ct.country ILIKE ?)|;
-    push(@values, '%' . $form->{country} . '%');
+    push(@values, like($form->{country}));
   }
 
   # when filtering for parts by description we probably want to filter by the description of the part as per the master data
@@ -136,7 +138,7 @@ sub invoice_transactions {
   # 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 (p.description ILIKE ?)|;
-    push(@values, '%' . $form->{description} . '%');
+    push(@values, like($form->{description}));
   }
   if ($form->{transdatefrom}) {
     $where .= " AND ar.transdate >= ?";
@@ -146,10 +148,9 @@ sub invoice_transactions {
     $where .= " AND ar.transdate <= ?";
     push(@values, $form->{transdateto});
   }
-  if ($form->{department}) {
-    my ($null, $department_id) = split /--/, $form->{department};
+  if ($form->{department_id}) {
     $where .= " AND ar.department_id = ?";
-    push(@values, $department_id);
+    push @values, conv_i($form->{department_id});
   }
   if ($form->{employee_id}) {
     $where .= " AND ar.employee_id = ?";