X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep106.php;h=1274a8df9cb94b4018c63e7f1940b2cafbb9ef3b;hb=a3616fe8abf36ba9a2ba9ba63689475b1c8978b8;hp=409465e4589098f21af351d4a6414bcf56524160;hpb=a867eb6e8899ca5d9969645c24ad170379373f1f;p=fa-stable.git

diff --git a/reporting/rep106.php b/reporting/rep106.php
index 409465e4..1274a8df 100644
--- a/reporting/rep106.php
+++ b/reporting/rep106.php
@@ -40,7 +40,6 @@ function GetSalesmanTrans($from, $to)
 			cust.name AS DebtorName,
 			cust.curr_code,
 			branch.br_name,
-			branch.contact_name,
 			sorder.customer_ref,
 			salesman.*
 		FROM ".TB_PREF."debtor_trans trans,
@@ -50,6 +49,7 @@ function GetSalesmanTrans($from, $to)
 			".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.")
@@ -144,10 +144,14 @@ function print_salesman_list()
 		}
 		$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']);