X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fvk.pl;h=9206e7e741f471307bf90a9ddb06cc71ba711f5a;hb=e4070a746ddfeb7e08868759ce4100af7a198560;hp=87805f3b2ed25cf2d6df1150969d4add76879109;hpb=c588d5b4c668465940282e57fc97d8d1c0ea94ce;p=kivitendo-erp.git diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index 87805f3b2..9206e7e74 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -61,7 +61,6 @@ sub search_invoice { $form->all_vc(\%myconfig, "customer", "AR"); $form->{title} = $locale->text('Sales Report'); - $form->{jsscript} = 1; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, "departments" => "ALL_DEPARTMENTS", @@ -104,10 +103,10 @@ sub invoice_transactions { # can't currently be configured from report, empty line between main sortings my $addemptylines = 1; - + # don't add empty lines between mainsort subtotals when only subtotal_mainsort is selected if ($form->{l_subtotal_mainsort} eq "Y" and not defined $form->{l_headers_mainsort} and not defined $form->{l_headers_subsort} and not defined $form->{l_subtotal_subsort} ) { - $addemptylines = 0 + $addemptylines = 0 }; if ( $form->{customer} =~ /--/ ) { @@ -407,6 +406,9 @@ sub invoice_transactions { $row{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit') . "&id=" . E($ar->{id}) . "&callback=${callback}"; + # use partdescription according to invoice in article mode + $row{description}->{data} = $ar->{invoice_description}; + $report->add_data(\%row); }