X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=94e5b770899811665a2c840c6743ba9ff6b18a0c;hb=c7ad671d22e558e157797af7d787c8df499be1b4;hp=a1db029ca42b8f38e5202b9868fde1b0cd23b858;hpb=20993efbc44d0ccae27ff32a5f9e3f30a49180c8;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index a1db029ca..94e5b7708 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -483,6 +483,7 @@ sub get_invoices { "ordnumber" => "a.ordnumber", "invnumber" => "a.invnumber", "notes" => "a.notes", + "country" => "ct.country", ); foreach my $key (keys(%columns)) { next unless ($form->{$key}); @@ -509,7 +510,7 @@ sub get_invoices { $query = qq|SELECT - a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, + a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, a.language_id, ct.name AS customername, a.customer_id, a.duedate, a.amount - a.paid AS open_amount, @@ -669,7 +670,7 @@ sub get_dunning { my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} }; my $query = - qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount, + qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount, a.language_id, ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee, da.interest, dn.dunning_description, da.transdate AS dunning_date, da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id,