X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FVK.pm;h=5a3db9cdc8c79c2c22ede16a5bdf4a200b745126;hb=1b032ef45d886922f1fe347ec234c9b0c8c50efd;hp=3ec6e0870dbed50cf3eddfb97e2376f344503c7c;hpb=c17d679a939585324f8690e04c4d32ff4a1f4053;p=kivitendo-erp.git diff --git a/SL/VK.pm b/SL/VK.pm index 3ec6e0870..5a3db9cdc 100644 --- a/SL/VK.pm +++ b/SL/VK.pm @@ -56,7 +56,7 @@ 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|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|RIGHT JOIN ar on (i.trans_id = ar.id) | . @@ -85,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;