Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6458] trunk
|
From: <ex...@us...> - 2013-11-30 11:54:06
|
Revision: 6458
http://sourceforge.net/p/web-erp/reponame/6458
Author: exsonqu
Date: 2013-11-30 11:54:03 +0000 (Sat, 30 Nov 2013)
Log Message:
-----------
2013/11/30 Thumb: Add salesman constraint to show salesperson's own sales orders invoice, customer etc in DailySalesInquiry.php,PDFDeliveryDifferences.php,PDFOrdersInvoiced.php,PDFOrderStatus.php,PDFPickingList.php,SalesByTypePeriodInquiry.php,SalesInquiry.php,SelectCompletedOrder.php.
Modified Paths:
--------------
trunk/DailySalesInquiry.php
trunk/PDFDeliveryDifferences.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPickingList.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesInquiry.php
trunk/SelectCompletedOrder.php
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/DailySalesInquiry.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -37,13 +37,19 @@
}
}
echo '</select></td>
- <td>' . _('Salesperson') . ':</td>
- <td><select tabindex="2" name="Salesperson">';
+ <td>' . _('Salesperson') . ':</td>';
-$SalespeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman",$db);
-if (!isset($_POST['Salesperson'])){
- $_POST['Salesperson'] = 'All';
- echo '<option selected="selected" value="All">' . _('All') . '</option>';
+if($_SESSION['SalesmanLogin'] != '') {
+ echo '<td>';
+ echo $_SESSION['UsersRealName'];
+ echo '</td>';
+}else{
+ echo '<td><select tabindex="2" name="Salesperson">';
+
+ $SalespeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman",$db);
+ if (!isset($_POST['Salesperson'])){
+ $_POST['Salesperson'] = 'All';
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
} else {
echo '<option value="All">' . _('All') . '</option>';
}
@@ -56,7 +62,7 @@
}
}
echo '</select></td>';
-
+}
echo '</tr>
</table>
<br />
@@ -94,7 +100,9 @@
AND trandate>='" . $StartDateSQL . "'
AND trandate<='" . $EndDateSQL . "'";
-if ($_POST['Salesperson']!='All') {
+if ($_SESSION['SalesmanLogin'] != '') {
+ $SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
+}elseif ($_POST['Salesperson']!='All') {
$sql .= " AND custbranch.salesman='" . $_POST['Salesperson'] . "'";
}
@@ -190,4 +198,4 @@
echo '</table>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFDeliveryDifferences.php
===================================================================
--- trunk/PDFDeliveryDifferences.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFDeliveryDifferences.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -173,6 +173,10 @@
AND trandate <= '" . FormatDateForSQL($_POST['ToDate']) . "'";
}
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
$Result=DB_query($sql,$db,'','',false,false); //dont error check - see below
if (DB_error_no($db)!=0){
@@ -270,6 +274,11 @@
AND trandate <= '" . FormatDateForSQL($_POST['ToDate']) . "'";
}
+
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
$ErrMsg = _('Could not retrieve the count of sales order lines in the period under review');
$result = DB_query($sql,$db,$ErrMsg);
Modified: trunk/PDFOrderStatus.php
===================================================================
--- trunk/PDFOrderStatus.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFOrderStatus.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -355,4 +355,4 @@
} /* end of while there are delivery differences to print */
$pdf->OutputD($_SESSION['DatabaseName'] . '_OrderStatus_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFOrdersInvoiced.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -121,17 +121,7 @@
INNER JOIN locations
ON salesorders.fromstkloc=locations.loccode
WHERE orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
} elseif ($_POST['CategoryID']!='All' AND $_POST['Location']=='All') {
@@ -166,17 +156,7 @@
ON salesorders.fromstkloc=locations.loccode
WHERE stockmaster.categoryid ='" . $_POST['CategoryID'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
} elseif ($_POST['CategoryID']=='All' AND $_POST['Location']!='All') {
$sql= "SELECT salesorders.orderno,
@@ -210,17 +190,7 @@
ON salesorders.fromstkloc=locations.loccode
WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
} elseif ($_POST['CategoryID']!='All' AND $_POST['location']!='All'){
@@ -254,8 +224,14 @@
WHERE stockmaster.categoryid ='" . $_POST['CategoryID'] . "'
AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
+}
+
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
+$sql .= " GROUP BY salesorders.orderno,
salesorders.debtorno,
salesorders.branchcode,
salesorders.customerref,
@@ -264,11 +240,9 @@
salesorderdetails.stkcode,
stockmaster.description,
stockmaster.units,
- stockmaster.decimalplaces";
-}
+ stockmaster.decimalplaces
+ ORDER BY salesorders.orderno";
-$sql .= " ORDER BY salesorders.orderno";
-
$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here
if (DB_error_no($db)!=0){
@@ -439,4 +413,4 @@
$pdf->OutputD($_SESSION['DatabaseName'] . '_OrdersInvoiced_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFPickingList.php
===================================================================
--- trunk/PDFPickingList.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFPickingList.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -130,6 +130,10 @@
AND salesorders.deliverydate<='" . FormatDateForSQL($_POST['TransDate'])."'";
}
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
if (isset($_POST['TransDate'])
OR (isset($_GET['TransNo']) AND $_GET['TransNo'] != 'Preview')) {
$result=DB_query($sql,$db, $ErrMsg);
@@ -349,4 +353,4 @@
$pdf->OutputD($_SESSION['DatabaseName'] . '_PickingLists_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/SalesByTypePeriodInquiry.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -209,8 +209,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY debtortrans.trandate,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY debtortrans.trandate,
tpe
ORDER BY debtortrans.trandate,
tpe";
@@ -242,8 +247,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY week_no,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY week_no,
transyear,
tpe
ORDER BY transyear,
@@ -278,8 +288,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY month_no,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY month_no,
month_name,
transyear,
debtortrans.tpe
@@ -314,8 +329,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY quarter_no,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY quarter_no,
transyear,
tpe
ORDER BY transyear,
@@ -566,4 +586,4 @@
} //end of if user hit show sales
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/SalesInquiry.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -160,9 +160,13 @@
$WhereArea = " AND custbranch.area = '" . $_POST['Area'] . "'";
}
- $WhereSalesman = ' ';
- if ($_POST['Salesman'] != 'All') {
+ $WhereSalesman = ' ';
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $WhereSalesman .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
+
+ }elseif ($_POST['Salesman'] != 'All') {
+
$WhereSalesman = " AND custbranch.salesman = '" . $_POST['Salesman'] . "'";
}
@@ -1171,15 +1175,22 @@
</tr>';
echo '<tr>
- <td>' . _('For Sales Person') . ':</td>
- <td><select name="Salesman">';
- $sql="SELECT salesmancode, salesmanname FROM salesman";
- $SalesmanResult= DB_query($sql,$db);
- echo '<option selected="selected" value="All">' . _('All Salesmen') . '</option>';
- While ($myrow = DB_fetch_array($SalesmanResult)){
- echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
+ <td>' . _('For Sales Person') . ':</td>';
+ if ($_SESSION['SalesmanLogin'] != '') {
+ echo '<td>';
+ echo $_SESSION['UsersRealName'];
+ echo '</td>';
+ }else{
+ echo '<td><select name="Salesman">';
+ $sql="SELECT salesmancode, salesmanname FROM salesman";
+ $SalesmanResult= DB_query($sql,$db);
+ echo '<option selected="selected" value="All">' . _('All Salesmen') . '</option>';
+ While ($myrow = DB_fetch_array($SalesmanResult)){
+ echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
+ }
+ echo '</select></td>';
}
- echo '</select></td></tr>';
+ echo '</tr>';
// Use name='Areas[]' multiple - if want to create an array for Areas and allow multiple selections
echo '<tr><td>' . _('For Sales Areas') . ':</td>
@@ -1277,4 +1288,4 @@
} // End of function TempStockmoves
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/SelectCompletedOrder.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -259,16 +259,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.orderno='". $OrderNumber ."'
AND salesorders.quotation=0
- AND salesorderdetails.completed " . $Completed ."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed " . $Completed;
} elseif (isset($CustomerRef)) {
if (isset($SelectedCustomer)) {
$SQL = "SELECT salesorders.orderno,
@@ -291,16 +282,7 @@
WHERE salesorders.debtorno='" . $SelectedCustomer ."'
AND salesorders.customerref like '%". $CustomerRef."%'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
} else { //customer not selected
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -321,16 +303,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.customerref " . LIKE . " '%". $CustomerRef . "%'
AND salesorders.quotation=0
- AND salesorderdetails.completed" . $Completed . "
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed" . $Completed;
}
} else {
@@ -360,16 +333,7 @@
AND salesorders.debtorno='" . $SelectedCustomer ."'
AND salesorders.orddate >= '" . $DateAfterCriteria ."'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
} else {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -391,16 +355,7 @@
WHERE salesorders.debtorno='" . $SelectedCustomer . "'
AND salesorders.orddate >= '" . $DateAfterCriteria . "'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
}
} else { //no customer selected
if (isset($SelectedStockItem)) {
@@ -424,16 +379,7 @@
WHERE salesorderdetails.stkcode='". $SelectedStockItem ."'
AND salesorders.orddate >= '" . $DateAfterCriteria . "'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
} else {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -454,20 +400,24 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.orddate >= '".$DateAfterCriteria . "'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
}
} //end selected customer
} //end not order number selected
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $SQL .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+ $SQL .= " GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
+
$SalesOrdersResult = DB_query($SQL,$db);
if (DB_error_no($db) !=0) {
|
