projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dimensions not utilized in Direct Invoice/Delivery
[fa-stable.git]
/
reporting
/
rep106.php
diff --git
a/reporting/rep106.php
b/reporting/rep106.php
index aa3a83f7c49f8b4d5c8d8b1bb8d7145c2be87ceb..ca1c84725b1b7a8bc07dabf96f6cf5331c1e92c4 100644
(file)
--- a/
reporting/rep106.php
+++ b/
reporting/rep106.php
@@
-9,12
+9,12
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
2
;
+$page_security =
'SA_SALESMANREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// date_: 2005-05-19
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// date_: 2005-05-19
-// Title:
Order Status Lis
t
+// Title:
Salesman Repor
t
// ----------------------------------------------------------------
$path_to_root="..";
// ----------------------------------------------------------------
$path_to_root="..";
@@
-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."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";
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->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
- $rep->
Header
();
+ $rep->
NewPage
();
$salesman = 0;
$subtotal = $total = $subprov = $provtotal = 0;
$salesman = 0;
$subtotal = $total = $subprov = $provtotal = 0;
@@
-105,11
+105,6
@@
function print_salesman_list()
while ($myrow=db_fetch($result))
{
while ($myrow=db_fetch($result))
{
- if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
- {
- $salesman = 0;
- $rep->Header();
- }
$rep->NewLine(0, 2, false, $salesman);
if ($salesman != $myrow['salesman_code'])
{
$rep->NewLine(0, 2, false, $salesman);
if ($salesman != $myrow['salesman_code'])
{
@@
-152,11
+147,6
@@
function print_salesman_list()
$rep->AmountCol(5, 6, $amt, $dec);
$rep->AmountCol(6, 7, $prov, $dec);
$rep->NewLine();
$rep->AmountCol(5, 6, $amt, $dec);
$rep->AmountCol(6, 7, $prov, $dec);
$rep->NewLine();
- if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
- {
- $salesman = 0;
- $rep->Header();
- }
}
$subtotal += $amt;
$subprov += $prov;
}
$subtotal += $amt;
$subprov += $prov;