projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug. is_date_closed() should be performed before is_date_in_fiscalyears().
[fa-stable.git]
/
reporting
/
rep106.php
diff --git
a/reporting/rep106.php
b/reporting/rep106.php
index 409465e4589098f21af351d4a6414bcf56524160..f9ea4499eaa518989504200dc95017dd4ee467fe 100644
(file)
--- 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,
cust.name AS DebtorName,
cust.curr_code,
branch.br_name,
- branch.contact_name,
sorder.customer_ref,
salesman.*
FROM ".TB_PREF."debtor_trans trans,
sorder.customer_ref,
salesman.*
FROM ".TB_PREF."debtor_trans trans,
@@
-144,10
+143,14
@@
function print_salesman_list()
}
$rate = $myrow['rate'];
$amt = $myrow['InvoiceTotal'] * $rate;
}
$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;
$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']);
if (!$summary)
{
$rep->TextCol(0, 1, $myrow['trans_no']);