cust.name AS DebtorName,
cust.curr_code,
branch.br_name,
- branch.contact_name,
sorder.customer_ref,
salesman.*
FROM ".TB_PREF."debtor_trans trans,
".TB_PREF."salesman salesman
WHERE sorder.order_no=trans.order_
AND sorder.branch_code=branch.branch_code
+ AND sorder.trans_type = ".ST_SALESORDER."
AND branch.salesman=salesman.salesman_code
AND trans.debtor_no=cust.debtor_no
AND (trans.type=".ST_SALESINVOICE." OR trans.type=".ST_CUSTCREDIT.")
}
$rate = $myrow['rate'];
$amt = $myrow['InvoiceTotal'] * $rate;
- if ($subprov > $myrow['break_pt'] && $myrow['provision2'] != 0)
- $prov = $myrow['provision2'] * $amt / 100;
- else
+ if ($myrow['provision2'] == 0)
$prov = $myrow['provision'] * $amt / 100;
+ else {
+ $amt1 = min($amt, max(0, $myrow['break_pt']-$subtotal));
+ $amt2 = $amt - $amt1;
+
+ $prov = $amt1*$myrow['provision']/100 + $amt2*$myrow['provision2']/100;
+ }
if (!$summary)
{
$rep->TextCol(0, 1, $myrow['trans_no']);