X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=900678ad7a9f6d62ad358c51a58bd43502ee0c3e;hb=fabc8d3e9dbd0ebeb28cefcdf85c5abf90a3496f;hp=34c975ea98771145faabb99acb7fa35a4653dfcb;hpb=23eaec5e4f4fa5d533d82e6d208135e25d13a2ee;p=fa-stable.git diff --git a/reporting/rep101.php b/reporting/rep101.php index 34c975ea..900678ad 100644 --- a/reporting/rep101.php +++ b/reporting/rep101.php @@ -168,7 +168,7 @@ function print_customer_balances() $accumulate = 0; $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1; - $bal = get_open_balance($myrow['debtor_no'], $from, $convert); + $bal = get_open_balance($myrow['debtor_no'], $from); $init[0] = $init[1] = 0.0; $init[0] = round2(abs($bal['charges']*$rate), $dec); $init[1] = round2(Abs($bal['credits']*$rate), $dec); @@ -239,7 +239,7 @@ function print_customer_balances() $item[2] = round2($trans['Allocated'] * $rate, $dec) * -1; } $rep->AmountCol(6, 7, $item[2], $dec); - if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) + if (($trans['type'] == ST_JOURNAL && $item[0]) || $trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) $item[3] = $item[0] - $item[2]; else $item[3] = -$item[1] - $item[2];