projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug [0000231] Wrong On Order for Advanced Manufacturing.before final production.
[fa-stable.git]
/
reporting
/
rep106.php
diff --git
a/reporting/rep106.php
b/reporting/rep106.php
index bc3889359764e2428ed19688cd4b290f9f3e0ced..4aac08ab275ad665a614d3e960c9e44c51daae63 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";
@@
-74,7
+74,7
@@
function print_salesman_list()
else
$sum = _("Yes");
else
$sum = _("Yes");
- $dec = user_
qty
_dec();
+ $dec = user_
price
_dec();
$cols = array(0, 60, 150, 220, 325, 385, 450, 515);
$cols = array(0, 60, 150, 220, 325, 385, 450, 515);