X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep106.php;h=42a02083828a5930dcb30c8872d7beb66ea119dd;hb=9b7ac7414c4ec6b3284adb22876cd5142ac78fa3;hp=09dd921cdb777aa18289a7a9ff020ef3e6b69d39;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/reporting/rep106.php b/reporting/rep106.php index 09dd921c..42a02083 100644 --- a/reporting/rep106.php +++ b/reporting/rep106.php @@ -45,7 +45,7 @@ function GetSalesmanTrans($from, $to) AND ".TB_PREF."sales_orders.branch_code=".TB_PREF."cust_branch.branch_code AND ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no - AND (".TB_PREF."debtor_trans.type=10 OR ".TB_PREF."debtor_trans.type=11) + AND (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE." OR ".TB_PREF."debtor_trans.type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtor_trans.tran_date>='$fromdate' AND ".TB_PREF."debtor_trans.tran_date<='$todate' ORDER BY ".TB_PREF."salesman.salesman_code, ".TB_PREF."debtor_trans.tran_date"; @@ -97,7 +97,7 @@ function print_salesman_list() $rep->Font(); $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2); - $rep->Header(); + $rep->NewPage(); $salesman = 0; $subtotal = $total = $subprov = $provtotal = 0; @@ -108,7 +108,7 @@ function print_salesman_list() if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight)) { $salesman = 0; - $rep->Header(); + $rep->NewPage(); } $rep->NewLine(0, 2, false, $salesman); if ($salesman != $myrow['salesman_code']) @@ -155,7 +155,7 @@ function print_salesman_list() if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight)) { $salesman = 0; - $rep->Header(); + $rep->NewPage(); } } $subtotal += $amt;