Menu
▾
▴
web-erp-svn
|
From: <Ex...@us...> - 2012-03-02 09:46:50
|
Revision: 5001
http://web-erp.svn.sourceforge.net/web-erp/?rev=5001&view=rev
Author: ExsonQu
Date: 2012-03-02 09:46:44 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
02/03/2012 Redirect Quotation PDF file to blank windows in SelectSalesOrder.php. Fixed by Exson
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-03-02 09:24:30 UTC (rev 5000)
+++ trunk/SelectSalesOrder.php 2012-03-02 09:46:44 UTC (rev 5001)
@@ -950,7 +950,7 @@
} else { /*must be quotes only */
printf('<td><a href="%s">%s</a></td>
- <td><a href="%s">' . $PrintText . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . '</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -1002,4 +1002,4 @@
} //end StockID already selected
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-02 09:46:54
|
Revision: 5001
http://web-erp.svn.sourceforge.net/web-erp/?rev=5001&view=rev
Author: ExsonQu
Date: 2012-03-02 09:46:44 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
02/03/2012 Redirect Quotation PDF file to blank windows in SelectSalesOrder.php. Fixed by Exson
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-03-02 09:24:30 UTC (rev 5000)
+++ trunk/SelectSalesOrder.php 2012-03-02 09:46:44 UTC (rev 5001)
@@ -950,7 +950,7 @@
} else { /*must be quotes only */
printf('<td><a href="%s">%s</a></td>
- <td><a href="%s">' . $PrintText . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . '</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -1002,4 +1002,4 @@
} //end StockID already selected
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-07 10:11:17
|
Revision: 5627
http://web-erp.svn.sourceforge.net/web-erp/?rev=5627&view=rev
Author: daintree
Date: 2012-09-07 10:11:07 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
sanitise SelectedStockItem
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-06 09:36:49 UTC (rev 5626)
+++ trunk/SelectSalesOrder.php 2012-09-07 10:11:07 UTC (rev 5627)
@@ -7,6 +7,10 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+if (isset($_REQUEST['SelectedStockItem'])) {
+ $_REQUEST['SelectedStockItem'] = DB_escape_string($_REQUEST['SelectedStockItem']);
+}
+
if (isset($_POST['PlacePO'])){ /*user hit button to place PO for selected orders */
/*Note the button would not have been displayed if the user had no authority to create purchase orders */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-07 10:11:17
|
Revision: 5627
http://web-erp.svn.sourceforge.net/web-erp/?rev=5627&view=rev
Author: daintree
Date: 2012-09-07 10:11:07 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
sanitise SelectedStockItem
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-06 09:36:49 UTC (rev 5626)
+++ trunk/SelectSalesOrder.php 2012-09-07 10:11:07 UTC (rev 5627)
@@ -7,6 +7,10 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+if (isset($_REQUEST['SelectedStockItem'])) {
+ $_REQUEST['SelectedStockItem'] = DB_escape_string($_REQUEST['SelectedStockItem']);
+}
+
if (isset($_POST['PlacePO'])){ /*user hit button to place PO for selected orders */
/*Note the button would not have been displayed if the user had no authority to create purchase orders */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ex...@us...> - 2013-10-09 01:17:08
|
Revision: 6346
http://sourceforge.net/p/web-erp/reponame/6346
Author: exsonqu
Date: 2013-10-09 01:17:04 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
2013/10/09 Exson: commit the fixed "Unable to Locate Purchase Order Number" error when the PO is created by SO interface. Fixed provided by Tim and reported by Merci from webERP forum.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2013-10-04 21:26:52 UTC (rev 6345)
+++ trunk/SelectSalesOrder.php 2013-10-09 01:17:04 UTC (rev 6346)
@@ -291,7 +291,7 @@
'" . $SupplierID . "',
'" . Date('Y-m-d') . "',
'" . $SuppRow['rate'] . "',
- '" . $_SESSION['UsersRealName'] . "',
+ '" . $_SESSION['UserID'] . "',
'" . $_SESSION['UserStockLocation'] . "',
'" . $DelAddRow['locationname'] . "',
'" . $DelAddRow['deladd1'] . "',
|
|
From: <ex...@us...> - 2014-04-09 11:37:17
|
Revision: 6681
http://sourceforge.net/p/web-erp/reponame/6681
Author: exsonqu
Date: 2014-04-09 11:37:13 +0000 (Wed, 09 Apr 2014)
Log Message:
-----------
09/04/14 Tim: Fixed the table sort failure bugs in SelectSalesOrder.php reported by Andrew Agaluski.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2014-04-08 08:27:07 UTC (rev 6680)
+++ trunk/SelectSalesOrder.php 2014-04-09 11:37:13 UTC (rev 6681)
@@ -1001,9 +1001,9 @@
if ($_POST['Quotations']=='Orders_Only'
AND $AuthRow['cancreate']==0){ //cancreate==0 means can create POs
- echo '<tr><td colspan="11" class="number"><input type="submit" name="PlacePO" value="' . _('Place') . " " . _('PO') . '" onclick="return confirm(\'' . _('This will create purchase orders for all the items on the checked sales orders above, based on the preferred supplier purchasing data held in the system. Are You Absolutely Sure?') . '\');" /></td</tr>';
+ echo '<tfoot><tr><td colspan="11" class="number"><input type="submit" name="PlacePO" value="' . _('Place') . " " . _('PO') . '" onclick="return confirm(\'' . _('This will create purchase orders for all the items on the checked sales orders above, based on the preferred supplier purchasing data held in the system. Are You Absolutely Sure?') . '\');" /></td></tr></tfoot>';
}
- echo '<tr><td colspan="9" class="number">';
+ echo '<tfoot><tr><td colspan="9" class="number">';
if ($_POST['Quotations']=='Orders_Only'){
echo '<b>' . _('Total Order(s) Value in');
} else {
@@ -1011,7 +1011,7 @@
}
echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td>
<td class="number"><b>' . locale_number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
- </tr>
+ </tr></tfoot>
</table>';
} //end if there are some orders to show
}
@@ -1022,4 +1022,4 @@
} //end StockID already selected
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
|
|
From: <ex...@us...> - 2014-05-17 16:31:17
|
Revision: 6715
http://sourceforge.net/p/web-erp/reponame/6715
Author: exsonqu
Date: 2014-05-17 16:31:14 +0000 (Sat, 17 May 2014)
Log Message:
-----------
18/5/14 Exson: Tidy up SelectSalesOrder.php SQL code and add Thumb's salesman login control and fixed bugs caused by no group by statements for customer and items selected.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2014-05-17 03:09:03 UTC (rev 6714)
+++ trunk/SelectSalesOrder.php 2014-05-17 16:31:14 UTC (rev 6715)
@@ -444,64 +444,8 @@
if (isset($_POST['SearchParts'])){
- if ($_POST['Keywords'] AND $_POST['StockCode']) {
- echo _('Stock description keywords have been used in preference to the Stock code extract entered');
- }
- if ($_POST['Keywords']) {
- //insert wildcard characters in spaces
- $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+ $StockItemsResult = GetSearchItems();
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid=locstock.stockid
- WHERE stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.categoryid='" . $_POST['StockCat']. "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- stockmaster.units
- ORDER BY stockmaster.stockid";
-
- } elseif (isset($_POST['StockCode'])){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid=locstock.stockid
- WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- stockmaster.units
- ORDER BY stockmaster.stockid";
-
- } elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid=locstock.stockid
- WHERE stockmaster.categoryid='" . $_POST['StockCat'] ."'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- stockmaster.units
- ORDER BY stockmaster.stockid";
- }
-
- $ErrMsg = _('No stock items were returned by the SQL because');
- $DbgMsg = _('The SQL used to retrieve the searched parts was');
- $StockItemsResult = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
-
}
if (isset($_POST['StockID'])){
@@ -653,9 +597,9 @@
if(!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] = '';
}
- if (isset($OrderNumber)
- AND $OrderNumber !='') {
- $SQL = "SELECT salesorders.orderno,
+ //Harmonize the ordervalue with SUM function since webERP allowed same items appeared several times in one sales orders. If there is no sum value, this situation not inclued.
+
+ $SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
salesorders.customerref,
@@ -664,7 +608,7 @@
salesorders.deliverto,
salesorders.printedpackingslip,
salesorders.poplaced,
- SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
+ SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
FROM salesorders INNER JOIN salesorderdetails
ON salesorders.orderno = salesorderdetails.orderno
INNER JOIN debtorsmaster
@@ -674,161 +618,59 @@
AND salesorders.branchcode = custbranch.branchcode
INNER JOIN currencies
ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorderdetails.completed=0
- AND salesorders.orderno=". $OrderNumber ."
- AND salesorders.quotation =" .$Quotations . "
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto,
- salesorders.printedpackingslip,
- salesorders.poplaced
- ORDER BY salesorders.orderno";
+ WHERE salesorderdetails.completed=0 ";
+ //Add salesman role control
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $SQL .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ if (isset($OrderNumber)
+ AND $OrderNumber !='') {
+
+ $SQL .= "AND salesorders.orderno=". $OrderNumber ."
+ AND salesorders.quotation=" .$Quotations;
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
if (isset($SelectedCustomer)) {
if (isset($SelectedStockItem)) {
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto,
- salesorders.printedpackingslip,
- salesorders.poplaced,
- salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate AS ordervalue
- FROM salesorders INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN debtorsmaster
- ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorderdetails.completed=0
- AND salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.stkcode='". $SelectedStockItem ."'
- AND salesorders.debtorno='" . $SelectedCustomer ."'
- AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
- ORDER BY salesorders.orderno";
+ $SQL .= "AND salesorders.quotation =" .$Quotations . "
+ AND salesorderdetails.stkcode='". $SelectedStockItem ."'
+ AND salesorders.debtorno='" . $SelectedCustomer ."'
+ AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'";
-
} else {
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.printedpackingslip,
- salesorders.poplaced,
- salesorders.deliverydate,
- SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
- FROM salesorders INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN debtorsmaster
- ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.completed=0
- AND salesorders.debtorno='" . $SelectedCustomer . "'
- AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- salesorders.debtorno,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate,
- salesorders.poplaced
- ORDER BY salesorders.orderno";
+ $SQL .= "AND salesorders.quotation =" .$Quotations . "
+ AND salesorders.debtorno='" . $SelectedCustomer . "'
+ AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'";
}
} else { //no customer selected
if (isset($SelectedStockItem)) {
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.printedpackingslip,
- salesorders.poplaced,
- salesorders.deliverydate,
- SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
- FROM salesorders INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN debtorsmaster
- ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorderdetails.completed=0
- AND salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.stkcode='". $SelectedStockItem . "'
- AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.poplaced,
- salesorders.deliverydate,
- salesorders.printedpackingslip
- ORDER BY salesorders.orderno";
+ $SQL .= "AND salesorders.quotation =" .$Quotations . "
+ AND salesorderdetails.stkcode='". $SelectedStockItem . "'
+ AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'";
} else {
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate,
- salesorders.printedpackingslip,
- salesorders.poplaced,
- SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
- FROM salesorders INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN debtorsmaster
- ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorderdetails.completed=0
- AND salesorders.quotation =" .$Quotations . "
- AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate,
- salesorders.printedpackingslip,
- salesorders.poplaced
- ORDER BY salesorders.orderno";
+ $SQL .= "AND salesorders.quotation =" .$Quotations . "
+ AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'";
}
} //end selected customer
+
+ $SQL .= ' GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto,
+ salesorders.printedpackingslip,
+ salesorders.poplaced
+ ORDER BY salesorders.orderno';
} //end not order number selected
+
$ErrMsg = _('No orders or quotations were returned by the SQL because');
$SalesOrdersResult = DB_query($SQL,$db,$ErrMsg);
@@ -1022,4 +864,49 @@
} //end StockID already selected
include('includes/footer.inc');
-?>
\ No newline at end of file
+function GetSearchItems ($SQLConstraint='') {
+ global $db;
+ if ($_POST['Keywords'] AND $_POST['StockCode']) {
+ echo _('Stock description keywords have been used in preference to the Stock code extract entered');
+ }
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid=locstock.stockid";
+ if (isset($_POST['StockCat']) AND trim($_POST['StockCat'])==''){
+ $WhereStockCat = '';
+ } else {
+ $WhereStockCat = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' ";
+ }
+ if ($_POST['Keywords']) {
+ //insert wildcard characters in spaces
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+
+ $SQL .= " WHERE stockmaster.description " . LIKE . " '" . $SearchString . "'
+ " . $WhereStockCat ;
+
+
+ } elseif (isset($_POST['StockCode'])){
+ $SQL .= " WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'" . $WhereStockCat;
+
+ } elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
+ $SQL .= " WHERE stockmaster.categoryid='" . $_POST['StockCat'] ."'";
+
+ }
+ $SQL .= $SQLConstraint;
+ $SQL .= " GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
+
+ $ErrMsg = _('No stock items were returned by the SQL because');
+ $DbgMsg = _('The SQL used to retrieve the searched parts was');
+ $StockItemsResult = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
+ return $StockItemsResult;
+
+}
+?>
|
|
From: <ex...@us...> - 2015-03-07 02:14:57
|
Revision: 7190
http://sourceforge.net/p/web-erp/reponame/7190
Author: exsonqu
Date: 2015-03-07 02:14:54 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2015-03-05 23:49:01 UTC (rev 7189)
+++ trunk/SelectSalesOrder.php 2015-03-07 02:14:54 UTC (rev 7190)
@@ -496,11 +496,11 @@
echo '</select></td>
<td><select name="Quotations">';
- if ($_GET['Quotations']=='Quotes_Only'){
+ if (isset($_GET['Quotations']) AND $_GET['Quotations']=='Quotes_Only'){
$_POST['Quotations']='Quotes_Only';
}
- if ($_POST['Quotations']=='Quotes_Only'){
+ if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Quotes_Only'){
echo '<option selected="selected" value="Quotes_Only">' . _('Quotations Only') . '</option>';
echo '<option value="Orders_Only">' . _('Orders Only') . '</option>';
} else {
@@ -613,7 +613,7 @@
salesorders.deliverto,
salesorders.printedpackingslip,
salesorders.poplaced,
- SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
+ SUM(salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
FROM salesorders INNER JOIN salesorderdetails
ON salesorders.orderno = salesorderdetails.orderno
INNER JOIN debtorsmaster
@@ -915,4 +915,4 @@
return $StockItemsResult;
}
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-12 01:03:37
|
Revision: 7219
http://sourceforge.net/p/web-erp/reponame/7219
Author: exsonqu
Date: 2015-03-12 01:03:30 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2015-03-12 00:56:27 UTC (rev 7218)
+++ trunk/SelectSalesOrder.php 2015-03-12 01:03:30 UTC (rev 7219)
@@ -695,7 +695,7 @@
if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Orders_Only'){
$TableHeader = '<tr>
- <th>' . _('Modify') . '</th>
+ <th class="ascending" >' . _('Modify') . '</th>
<th>' . _('Invoice') . '</th>
<th>' . _('Dispatch Note') . '</th>
<th class="ascending" >' . _('Customer') . '</th>
|
|
From: <dai...@us...> - 2016-10-19 08:29:18
|
Revision: 7650
http://sourceforge.net/p/web-erp/reponame/7650
Author: daintree
Date: 2016-10-19 08:29:16 +0000 (Wed, 19 Oct 2016)
Log Message:
-----------
S Kelly: SelectSalesOrder.php mods
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2016-10-18 07:38:17 UTC (rev 7649)
+++ trunk/SelectSalesOrder.php 2016-10-19 08:29:16 UTC (rev 7650)
@@ -28,18 +28,16 @@
} else {
unset($SelectedCustomer);
}
-
+
if (isset($_POST['PlacePO'])){ /*user hit button to place PO for selected orders */
/*Note the button would not have been displayed if the user had no authority to create purchase orders */
$OrdersToPlacePOFor = '';
for ($i=0;$i<=count($_POST['PlacePO_']);$i++){
- if (isset($_POST['PlacePO_'][$i])) { //checkboxes only set if they are checked
- if ($OrdersToPlacePOFor==''){
- $OrdersToPlacePOFor .= " orderno='" . $_POST['OrderNo_PO_'][$i] . "'";
- } else {
- $OrdersToPlacePOFor .= " OR orderno='" . $_POST['OrderNo_PO_'][$i] . "'";
- }
+ if ($OrdersToPlacePOFor==''){
+ $OrdersToPlacePOFor .= " orderno='" . $_POST['PlacePO_'][$i] . "'";
+ } else {
+ $OrdersToPlacePOFor .= " OR orderno='" . $_POST['PlacePO_'][$i] . "'";
}
}
if (mb_strlen($OrdersToPlacePOFor)==''){
@@ -149,6 +147,7 @@
/* We need the items to order to be in supplier order so that only a single order is created for a supplier - so need to sort the multi-dimensional array to ensure it is listed by supplier sequence. To use array_multisort we need to get arrays of supplier with the same keys as the main array of rows
*/
+ $SupplierArray =array();
foreach ($ItemArray as $key => $row) {
//to make the Supplier array with the keys of the $ItemArray
$SupplierArray[$key] = $row['supplierno'];
@@ -157,7 +156,9 @@
/* Use array_multisort to Sort the ItemArray with supplierno ascending
Add $ItemArray as the last parameter, to sort by the common key
*/
- array_multisort($SupplierArray, SORT_ASC, $ItemArray);
+ if (count($SupplierArray)>1) {
+ array_multisort($SupplierArray, SORT_ASC, $ItemArray);
+ }
if (count($ItemArray)==0){
prnMsg(_('There might be no supplier purchasing data set up for any items on the selected sales order(s). No purchase orders have been created'),'warn');
@@ -202,7 +203,7 @@
$AuthResult=DB_query($AuthSQL);
$AuthRow=DB_fetch_array($AuthResult);
- if ($AuthRow['authlevel']=''){
+ if ($AuthRow['authlevel']==''){
$AuthRow['authlevel'] = 0;
}
@@ -368,7 +369,7 @@
$AuthResult=DB_query($AuthSQL);
$AuthRow=DB_fetch_array($AuthResult);
- if ($AuthRow['authlevel']=''){
+ if ($AuthRow['authlevel']==''){
$AuthRow['authlevel'] = 0;
}
@@ -538,7 +539,7 @@
echo '</select> </td>
<td>' . _('Due Date From') . '</td>
- <td><input type="text" class="date" name="DueDateFrom" value="' . $_POST['DueDateFrom'] . '" alt="' . $_SESSION['DefaultDateFormat'] . '" size="10" /></td>
+ <td><input type="text" class="date" name="DueDateFrom" value="' . $_POST['DueDateFrom'] . '" alt="' . $_SESSION['DefaultDateFormat'] . '" size="10" /></td>
<td>' . _('Due Date To') . '</td>
<td><input type="text" class="date" name="DueDateTo" value="' . $_POST['DueDateTo'] . '" alt="' . $_SESSION['DefaultDateFormat'] . '" size="10" /></td>
<td><input type="submit" name="SearchOrders" value="' . _('Search') . '" /></td>
@@ -674,9 +675,9 @@
$_POST['StockLocation'] = '';
}
//Harmonize the ordervalue with SUM function since webERP allowed same items appeared several times in one sales orders. If there is no sum value, this situation not inclued.
- //We should separate itemdue inquiry from normal inquiry.
- if (($Quotations === 0 OR $Quotations === 1)
- AND (!isset($DueDateFrom) OR !is_date($DueDateFrom))
+ //We should separate itemdue inquiry from normal inquiry.
+ if (($Quotations === 0 OR $Quotations === 1)
+ AND (!isset($DueDateFrom) OR !is_date($DueDateFrom))
AND (!isset($DueDateTo) OR !is_date($DueDateTo))) {
$SQL = "SELECT salesorders.orderno,
@@ -701,7 +702,7 @@
WHERE salesorderdetails.completed=0 ";
$SQL .= $OrderDateFrom . $OrderDateTo;
} else {
- if ($Quotations !==0 AND $Quotations !==1) {//overdue inquiry only
+ if ($Quotations !==0 AND $Quotations !==1) {//overdue inquiry only
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -711,8 +712,8 @@
salesorders.deliverto,
salesorders.printedpackingslip,
salesorders.poplaced,
- SUM(CASE WHEN itemdue<'" . Date('Y-m-d') . "'
- THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
+ SUM(CASE WHEN itemdue<'" . Date('Y-m-d') . "'
+ THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
ELSE 0 END) as ordervalue";
} elseif (isset($DueDateFrom) AND is_date($DueDateFrom) AND (!isset($DueDateTo) OR !is_date($DueDateTo))) {
$SQL = "SELECT salesorders.orderno,
@@ -724,7 +725,7 @@
salesorders.deliverto,
salesorders.printedpackingslip,
salesorders.poplaced,
- SUM(CASE WHEN itemdue>='" . FormatDateFromSQL($DueDateFrom) . "'
+ SUM(CASE WHEN itemdue>='" . FormatDateFromSQL($DueDateFrom) . "'
THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
ELSE 0 END) as ordervalue";
} elseif (isset($DueDateFrom) AND is_date($DueDateFrom) AND isset($DueDateTo) AND is_date($DueDateTo)) {
@@ -738,8 +739,8 @@
salesorders.printedpackingslip,
salesorders.poplaced,
SUM (CASE WHEN itemdue>='" . FormatDateForSQL($DueDateFrom) . "' AND itemdue<='" . FormatDateForSQL($DueDateTo) ."'
- THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
- ELSE 0 END) as ordervalue";
+ THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
+ ELSE 0 END) as ordervalue";
} elseif ((!isset($DueDateFrom) OR !is_date($DueDateFrom)) AND isset($DueDateTo) AND is_date($DueDateTo)) {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -751,12 +752,12 @@
salesorders.printedpackingslip,
salesorders.poplaced,
SUM(CASE WHEN AND itemdue<='" . FormatDateForSQL($DueDateTo) ."'
- THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
- ELSE 0 END) as ordervalue";
+ THEN salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate
+ ELSE 0 END) as ordervalue";
}//end of due date inquiry
$SQL .= $OrderDateFrom . $OrderDateTo;
-
+
$SQL .=" FROM salesorders INNER JOIN salesorderdetails
ON salesorders.orderno = salesorderdetails.orderno
INNER JOIN debtorsmaster
@@ -779,11 +780,11 @@
$SQL .= "AND salesorders.orderno=". $OrderNumber ."
AND salesorders.quotation=" .$Quotations;
-
+
} elseif (isset($CustomerRef) AND $CustomerRef != ''){
$SQL .= "AND salesorders.customerref='" . $CustomerRef . "'
AND salesorders.quotation=" . $Quotations;
-
+
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
@@ -933,7 +934,7 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td><input type="checkbox" name="PlacePO_[]" /><input type="hidden" name="OrderNo_PO_[]" value="%s" /></td>
+ <td><input type="checkbox" name="PlacePO_[]" /></td>
</tr>',
$ModifyPage,
$myrow['orderno'],
|
|
From: <dai...@us...> - 2016-10-20 07:25:59
|
Revision: 7651
http://sourceforge.net/p/web-erp/reponame/7651
Author: daintree
Date: 2016-10-20 07:25:57 +0000 (Thu, 20 Oct 2016)
Log Message:
-----------
Simon Kelly fix to SelectSalesOrder.php
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2016-10-19 08:29:16 UTC (rev 7650)
+++ trunk/SelectSalesOrder.php 2016-10-20 07:25:57 UTC (rev 7651)
@@ -934,7 +934,7 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td><input type="checkbox" name="PlacePO_[]" /></td>
+ <td><input type="checkbox" name="PlacePO_[]" value="%s"/></td>
</tr>',
$ModifyPage,
$myrow['orderno'],
@@ -947,9 +947,7 @@
$FormatedDelDate,
html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'),
$FormatedOrderValue,
- $i,
- $i,
- $myrow['orderno']);
+ $myrow['orderno']);
} else { /*User is not authorised to create POs so don't even show the option */
printf('<td><a href="%s">%s</a></td>
<td><a href="%s">' . _('Invoice') . '</a></td>
|
|
From: <ex...@us...> - 2017-06-08 02:28:45
|
Revision: 7765
http://sourceforge.net/p/web-erp/reponame/7765
Author: exsonqu
Date: 2017-06-08 02:28:42 +0000 (Thu, 08 Jun 2017)
Log Message:
-----------
08/06/17 Exson: Fixed quotation and orders are mixed in searching result of SelectSalesOrder.php.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2017-06-01 01:21:09 UTC (rev 7764)
+++ trunk/SelectSalesOrder.php 2017-06-08 02:28:42 UTC (rev 7765)
@@ -2,12 +2,12 @@
/* $Id$*/
-include('includes/session.php');
+include('includes/session.inc');
$Title = _('Search Outstanding Sales Orders');
-/* webERP manual links before header.php */
+/* webERP manual links before header.inc */
$ViewTopic= "SalesOrders";
$BookMark = "SelectSalesOrder";
-include('includes/header.php');
+include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['Reset'])) {
unset($_POST);
@@ -439,7 +439,7 @@
<b>' . _('The Order Number entered MUST be numeric') . '</b>
<br />';
unset ($OrderNumber);
- include('includes/footer.php');
+ include('includes/footer.inc');
exit;
} else {
echo _('Order Number') . ' - ' . $OrderNumber;
@@ -643,7 +643,7 @@
//figure out the SQL required from the inputs available
if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Orders_Only'){
$Quotations = 0;
- } elseif(isset($_POST['Quotations']) AND $_POST['Quotations'] == 'Quotations_Only') {
+ } elseif(isset($_POST['Quotations']) AND $_POST['Quotations'] == 'Quotes_Only') {
$Quotations =1;
} elseif(isset($_POST['Quotations']) AND $_POST['Quotations'] == 'Overdue_Only') {
$Quotations = "0 AND itemdue<'" . Date('Y-m-d') . "'";
@@ -1028,7 +1028,7 @@
} //end StockID already selected
-include('includes/footer.php');
+include('includes/footer.inc');
function GetSearchItems ($SQLConstraint='') {
global $db;
if ($_POST['Keywords'] AND $_POST['StockCode']) {
|
|
From: <rc...@us...> - 2017-06-17 23:07:48
|
Revision: 7767
http://sourceforge.net/p/web-erp/reponame/7767
Author: rchacon
Date: 2017-06-17 23:07:46 +0000 (Sat, 17 Jun 2017)
Log Message:
-----------
Fix call to session.php, header.php, and footer.php.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2017-06-08 02:30:51 UTC (rev 7766)
+++ trunk/SelectSalesOrder.php 2017-06-17 23:07:46 UTC (rev 7767)
@@ -2,12 +2,12 @@
/* $Id$*/
-include('includes/session.inc');
+include('includes/session.php');
$Title = _('Search Outstanding Sales Orders');
-/* webERP manual links before header.inc */
+/* webERP manual links before header.php */
$ViewTopic= "SalesOrders";
$BookMark = "SelectSalesOrder";
-include('includes/header.inc');
+include('includes/header.php');
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['Reset'])) {
unset($_POST);
@@ -439,7 +439,7 @@
<b>' . _('The Order Number entered MUST be numeric') . '</b>
<br />';
unset ($OrderNumber);
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
} else {
echo _('Order Number') . ' - ' . $OrderNumber;
@@ -1028,7 +1028,7 @@
} //end StockID already selected
-include('includes/footer.inc');
+include('includes/footer.php');
function GetSearchItems ($SQLConstraint='') {
global $db;
if ($_POST['Keywords'] AND $_POST['StockCode']) {
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X