X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FAR.pm;h=0aa4ff372dcd8939703f0cdc7b5d40b6bcb60718;hb=0cf83814de3ae95e0ac01430b8c0d2756949a86e;hp=79653a75716686ecdc37c8f1dd523939fc5a695d;hpb=3915f5c658e23587976dcc08ce137f4350429fcb;p=kivitendo-erp.git diff --git a/SL/AR.pm b/SL/AR.pm index 79653a757..0aa4ff372 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -416,10 +416,12 @@ sub ar_transactions { qq| a.transaction_description, | . qq| pr.projectnumber AS globalprojectnumber, | . qq| c.name, | . - qq| e.name AS employee | . + qq| e.name AS employee, | . + qq| e2.name AS salesman | . qq|FROM ar a | . qq|JOIN customer c ON (a.customer_id = c.id) | . qq|LEFT JOIN employee e ON (a.employee_id = e.id) | . + qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | . qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)|; my $where = "1 = 1"; @@ -635,7 +637,7 @@ sub storno { $storno_row->{invnumber} = 'Storno-' . $storno_row->{invnumber}; $storno_row->{amount} *= -1; $storno_row->{netamount} *= -1; - $storno_row->{paid} = $storno_amount->{amount}; + $storno_row->{paid} = $storno_row->{amount}; delete @$storno_row{qw(itime mtime)};