X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=5fc6032a96a63b240c8e047024c46fc80e36151f;hb=518ed6b5bd287b66ea4d8495d319640541878dea;hp=b716b208c83560cb4aae5c754b032b5038a640d8;hpb=62a9b7075e66ccbf41e9f0bc6314359aa70af8e6;p=kivitendo-erp.git diff --git a/SL/AR.pm b/SL/AR.pm index b716b208c..5fc6032a9 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -411,7 +411,8 @@ sub ar_transactions { qq|SELECT a.id, a.invnumber, a.ordnumber, a.transdate, | . qq| a.duedate, a.netamount, a.amount, a.paid, | . qq| a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | . - qq| a.shippingpoint, a.storno, a.globalproject_id, | . + qq| a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | . + qq| a.marge_total, a.marge_percent, | . qq| a.transaction_description, | . qq| pr.projectnumber AS globalprojectnumber, | . qq| c.name, | . @@ -634,7 +635,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)};