From: Jan Büren Date: Mon, 13 Apr 2020 08:05:31 +0000 (+0200) Subject: Verkaufsbericht: Transportmittel in Bericht mitausgeben X-Git-Tag: release-3.5.6.1~236 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=eefbbed35a09fbca6ad638e0e52f03f750c7e442;p=kivitendo-erp.git Verkaufsbericht: Transportmittel in Bericht mitausgeben --- diff --git a/SL/VK.pm b/SL/VK.pm index 3ec6e0870..1dcf44a7d 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) | . diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index ea05ab41b..8a0dc463a 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -137,7 +137,7 @@ sub invoice_transactions { $form->{title} = $locale->text('Sales Report'); @columns = - qw(description invnumber transdate customernumber customername partnumber partsgroup country business transdate qty parts_unit weight sellprice sellprice_total discount lastcost lastcost_total marge_total marge_percent employee salesman); + qw(description invnumber transdate shipvia customernumber customername partnumber partsgroup country business transdate qty parts_unit weight sellprice sellprice_total discount lastcost lastcost_total marge_total marge_percent employee salesman); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs_ic }, @{ $cvar_configs_ct }; my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs_ic }, @{ $cvar_configs_ct }; @@ -171,6 +171,7 @@ sub invoice_transactions { 'salesman' => { 'text' => $locale->text('Salesperson'), }, 'invnumber' => { 'text' => $locale->text('Invoice Number'), }, 'transdate' => { 'text' => $locale->text('Invoice Date'), }, + 'shipvia' => { 'text' => $locale->text('Ship via'), }, 'qty' => { 'text' => $locale->text('Quantity'), }, 'parts_unit' => { 'text' => $locale->text('Base unit'), }, 'weight' => { 'text' => $locale->text('Weight'), }, @@ -209,6 +210,7 @@ sub invoice_transactions { push @options, $locale->text('Department') . " : " . SL::DB::Department->new(id => $form->{department_id})->load->description if $form->{department_id}; push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if $form->{invnumber}; push @options, $locale->text('Invoice Date') . " : $form->{invdate}" if $form->{invdate}; + push @options, $locale->text('Ship via') . " : $form->{shipvia}" if $form->{shipvia}; push @options, $locale->text('Part Number') . " : $form->{partnumber}" if $form->{partnumber}; push @options, $locale->text('Partsgroup') . " : " . SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load->partsgroup if $form->{partsgroup_id}; push @options, $locale->text('Country') . " : $form->{country}" if $form->{country}; diff --git a/templates/webpages/vk/search_invoice.html b/templates/webpages/vk/search_invoice.html index 6092496fc..e84b8155b 100644 --- a/templates/webpages/vk/search_invoice.html +++ b/templates/webpages/vk/search_invoice.html @@ -218,7 +218,9 @@ [% 'Country' | $T8 %] [% 'Customer type' | $T8 %] - + + [% 'Ship via' | $T8 %] + [% 'Customer variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %])