Menu
▾
▴
web-erp-svn
|
From: <tu...@us...> - 2018-02-12 21:53:31
|
Revision: 7957
http://sourceforge.net/p/web-erp/reponame/7957
Author: turbopt
Date: 2018-02-12 21:53:28 +0000 (Mon, 12 Feb 2018)
Log Message:
-----------
Tim (PaulT commit): StockMovements.php, StockLocMovements.php: Correct stock movements that have more than one serial number as part of it, then the item will appear multiple times in the movements script with the total quantity in each line. For example, if I enter a quantity adjustment for a controlled item, and assign 3 serial numbers to this movement and then run the inquiries, there will be 3 separate lines with a quantity of 3 against each one.
Modified Paths:
--------------
trunk/StockLocMovements.php
trunk/StockMovements.php
trunk/doc/Change.log
Modified: trunk/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php 2018-02-11 19:21:52 UTC (rev 7956)
+++ trunk/StockLocMovements.php 2018-02-12 21:53:28 UTC (rev 7957)
@@ -7,146 +7,153 @@
include('includes/header.php');
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<p class="page_title_text">
+ <img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/magnifier.png" title="', _('Search'), '" alt="" />', ' ', $Title, '
+ </p>';
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $Title . '</p>';
+echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
+ <table>
+ <tr>
+ <td>', _('From Stock Location'), ':<select required="required" name="StockLocation">';
-echo '<table class="selection">
- <tr>
- <td> ' . _('From Stock Location') . ':<select name="StockLocation"> ';
+$SQL = "SELECT locationname,
+ locations.loccode
+ FROM locations
+ INNER JOIN locationusers
+ ON locationusers.loccode=locations.loccode
+ AND locationusers.userid='" . $_SESSION['UserID'] . "'
+ AND locationusers.canview=1
+ ORDER BY locationname";
-$sql = "SELECT locations.loccode, locationname FROM locations
- INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
-$resultStkLocs = DB_query($sql);
-while ($myrow=DB_fetch_array($resultStkLocs)){
- if (isset($_POST['StockLocation']) AND $_POST['StockLocation']!='All'){
- if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+echo '<option selected="selected" value="All">', _('All Locations'), '</option>';
+
+if (!isset($_POST['StockLocation'])) {
+ $_POST['StockLocation'] = 'All';
+}
+
+$ResultStkLocs = DB_query($SQL);
+
+while ($MyRow = DB_fetch_array($ResultStkLocs)) {
+ if (isset($_POST['StockLocation']) and $_POST['StockLocation'] != 'All') {
+ if ($MyRow['loccode'] == $_POST['StockLocation']) {
+ echo '<option selected="selected" value="', $MyRow['loccode'], '">', $MyRow['locationname'], '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="', $MyRow['loccode'], '">', $MyRow['locationname'], '</option>';
}
- } elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- $_POST['StockLocation']=$myrow['loccode'];
+ } elseif ($MyRow['loccode'] == $_SESSION['UserStockLocation']) {
+ echo '<option selected="selected" value="' . $MyRow['loccode'] . '">' . $MyRow['locationname'] . '</option>';
+ $_POST['StockLocation']=$MyRow['loccode'];
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="', $MyRow['loccode'], '">', $MyRow['locationname'], '</option>';
}
}
echo '</select>';
-if (!isset($_POST['BeforeDate']) OR !Is_Date($_POST['BeforeDate'])){
- $_POST['BeforeDate'] = Date($_SESSION['DefaultDateFormat']);
+if (!isset($_POST['BeforeDate']) or !Is_date($_POST['BeforeDate'])) {
+ $_POST['BeforeDate'] = Date($_SESSION['DefaultDateFormat']);
}
-if (!isset($_POST['AfterDate']) OR !Is_Date($_POST['AfterDate'])){
- $_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')-1,Date('d'),Date('y')));
+if (!isset($_POST['AfterDate']) or !Is_date($_POST['AfterDate'])) {
+ $_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - 1, Date('d'), Date('y')));
}
-echo ' ' . _('Show Movements before') . ': <input type="text" name="BeforeDate" size="12" maxlength="12" value="' . $_POST['BeforeDate'] . '" />';
-echo ' ' . _('But after') . ': <input type="text" name="AfterDate" size="12" maxlength="12" value="' . $_POST['AfterDate'] . '" />';
-echo '</td>
- </tr>
- </table>
- <br />';
-echo '<div class="centre">
- <input type="submit" name="ShowMoves" value="' . _('Show Stock Movements') . '" />
- </div>
- <br />';
+echo ' ', _('Show Movements before'), ': <input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="BeforeDate" size="12" required="required" maxlength="12" value="', $_POST['BeforeDate'], '" />',
+ ' ', _('But after'), ': <input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="AfterDate" size="12" required="required" maxlength="12" value="', $_POST['AfterDate'], '" />',
+ '</td>
+ </tr>
+ </table>
+ <div class="centre">
+ <input type="submit" name="ShowMoves" value="', _('Show Stock Movements'), '" />
+ </div>
+ <br />';
+if ($_POST['StockLocation'] == 'All') {
+ $_POST['StockLocation'] = '%%';
+}
$SQLBeforeDate = FormatDateForSQL($_POST['BeforeDate']);
$SQLAfterDate = FormatDateForSQL($_POST['AfterDate']);
-$sql = "SELECT stockmoves.stockid,
- systypes.typename,
- stockmoves.type,
- stockmoves.transno,
- stockmoves.trandate,
- stockmoves.debtorno,
- stockmoves.branchcode,
- stockmoves.qty,
- stockmoves.reference,
- stockmoves.price,
- stockmoves.discountpercent,
- stockmoves.newqoh,
- stockmaster.decimalplaces,
- stockserialmoves.serialno
- FROM stockmoves
- INNER JOIN systypes ON stockmoves.type=systypes.typeid
- INNER JOIN stockmaster ON stockmoves.stockid=stockmaster.stockid
- LEFT JOIN stockserialmoves ON stockmoves.stkmoveno=stockserialmoves.stockmoveno
- WHERE stockmoves.loccode='" . $_POST['StockLocation'] . "'
- AND stockmoves.trandate >= '". $SQLAfterDate . "'
- AND stockmoves.trandate <= '" . $SQLBeforeDate . "'
- AND hidemovt=0
- ORDER BY stkmoveno DESC";
-
+$SQL = "SELECT stockmoves.stockid,
+ stockmoves.stkmoveno,
+ systypes.typename,
+ stockmoves.type,
+ stockmoves.transno,
+ stockmoves.trandate,
+ stockmoves.debtorno,
+ stockmoves.branchcode,
+ stockmoves.qty,
+ stockmoves.reference,
+ stockmoves.price,
+ stockmoves.discountpercent,
+ stockmoves.newqoh,
+ stockmaster.controlled,
+ stockmaster.serialised,
+ stockmaster.decimalplaces
+ FROM stockmoves
+ INNER JOIN systypes
+ ON stockmoves.type=systypes.typeid
+ INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ WHERE stockmoves.loccode " . LIKE . " '" . $_POST['StockLocation'] . "'
+ AND stockmoves.trandate >= '" . $SQLAfterDate . "'
+ AND stockmoves.trandate <= '" . $SQLBeforeDate . "'
+ AND hidemovt=0
+ ORDER BY stkmoveno DESC";
$ErrMsg = _('The stock movements for the selected criteria could not be retrieved because');
-$MovtsResult = DB_query($sql,$ErrMsg);
+$MovtsResult = DB_query($SQL, $ErrMsg);
-echo '<table cellpadding="5" cellspacing="4 "class="selection">';
-$tableheader = '<tr>
- <th>' . _('Item Code') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Trans No') . '</th>
- <th>' . _('Date') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('Quantity on Hand') . '</th>
- <th>' . _('Serial No.') . '</th>
- </tr>';
-echo $tableheader;
+if (DB_num_rows($MovtsResult) > 0) {
+ echo '<table cellpadding="5" cellspacing="4" class="selection">
+ <tr>
+ <th>', _('Item Code'), '</th>
+ <th>', _('Type'), '</th>
+ <th>', _('Trans No'), '</th>
+ <th>', _('Date'), '</th>
+ <th>', _('Customer'), '</th>
+ <th>', _('Quantity'), '</th>
+ <th>', _('Reference'), '</th>
+ <th>', _('Price'), '</th>
+ <th>', _('Discount'), '</th>
+ <th>', _('Quantity on Hand'), '</th>
+ <th>', _('Serial No.'), '</th>
+ </tr>';
-$j = 1;
+ while ($MyRow = DB_fetch_array($MovtsResult)) {
-while ($myrow=DB_fetch_array($MovtsResult)) {
+ $DisplayTranDate = ConvertSQLDate($MyRow['trandate']);
- $DisplayTranDate = ConvertSQLDate($myrow['trandate']);
+ $SerialSQL = "SELECT serialno, moveqty FROM stockserialmoves WHERE stockmoveno='" . $MyRow['stkmoveno'] . "'";
+ $SerialResult = DB_query($SerialSQL);
- printf('<tr class="striped_row">
- <td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=%s">%s</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- mb_strtoupper($myrow['stockid']),
- mb_strtoupper($myrow['stockid']),
- $myrow['typename'],
- $myrow['transno'],
- $DisplayTranDate,
- $myrow['debtorno'],
- locale_number_format($myrow['qty'],
- $myrow['decimalplaces']),
- $myrow['reference'],
- locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
- locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
- $myrow['serialno']);
- $j++;
- If ($j == 16){
- $j=1;
- echo $tableheader;
+ $SerialText = '';
+ while ($SerialRow = DB_fetch_array($SerialResult)) {
+ if ($MyRow['serialised'] == 1) {
+ $SerialText .= $SerialRow['serialno'] . '<br />';
+ } else {
+ $SerialText .= $SerialRow['serialno'] . ' Qty- ' . $SerialRow['moveqty'] . '<br />';
+ }
+ }
+
+ echo '<tr class="striped_row">
+ <td><a target="_blank" href="', $RootPath, '/StockStatus.php?StockID=', mb_strtoupper(urlencode($MyRow['stockid'])), '">', mb_strtoupper($MyRow['stockid']), '</a></td>
+ <td>', $MyRow['typename'], '</td>
+ <td>', $MyRow['transno'], '</td>
+ <td>', $DisplayTranDate, '</td>
+ <td>', $MyRow['debtorno'], '</td>
+ <td class="number">', locale_number_format($MyRow['qty'], $MyRow['decimalplaces']), '</td>
+ <td>', $MyRow['reference'], '</td>
+ <td class="number">', locale_number_format($MyRow['price'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($MyRow['discountpercent'] * 100, 2), '%</td>
+ <td class="number">', locale_number_format($MyRow['newqoh'], $MyRow['decimalplaces']), '</td>
+ <td>', $SerialText, '</td>
+ </tr>';
}
-//end of page full new headings if
+ //end of while loop
+ echo '</table>';
}
-//end of while loop
+echo '</form>';
-echo '</table>';
-echo '</div>
- </form>';
+include ('includes/footer.php');
-include('includes/footer.php');
-
?>
\ No newline at end of file
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2018-02-11 19:21:52 UTC (rev 7956)
+++ trunk/StockMovements.php 2018-02-12 21:53:28 UTC (rev 7957)
@@ -5,8 +5,8 @@
include('includes/session.php');
$Title = _('Stock Movements');
/* webERP manual links before header.php */
-$ViewTopic= "Inventory";
-$BookMark = "InventoryMovement";
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryMovement';
include('includes/header.php');
if (isset($_GET['StockID'])){
@@ -17,47 +17,60 @@
$StockID = '';
}
-$result = DB_query("SELECT description, units FROM stockmaster WHERE stockid='".$StockID."'");
-$myrow = DB_fetch_row($result);
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['0'] . ' : ' . _('in units of') . ' : ' . $myrow[1] . '</b></p>';
+$StockInfo = '';
+if ('' != $StockID) {
+ $result = DB_query("SELECT description, units FROM stockmaster WHERE stockid='" . $StockID . "'");
+ $myrow = DB_fetch_row($result);
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ $StockInfo = '<br /><b>' . $StockID . ' - ' . $myrow['0'] . ' : ' . _('in units of') . ' : ' . $myrow[1] . '</b>';
+}
-if (!isset($_POST['BeforeDate']) OR !Is_Date($_POST['BeforeDate'])){
+echo '<p class="page_title_text">
+ <img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/inventory.png" title="', _('Inventory'), '" alt="" /> ', $Title,
+ $StockInfo,
+ '</p>';
+
+echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
+
+if (!isset($_POST['BeforeDate']) OR !Is_date($_POST['BeforeDate'])){
$_POST['BeforeDate'] = Date($_SESSION['DefaultDateFormat']);
}
-if (!isset($_POST['AfterDate']) OR !Is_Date($_POST['AfterDate'])){
+if (!isset($_POST['AfterDate']) OR !Is_date($_POST['AfterDate'])){
$_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')-3,Date('d'),Date('y')));
}
+
echo '<br />
- <table class="selection">';
-echo '<tr><th colspan="12">' . _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" />';
+ <table class="selection">
+ <tr>
+ <th colspan="12">', _('Stock Code'), ':<input type="text" name="StockID" size="21" value="', $StockID, '" required="required" maxlength="20" />';
-echo ' ' . _('From Stock Location') . ':<select name="StockLocation"> ';
+echo ' ', _('From Stock Location'), ':<select required="required" name="StockLocation"> ';
-$sql = "SELECT locations.loccode, locationname FROM locations
+$SQL = "SELECT locations.loccode,
+ locationname
+ FROM locations
INNER JOIN locationusers
ON locationusers.loccode=locations.loccode
AND locationusers.userid='" . $_SESSION['UserID'] . "'
AND locationusers.canview=1
- ORDER BY locationname
- ";
-$resultStkLocs = DB_query($sql);
+ ORDER BY locationname";
+$resultStkLocs = DB_query($SQL);
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation']) AND $_POST['StockLocation']!='All'){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- $_POST['StockLocation']=$myrow['loccode'];
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ $_POST['StockLocation']=$myrow['loccode'];
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -64,14 +77,19 @@
echo '</select></th>
</tr>';
echo '<tr>
- <th colspan="12">' . _('Show Movements between') . ': <input type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="12" value="' . $_POST['AfterDate'] . '" /> ' . _('and') . ': <input type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="12" value="' . $_POST['BeforeDate'] . '" /><input type="submit" name="ShowMoves" value="' . _('Show Stock Movements') . '" /></th>
+ <th colspan="12">', _('Show Movements between'), ':
+ <input type="text" name="AfterDate" class="date" alt="', $_SESSION['DefaultDateFormat'], '" size="12" required="required" maxlength="12" value="', $_POST['AfterDate'], '" /> ' . _('and') . ':
+ <input type="text" name="BeforeDate" class="date" alt="', $_SESSION['DefaultDateFormat'], '" size="12" required="required" maxlength="12" value="', $_POST['BeforeDate'], '" />
+ <input type="submit" name="ShowMoves" value="', _('Show Stock Movements'), '" />
+ </th>
</tr>';
$SQLBeforeDate = FormatDateForSQL($_POST['BeforeDate']);
$SQLAfterDate = FormatDateForSQL($_POST['AfterDate']);
-$sql = "SELECT stockmoves.stockid,
+$SQL = "SELECT stockmoves.stockid,
systypes.typename,
+ stockmoves.stkmoveno,
stockmoves.type,
stockmoves.transno,
stockmoves.trandate,
@@ -84,150 +102,137 @@
stockmoves.discountpercent,
stockmoves.newqoh,
stockmaster.decimalplaces,
- stockserialmoves.serialno
+ stockmaster.controlled,
+ stockmaster.serialised
FROM stockmoves
- INNER JOIN systypes ON stockmoves.type=systypes.typeid
- INNER JOIN stockmaster ON stockmoves.stockid=stockmaster.stockid
- LEFT JOIN stockserialmoves ON stockmoves.stkmoveno=stockserialmoves.stockmoveno
+ INNER JOIN systypes
+ ON stockmoves.type=systypes.typeid
+ INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
WHERE stockmoves.loccode='" . $_POST['StockLocation'] . "'
- AND stockmoves.trandate >= '". $SQLAfterDate . "'
- AND stockmoves.stockid = '" . $StockID . "'
- AND stockmoves.trandate <= '" . $SQLBeforeDate . "'
- AND hidemovt=0
+ AND stockmoves.trandate >= '" . $SQLAfterDate . "'
+ AND stockmoves.stockid = '" . $StockID . "'
+ AND stockmoves.trandate <= '" . $SQLBeforeDate . "'
+ AND hidemovt=0
ORDER BY stkmoveno DESC";
$ErrMsg = _('The stock movements for the selected criteria could not be retrieved because') . ' - ';
$DbgMsg = _('The SQL that failed was') . ' ';
-$MovtsResult = DB_query($sql, $ErrMsg, $DbgMsg);
+$MovtsResult = DB_query($SQL, $ErrMsg, $DbgMsg);
-$tableheader = '<tr>
- <th>' . _('Type') . '</th>
- <th>' . _('Number') . '</th>
- <th>' . _('Date') . '</th>
- <th>' . _('User ID') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('New Qty') . '</th>
- <th>' . _('Serial No.') . '</th>
- </tr>';
+if (DB_num_rows($MovtsResult) > 0) {
+ $myrow = DB_fetch_array($MovtsResult);
-echo $tableheader;
+ echo '<tr>
+ <th>' . _('Type') . '</th>
+ <th>' . _('Number') . '</th>
+ <th>' . _('Date') . '</th>
+ <th>' . _('User ID') . '</th>
+ <th>' . _('Customer') . '</th>
+ <th>' . _('Branch') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Reference') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Discount') . '</th>
+ <th>' . _('New Qty') . '</th>';
+ if ($myrow['controlled'] == 1) {
+ echo '<th>', _('Serial No.'), '</th>';
+ }
+ echo '</tr>';
-$j = 1;
+ DB_data_seek($MovtsResult, 0);
-while ($myrow=DB_fetch_array($MovtsResult)) {
+ while ($myrow = DB_fetch_array($MovtsResult)) {
- $DisplayTranDate = ConvertSQLDate($myrow['trandate']);
+ $DisplayTranDate = ConvertSQLDate($myrow['trandate']);
- if ($myrow['type']==10){ /*its a sales invoice allow link to show invoice it was sold on*/
+ $SerialSQL = "SELECT serialno, moveqty FROM stockserialmoves WHERE stockmoveno='" . $myrow['stkmoveno'] . "'";
+ $SerialResult = DB_query($SerialSQL);
- printf('<tr class="striped_row">
- <td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s%%</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- $RootPath,
- $myrow['transno'],
- $myrow['typename'],
- $myrow['transno'],
- $DisplayTranDate,
- $myrow['userid'],
- $myrow['debtorno'],
- $myrow['branchcode'],
- locale_number_format($myrow['qty'],$myrow['decimalplaces']),
- $myrow['reference'],
- locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
- locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
- $myrow['serialno']);
+ $SerialText = '';
+ while ($SerialRow = DB_fetch_array($SerialResult)) {
+ if ($myrow['serialised'] == 1) {
+ $SerialText .= $SerialRow['serialno'] . '<br />';
+ } else {
+ $SerialText .= $SerialRow['serialno'] . ' Qty- ' . $SerialRow['moveqty'] . '<br />';
+ }
+ }
- } elseif ($myrow['type']==11){
+ if ($myrow['type']==10){
+ /*its a sales invoice allow link to show invoice it was sold on*/
- printf('<tr class="striped_row">
- <td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s%%</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- $RootPath,
- $myrow['transno'],
- $myrow['typename'],
- $myrow['transno'],
- $DisplayTranDate,
- $myrow['userid'],
- $myrow['debtorno'],
- $myrow['branchcode'],
- locale_number_format($myrow['qty'],$myrow['decimalplaces']),
- $myrow['reference'],
- locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
- locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
- $myrow['serialno']);
- } else {
+ echo '<tr class="striped_row">
+ <td><a target="_blank" href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', urlencode($myrow['transno']), '&InvOrCredit=Invoice">', $myrow['typename'], '</a></td>
+ <td>', $myrow['transno'], '</td>
+ <td>', $DisplayTranDate, '</td>
+ <td>', $myrow['userid'], '</td>
+ <td>', $myrow['debtorno'], '</td>
+ <td>', $myrow['branchcode'], '</td>
+ <td class="number">', locale_number_format($myrow['qty'], $myrow['decimalplaces']), '</td>
+ <td>', $myrow['reference'], '</td>
+ <td class="number">', locale_number_format($myrow['price'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($myrow['discountpercent'] * 100, 2), '%%</td>
+ <td class="number">', locale_number_format($myrow['newqoh'], $myrow['decimalplaces']), '</td>';
+ if ($myrow['controlled'] == 1) {
+ echo '<td>', $SerialText, '</td>';
+ }
+ echo '</tr>';
- printf('<tr class="striped_row">
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s%%</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- $myrow['typename'],
- $myrow['transno'],
- $DisplayTranDate,
- $myrow['userid'],
- $myrow['debtorno'],
- $myrow['branchcode'],
- locale_number_format($myrow['qty'],$myrow['decimalplaces']),
- $myrow['reference'],
- locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
- locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
- $myrow['serialno']);
+ } elseif ($myrow['type']==11){
+
+ echo '<tr class="striped_row">
+ <td><a target="_blank" href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', urlencode($myrow['transno']), '&InvOrCredit=Credit">', $myrow['typename'], '</a></td>
+ <td>', $myrow['transno'], '</td>
+ <td>', $DisplayTranDate, '</td>
+ <td>', $myrow['userid'], '</td>
+ <td>', $myrow['debtorno'], '</td>
+ <td>', $myrow['branchcode'], '</td>
+ <td class="number">', locale_number_format($myrow['qty'], $myrow['decimalplaces']), '</td>
+ <td>', $myrow['reference'], '</td>
+ <td class="number">', locale_number_format($myrow['price'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($myrow['discountpercent'] * 100, 2), '%%</td>
+ <td class="number">', locale_number_format($myrow['newqoh'], $myrow['decimalplaces']), '</td>';
+ if ($myrow['controlled'] == 1) {
+ echo '<td>', $SerialText, '</td>';
+ }
+ echo '</tr>';
+
+ } else {
+
+ echo '<tr class="striped_row">
+ <td>', $myrow['typename'], '</td>
+ <td>', $myrow['transno'], '</td>
+ <td>', $DisplayTranDate, '</td>
+ <td>', $myrow['userid'], '</td>
+ <td>', $myrow['debtorno'], '</td>
+ <td>', $myrow['branchcode'], '</td>
+ <td class="number">', locale_number_format($myrow['qty'], $myrow['decimalplaces']), '</td>
+ <td>', $myrow['reference'], '</td>
+ <td class="number">', locale_number_format($myrow['price'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($myrow['discountpercent'] * 100, 2), '%</td>
+ <td class="number">', locale_number_format($myrow['newqoh'], $myrow['decimalplaces']), '</td>';
+ if ($myrow['controlled'] == 1) {
+ echo '<td>', $SerialText, '</td>';
+ }
+ echo '</tr>';
+
+ }
+ //end of page full new headings if
}
-//end of page full new headings if
+ //end of while loop
}
-//end of while loop
-echo '</table>';
-echo '<div class="centre"><br /><a href="' . $RootPath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
-echo '<br /><a href="' . $RootPath . '/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Show Stock Usage') . '</a>';
-echo '<br /><a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Search Outstanding Sales Orders') . '</a>';
-echo '<br /><a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
+echo '</table>
+ <div class="centre">
+ <br /><a href="', $RootPath, '/StockStatus.php?StockID=', urlencode($StockID), '">', _('Show Stock Status'), '</a>
+ <br /><a href="', $RootPath, '/StockUsage.php?StockID=', urlencode($StockID), '&StockLocation=', urlencode($_POST['StockLocation']), '">', _('Show Stock Usage'), '</a>
+ <br /><a href="', $RootPath, '/SelectSalesOrder.php?SelectedStockItem=', urlencode($StockID), '&StockLocation=', urlencode($_POST['StockLocation']), '">', _('Search Outstanding Sales Orders'), '</a>
+ <br /><a href="', $RootPath, '/SelectCompletedOrder.php?SelectedStockItem=', urlencode($StockID), '">', _('Search Completed Sales Orders'), '</a>
+ </div>
+ </div>
+ </form>';
-echo '</div>
- </div>
- </form>';
-
include('includes/footer.php');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-11 19:21:52 UTC (rev 7956)
+++ trunk/doc/Change.log 2018-02-12 21:53:28 UTC (rev 7957)
@@ -1,5 +1,6 @@
webERP Change Log
+12/2/18 Tim (PaulT commit): StockMovements.php, StockLocMovements.php: Correct stock movements that have more than one serial number as part of it, then the item will appear multiple times in the movements script with the total quantity in each line. For example, if I enter a quantity adjustment for a controlled item, and assign 3 serial numbers to this movement and then run the inquiries, there will be 3 separate lines with a quantity of 3 against each one.
11/2/18 PaulT: SellThroughSupport.php: Remove (another) redundant hidden FormID input. (there were two, overlooked the 2nd one earlier)
11/2/18 PaulT: SellThroughSupport.php: Remove redundant hidden FormID input.
11/2/18 PaulT: Contracts.php: Move closing form tag outside of condition. Fixes view page source message "Saw a form start tag, but there was already an active form element. Nested forms are not allowed. Ignoring the tag." reported in Firefox.
|
|
From: <tu...@us...> - 2018-02-13 00:20:47
|
Revision: 7958
http://sourceforge.net/p/web-erp/reponame/7958
Author: turbopt
Date: 2018-02-13 00:20:44 +0000 (Tue, 13 Feb 2018)
Log Message:
-----------
PaulT: InternalStockRequest.php: Address a few issues reported by Paul B: Fix Previous/Next handling, table sorting, wrong on-order quantities, and apply the user's display records max. Change also removes unused code and other minor improvements. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8089)
Modified Paths:
--------------
trunk/InternalStockRequest.php
trunk/doc/Change.log
Property Changed:
----------------
trunk/InternalStockRequest.php
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2018-02-12 21:53:28 UTC (rev 7957)
+++ trunk/InternalStockRequest.php 2018-02-13 00:20:44 UTC (rev 7958)
@@ -1,6 +1,6 @@
<?php
-/* $Id: InternalStockRequest.php 4576 2011-05-27 10:59:20Z daintree $*/
+/* $Id$*/
include('includes/DefineStockRequestClass.php');
@@ -117,8 +117,8 @@
if ($myEmail=DB_fetch_array($EmailResult)){
$ConfirmationText = _('An internal stock request has been created and is waiting for your authoritation');
$EmailSubject = _('Internal Stock Request needs your authoritation');
- if($_SESSION['SmtpSetting']==0){
- mail($myEmail['email'],$EmailSubject,$ConfirmationText);
+ if($_SESSION['SmtpSetting']==0){
+ mail($myEmail['email'],$EmailSubject,$ConfirmationText);
}else{
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
@@ -126,13 +126,11 @@
$mail->setText($ConfirmationText);
$result = SendmailBySmtp($mail,array($myEmail['email']));
}
-
}
-
}
DB_Txn_Commit();
prnMsg( _('The internal stock request has been entered and now needs to be authorised'), 'success');
- echo '<br /><div class="centre"><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?New=Yes">' . _('Create another request') . '</a></div>';
+ echo '<br /><div class="centre"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?New=Yes">', _('Create another request'), '</a></div>';
include('includes/footer.php');
unset($_SESSION['Request']);
exit;
@@ -140,80 +138,79 @@
prnMsg(_('There are no items added to this request'),'error');
}
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Dispatch') .
- '" alt="" />' . ' ' . $Title . '</p>';
+echo '<p class="page_title_text"><img src="', $RootPath, '/css/', $Theme, '/images/supplier.png" title="', _('Dispatch'),
+ '" alt="" />', ' ', $Title, '</p>';
if (isset($_GET['Edit'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
echo '<table class="selection">';
echo '<tr>
- <th colspan="2"><h4>' . _('Edit the Request Line') . '</h4></th>
+ <th colspan="2"><h4>', _('Edit the Request Line'), '</h4></th>
</tr>';
echo '<tr>
- <td>' . _('Line number') . '</td>
- <td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber . '</td>
+ <td>', _('Line number'), '</td>
+ <td>', $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber, '</td>
</tr>
<tr>
- <td>' . _('Stock Code') . '</td>
- <td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->StockID . '</td>
+ <td>', _('Stock Code'), '</td>
+ <td>', $_SESSION['Request']->LineItems[$_GET['Edit']]->StockID, '</td>
</tr>
<tr>
- <td>' . _('Item Description') . '</td>
- <td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->ItemDescription . '</td>
+ <td>', _('Item Description'), '</td>
+ <td>', $_SESSION['Request']->LineItems[$_GET['Edit']]->ItemDescription, '</td>
</tr>
<tr>
- <td>' . _('Unit of Measure') . '</td>
- <td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->UOM . '</td>
+ <td>', _('Unit of Measure'), '</td>
+ <td>', $_SESSION['Request']->LineItems[$_GET['Edit']]->UOM, '</td>
</tr>
<tr>
- <td>' . _('Quantity Requested') . '</td>
- <td><input type="text" class="number" name="Quantity" value="' . locale_number_format($_SESSION['Request']->LineItems[$_GET['Edit']]->Quantity, $_SESSION['Request']->LineItems[$_GET['Edit']]->DecimalPlaces) . '" /></td>
+ <td>', _('Quantity Requested'), '</td>
+ <td><input type="text" class="number" name="Quantity" value="', locale_number_format($_SESSION['Request']->LineItems[$_GET['Edit']]->Quantity, $_SESSION['Request']->LineItems[$_GET['Edit']]->DecimalPlaces), '" /></td>
</tr>';
- echo '<input type="hidden" name="LineNumber" value="' . $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber . '" />';
+ echo '<input type="hidden" name="LineNumber" value="', $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber, '" />';
echo '</table>
<br />';
echo '<div class="centre">
- <input type="submit" name="Edit" value="' . _('Update Line') . '" />
+ <input type="submit" name="Edit" value="', _('Update Line'), '" />
</div>
- </div>
+ </div>
</form>';
include('includes/footer.php');
exit;
}
-echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-echo '<table class="selection">';
-echo '<tr>
- <th colspan="2"><h4>' . _('Internal Stock Request Details') . '</h4></th>
+echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
+ <table class="selection">
+ <tr>
+ <th colspan="2"><h4>', _('Internal Stock Request Details'), '</h4></th>
</tr>
<tr>
<td>' . _('Department') . ':</td>';
if($_SESSION['AllowedDepartment'] == 0){
// any internal department allowed
- $sql="SELECT departmentid,
+ $SQL="SELECT departmentid,
description
FROM departments
ORDER BY description";
}else{
// just 1 internal department allowed
- $sql="SELECT departmentid,
+ $SQL="SELECT departmentid,
description
FROM departments
WHERE departmentid = '". $_SESSION['AllowedDepartment'] ."'
ORDER BY description";
}
-$result=DB_query($sql);
+$Result=DB_query($SQL);
echo '<td><select name="Department">';
-while ($myrow=DB_fetch_array($result)){
- if (isset($_SESSION['Request']->Department) AND $_SESSION['Request']->Department==$myrow['departmentid']){
- echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . htmlspecialchars($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
+while ($MyRow=DB_fetch_array($Result)){
+ if (isset($_SESSION['Request']->Department) AND $_SESSION['Request']->Department==$MyRow['departmentid']){
+ echo '<option selected value="', $MyRow['departmentid'], '">', htmlspecialchars($MyRow['description'], ENT_QUOTES,'UTF-8'), '</option>';
} else {
- echo '<option value="' . $myrow['departmentid'] . '">' . htmlspecialchars($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="', $MyRow['departmentid'], '">', htmlspecialchars($MyRow['description'], ENT_QUOTES,'UTF-8'), '</option>';
}
}
echo '</select></td>
@@ -220,7 +217,7 @@
</tr>
<tr>
<td>' . _('Location from which to request stock') . ':</td>';
-$sql="SELECT locations.loccode,
+$SQL="SELECT locations.loccode,
locationname
FROM locations
INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1
@@ -227,34 +224,32 @@
WHERE internalrequest = 1
ORDER BY locationname";
-$result=DB_query($sql);
+$Result=DB_query($SQL);
echo '<td><select name="Location">
- <option value="">' . _('Select a Location') . '</option>';
-while ($myrow=DB_fetch_array($result)){
- if (isset($_SESSION['Request']->Location) AND $_SESSION['Request']->Location==$myrow['loccode']){
- echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlspecialchars($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
+ <option value="">', _('Select a Location'), '</option>';
+while ($MyRow=DB_fetch_array($Result)){
+ if (isset($_SESSION['Request']->Location) AND $_SESSION['Request']->Location==$MyRow['loccode']){
+ echo '<option selected value="', $MyRow['loccode'], '">', $MyRow['loccode'], ' - ', htmlspecialchars($MyRow['locationname'], ENT_QUOTES,'UTF-8'), '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlspecialchars($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="', $MyRow['loccode'], '">', $MyRow['loccode'], ' - ', htmlspecialchars($MyRow['locationname'], ENT_QUOTES,'UTF-8'), '</option>';
}
}
echo '</select></td>
</tr>
<tr>
- <td>' . _('Date when required') . ':</td>';
-echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DispatchDate" maxlength="10" size="11" value="' . $_SESSION['Request']->DispatchDate . '" /></td>
- </tr>';
-
-echo '<tr>
- <td>' . _('Narrative') . ':</td>
- <td><textarea name="Narrative" cols="30" rows="5">' . $_SESSION['Request']->Narrative . '</textarea></td>
+ <td>', _('Date when required'), ':</td>
+ <td><input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="DispatchDate" maxlength="10" size="11" value="', $_SESSION['Request']->DispatchDate, '" /></td>
</tr>
+ <tr>
+ <td>', _('Narrative'), ':</td>
+ <td><textarea name="Narrative" cols="30" rows="5">', $_SESSION['Request']->Narrative, '</textarea></td>
+ </tr>
</table>
- <br />';
-
-echo '<div class="centre">
- <input type="submit" name="Update" value="' . _('Update') . '" />
+ <br />
+ <div class="centre">
+ <input type="submit" name="Update" value="', _('Update'), '" />
</div>
- </div>
+ </div>
</form>';
if (!isset($_SESSION['Request']->Location)) {
@@ -262,33 +257,32 @@
exit;
}
-$i = 0; //Line Item Array pointer
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br />
+echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
+ <br />
<table class="selection">
<tr>
- <th colspan="7"><h4>' . _('Details of Items Requested') . '</h4></th>
+ <th colspan="7"><h4>', _('Details of Items Requested'), '</h4></th>
</tr>
<tr>
- <th>' . _('Line Number') . '</th>
- <th class="ascending">' . _('Item Code') . '</th>
- <th class="ascending">' . _('Item Description'). '</th>
- <th class="ascending">' . _('Quantity Required'). '</th>
- <th>' . _('UOM'). '</th>
+ <th>', _('Line Number'), '</th>
+ <th class="ascending">', _('Item Code'), '</th>
+ <th class="ascending">', _('Item Description'), '</th>
+ <th class="ascending">', _('Quantity Required'), '</th>
+ <th>', _('UOM'), '</th>
</tr>';
if (isset($_SESSION['Request']->LineItems)) {
foreach ($_SESSION['Request']->LineItems as $LineItems) {
echo '<tr class="striped_row">
- <td>' . $LineItems->LineNumber . '</td>
- <td>' . $LineItems->StockID . '</td>
- <td>' . $LineItems->ItemDescription . '</td>
- <td class="number">' . locale_number_format($LineItems->Quantity, $LineItems->DecimalPlaces) . '</td>
- <td>' . $LineItems->UOM . '</td>
- <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Edit='.$LineItems->LineNumber.'">' . _('Edit') . '</a></td>
- <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete='.$LineItems->LineNumber.'">' . _('Delete') . '</a></td>
+ <td>', $LineItems->LineNumber, '</td>
+ <td>', $LineItems->StockID, '</td>
+ <td>', $LineItems->ItemDescription, '</td>
+ <td class="number">', locale_number_format($LineItems->Quantity, $LineItems->DecimalPlaces), '</td>
+ <td>', $LineItems->UOM, '</td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?Edit=', urlencode($LineItems->LineNumber), '">', _('Edit'), '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?Delete=', urlencode($LineItems->LineNumber), '">', _('Delete'), '</a></td>
</tr>';
}
}
@@ -296,77 +290,88 @@
echo '</table>
<br />
<div class="centre">
- <input type="submit" name="Submit" value="' . _('Submit') . '" />
+ <input type="submit" name="Submit" value="', _('Submit'), '" />
</div>
<br />
- </div>
- </form>';
+ </div>
+ </form>';
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<p class="page_title_text">
+ <img src="', $RootPath, '/css/', $Theme, '/images/magnifier.png" title="', _('Search'), '" alt="" />', ' ', _('Search for Inventory Items'),
+ '</p>
+ <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>';
$SQL = "SELECT stockcategory.categoryid,
stockcategory.categorydescription
- FROM stockcategory, internalstockcatrole
- WHERE stockcategory.categoryid = internalstockcatrole.categoryid
- AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- ORDER BY stockcategory.categorydescription";
-$result1 = DB_query($SQL);
-if (DB_num_rows($result1) == 0) {
- echo '<p class="bad">' . _('Problem Report') . ':<br />' . _('There are no stock categories currently defined please use the link below to set them up') . '</p>';
- echo '<br />
- <a href="' . $RootPath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ FROM stockcategory
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
+ ORDER BY stockcategory.categorydescription";
+
+$Result1 = DB_query($SQL);
+if (DB_num_rows($Result1) == 0) {
+ echo '<p class="bad">', _('Problem Report'), ':<br />', _('There are no stock categories currently defined please use the link below to set them up'), '</p>
+ <br />
+ <a href="', $RootPath, '/StockCategories.php">', _('Define Stock Categories'), '</a>';
exit;
}
+
echo '<table class="selection">
<tr>
<td>' . _('In Stock Category') . ':<select name="StockCat">';
if (!isset($_POST['StockCat'])) {
- $_POST['StockCat'] = '';
+ $_POST['StockCat'] = 'All';
}
+
if ($_POST['StockCat'] == 'All') {
- echo '<option selected="True" value="All">' . _('All Authorized') . '</option>';
+ echo '<option selected value="All">' . _('All Authorized') . '</option>';
} else {
echo '<option value="All">' . _('All Authorized') . '</option>';
}
-while ($myrow1 = DB_fetch_array($result1)) {
- if ($myrow1['categoryid'] == $_POST['StockCat']) {
- echo '<option selected="True" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+
+while ($MyRow1 = DB_fetch_array($Result1)) {
+ if ($MyRow1['categoryid'] == $_POST['StockCat']) {
+ echo '<option selected value="', $MyRow1['categoryid'], '">', $MyRow1['categorydescription'], '</option>';
} else {
- echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ echo '<option value="', $MyRow1['categoryid'], '">', $MyRow1['categorydescription'], '</option>';
}
}
+
echo '</select></td>
- <td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td>';
+ <td>', _('Enter partial'), '<b> ', _('Description'), '</b>:</td>';
+
if (isset($_POST['Keywords'])) {
- echo '<td><input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" /></td>';
+ echo '<td><input type="text" name="Keywords" value="', $_POST['Keywords'], '" size="20" maxlength="25" /></td>';
} else {
echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
}
+
echo '</tr>
<tr>
<td></td>
- <td><h3>' . _('OR') . ' ' . '</h3>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
+ <td><h3>', _('OR'), ' ', '</h3>', _('Enter partial'), ' <b>', _('Stock Code'), '</b>:</td>';
if (isset($_POST['StockCode'])) {
- echo '<td><input type="text" autofocus="autofocus" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" /></td>';
+ echo '<td><input type="text" autofocus="autofocus" name="StockCode" value="', $_POST['StockCode'], '" size="15" maxlength="18" /></td>';
} else {
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>';
}
+
echo '</tr>
</table>
<br />
<div class="centre">
- <input type="submit" name="Search" value="' . _('Search Now') . '" />
+ <input type="submit" name="Search" value="', _('Search Now'), '" />
</div>
<br />
</div>
</form>';
-if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Prev'])){
+if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Previous'])){
if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
prnMsg ( _('Order Item description has been used in search'), 'warn' );
@@ -375,6 +380,7 @@
} elseif ($_POST['Keywords']=='' AND $_POST['StockCode']=='') {
prnMsg ( _('Stock Category has been used in search'), 'warn' );
}
+
if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
$_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
@@ -385,15 +391,15 @@
stockmaster.description,
stockmaster.units as stockunits,
stockmaster.decimalplaces
- FROM stockmaster,
- stockcategory,
- internalstockcatrole
- WHERE stockmaster.categoryid=stockcategory.categoryid
- AND stockcategory.categoryid = internalstockcatrole.categoryid
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND stockmaster.mbflag <>'G'
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.discontinued=0
ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
@@ -400,14 +406,14 @@
stockmaster.description,
stockmaster.units as stockunits,
stockmaster.decimalplaces
- FROM stockmaster,
- stockcategory,
- internalstockcatrole
- WHERE stockmaster.categoryid=stockcategory.categoryid
- AND stockcategory.categoryid = internalstockcatrole.categoryid
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
ORDER BY stockmaster.stockid";
@@ -423,15 +429,15 @@
stockmaster.description,
stockmaster.units as stockunits,
stockmaster.decimalplaces
- FROM stockmaster,
- stockcategory,
- internalstockcatrole
- WHERE stockmaster.categoryid=stockcategory.categoryid
- AND stockcategory.categoryid = internalstockcatrole.categoryid
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
@@ -438,15 +444,15 @@
stockmaster.description,
stockmaster.units as stockunits,
stockmaster.decimalplaces
- FROM stockmaster,
- stockcategory,
- internalstockcatrole
- WHERE stockmaster.categoryid=stockcategory.categoryid
- AND stockcategory.categoryid = internalstockcatrole.categoryid
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
ORDER BY stockmaster.stockid";
}
@@ -457,14 +463,14 @@
stockmaster.description,
stockmaster.units as stockunits,
stockmaster.decimalplaces
- FROM stockmaster,
- stockcategory,
- internalstockcatrole
- WHERE stockmaster.categoryid=stockcategory.categoryid
- AND stockcategory.categoryid = internalstockcatrole.categoryid
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
@@ -471,14 +477,14 @@
stockmaster.description,
stockmaster.units as stockunits,
stockmaster.decimalplaces
- FROM stockmaster,
- stockcategory,
- internalstockcatrole
- WHERE stockmaster.categoryid=stockcategory.categoryid
- AND stockcategory.categoryid = internalstockcatrole.categoryid
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN internalstockcatrole
+ ON stockcategory.categoryid = internalstockcatrole.categoryid
+ WHERE stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
ORDER BY stockmaster.stockid";
}
@@ -487,13 +493,13 @@
if (isset($_POST['Next'])) {
$Offset = $_POST['NextList'];
}
- if (isset($_POST['Prev'])) {
- $Offset = $_POST['Previous'];
+ if (isset($_POST['Previous'])) {
+ $Offset = $_POST['PreviousList'];
}
if (!isset($Offset) or $Offset<0) {
$Offset=0;
}
- $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'] . ' OFFSET ' . ($_SESSION['DefaultDisplayRecordsMax']*$Offset);
+ $SQL = $SQL . ' LIMIT ' . $_SESSION['DisplayRecordsMax'] . ' OFFSET ' . ($_SESSION['DisplayRecordsMax']*$Offset);
$ErrMsg = _('There is a problem selecting the part records to display because');
$DbgMsg = _('The SQL used to get the part selection was');
@@ -507,157 +513,78 @@
}
} //end of if search
-/* display list if there is more than one record */
-if (isset($searchresult) AND !isset($_POST['Select'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $ListCount = DB_num_rows($searchresult);
- if ($ListCount > 0) {
- // If the user hit the search button and there is more than one item to show
- $ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
- if (isset($_POST['Next'])) {
- if ($_POST['PageOffset'] < $ListPageMax) {
- $_POST['PageOffset'] = $_POST['PageOffset'] + 1;
- }
- }
- if (isset($_POST['Previous'])) {
- if ($_POST['PageOffset'] > 1) {
- $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
- }
- }
- if ($_POST['PageOffset'] > $ListPageMax) {
- $_POST['PageOffset'] = $ListPageMax;
- }
- if ($ListPageMax > 1) {
- echo '<div class="centre"><br /> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
- echo '<select name="PageOffset">';
- $ListPage = 1;
- while ($ListPage <= $ListPageMax) {
- if ($ListPage == $_POST['PageOffset']) {
- echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
- } else {
- echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
- }
- $ListPage++;
- }
- echo '</select>
- <input type="submit" name="Go" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />
- <input type="hidden" name=Keywords value="'.$_POST['Keywords'].'" />
- <input type="hidden" name=StockCat value="'.$_POST['StockCat'].'" />
- <input type="hidden" name=StockCode value="'.$_POST['StockCode'].'" />
- <br />
- </div>';
- }
- echo '<table cellpadding="2">';
- echo '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Total Qty On Hand') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('Stock Status') . '</th>
- </tr>';
- $j = 1;
- $RowIndex = 0;
- if (DB_num_rows($searchresult) <> 0) {
- DB_data_seek($searchresult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
- }
- while (($myrow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
- if ($myrow['mbflag'] == 'D') {
- $qoh = _('N/A');
- } else {
- $qoh = locale_number_format($myrow['qoh'], $myrow['decimalplaces']);
- }
- if ($myrow['discontinued']==1){
- $ItemStatus = '<p class="bad">' . _('Obsolete') . '</p>';
- } else {
- $ItemStatus ='';
- }
- echo '<tr class="striped_row">
- <td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>' . $myrow['description'] . '</td>
- <td class="number">' . $qoh . '</td>
- <td>' . $myrow['units'] . '</td>
- <td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=' . $myrow['stockid'].'">' . _('View') . '</a></td>
- <td>' . $ItemStatus . '</td>
- </tr>';
- //end of page full new headings if
- }
- //end of while loop
- echo '</table>
- </div>
- </form>
- <br />';
- }
-}
-/* end display list if there is more than one record */
-
if (isset($SearchResult)) {
$j = 1;
echo '<br />
- <div class="page_help_text">' . _('Select an item by entering the quantity required. Click Order when ready.') . '</div>
+ <div class="page_help_text">', _('Select an item by entering the quantity required. Click Order when ready.'), '</div>
<br />
- <form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" id="orderform">
+ <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" id="orderform">
<div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
<table class="table1">
- <tr>
- <td>
- <input type="hidden" name="Previous" value="'.($Offset-1).'" />
- <input tabindex="'.($j+8).'" type="submit" name="Prev" value="'._('Prev').'" /></td>
+ <thead>
+ <tr>
+ <td>
+ <input type="hidden" name="PreviousList" value="', ($Offset - 1), '" />
+ <input tabindex="', ($j+8), '" type="submit" name="Previous" value="', _('Previous'), '" /></td>
<td class="centre" colspan="6">
- <input type="hidden" name="order_items" value="1" />
- <input tabindex="'.($j+9).'" type="submit" value="'._('Add to Requisition').'" /></td>
- <td>
- <input type="hidden" name="NextList" value="'.($Offset+1).'" />
- <input tabindex="'.($j+10).'" type="submit" name="Next" value="'._('Next').'" /></td>
+ <input type="hidden" name="order_items" value="1" />
+ <input tabindex="', ($j+9), '" type="submit" value="', _('Add to Requisition'), '" /></td>
+ <td>
+ <input type="hidden" name="NextList" value="', ($Offset + 1), '" />
+ <input tabindex="', ($j+10), '" type="submit" name="Next" value="', _('Next'), '" /></td>
</tr>
+ </thead>
+ <tbody>
<tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th class="ascending">' . _('On Hand') . '</th>
- <th class="ascending">' . _('On Demand') . '</th>
- <th class="ascending">' . _('On Order') . '</th>
- <th class="ascending">' . _('Available') . '</th>
- <th class="ascending">' . _('Quantity') . '</th>
+ <th class="ascending">', _('Code'), '</th>
+ <th class="ascending">', _('Description'), '</th>
+ <th>', _('Units'), '</th>
+ <th class="ascending">', _('On Hand'), '</th>
+ <th cl...
[truncated message content] |
|
From: <tu...@us...> - 2018-02-13 04:05:02
|
Revision: 7959
http://sourceforge.net/p/web-erp/reponame/7959
Author: turbopt
Date: 2018-02-13 04:04:59 +0000 (Tue, 13 Feb 2018)
Log Message:
-----------
PaulT: Remove $db parameter from PeriodExists(), CreatePeriod(), CalcFreightCost(), CheckForRecursiveBOM(), DisplayBOMItems() and a few other functions.
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/BOMs.php
trunk/ConfirmDispatch_Invoice.php
trunk/DeliveryDetails.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPDemands.php
trunk/MRPReport.php
trunk/POReport.php
trunk/PcAnalysis.php
trunk/PcTabExpensesList.php
trunk/PriceMatrix.php
trunk/Prices_Customer.php
trunk/SalesInquiry.php
trunk/WOCanBeProducedNow.php
trunk/api/api_login.php
trunk/api/api_salesorders.php
trunk/doc/Change.log
trunk/includes/DateFunctions.inc
trunk/includes/FreightCalculation.inc
trunk/includes/UserLogin.php
trunk/includes/session.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/AccountGroups.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -11,7 +11,7 @@
include('includes/SQL_CommonFunctions.inc');
-function CheckForRecursiveGroup($ParentGroupName, $GroupName, $db) {
+function CheckForRecursiveGroup($ParentGroupName, $GroupName) {
/* returns true ie 1 if the group contains the parent group as a child group
ie the parent group results in a recursive group structure otherwise false ie 0 */
@@ -90,7 +90,7 @@
$i++;
}
if($_POST['ParentGroupName'] !='') {
- if(CheckForRecursiveGroup($_POST['GroupName'],$_POST['ParentGroupName'],$db)) {
+ if(CheckForRecursiveGroup($_POST['GroupName'],$_POST['ParentGroupName'])) {
$InputError =1;
prnMsg(_('The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group'),'error');
$Errors[$i] = 'ParentGroupName';
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/BOMs.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -49,7 +49,7 @@
}
-function CheckForRecursiveBOM ($UltimateParent, $ComponentToCheck, $db) {
+function CheckForRecursiveBOM ($UltimateParent, $ComponentToCheck) {
/* returns true ie 1 if the BOM contains the parent part as a component
ie the BOM is recursive otherwise false ie 0 */
@@ -64,7 +64,7 @@
if ($myrow['component']==$UltimateParent){
return 1;
}
- if (CheckForRecursiveBOM($UltimateParent, $myrow['component'],$db)){
+ if (CheckForRecursiveBOM($UltimateParent, $myrow['component'])){
return 1;
}
} //(while loop)
@@ -74,7 +74,7 @@
} //end of function CheckForRecursiveBOM
-function DisplayBOMItems($UltimateParent, $Parent, $Component,$Level, $db) {
+function DisplayBOMItems($UltimateParent, $Parent, $Component,$Level) {
global $ParentMBflag;
$sql = "SELECT bom.sequence,
@@ -377,7 +377,7 @@
//need to check not recursive BOM component of itself!
- if (!CheckForRecursiveBOM ($SelectedParent, $_POST['Component'], $db)) {
+ if (!CheckForRecursiveBOM ($SelectedParent, $_POST['Component'])) {
/*Now check to see that the component is not already on the BOM */
$sql = "SELECT component
@@ -685,7 +685,7 @@
echo '<tr class="striped_row">';
- DisplayBOMItems($UltimateParent, $Parent, $Component, $Level, $db);
+ DisplayBOMItems($UltimateParent, $Parent, $Component, $Level);
}
}
echo '</table>
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/ConfirmDispatch_Invoice.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -514,8 +514,7 @@
$_SESSION['Items'.$identifier]->totalVolume,
$_SESSION['Items'.$identifier]->totalWeight,
$_SESSION['Items'.$identifier]->Location,
- $_SESSION['Items'.$identifier]->DefaultCurrency,
- $db);
+ $_SESSION['Items'.$identifier]->DefaultCurrency);
$_SESSION['Items'.$identifier]->ShipVia = $BestShipper;
}
if (isset($FreightCost) and is_numeric($FreightCost)) {
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/DeliveryDetails.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -130,8 +130,7 @@
$_SESSION['Items'.$identifier]->totalVolume,
$_SESSION['Items'.$identifier]->totalWeight,
$_SESSION['Items'.$identifier]->Location,
- $_SESSION['Items'.$identifier]->DefaultCurrency,
- $db);
+ $_SESSION['Items'.$identifier]->DefaultCurrency);
if( !empty($BestShipper) ) {
$_POST['FreightCost'] = round($_POST['FreightCost'],2);
$_POST['ShipVia'] = $BestShipper;
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/MRP.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -489,7 +489,7 @@
flush();
$result = DB_query($sql);
while ($myrow=DB_fetch_array($result)) {
- LevelNetting($db,$myrow['part'],$myrow['eoq'],$myrow['pansize'],$myrow['shrinkfactor'], $myrow['leadtime']);
+ LevelNetting($myrow['part'],$myrow['eoq'],$myrow['pansize'],$myrow['shrinkfactor'], $myrow['leadtime']);
} //end of while loop
} // end of for
echo '<br />' . _('End time') . ': ' . date('h:i:s') . '<br />';
@@ -666,7 +666,7 @@
-function LevelNetting(&$db,$Part,$eoq,$PanSize,$ShrinkFactor,$LeadTime) {
+function LevelNetting($Part,$eoq,$PanSize,$ShrinkFactor,$LeadTime) {
// Create an array of mrprequirements and an array of mrpsupplies, then read through
// them seeing if all requirements are covered by supplies. Create a planned order
// for any unmet requirements. Change dates if necessary for the supplies.
@@ -860,7 +860,7 @@
$result = DB_query($sql);
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0) {
- CreateLowerLevelRequirement($db,$Requirement['part'],$NewDate,
+ CreateLowerLevelRequirement($Requirement['part'],$NewDate,
$PlannedQty,$Requirement['mrpdemandtype'],$Requirement['orderno'],
$Requirement['whererequired']);
}
@@ -881,8 +881,7 @@
} // End of LevelNetting -------------------------------------------------------
-function CreateLowerLevelRequirement(&$db,
- $TopPart,
+function CreateLowerLevelRequirement($TopPart,
$TopDate,
$TopQuantity,
$TopMRPDemandType,
@@ -930,4 +929,4 @@
} // End of CreateLowerLevelRequirement
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/MRPCalendar.php
===================================================================
--- trunk/MRPCalendar.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/MRPCalendar.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -22,16 +22,16 @@
</p>';
if (isset($_POST['submit'])) {
- submit($db,$ChangeDate);
+ submit($ChangeDate);
} elseif (isset($_POST['update'])) {
- update($db,$ChangeDate);
+ update($ChangeDate);
} elseif (isset($_POST['ListAll'])) {
- ShowDays($db);
+ ShowDays();
} else {
- ShowInputForm($db,$ChangeDate);
+ ShowInputForm($ChangeDate);
}
-function submit(&$db,&$ChangeDate) //####SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
+function submit(&$ChangeDate) //####SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
{
//initialize no input errors
@@ -70,7 +70,7 @@
}
if ($InputError == 1) {
- ShowInputForm($db,$ChangeDate);
+ ShowInputForm($ChangeDate);
return;
}
@@ -135,12 +135,12 @@
$resultupdate = DB_query($sql,$ErrMsg);
}
prnMsg(_('The MRP Calendar has been created'),'success');
- ShowInputForm($db,$ChangeDate);
+ ShowInputForm($ChangeDate);
} // End of function submit()
-function update(&$db,&$ChangeDate) //####UPDATE_UPDATE_UPDATE_UPDATE_UPDATE_UPDATE_UPDATE_####
+function update(&$ChangeDate) //####UPDATE_UPDATE_UPDATE_UPDATE_UPDATE_UPDATE_UPDATE_####
{
// Change manufacturing flag for a date. The value "1" means the date is a manufacturing date.
// After change the flag, re-calculate the daynumber for all dates.
@@ -158,7 +158,7 @@
}
if ($InputError == 1) {
- ShowInputForm($db,$ChangeDate);
+ ShowInputForm($ChangeDate);
return;
}
@@ -175,7 +175,7 @@
$resultupdate = DB_query($sql,$ErrMsg);
prnMsg(_('The MRP calendar record for') . ' ' . $ChangeDate . ' ' . _('has been updated'),'success');
unset ($ChangeDate);
- ShowInputForm($db,$ChangeDate);
+ ShowInputForm($ChangeDate);
// Have to update daynumber any time change a date from or to a manufacturing date
// Update daynumber. Set it so non-manufacturing days will have the same daynumber as a valid
@@ -197,7 +197,7 @@
} // End of function update()
-function ShowDays(&$db) {//####LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_####
+function ShowDays() {//####LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_####
// List all records in date range
$FromDate = FormatDateForSQL($_POST['FromDate']);
@@ -238,12 +238,12 @@
echo '</table>';
echo '<br /><br />';
unset ($ChangeDate);
- ShowInputForm($db,$ChangeDate);
+ ShowInputForm($ChangeDate);
} // End of function ShowDays()
-function ShowInputForm(&$db,&$ChangeDate) {//####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
+function ShowInputForm(&$ChangeDate) {//####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
// Display form fields. This function is called the first time
// the page is called, and is also invoked at the end of all of the other functions.
@@ -323,4 +323,4 @@
} // End of function ShowInputForm()
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/MRPDemands.php
===================================================================
--- trunk/MRPDemands.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/MRPDemands.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -3,9 +3,8 @@
/* $Id$*/
// Add, Edit, Delete, and List MRP demand records. Table is mrpdemands.
-// Have separate functions for each routine. Use pass-by-reference - (&$db,&$StockID) -
-// to pass values of $db and $StockID to functions. - when just used $db as variable,
-// got error: Catchable fatal error: Object of class mysqli could not be converted to string
+// Have separate functions for each routine. Use pass-by-reference - (&$StockID) -
+// to pass value of $StockID to functions.
include('includes/session.php');
$Title = _('MRP Demands');
@@ -27,22 +26,22 @@
_('Inventory') . '" alt="" />' . ' ' . $Title . '</p>';
if (isset($_POST['Search'])) {
- search($db,$StockID);
+ search($StockID);
} elseif (isset($_POST['submit'])) {
- submit($db,$StockID,$DemandID);
+ submit($StockID,$DemandID);
} elseif (isset($_GET['delete'])) {
- delete($db,$DemandID,'',$StockID);
+ delete($DemandID,'',$StockID);
} elseif (isset($_POST['deletesome'])) {
- delete($db,'',$_POST['MRPDemandtype'],$StockID);
+ delete('',$_POST['MRPDemandtype'],$StockID);
} elseif (isset($_GET['listall'])) {
- listall($db,'','');
+ listall('','');
} elseif (isset($_POST['listsome'])) {
- listall($db,$StockID,$_POST['MRPDemandtype']);
+ listall($StockID,$_POST['MRPDemandtype']);
} else {
- display($db,$StockID,$DemandID);
+ display($StockID,$DemandID);
}
-function search(&$db,&$StockID) { //####SEARCH_SEARCH_SEARCH_SEARCH_SEARCH_SEARCH_SEARCH_#####
+function search(&$StockID) { //####SEARCH_SEARCH_SEARCH_SEARCH_SEARCH_SEARCH_SEARCH_#####
// Search by partial part number or description. Display the part number and description from
// the stockmaster so user can select one. If the user clicks on a part number
@@ -111,7 +110,7 @@
} else {
prnMsg(_('No record found in search'),'error');
unset ($StockID);
- display($db,$StockID,$DemandID);
+ display($StockID,$DemandID);
}
@@ -118,7 +117,7 @@
} // End of function search()
-function submit(&$db,&$StockID,&$DemandID) //####SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
+function submit(&$StockID,&$DemandID) //####SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
{
// In this section if hit submit button. Do edit checks. If all checks pass, see if record already
// exists for StockID/Duedate/MRPDemandtype combo; that means do an Update, otherwise, do INSERT.
@@ -218,11 +217,11 @@
unset ($DemandID);
} // End of else where DB_num_rows showed there was a valid stockmaster record
- display($db,$StockID,$DemandID);
+ display($StockID,$DemandID);
} // End of function submit()
-function delete(&$db,$DemandID,$DemandType,$StockID) { //####DELETE_DELETE_DELETE_DELETE_DELETE_DELETE_####
+function delete($DemandID,$DemandType,$StockID) { //####DELETE_DELETE_DELETE_DELETE_DELETE_DELETE_####
// If wanted to have a Confirm routine before did actually deletion, could check if
// deletion = "yes"; if it did, display link that redirects back to this page
@@ -247,12 +246,12 @@
}
unset ($DemandID);
unset ($StockID);
- display($db,$stockID,$DemandID);
+ display($stockID,$DemandID);
} // End of function delete()
-function listall(&$db,$part,$DemandType) {//####LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_####
+function listall($part,$DemandType) {//####LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_LISTALL_####
// List all mrpdemands records, with anchors to Edit or Delete records if hit List All anchor
// Lists some in hit List Selection submit button, and uses part number if it is entered or
@@ -312,12 +311,12 @@
echo '</div>';
echo '</form><br/><br/><br/><br/>';
unset ($StockID);
- display($db,$StockID,$DemandID);
+ display($StockID,$DemandID);
} // End of function listall()
-function display(&$db,&$StockID,&$DemandID) { //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
+function display(&$StockID,&$DemandID) { //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
// Display Seach fields at top and Entry form below that. This function is called the first time
// the page is called, and is also invoked at the end of all of the other functions.
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/MRPReport.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -31,7 +31,6 @@
$result = DB_query($sql,'','',False,False);
if (DB_error_no() !=0) {
$errors = 1;
- $holddb = $db;
$Title = _('Print MRP Report Error');
include('includes/header.php');
prnMsg(_('The MRP calculation must be run before this report will have any output. MRP requires set up of many parameters, including, EOQ, lead times, minimums, bills of materials, demand types, master schedule etc'),'error');
@@ -42,7 +41,6 @@
if (DB_num_rows($result) == 0) {
$errors = 1;
- $holddb = $db;
$Title = _('Print MRP Report Warning');
include('includes/header.php');
prnMsg(_('The MRP calculation must be run before this report will have any output. MRP requires set up of many parameters, including, EOQ, lead times, minimums, bills of materials, demand types, master schedule, etc'), 'warn');
@@ -82,7 +80,6 @@
$result = DB_query($sql,'','',false,true);
if (DB_error_no() !=0) {
$errors = 1;
- $holddb = $db;
}
$Supplies = array();
$WeeklySup = array();
@@ -116,7 +113,6 @@
$result = DB_query($sql,'','',false,true);
if (DB_error_no() !=0) {
$errors = 1;
- $holddb = $db;
}
// Fields for Order Due weekly buckets based on planned orders
@@ -145,7 +141,7 @@
if (isset($errors)) {
$Title = _('MRP Report') . ' - ' . _('Problem Report');
include('includes/header.php');
- prnMsg( _('The MRP Report could not be retrieved by the SQL because') . ' ' . DB_error_msg($holddb),'error');
+ prnMsg( _('The MRP Report could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error');
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/POReport.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -59,20 +59,20 @@
if (isset($_POST['submit'])) {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title . '</p>';
- submit($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
+ submit($PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
} else if (isset($_POST['submitcsv'])) {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title . '</p>';
- submitcsv($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
+ submitcsv($PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . $Title . '</p>';
- display($db);
+ display();
}
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submit(&$db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType) {
+function submit($PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType) {
global $RootPath;
//initialize no input errors
@@ -834,8 +834,7 @@
} // End of function submit()
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submitcsv(&$db,
- $PartNumber,
+function submitcsv( $PartNumber,
$PartNumberOp,
$SupplierId,
$SupplierIdOp,
@@ -1490,7 +1489,7 @@
} // End of function submitcvs()
-function display(&$db) //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
+function display() //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
{
// Display form fields. This function is called the first time
// the page is called.
Modified: trunk/PcAnalysis.php
===================================================================
--- trunk/PcAnalysis.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/PcAnalysis.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -7,13 +7,13 @@
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['submit'])) {
- submit($db, $_POST['Tabs']);
+ submit($_POST['Tabs']);
} else {
- display($db);
+ display();
}
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submit(&$db, $TabToShow) {
+function submit($TabToShow) {
//initialise no input errors
$InputError = 0;
@@ -194,7 +194,7 @@
} // End of function submit()
-function display(&$db) //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
+function display() //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
{
// Display form fields. This function is called the first time
// the page is called.
Modified: trunk/PcTabExpensesList.php
===================================================================
--- trunk/PcTabExpensesList.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/PcTabExpensesList.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -7,13 +7,13 @@
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['submit'])) {
- submit($db, $_POST['Tabs'], $_POST['FromDate'], $_POST['ToDate']);
+ submit($_POST['Tabs'], $_POST['FromDate'], $_POST['ToDate']);
} else {
- display($db);
+ display();
}
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submit(&$db, $TabToShow, $FromDate, $ToDate) {
+function submit($TabToShow, $FromDate, $ToDate) {
//initialise no input errors
$InputError = 0;
@@ -56,10 +56,10 @@
WHERE pcashdetails.tabcode = '" . $TabToShow . "'
AND pcashdetails.date >= '" . FormatDateForSQL($FromDate) . "'
AND pcashdetails.date <= '" . FormatDateForSQL($ToDate) . "'
- ORDER BY pcashdetails.date,
+ ORDER BY pcashdetails.date,
pcashdetails.counterindex";
$Result = DB_query($SQL);
-
+
if (DB_num_rows($Result) != 0){
// Create new PHPExcel object
@@ -73,9 +73,9 @@
->setDescription("PC Tab Expenses List")
->setKeywords("")
->setCategory("");
-
+
// Formatting
-
+
$objPHPExcel->getActiveSheet()->getStyle('A')->getAlignment()->setWrapText(true);
$objPHPExcel->getActiveSheet()->getStyle('A')->getNumberFormat()->setFormatCode('dd/mm/yyyy');
$objPHPExcel->getActiveSheet()->getStyle('B5')->getNumberFormat()->setFormatCode('#,##0.00');
@@ -110,7 +110,7 @@
$objPHPExcel->getActiveSheet()->setCellValue('E1', $FromDate);
$objPHPExcel->getActiveSheet()->setCellValue('D2', 'To');
$objPHPExcel->getActiveSheet()->setCellValue('E2', $ToDate);
-
+
$objPHPExcel->getActiveSheet()->setCellValue('A10', 'Date');
$objPHPExcel->getActiveSheet()->setCellValue('B10', 'Expense Code');
$objPHPExcel->getActiveSheet()->setCellValue('C10', 'Gross Amount');
@@ -123,11 +123,11 @@
$objPHPExcel->getActiveSheet()->setCellValue('B11', 'Previous Balance');
$objPHPExcel->getActiveSheet()->setCellValue('D11', $MyPreviousBalance['previous']);
-
+
// Add data
$i = 12;
while ($MyRow = DB_fetch_array($Result)) {
-
+
$SQLDes = "SELECT description
FROM pcexpenses
WHERE codeexpense = '" . $MyRow['codeexpense'] . "'";
@@ -138,7 +138,7 @@
} else {
$ExpenseCodeDes = $MyRow['codeexpense'] . ' - ' . $Description[0];
}
-
+
$TagSQL = "SELECT tagdescription FROM tags WHERE tagref='" . $MyRow['tag'] . "'";
$TagResult = DB_query($TagSQL);
$TagRow = DB_fetch_array($TagResult);
@@ -147,7 +147,7 @@
}
$TagTo = $MyRow['tag'];
$TagDescription = $TagTo . ' - ' . $TagRow['tagdescription'];
-
+
$TaxesDescription = '';
$TaxesTaxAmount = '';
$TaxSQL = "SELECT counterindex,
@@ -166,7 +166,7 @@
$TaxesDescription .= $MyTaxRow['description'];
$TaxesTaxAmount .= locale_number_format($MyTaxRow['amount'], $CurrDecimalPlaces);
}
-
+
//Generate download link for expense receipt, or show text if no receipt file is found.
$ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
$ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($TabToShow); //Receipts upload directory
@@ -176,12 +176,12 @@
} else {
$ReceiptText = '<a href="' . $ReceiptFilePath . '" download="ExpenseReceipt-' . mb_strtolower($TabToShow) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
}
-
+
if ($MyRow['authorized'] == '0000-00-00') {
$AuthorisedDate = _('Unauthorised');
} else {
$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
- }
+ }
$objPHPExcel->getActiveSheet()->setCellValue('A'.$i, ConvertSQLDate($MyRow['date']));
$objPHPExcel->getActiveSheet()->setCellValue('B'.$i, $ExpenseCodeDes);
@@ -198,13 +198,13 @@
// Freeze panes
$objPHPExcel->getActiveSheet()->freezePane('A11');
-
+
// Auto Size columns
foreach(range('A','I') as $columnID) {
$objPHPExcel->getActiveSheet()->getColumnDimension($columnID)
->setAutoSize(true);
}
-
+
// Rename worksheet
$objPHPExcel->getActiveSheet()->setTitle($TabToShow);
// Set active sheet index to the first sheet, so Excel opens this as the first sheet
@@ -237,7 +237,7 @@
} // End of function submit()
-function display(&$db) //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
+function display() //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
{
// Display form fields. This function is called the first time
// the page is called.
@@ -270,7 +270,7 @@
<td><select name="Tabs">';
$SQL = "SELECT tabcode
- FROM pctabs
+ FROM pctabs
ORDER BY tabcode";
$CatResult = DB_query($SQL);
@@ -303,7 +303,7 @@
function beginning_of_month($Date){
$Date2 = explode("-",$Date);
- $M = $Date2[1];
+ $M = $Date2[1];
$Y = $Date2[0];
$FirstOfMonth = $Y . '-' . $M . '-01';
return $FirstOfMonth;
Modified: trunk/PriceMatrix.php
===================================================================
--- trunk/PriceMatrix.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/PriceMatrix.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -90,7 +90,7 @@
$ErrMsg = _('Could not be update the existing prices');
$result = DB_query($sql,$ErrMsg);
- ReSequenceEffectiveDates ($StockID, $_POST['SalesType'],$_POST['CurrAbrev'],$_POST['QuantityBreak'],$db);
+ ReSequenceEffectiveDates ($StockID, $_POST['SalesType'],$_POST['CurrAbrev'],$_POST['QuantityBreak']);
prnMsg(_('The price has been updated'),'success');
} elseif ($InputError != 1) {
@@ -332,7 +332,7 @@
return '9999/12/31';
}
}
-function ReSequenceEffectiveDates ($Item, $PriceList, $CurrAbbrev, $QuantityBreak,$db) {
+function ReSequenceEffectiveDates ($Item, $PriceList, $CurrAbbrev, $QuantityBreak) {
/*This is quite complicated - the idea is that prices set up should be unique and there is no way two prices could be returned as valid - when getting a price in includes/GetPrice.inc the logic is to first look for a price of the salestype/currency within the effective start and end dates - then if not get the price with a start date prior but a blank end date (the default price). We would not want two prices where one price falls inside another effective date range except in the case of a blank end date - ie no end date - the default price for the currency/salestype.
I first thought that we would need to update the previous default price (blank end date), when a new default price is entered, to have an end date of the startdate of this new default price less 1 day - but this is converting a default price into a special price which could result in having two special prices over the same date range - best to leave it unchanged and use logic in the GetPrice.inc to ensure the correct default price is returned
Modified: trunk/Prices_Customer.php
===================================================================
--- trunk/Prices_Customer.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/Prices_Customer.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -158,7 +158,7 @@
$msg = _('The price could not be added because') . ' - ' . DB_error_msg();
}
}else {
- ReSequenceEffectiveDates ($Item, $SalesType, $CurrCode, $_SESSION['CustomerID'], $db);
+ ReSequenceEffectiveDates ($Item, $SalesType, $CurrCode, $_SESSION['CustomerID']);
unset($_POST['EndDate']);
unset($_POST['StartDate']);
unset($_POST['Price']);
@@ -375,7 +375,7 @@
include('includes/footer.php');
exit;
-function ReSequenceEffectiveDates ($Item, $PriceList, $CurrAbbrev, $CustomerID, $db) {
+function ReSequenceEffectiveDates ($Item, $PriceList, $CurrAbbrev, $CustomerID) {
/*This is quite complicated - the idea is that prices set up should be unique and there is no way two prices could be returned as valid - when getting a price in includes/GetPrice.inc the logic is to first look for a price of the salestype/currency within the effective start and end dates - then if not get the price with a start date prior but a blank end date (the default price). We would not want two prices where the effective dates fall between an existing price so it is necessary to update enddates of prices - with me - I am just hanging on here myself
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2018-02-13 00:20:44 UTC (rev 7958)
+++ trunk/SalesInquiry.php 2018-02-13 04:04:59 UTC (rev 7959)
@@ -61,13 +61,13 @@
}
if(isset($_POST['submit'])) {
- submit($db,$PartNumber,$PartNumberOp,$DebtorNo,$DebtorNoOp,$DebtorName,$DebtorNameOp,$SaveSummaryType);
+ submit($PartNumber,$PartNumberOp,$DebtorNo,$DebtorNoOp,$DebtorName,$DebtorNameOp,$SaveSummaryType);
} else {
- display($db);
+ display();
}
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submit(&$db,$PartNumber,$PartNumberOp,$DebtorNo,$DebtorNoOp,$DebtorName,$DebtorNameOp,$SaveSummaryType) {
+function submit($PartNumber,$PartNumberOp,$DebtorNo,$DebtorNoOp,$DebtorName,$DebtorNameOp,$SaveSummaryType) {
//initialise no input errors
$InputError = 0;
@@ -101,7 +101,7 @@
// TempStockmoves function creates a temporary table of stockmoves that is used when the DateType
// is Invoice Date
if($_POST['DateType'] == 'Invoice') {
- TempStockmoves($db);
+ TempStockmoves();
}
# Add more to WHERE statement, if user entered something for the part number,debtorno, name
@@ -1050,7 +1050,7 @@
} // End of function submit()
-function display(&$db) //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
+function display() //####DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_DISPLAY_#####
{
// Display form fields. This function is called the first time
// the page is called.
@@ -1253,7 +1253,7 @@
} // End of function display()
-function TempStockmoves(&$db) {
+function TempStockmoves() {
// When report based on Invoice Date, use stockmoves as the main file, but credit
// notes, which are type 11 in stockmoves, do not have the order number in the
// reference field; instead they have "Ex Inv - " and then the transno from the
@@ -1289,4 +1289,4 @@
} // End of function TempStockmoves
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/WOCanBeProducedNow.php
=============...
[truncated message content] |
|
From: <tu...@us...> - 2018-02-16 06:51:51
|
Revision: 7961
http://sourceforge.net/p/web-erp/reponame/7961
Author: turbopt
Date: 2018-02-16 06:51:24 +0000 (Fri, 16 Feb 2018)
Log Message:
-----------
Paul Becker (PaulT commit): Z_ChangeSalesmanCode.php: New script to change a salesman code. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8094)
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
Added Paths:
-----------
trunk/Z_ChangeSalesmanCode.php
Added: trunk/Z_ChangeSalesmanCode.php
===================================================================
--- trunk/Z_ChangeSalesmanCode.php (rev 0)
+++ trunk/Z_ChangeSalesmanCode.php 2018-02-16 06:51:24 UTC (rev 7961)
@@ -0,0 +1,142 @@
+<?php
+/* $Id: Z_ChangeSalesmanCode.php 7751 2017-04-13 16:34:26Z rchacon $*/
+/* This script is an utility to change a salesman code. */
+
+include ('includes/session.php');
+
+$Title = _('UTILITY PAGE To Change A Salesman Code In All Tables');// Screen identificator.
+$ViewTopic = 'SpecialUtilities'; // Filename's id in ManualContents.php's TOC.
+$BookMark = 'Z_ChangeSalesmanCode'; // Anchor's id in the manual's html document.
+
+include('includes/header.php');
+
+echo '<p class="page_title_text">
+ <img alt="" src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/salesman.png" title="', _('Change A Salesman Code'), '" /> ', _('Change A Salesman Code'),
+ '</p>';
+
+if (isset($_POST['ProcessSalesmanChange'])){
+
+ if ($_POST['OldSalesmanCode']==''){
+ prnMsg(_('An existing salesman code entry must be provided'), 'error');
+ include('includes/footer.php');
+ exit;
+ }
+
+/*First check the salesman code exists */
+ $result=DB_query("SELECT salesmancode FROM salesman WHERE salesmancode='" . $_POST['OldSalesmanCode'] . "'");
+ if (DB_num_rows($result) == 0){
+ prnMsg('<br /><br />' . _('The salesman code') . ': ' . $_POST['OldSalesmanCode'] . ' ' . _('does not currently exist as a salesman code in the system'), 'error');
+ include('includes/footer.php');
+ exit;
+ }
+
+ if ($_POST['NewSalesmanCode']==''){
+ prnMsg(_('A new salesman code entry must be provided'), 'error');
+ include('includes/footer.php');
+ exit;
+ }
+ else if (ContainsIllegalCharacters($_POST['NewSalesmanCode'])) {
+ prnMsg(_('The new salesman code to change the old code to contains illegal characters - no changes will be made'), 'error');
+ include ('includes/footer.php');
+ exit;
+ }
+
+ $_POST['NewSalesmanCode'] = mb_strtoupper($_POST['NewSalesmanCode']);
+
+/*Now check that the new code doesn't already exist */
+ $result=DB_query("SELECT salesmancode FROM salesman WHERE salesmancode='" . $_POST['NewSalesmanCode'] . "'");
+ if (DB_num_rows($result)!=0){
+ prnMsg(_('The replacement salesman code') .': ' . $_POST['NewSalesmanCode'] . ' ' . _('already exists as a salesman code in the system') . ' - ' . _('a unique salesman code must be entered for the new code'), 'error');
+ include('includes/footer.php');
+ exit;
+ }
+
+ $result = DB_Txn_Begin();
+
+ prnMsg(_('Inserting the new salesman master record'), 'info');
+ $sql = "INSERT INTO salesman (`salesmancode`,
+ `salesmanname`,
+ `commissionrate1`,
+ `commissionrate2`,
+ `breakpoint`,
+ `smantel`,
+ `smanfax`,
+ `current`)
+ SELECT '" . $_POST['NewSalesmanCode'] . "',
+ `salesmanname`,
+ `commissionrate1`,
+ `commissionrate2`,
+ `breakpoint`,
+ `smantel`,
+ `smanfax`,
+ `current`
+ FROM salesman
+ WHERE salesmancode='" . $_POST['OldSalesmanCode'] . "'";
+
+ $DbgMsg =_('The SQL that failed was');
+ $ErrMsg = _('The SQL to insert the new salesman master record failed') . ', ' . _('the SQL statement was');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ prnMsg(_('Changing debtor branch records'), 'info');
+ $sql = "UPDATE custbranch SET salesman='" . $_POST['NewSalesmanCode'] . "' WHERE salesman='" . $_POST['OldSalesmanCode'] . "'";
+
+ $ErrMsg = _('The SQL to update debtor branch records failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ prnMsg(_('Changing debtor transaction records'), 'info');
+ $sql = "UPDATE debtortrans SET salesperson='" . $_POST['NewSalesmanCode'] . "' WHERE salesperson='" . $_POST['OldSalesmanCode'] . "'";
+
+ $ErrMsg = _('The SQL to update debtor transaction records failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ prnMsg(_('Changing sales analysis records'), 'info');
+ $sql = "UPDATE salesanalysis SET salesperson='" . $_POST['NewSalesmanCode'] . "' WHERE salesperson='" . $_POST['OldSalesmanCode'] . "'";
+
+ $ErrMsg = _('The SQL to update Sales Analysis records failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ prnMsg(_('Changing sales orders records'), 'info');
+ $sql = "UPDATE salesorders SET salesperson='" . $_POST['NewSalesmanCode'] . "' WHERE salesperson='" . $_POST['OldSalesmanCode'] . "'";
+
+ $ErrMsg = _('The SQL to update the sales order header records failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ prnMsg(_('Changing user salesman records'), 'info');
+ $sql = "UPDATE www_users SET salesman='" . $_POST['NewSalesmanCode'] . "' WHERE salesman='" . $_POST['OldSalesmanCode'] . "'";
+
+ $ErrMsg = _('The SQL to update the user records failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ $result = DB_IgnoreForeignKeys();
+
+ prnMsg(_('Deleting the salesman code from the Salesman table'), 'info');
+ $sql = "DELETE FROM salesman WHERE salesmancode='" . $_POST['OldSalesmanCode'] . "'";
+
+ $ErrMsg = _('The SQL to delete the old salesman record failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+
+ $result = DB_Txn_Commit();
+ $result = DB_ReinstateForeignKeys();
+}
+
+echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <div class="centre">
+ <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
+ <br />
+ <table>
+ <tr>
+ <td>', _('Existing Salesman Code'), ':</td>
+ <td><input type="text" name="OldSalesmanCode" size="4" maxlength="4" required="required" /></td>
+ </tr>
+ <tr>
+ <td> ', _('New Salesman Code'), ':</td>
+ <td><input type="text" name="NewSalesmanCode" size="4" maxlength="4" required="required"/></td>
+ </tr>
+ </table>
+
+ <input type="submit" name="ProcessSalesmanChange" value="', _('Process'), '" />
+ </div>
+ </form>';
+
+include('includes/footer.php');
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-14 02:42:51 UTC (rev 7960)
+++ trunk/doc/Change.log 2018-02-16 06:51:24 UTC (rev 7961)
@@ -1,6 +1,7 @@
webERP Change Log
-13/2/18 Paul Becker (PaulT commit): Minor change to remove number from input field committed with 7946, and add attributes on two input fields. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8089&pid=14266#pid14266)
+16/2/18 Paul Becker (PaulT commit): Z_ChangeSalesmanCode.php: New script to change a salesman code. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8094)
+13/2/18 Paul Becker (PaulT commit): InternalStockRequestFulfill.php: Minor change to remove number from input field committed with 7946, and add attributes on two input fields. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8089&pid=14266#pid14266)
12/2/18 PaulT: Remove $db parameter from PeriodExists(), CreatePeriod(), CalcFreightCost(), CheckForRecursiveBOM(), DisplayBOMItems() and a few other functions.
12/2/18 PaulT: InternalStockRequest.php: Address a few issues reported by Paul B: Fix Previous/Next handling, table sorting, wrong on-order quantities, and apply the user's display records max. Change also removes unused code and other minor improvements. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8089)
12/2/18 Tim (PaulT commit): StockMovements.php, StockLocMovements.php: Correct stock movements that have more than one serial number as part of it, then the item will appear multiple times in the movements script with the total quantity in each line. For example, if I enter a quantity adjustment for a controlled item, and assign 3 serial numbers to this movement and then run the inquiries, there will be 3 separate lines with a quantity of 3 against each one.
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2018-02-14 02:42:51 UTC (rev 7960)
+++ trunk/includes/MainMenuLinksArray.php 2018-02-16 06:51:24 UTC (rev 7961)
@@ -585,11 +585,12 @@
$MenuItems['Utilities']['Transactions']['Caption'] = array( _('Change A Customer Code'),
_('Change A Customer Branch Code'),
- _('Change A Supplier Code'),
- _('Change A Stock Category Code'),
+ _('Change A GL Account Code'),
_('Change An Inventory Item Code'),
- _('Change A GL Account Code'),
_('Change A Location Code'),
+ _('Change A Salesman Code'),
+ _('Change A Stock Category Code'),
+ _('Change A Supplier Code'),
_('Translate Item Descriptions'),
_('Update costs for all BOM items, from the bottom up'),
_('Re-apply costs to Sales Analysis'),
@@ -600,11 +601,12 @@
$MenuItems['Utilities']['Transactions']['URL'] = array( '/Z_ChangeCustomerCode.php',
'/Z_ChangeBranchCode.php',
- '/Z_ChangeSupplierCode.php',
- '/Z_ChangeStockCategory.php',
+ '/Z_ChangeGLAccountCode.php',
'/Z_ChangeStockCode.php',
- '/Z_ChangeGLAccountCode.php',
'/Z_ChangeLocationCode.php',
+ '/Z_ChangeSalesmanCode.php',
+ '/Z_ChangeStockCategory.php',
+ '/Z_ChangeSupplierCode.php',
'/AutomaticTranslationDescriptions.php',
'/Z_BottomUpCosts.php',
'/Z_ReApplyCostToSA.php',
@@ -650,4 +652,4 @@
'/Z_RePostGLFromPeriod.php',
'/Z_DeleteOldPrices.php',
'/Z_RemovePurchaseBackOrders.php');
-?>
+?>
\ No newline at end of file
|
|
From: <tu...@us...> - 2018-02-16 07:11:18
|
Revision: 7962
http://sourceforge.net/p/web-erp/reponame/7962
Author: turbopt
Date: 2018-02-16 07:11:14 +0000 (Fri, 16 Feb 2018)
Log Message:
-----------
Paul Becker (PaulT commit): AgedControlledInventory.php: Add UOM to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8091&pid=14286#pid14286)
Modified Paths:
--------------
trunk/AgedControlledInventory.php
trunk/doc/Change.log
Modified: trunk/AgedControlledInventory.php
===================================================================
--- trunk/AgedControlledInventory.php 2018-02-16 06:51:24 UTC (rev 7961)
+++ trunk/AgedControlledInventory.php 2018-02-16 07:11:14 UTC (rev 7962)
@@ -11,8 +11,7 @@
include('includes/header.php');
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Inventory') .
-'" alt="" /><b>' . $Title. '</b>
+ <img src="', $RootPath, '/css/', $Theme, '/images/inventory.png" title="', _('Inventory'), '" alt="" /><b>', $Title, '</b>
</p>';
$sql = "SELECT stockserialitems.stockid,
@@ -20,6 +19,7 @@
stockserialitems.serialno,
stockserialitems.quantity,
stockmoves.trandate,
+ stockmaster.units,
stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS cost,
createdate,
decimalplaces
@@ -46,24 +46,25 @@
echo '<table>
<tr>
- <th class="ascending">' . _('Stock') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('Batch') . '</th>
- <th class="ascending">' . _('Quantity Remaining') . '</th>
- <th class="ascending">' . _('Inventory Value') . '</th>
- <th class="ascending">' . _('Date') . '</th>
- <th class="ascending">' . _('Days Old') . '</th>
+ <th class="ascending">', _('Stock'), '</th>
+ <th class="ascending">', _('Description'), '</th>
+ <th class="ascending">', _('Batch'), '</th>
+ <th class="ascending">', _('Quantity Remaining'), '</th>
+ <th class="ascending">', _('Units'), '</th>
+ <th class="ascending">', _('Inventory Value'), '</th>
+ <th class="ascending">', _('Date'), '</th>
+ <th class="ascending">', _('Days Old'), '</th>
</tr>';
while ($LocQtyRow=DB_fetch_array($LocStockResult)) {
- $DaysOld=floor(($Today - strtotime($LocQtyRow['createdate']))/(60*60*24));
- $TotalQty +=$LocQtyRow['quantity'];
+ $DaysOld = floor(($Today - strtotime($LocQtyRow['createdate']))/(60*60*24));
+ $TotalQty += $LocQtyRow['quantity'];
$DispVal = '-----------';
if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
- $DispVal =locale_number_format(($LocQtyRow['quantity']*$LocQtyRow['cost']),$LocQtyRow['decimalplaces']);
- $TotalVal +=($LocQtyRow['quantity'] *$LocQtyRow['cost']);
+ $DispVal = locale_number_format(($LocQtyRow['quantity']*$LocQtyRow['cost']),$LocQtyRow['decimalplaces']);
+ $TotalVal += ($LocQtyRow['quantity'] * $LocQtyRow['cost']);
}
printf('<tr class="striped_row">
@@ -71,6 +72,7 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
<td class="number">%s</td>
@@ -79,6 +81,7 @@
$LocQtyRow['description'],
$LocQtyRow['serialno'],
locale_number_format($LocQtyRow['quantity'],$LocQtyRow['decimalplaces']),
+ $LocQtyRow['units'],
$DispVal,
ConvertSQLDate($LocQtyRow['createdate']),
$DaysOld
@@ -87,9 +90,9 @@
echo '<tfoot>
<tr class="striped_row">
- <td colspan="3"><b>' . _('Total') . '</b></td>
- <td class="number"><b>' . locale_number_format($TotalQty,2) . '</b></td>
- <td class="number"><b>' . locale_number_format($TotalVal,2) . '</b></td>
+ <td colspan="3"><b>', _('Total'), '</b></td>
+ <td class="number"><b>', locale_number_format($TotalQty,2), '</b></td>
+ <td class="number"><b>', locale_number_format($TotalVal,2), '</b></td>
<td colspan="2"></td>
</tr>
</tfoot>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-16 06:51:24 UTC (rev 7961)
+++ trunk/doc/Change.log 2018-02-16 07:11:14 UTC (rev 7962)
@@ -1,5 +1,6 @@
webERP Change Log
+16/2/18 Paul Becker (PaulT commit): AgedControlledInventory.php: Add UOM to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8091&pid=14286#pid14286)
16/2/18 Paul Becker (PaulT commit): Z_ChangeSalesmanCode.php: New script to change a salesman code. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8094)
13/2/18 Paul Becker (PaulT commit): InternalStockRequestFulfill.php: Minor change to remove number from input field committed with 7946, and add attributes on two input fields. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8089&pid=14266#pid14266)
12/2/18 PaulT: Remove $db parameter from PeriodExists(), CreatePeriod(), CalcFreightCost(), CheckForRecursiveBOM(), DisplayBOMItems() and a few other functions.
|
|
From: <tu...@us...> - 2018-02-16 07:19:57
|
Revision: 7963
http://sourceforge.net/p/web-erp/reponame/7963
Author: turbopt
Date: 2018-02-16 07:19:54 +0000 (Fri, 16 Feb 2018)
Log Message:
-----------
PaulT: upgrade4.14.1-4.14.2.sql: Add SQL update to support commit 7961.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-16 07:11:14 UTC (rev 7962)
+++ trunk/doc/Change.log 2018-02-16 07:19:54 UTC (rev 7963)
@@ -1,5 +1,6 @@
webERP Change Log
+16/2/18 PaulT: upgrade4.14.1-4.14.2.sql: Add SQL update to support commit 7961.
16/2/18 Paul Becker (PaulT commit): AgedControlledInventory.php: Add UOM to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8091&pid=14286#pid14286)
16/2/18 Paul Becker (PaulT commit): Z_ChangeSalesmanCode.php: New script to change a salesman code. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8094)
13/2/18 Paul Becker (PaulT commit): InternalStockRequestFulfill.php: Minor change to remove number from input field committed with 7946, and add attributes on two input fields. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8089&pid=14266#pid14266)
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2018-02-16 07:11:14 UTC (rev 7962)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2018-02-16 07:19:54 UTC (rev 7963)
@@ -119,5 +119,7 @@
JOIN pickinglists ON pickinglistdetails.pickinglistno = pickinglists.pickinglistno
JOIN salesorderdetails ON salesorderdetails.orderno = pickinglists.orderno;
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('Z_ChangeSalesmanCode.php', '15', '');
+
UPDATE config SET confvalue='4.15' WHERE confname='VersionNumber';
|
|
From: <tu...@us...> - 2018-02-16 07:48:33
|
Revision: 7964
http://sourceforge.net/p/web-erp/reponame/7964
Author: turbopt
Date: 2018-02-16 07:42:05 +0000 (Fri, 16 Feb 2018)
Log Message:
-----------
PaulT: Remove unused $db parameter from many functions within the /api area.
Modified Paths:
--------------
trunk/api/api_branches.php
trunk/api/api_customers.php
trunk/api/api_debtortransactions.php
trunk/api/api_glaccounts.php
trunk/api/api_glgroups.php
trunk/api/api_glsections.php
trunk/api/api_locations.php
trunk/api/api_purchdata.php
trunk/api/api_salesareas.php
trunk/api/api_salesorders.php
trunk/api/api_stock.php
trunk/api/api_stockcategories.php
trunk/api/api_suppliers.php
trunk/api/api_workorders.php
trunk/doc/Change.log
Modified: trunk/api/api_branches.php
===================================================================
--- trunk/api/api_branches.php 2018-02-16 07:19:54 UTC (rev 7963)
+++ trunk/api/api_branches.php 2018-02-16 07:42:05 UTC (rev 7964)
@@ -2,7 +2,7 @@
/* $Id$*/
/* Check that the debtor number exists*/
- function VerifyBranchDebtorExists($DebtorNumber, $i, $Errors, $db) {
+ function VerifyBranchDebtorExists($DebtorNumber, $i, $Errors) {
$Searchsql = "SELECT count(debtorno)
FROM debtorsmaster
WHERE debtorno='".$DebtorNumber."'";
@@ -16,7 +16,7 @@
/* Verify that the branch number is valid, and doesn't already
exist.*/
- function VerifyBranchNo($DebtorNumber, $BranchNumber, $i, $Errors, $db) {
+ function VerifyBranchNo($DebtorNumber, $BranchNumber, $i, $Errors) {
if ((mb_strlen($BranchNumber)<1) or (mb_strlen($BranchNumber)>10)) {
$Errors[$i] = IncorrectBranchNumberLength;
}
@@ -33,7 +33,7 @@
}
/* Verify that the branch number exists.*/
- function VerifyBranchNoExists($DebtorNumber, $BranchNumber, $i, $Errors, $db) {
+ function VerifyBranchNoExists($DebtorNumber, $BranchNumber, $i, $Errors) {
if ((mb_strlen($BranchNumber)<1) or (mb_strlen($BranchNumber)>10)) {
$Errors[$i] = IncorrectBranchNumberLength;
}
@@ -91,7 +91,7 @@
}
/* Check that the area code is set up in the weberp database */
- function VerifyAreaCode($AreaCode , $i, $Errors, $db) {
+ function VerifyAreaCode($AreaCode , $i, $Errors) {
$Searchsql = "SELECT COUNT(areacode)
FROM areas
WHERE areacode='".$AreaCode."'";
@@ -104,7 +104,7 @@
}
/* Check that the salesman is set up in the weberp database */
- function VerifySalesmanCode($SalesmanCode , $i, $Errors, $db) {
+ function VerifySalesmanCode($SalesmanCode , $i, $Errors) {
$Searchsql = "SELECT COUNT(salesmancode)
FROM salesman
WHERE salesmancode='".$SalesmanCode."'";
@@ -165,7 +165,7 @@
}
/* Check that the default location is set up in the weberp database */
- function VerifyDefaultLocation($DefaultLocation , $i, $Errors, $db) {
+ function VerifyDefaultLocation($DefaultLocation , $i, $Errors) {
$Searchsql = "SELECT COUNT(loccode)
FROM locations
WHERE loccode='".$DefaultLocation."'";
@@ -178,7 +178,7 @@
}
/* Check that the tax group id is set up in the weberp database */
- function VerifyTaxGroupId($TaxGroupId , $i, $Errors, $db) {
+ function VerifyTaxGroupId($TaxGroupId , $i, $Errors) {
$Searchsql = "SELECT COUNT(taxgroupid)
FROM taxgroups
WHERE taxgroupid='".$TaxGroupId."'";
@@ -191,7 +191,7 @@
}
/* Check that the default shipper is set up in the weberp database */
- function VerifyDefaultShipVia($DefaultShipVia , $i, $Errors, $db) {
+ function VerifyDefaultShipVia($DefaultShipVia , $i, $Errors) {
$Searchsql = "SELECT COUNT(shipper_id)
FROM shippers
WHERE shipper_id='".$DefaultShipVia."'";
@@ -245,26 +245,26 @@
foreach ($BranchDetails as $key => $value) {
$BranchDetails[$key] = DB_escape_string($value);
}
- $Errors=VerifyBranchDebtorExists($BranchDetails['debtorno'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyBranchNo($BranchDetails['debtorno'], $BranchDetails['branchcode'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyBranchName($BranchDetails['brname'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchDebtorExists($BranchDetails['debtorno'], sizeof($Errors), $Errors);
+ $Errors=VerifyBranchNo($BranchDetails['debtorno'], $BranchDetails['branchcode'], sizeof($Errors), $Errors);
+ $Errors=VerifyBranchName($BranchDetails['brname'], sizeof($Errors), $Errors);
if (isset($BranchDetails['address1'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address1'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address1'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address2'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address2'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address2'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address3'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address3'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address3'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address4'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address4'], 50, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address4'], 50, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address5'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address5'], 20, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address5'], 20, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address6'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address6'], 15, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address6'], 15, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['lat'])){
$Errors=VerifyLatitude($BranchDetails['lat'], sizeof($Errors), $Errors);
@@ -276,10 +276,10 @@
$Errors=VerifyEstDeliveryDays($BranchDetails['estdeliverydays'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['area'])){
- $Errors=VerifyAreaCode($BranchDetails['area'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyAreaCode($BranchDetails['area'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['salesman'])){
- $Errors=VerifySalesmanCode($BranchDetails['salesman'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifySalesmanCode($BranchDetails['salesman'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['fwddate'])){
$Errors=VerifyFwdDate($BranchDetails['fwddate'], sizeof($Errors), $Errors);
@@ -297,13 +297,13 @@
$Errors=VerifyEmailAddress($BranchDetails['email'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['defaultlocation'])){
- $Errors=VerifyDefaultLocation($BranchDetails['defaultlocation'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDefaultLocation($BranchDetails['defaultlocation'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['taxgroupid'])){
- $Errors=VerifyTaxGroupId($BranchDetails['taxgroupid'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyTaxGroupId($BranchDetails['taxgroupid'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['defaultshipvia'])){
- $Errors=VerifyDefaultShipVia($BranchDetails['defaultshipvia'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDefaultShipVia($BranchDetails['defaultshipvia'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['deliverblind'])){
$Errors=VerifyDeliverBlind($BranchDetails['deliverblind'], sizeof($Errors), $Errors);
@@ -312,22 +312,22 @@
$Errors=VerifyDisableTrans($BranchDetails['disabletrans'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr1'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr1'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr1'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr2'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr2'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr2'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr3'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr3'], 30, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr3'], 30, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr4'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr4'], 20, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr4'], 20, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr5'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr5'], 20, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr5'], 20, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr6'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr6'], 15, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr6'], 15, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['specialinstructions'])){
$Errors=VerifySpecialInstructions($BranchDetails['specialinstructions'], sizeof($Errors), $Errors);
@@ -369,25 +369,25 @@
foreach ($BranchDetails as $key => $value) {
$BranchDetails[$key] = DB_escape_string($value);
}
- $Errors=VerifyBranchNoExists($BranchDetails['debtorno'], $BranchDetails['branchcode'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyBranchName($BranchDetails['brname'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchNoExists($BranchDetails['debtorno'], $BranchDetails['branchcode'], sizeof($Errors), $Errors);
+ $Errors=VerifyBranchName($BranchDetails['brname'], sizeof($Errors), $Errors);
if (isset($BranchDetails['address1'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address1'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address1'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address2'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address2'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address2'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address3'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address3'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address3'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address4'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address4'], 50, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address4'], 50, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address5'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address5'], 20, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address5'], 20, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['address6'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['address6'], 15, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['address6'], 15, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['lat'])){
$Errors=VerifyLatitude($BranchDetails['lat'], sizeof($Errors), $Errors);
@@ -399,10 +399,10 @@
$Errors=VerifyEstDeliveryDays($BranchDetails['estdeliverydays'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['area'])){
- $Errors=VerifyAreaCode($BranchDetails['area'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyAreaCode($BranchDetails['area'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['salesman'])){
- $Errors=VerifySalesmanCode($BranchDetails['salesman'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifySalesmanCode($BranchDetails['salesman'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['fwddate'])){
$Errors=VerifyFwdDate($BranchDetails['fwddate'], sizeof($Errors), $Errors);
@@ -420,13 +420,13 @@
$Errors=VerifyEmailAddress($BranchDetails['email'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['defaultlocation'])){
- $Errors=VerifyDefaultLocation($BranchDetails['defaultlocation'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDefaultLocation($BranchDetails['defaultlocation'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['taxgroupid'])){
- $Errors=VerifyTaxGroupId($BranchDetails['taxgroupid'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyTaxGroupId($BranchDetails['taxgroupid'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['defaultshipvia'])){
- $Errors=VerifyDefaultShipVia($BranchDetails['defaultshipvia'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDefaultShipVia($BranchDetails['defaultshipvia'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['deliverblind'])){
$Errors=VerifyDeliverBlind($BranchDetails['deliverblind'], sizeof($Errors), $Errors);
@@ -435,22 +435,22 @@
$Errors=VerifyDisableTrans($BranchDetails['disabletrans'], sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr1'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr1'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr1'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr2'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr2'], 40, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr2'], 40, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr3'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr3'], 30, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr3'], 30, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr4'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr4'], 20, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr4'], 20, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr5'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr5'], 20, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr5'], 20, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['brpostaddr6'])){
- $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr6'], 15, sizeof($Errors), $Errors, $db);
+ $Errors=VerifyBranchAddressLine($BranchDetails['brpostaddr6'], 15, sizeof($Errors), $Errors);
}
if (isset($BranchDetails['specialinstructions'])){
$Errors=VerifySpecialInstructions($BranchDetails['specialinstructions'], sizeof($Errors), $Errors);
@@ -520,7 +520,7 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $Errors = VerifyBranchNoExists($DebtorNumber, $BranchCode, sizeof($Errors), $Errors, $db);
+ $Errors = VerifyBranchNoExists($DebtorNumber, $BranchCode, sizeof($Errors), $Errors);
if (sizeof($Errors)!=0) {
return $Errors;
}
Modified: trunk/api/api_customers.php
===================================================================
--- trunk/api/api_customers.php 2018-02-16 07:19:54 UTC (rev 7963)
+++ trunk/api/api_customers.php 2018-02-16 07:42:05 UTC (rev 7964)
@@ -3,7 +3,7 @@
/* Verify that the debtor number is valid, and doesn't already
exist.*/
- function VerifyDebtorNo($DebtorNumber, $i, $Errors, $db) {
+ function VerifyDebtorNo($DebtorNumber, $i, $Errors) {
if ((mb_strlen($DebtorNumber)<1) or (mb_strlen($DebtorNumber)>10)) {
$Errors[$i] = IncorrectDebtorNumberLength;
}
@@ -19,7 +19,7 @@
}
/* Check that the debtor number exists*/
- function VerifyDebtorExists($DebtorNumber, $i, $Errors, $db) {
+ function VerifyDebtorExists($DebtorNumber, $i, $Errors) {
$Searchsql = "SELECT count(debtorno)
FROM debtorsmaster
WHERE debtorno='".$DebtorNumber."'";
@@ -48,7 +48,7 @@
}
/* Check that the currency code is set up in the weberp database */
- function VerifyCurrencyCode($CurrCode, $i, $Errors, $db) {
+ function VerifyCurrencyCode($CurrCode, $i, $Errors) {
$Searchsql = "SELECT COUNT(currabrev)
FROM currencies
WHERE currabrev='".$CurrCode."'";
@@ -61,7 +61,7 @@
}
/* Check that the sales type is set up in the weberp database */
- function VerifySalesType($SalesType, $i, $Errors, $db) {
+ function VerifySalesType($SalesType, $i, $Errors) {
$Searchsql = "SELECT COUNT(typeabbrev)
FROM salestypes
WHERE typeabbrev='".$SalesType."'";
@@ -82,7 +82,7 @@
}
/* Check that the hold reason is set up in the weberp database */
- function VerifyHoldReason($HoldReason , $i, $Errors, $db) {
+ function VerifyHoldReason($HoldReason , $i, $Errors) {
$Searchsql = "SELECT COUNT(reasoncode)
FROM holdreasons
WHERE reasoncode='".$HoldReason."'";
@@ -95,7 +95,7 @@
}
/* Check that the payment terms are set up in the weberp database */
- function VerifyPaymentTerms($PaymentTerms , $i, $Errors, $db) {
+ function VerifyPaymentTerms($PaymentTerms , $i, $Errors) {
$Searchsql = "SELECT COUNT(termsindicator)
FROM paymentterms
WHERE termsindicator='".$PaymentTerms."'";
@@ -229,7 +229,7 @@
}
/* Check that the customer type is set up in the weberp database */
- function VerifyCustomerType($debtortype , $i, $Errors, $db) {
+ function VerifyCustomerType($debtortype , $i, $Errors) {
$Searchsql = "SELECT COUNT(typeid)
FROM debtortype
WHERE typeid='".$debtortype."'";
@@ -266,7 +266,7 @@
$autonumberresult=DB_query($autonumbersql);
$autonumber=DB_fetch_row($autonumberresult);
if ($autonumber[0]==0) {
- $Errors=VerifyDebtorNo($CustomerDetails['debtorno'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDebtorNo($CustomerDetails['debtorno'], sizeof($Errors), $Errors);
} else {
$CustomerDetails['debtorno']='';
}
@@ -290,19 +290,19 @@
$Errors=VerifyAddressLine($CustomerDetails['address6'], 15, sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['currcode'])){
- $Errors=VerifyCurrencyCode($CustomerDetails['currcode'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyCurrencyCode($CustomerDetails['currcode'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['salestype'])){
- $Errors=VerifySalesType($CustomerDetails['salestype'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifySalesType($CustomerDetails['salestype'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['clientsince'])){
$Errors=VerifyClientSince($CustomerDetails['clientsince'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['holdreason'])){
- $Errors=VerifyHoldReason($CustomerDetails['holdreason'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyHoldReason($CustomerDetails['holdreason'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['paymentterms'])){
- $Errors=VerifyPaymentTerms($CustomerDetails['paymentterms'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyPaymentTerms($CustomerDetails['paymentterms'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['discount'])){
$Errors=VerifyDiscount($CustomerDetails['discount'], sizeof($Errors), $Errors);
@@ -350,7 +350,7 @@
$Errors=VerifyCustomerPOLine($CustomerDetails['customerpoline'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['typeid'])){
- $Errors=VerifyCustomerType($CustomerDetails['typeid'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyCustomerType($CustomerDetails['typeid'], sizeof($Errors), $Errors);
}
$FieldNames='';
$FieldValues='';
@@ -393,7 +393,7 @@
$Errors[sizeof($Errors)] = NoDebtorNumber;
return $Errors;
}
- $Errors=VerifyDebtorExists($CustomerDetails['debtorno'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDebtorExists($CustomerDetails['debtorno'], sizeof($Errors), $Errors);
if (in_array(DebtorDoesntExist, $Errors)) {
return $Errors;
}
@@ -419,19 +419,19 @@
$Errors=VerifyAddressLine($CustomerDetails['address6'], 15, sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['currcode'])){
- $Errors=VerifyCurrencyCode($CustomerDetails['currcode'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyCurrencyCode($CustomerDetails['currcode'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['salestype'])){
- $Errors=VerifySalesType($CustomerDetails['salestype'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifySalesType($CustomerDetails['salestype'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['clientsince'])){
$Errors=VerifyClientSince($CustomerDetails['clientsince'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['holdreason'])){
- $Errors=VerifyHoldReason($CustomerDetails['holdreason'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyHoldReason($CustomerDetails['holdreason'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['paymentterms'])){
- $Errors=VerifyPaymentTerms($CustomerDetails['paymentterms'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyPaymentTerms($CustomerDetails['paymentterms'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['discount'])){
$Errors=VerifyDiscount($CustomerDetails['discount'], sizeof($Errors), $Errors);
@@ -479,7 +479,7 @@
$Errors=VerifyCustomerPOLine($CustomerDetails['customerpoline'], sizeof($Errors), $Errors);
}
if (isset($CustomerDetails['typeid'])){
- $Errors=VerifyCustomerType($CustomerDetails['typeid'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyCustomerType($CustomerDetails['typeid'], sizeof($Errors), $Errors);
}
$sql='UPDATE debtorsmaster SET ';
foreach ($CustomerDetails as $key => $value) {
@@ -508,7 +508,7 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $Errors = VerifyDebtorExists($DebtorNumber, sizeof($Errors), $Errors, $db);
+ $Errors = VerifyDebtorExists($DebtorNumber, sizeof($Errors), $Errors);
if (sizeof($Errors)!=0) {
return $Errors;
}
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2018-02-16 07:19:54 UTC (rev 7963)
+++ trunk/api/api_debtortransactions.php 2018-02-16 07:42:05 UTC (rev 7964)
@@ -3,7 +3,7 @@
/* Check that the transaction number is unique
* for this type of transaction*/
- function VerifyTransNo($TransNo, $Type, $i, $Errors, $db) {
+ function VerifyTransNo($TransNo, $Type, $i, $Errors) {
$Searchsql = "SELECT count(transno)
FROM debtortrans
WHERE type='".$Type."' and transno='".$TransNo . "'";
@@ -48,7 +48,7 @@
/* Check that the transaction date is a valid date. The date
* must be in the same format as the date format specified in the
* target webERP company */
- function VerifyTransactionDate($TranDate, $i, $Errors, $db) {
+ function VerifyTransactionDate($TranDate, $i, $Errors) {
$sql="SELECT confvalue FROM config WHERE confname='" . DefaultDateFormat ."'";
$result=DB_query($sql);
$myrow=DB_fetch_array($result);
@@ -84,7 +84,7 @@
/* Find the period number from the transaction date */
/* Why use this function over GetPeriod we already have this function included in DateFunctions.inc
* This function doesn't create periods if required so there is the danger of not being able to insert transactions*/
- function GetPeriodFromTransactionDate($TranDate, $i, $Errors, $db) {
+ function GetPeriodFromTransactionDate($TranDate, $i, $Errors) {
$sql="SELECT confvalue FROM config WHERE confname='DefaultDateFormat'";
$result=DB_query($sql);
$myrow=DB_fetch_array($result);
@@ -248,7 +248,7 @@
* This function also in SQL_CommonFunctions...better to use it from there as it covers all cases
* and not limited to stk='any'!!
*
- function GetSalesGLCode($salesarea, $partnumber, $db) {
+ function GetSalesGLCode($salesarea, $partnumber) {
$sql="SELECT salesglcode FROM salesglpostings
WHERE stkcat='any'";
$result=DB_query($sql);
@@ -503,8 +503,8 @@
}
- $Errors=VerifyDebtorExists($Header['debtorno'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyBranchNoExists($Header['debtorno'],$Header['branchcode'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDebtorExists($Header['debtorno'], sizeof($Errors), $Errors);
+ $Errors=VerifyBranchNoExists($Header['debtorno'],$Header['branchcode'], sizeof($Errors), $Errors);
/*Does not deal with serialised/lot track items - for use by POS */
/*Get Company Defaults */
$ReadCoyResult = api_DB_query("SELECT debtorsact,
@@ -549,7 +549,7 @@
/*Start an SQL transaction */
$result = DB_Txn_Begin();
/*Now Get the next credit note number - function in SQL_CommonFunctions*/
- $CreditNoteNo = GetNextTransNo(11, $db);
+ $CreditNoteNo = GetNextTransNo(11);
$PeriodNo = GetCurrentPeriod($db);
$TotalFXNetCredit = 0;
@@ -928,7 +928,7 @@
'" . $CreditNoteNo . "',
'" . $Header['trandate'] . "',
'" . $PeriodNo . "',
- '" . GetCOGSGLAccount($CN_Header['area'], $CN_Line['stockid'], $Header['tpe'], $db) . "',
+ '" . GetCOGSGLAccount($CN_Header['area'], $CN_Line['stockid'], $Header['tpe']) . "',
'" . $Header['debtorno'] . " - " . $CN_Line['stockid'] . " x " . $CN_Line['qty'] . " @ " . $StandardCost . "',
'" . ($StandardCost * $CN_Line['qty']) . "')";
@@ -959,7 +959,7 @@
if ($CompanyRecord['gllink_debtors']==1 AND $CN_Line['price'] !=0){
//Post sales transaction to GL credit sales
- $SalesGLAccounts = GetSalesGLAccount($CN_Header['area'], $CN_Line['stockid'], $Header['tpe'], $db);
+ $SalesGLAccounts = GetSalesGLAccount($CN_Header['area'], $CN_Line['stockid'], $Header['tpe']);
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -1189,16 +1189,16 @@
$InvoiceDetails[$key] = DB_escape_string($value);
}
$PartCode=$InvoiceDetails['partcode'];
- $Errors=VerifyStockCodeExists($PartCode, sizeof($Errors), $Errors, $db );
+ $Errors=VerifyStockCodeExists($PartCode, sizeof($Errors), $Errors );
unset($InvoiceDetails['partcode']);
$SalesArea=$InvoiceDetails['salesarea'];
unset($InvoiceDetails['salesarea']);
- $InvoiceDetails['transno']=GetNextTransactionNo(10, $db);
+ $InvoiceDetails['transno']=GetNextTransactionNo(10);
$InvoiceDetails['type'] = 10;
- $Errors=VerifyDebtorExists($InvoiceDetails['debtorno'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyBranchNoExists($InvoiceDetails['debtorno'],$InvoiceDetails['branchcode'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyTransNO($InvoiceDetails['transno'], 10, sizeof($Errors), $Errors, $db);
- $Errors=VerifyTransactionDate($InvoiceDetails['trandate'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDebtorExists($InvoiceDetails['debtorno'], sizeof($Errors), $Errors);
+ $Errors=VerifyBranchNoExists($InvoiceDetails['debtorno'],$InvoiceDetails['branchcode'], sizeof($Errors), $Errors);
+ $Errors=VerifyTransNO($InvoiceDetails['transno'], 10, sizeof($Errors), $Errors);
+ $Errors=VerifyTransactionDate($InvoiceDetails['trandate'], sizeof($Errors), $Errors);
if (isset($InvoiceDetails['settled'])){
$Errors=VerifySettled($InvoiceDetails['settled'], sizeof($Errors), $Errors);
}
@@ -1247,7 +1247,7 @@
$FieldNames='';
$FieldValues='';
$InvoiceDetails['trandate']=ConvertToSQLDate($InvoiceDetails['trandate']);
- $InvoiceDetails['prd']=GetPeriodFromTransactionDate($InvoiceDetails['trandate'], sizeof($Errors), $Errors, $db);
+ $InvoiceDetails['prd']=GetPeriodFromTransactionDate($InvoiceDetails['trandate'], sizeof($Errors), $Errors);
foreach ($InvoiceDetails as $key => $value) {
$FieldNames.=$key.', ';
$FieldValues.='"'.$value.'", ';
@@ -1257,13 +1257,13 @@
$sql = "INSERT INTO debtortrans (" . mb_substr($FieldNames,0,-2) .")
VALUES ('" . mb_substr($FieldValues,0,-2) ."') ";
$result = DB_query($sql);
- $sql = "UPDATE systypes SET typeno='" . GetNextTransactionNo(10, $db) . "' WHERE typeid=10";
+ $sql = "UPDATE systypes SET typeno='" . GetNextTransactionNo(10) . "' WHERE typeid=10";
$result = DB_query($sql);
- $SalesGLCode=GetSalesGLCode($SalesArea, $PartCode, $db);
+ $SalesGLCode=GetSalesGLCode($SalesArea, $PartCode);
$DebtorsGLCode=GetDebtorsGLCode($db);
$sql="INSERT INTO gltrans VALUES(null,
10,
- '" . GetNextTransactionNo(10, $db) . "',
+ '" . GetNextTransactionNo(10) . "',
0,
'" . $InvoiceDetails['trandate'] ."',
'" . $InvoiceDetails['prd'] . "',
@@ -1276,7 +1276,7 @@
$result = api_DB_query($sql);
$sql="INSERT INTO gltrans VALUES(null,
10,
- '" . GetNextTransactionNo(10, $db) . "',
+ '" . GetNextTransactionNo(10) . "',
0,
'" . $InvoiceDetails['trandate'] ."',
'" . $InvoiceDetails['prd'] . "',
@@ -1319,7 +1319,7 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $Errors=VerifyDebtorExists($AllocDetails['debtorno'], sizeof($Errors), $Errors, $db);
+ $Errors=VerifyDebtorExists($AllocDetails['debtorno'], sizeof($Errors), $Errors);
/*Get the outstanding amount to allocate (all amounts in FX) from the transaction*/
if ($AllocDetails['type'] !='11' AND $AllocDetails['type'] !=12){
@@ -1487,16 +1487,16 @@
$CreditDetails[$key] = DB_escape_string($value);
}
$PartCode=$CreditDetails['partcode'];
- $Errors=VerifyStockCodeExists($PartCode, sizeof($Errors), $Errors, $db );
+ $Errors=VerifyStockCodeExists($PartCode, sizeof($Errors), $Errors );
unset($CreditDetails['partcode']);
$SalesArea=$CreditDetails['salesarea'];
unset($CreditDetails['salesarea']);
- $CreditDetails['transno']=GetNextTransactionNo(11, $db);
+ $CreditDetails['transno']=GetNextTransactionNo(11);
$CreditDetails['type'] = 10;
- $Errors=VerifyDebtorExists($CreditDetails['debtorno'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyBranchNoExists($CreditDetails['debtorno'],$CreditDetails['branchcode'], sizeof($Errors), $Errors, $db);
- $Errors=VerifyTransNO($CreditDetails['transno'], 10, sizeof($Errors), $Errors, $db);
- $Errors=VerifyTransactionDate($Cr...
[truncated message content] |
|
From: <tu...@us...> - 2018-02-16 20:53:55
|
Revision: 7965
http://sourceforge.net/p/web-erp/reponame/7965
Author: turbopt
Date: 2018-02-16 20:53:52 +0000 (Fri, 16 Feb 2018)
Log Message:
-----------
Paul Becker (PaulT commit): header.php: Add link to the Dashboard in the AppInfoUserDiv. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8100)
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/header.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-16 07:42:05 UTC (rev 7964)
+++ trunk/doc/Change.log 2018-02-16 20:53:52 UTC (rev 7965)
@@ -1,5 +1,6 @@
webERP Change Log
+16/2/18 Paul Becker (PaulT commit): header.php: Add link to the Dashboard in the AppInfoUserDiv. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8100)
16/2/18 PaulT: Remove unused $db parameter from many functions within the /api area.
16/2/18 PaulT: upgrade4.14.1-4.14.2.sql: Add SQL update to support commit 7961.
16/2/18 Paul Becker (PaulT commit): AgedControlledInventory.php: Add UOM to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8091&pid=14286#pid14286)
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2018-02-16 07:42:05 UTC (rev 7964)
+++ trunk/includes/header.php 2018-02-16 20:53:52 UTC (rev 7965)
@@ -12,8 +12,8 @@
}
}
- $ViewTopic = isset($ViewTopic)?'?ViewTopic=' . $ViewTopic : '';
- $BookMark = isset($BookMark)? '#' . $BookMark : '';
+ $ViewTopic = isset($ViewTopic) ? '?ViewTopic=' . $ViewTopic : '';
+ $BookMark = isset($BookMark) ? '#' . $BookMark : '';
$StrictXHTML=False;
if (!headers_sent()){
@@ -28,10 +28,10 @@
}
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
'<html xmlns="http://www.w3.org/1999/xhtml">',
-
'<head>',
'<link rel="icon" href="', $RootPath, '/favicon.ico" />',
'<link rel="shortcut icon" href="', $RootPath, '/favicon.ico" />';
+
if ($StrictXHTML) {
echo '<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />';
} else {
@@ -38,18 +38,19 @@
echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />';
}
- echo '<link href="', $RootPath, '/css/menu.css" rel="stylesheet" type="text/css" />';
- echo '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />',
- '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
- '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).
- '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
- '<title>', $Title, '</title>';
+ echo '<link href="', $RootPath, '/css/menu.css" rel="stylesheet" type="text/css" />',
+ '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />',
+ '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
+ '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).
+ '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
+ '<title>', $Title, '</title>';
+
// If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text:
if(isset($_SESSION['ShowPageHelp']) AND !$_SESSION['ShowPageHelp']) {
- echo '<style>.page_help_text, DIV.page_help_text {display:none;}</style>';
+ echo '<style>.page_help_text, div.page_help_text {display:none;}</style>';
}
+
echo '</head>',
-
'<body>',
'<div id="CanvasDiv">',
'<input type="hidden" name="Lang" id="Lang" value="', $Lang, '" />',
@@ -57,36 +58,36 @@
'<div id="HeaderWrapDiv">';
if (isset($Title)) {
- echo '<div id="AppInfoDiv">'; //===HJ===
- echo '<div id="AppInfoCompanyDiv">';
- echo '<img alt="'._('Company').'" src="'.$RootPath.'/css/'.$_SESSION['Theme'].'/images/company.png" title="'._('Company').'" />' . stripslashes($_SESSION['CompanyRecord']['coyname']);
- echo '</div>';
- echo '<div id="AppInfoUserDiv">';
- echo '<a href="'.$RootPath.'/UserSettings.php"><img alt="'._('User').'" src="'.$RootPath.'/css/'.$_SESSION['Theme'].'/images/user.png" title="'._('User').'" />' . stripslashes($_SESSION['UsersRealName']) . '</a>';
- echo '</div>';
- echo '<div id="AppInfoModuleDiv">';
+ echo '<div id="AppInfoDiv">', //===HJ===
+ '<div id="AppInfoCompanyDiv">',
+ '<img alt="', _('Company'), '" src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/company.png" title="', _('Company'), '" /> ', stripslashes($_SESSION['CompanyRecord']['coyname']),
+ '</div>',
+ '<div id="AppInfoUserDiv">',
+ '<a href="', $RootPath, '/UserSettings.php"> <img alt="', _('User'), '" src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/user.png" title="', _('User'), '" /> ', stripslashes($_SESSION['UsersRealName']), '</a>',
+ ' | <a href="', $RootPath, '/Dashboard.php">', _('Dashboard'), '</a>',
+ '</div>',
+ '<div id="AppInfoModuleDiv">';
// Make the title text a class, can be set to display:none is some themes
echo $Title;
- echo '</div>';
- echo '</div>'; // AppInfoDiv
+ echo '</div>',
+ '</div>'; // AppInfoDiv
+ echo '<div id="QuickMenuDiv">
+ <ul id="menu">
+ <li><a href="', $RootPath, '/index.php">', _('Main Menu'), '</a>';
- echo '<div id="QuickMenuDiv"><ul id="menu">';
-
- echo '<li><a href="'.$RootPath.'/index.php">' . _('Main Menu') . '</a>';
if (isset($_POST['AddToMenu'])) {
if (!isset($_SESSION['Favourites'][$_POST['ScriptName']])) {
- $_SESSION['Favourites'][$_POST['ScriptName']] = $_POST['Title'];
- }
+ $_SESSION['Favourites'][$_POST['ScriptName']] = $_POST['Title'];
+ }
}
if (isset($_POST['DelFromMenu'])) {
unset($_SESSION['Favourites'][$_POST['ScriptName']]);
}
if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) {
- echo '<ul>';
- foreach ($_SESSION['Favourites'] as $url=>$ttl) {
- echo '<li><a href="' . $url . '">' . _($ttl) . '<a></li>';
-
+ echo '<ul>';
+ foreach ($_SESSION['Favourites'] as $url=>$ttl) {
+ echo '<li><a href="', $url, '">', _($ttl), '<a></li>';
}
echo '</ul>';
}
@@ -93,9 +94,9 @@
echo '</li>'; //take off inline formatting, use CSS instead ===HJ===
if (count($_SESSION['AllowedPageSecurityTokens'])>1){
- echo '<li><a href="'.$RootPath.'/SelectCustomer.php">' . _('Customers') . '</a></li>';
- echo '<li><a href="'.$RootPath.'/SelectProduct.php">' . _('Items') . '</a></li>';
- echo '<li><a href="'.$RootPath.'/SelectSupplier.php">' . _('Suppliers') . '</a></li>';
+ echo '<li><a href="', $RootPath, '/SelectCustomer.php">', _('Customers'), '</a></li>';
+ echo '<li><a href="', $RootPath, '/SelectProduct.php">', _('Items'), '</a></li>';
+ echo '<li><a href="', $RootPath, '/SelectSupplier.php">', _('Suppliers'), '</a></li>';
/* $DefaultManualLink = '<li><a rel="external" accesskey="8" href="' . $RootPath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
if (mb_substr($_SESSION['Language'],0,2) != 'en'){
if (file_exists('locale/'.$_SESSION['Language'].'/Manual/ManualContents.php')){
@@ -109,13 +110,13 @@
echo '<li><a href="', $RootPath, '/ManualContents.php', $ViewTopic, $BookMark, '" rel="external" accesskey="8">', _('Manual'), '</a></li>';
}
- echo '<li><a href="'.$RootPath.'/Logout.php" onclick="return confirm(\''._('Are you sure you wish to logout?').'\');">' . _('Logout') . '</a></li>';
+ echo '<li><a href="', $RootPath, '/Logout.php" onclick="return confirm(\'', _('Are you sure you wish to logout?'), '\');">', _('Logout'), '</a></li>';
echo '</ul></div>'; // QuickMenuDiv
}
- echo '</div>',// Close HeaderWrapDiv
+ echo '</div>',// Close HeaderWrapDiv
'</div>',// Close Headerdiv
'<div id="BodyDiv">',
'<div id="BodyWrapDiv">';
-?>
+?>
\ No newline at end of file
|
|
From: <tu...@us...> - 2018-02-17 17:02:40
|
Revision: 7969
http://sourceforge.net/p/web-erp/reponame/7969
Author: turbopt
Date: 2018-02-17 17:02:36 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
FixedAssetLocations.php: Move closing condition brace to cover entire table output to avoid a stray closing table tag output if the condition is not met. Also, replace some style attributes with equivalent CSS.
Modified Paths:
--------------
trunk/FixedAssetLocations.php
trunk/doc/Change.log
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2018-02-17 16:44:24 UTC (rev 7968)
+++ trunk/FixedAssetLocations.php 2018-02-17 17:02:36 UTC (rev 7969)
@@ -99,26 +99,27 @@
<th class="ascending">' . _('Location Description') . '</th>
<th class="ascending">' . _('Parent Location') . '</th>
</tr>';
+
+ while ($myrow=DB_fetch_array($result)) {
+ echo '<tr>
+ <td>' . $myrow['locationid'] . '</td>
+ <td>' . $myrow['locationdescription'] . '</td>';
+ $ParentSql="SELECT locationdescription FROM fixedassetlocations WHERE locationid='".$myrow['parentlocationid']."'";
+ $ParentResult=DB_query($ParentSql);
+ $ParentRow=DB_fetch_array($ParentResult);
+ echo '<td>' . $ParentRow['locationdescription'] . '</td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedLocation=', urlencode($myrow['locationid']), '">', _('Edit'), '</a></td></tr>';
+ }
+
+ echo '</table>';
}
-while ($myrow=DB_fetch_array($result)) {
- echo '<tr>
- <td>' . $myrow['locationid'] . '</td>
- <td>' . $myrow['locationdescription'] . '</td>';
- $ParentSql="SELECT locationdescription FROM fixedassetlocations WHERE locationid='".$myrow['parentlocationid']."'";
- $ParentResult=DB_query($ParentSql);
- $ParentRow=DB_fetch_array($ParentResult);
- echo '<td>' . $ParentRow['locationdescription'] . '</td>
- <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</a></td></tr>';
-}
-echo '</table>
- <br />';
-echo '<form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ echo '<br /><form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
- <th style="text-align:left">' . _('Location ID') . '</th>';
+ <th class="text">' . _('Location ID') . '</th>';
if (isset($_GET['SelectedLocation'])) {
echo '<input type="hidden" name="LocationID" value="'.$LocationID.'" />';
echo '<td>' . $LocationID . '</td>';
@@ -128,11 +129,11 @@
}
echo '<tr>
- <th style="text-align:left">' . _('Location Description') . '</th>
+ <th class="text">' . _('Location Description') . '</th>
<td><input type="text" name="LocationDescription" required="required" title="' . _('Enter the fixed asset location description. Up to 20 characters') . '" size="20" value="'.$LocationDescription.'" /></td>
</tr>
<tr>
- <th style="text-align:left">' . _('Parent Location') . '</th>
+ <th class="text">' . _('Parent Location') . '</th>
<td><select name="ParentLocationID">';
$sql="SELECT locationid, locationdescription FROM fixedassetlocations";
@@ -153,9 +154,8 @@
echo '<div class="centre">';
if (isset($_GET['SelectedLocation'])) {
- echo '<input type="submit" name="update" value="' . _('Update Information') . '" />';
- echo '<br />
- <br />
+ echo '<input type="submit" name="update" value="' . _('Update Information') . '" />
+ <br /><br />
<input type="submit" name="delete" value="' . _('Delete This Location') . '" />';
} else {
echo '<input type="submit" name="submit" value="' . _('Enter Information') . '" />';
@@ -165,4 +165,4 @@
</form>';
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 16:44:24 UTC (rev 7968)
+++ trunk/doc/Change.log 2018-02-17 17:02:36 UTC (rev 7969)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: FixedAssetLocations.php: Move closing condition brace to cover entire table output to avoid a stray closing table tag output if the condition is not met. Also, replace some style attributes with equivalent CSS.
17/2/18 PaulT: MaintenanceUserSchedule.php: Fix closing tag mismatch.
17/2/18 PaulT: GLJournalInquiry.php: Add missing = to value attribute.
17/02/18 Exson: Fixed the DB_escape_string bug for Array in session.inc and destroy cookie while users log out in Logout.php
|
|
From: <tu...@us...> - 2018-02-17 15:44:59
|
Revision: 7967
http://sourceforge.net/p/web-erp/reponame/7967
Author: turbopt
Date: 2018-02-17 15:44:56 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
GLJournalInquiry.php: Add missing = to value attribute.
Modified Paths:
--------------
trunk/GLJournalInquiry.php
trunk/doc/Change.log
Modified: trunk/GLJournalInquiry.php
===================================================================
--- trunk/GLJournalInquiry.php 2018-02-17 15:15:22 UTC (rev 7966)
+++ trunk/GLJournalInquiry.php 2018-02-17 15:44:56 UTC (rev 7967)
@@ -63,7 +63,7 @@
</tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Show" value"' . _('Show transactions'). '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="Show" value="' . _('Show transactions'). '" /></div>';
echo '</form>';
} else {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 15:15:22 UTC (rev 7966)
+++ trunk/doc/Change.log 2018-02-17 15:44:56 UTC (rev 7967)
@@ -1,4 +1,6 @@
webERP Change Log
+
+17/2/18 PaulT: GLJournalInquiry.php: Add missing = to value attribute.
17/02/18 Exson: Fixed the DB_escape_string bug for Array in session.inc and destroy cookie while users log out in Logout.php
16/2/18 Paul Becker (PaulT commit): header.php: Add link to the Dashboard in the AppInfoUserDiv. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8100)
16/2/18 PaulT: Remove unused $db parameter from many functions within the /api area.
|
|
From: <tu...@us...> - 2018-02-17 16:44:27
|
Revision: 7968
http://sourceforge.net/p/web-erp/reponame/7968
Author: turbopt
Date: 2018-02-17 16:44:24 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
MaintenanceUserSchedule.php: Fix closing tag mismatch.
Modified Paths:
--------------
trunk/MaintenanceUserSchedule.php
trunk/doc/Change.log
Modified: trunk/MaintenanceUserSchedule.php
===================================================================
--- trunk/MaintenanceUserSchedule.php 2018-02-17 15:44:56 UTC (rev 7967)
+++ trunk/MaintenanceUserSchedule.php 2018-02-17 16:44:24 UTC (rev 7968)
@@ -49,7 +49,7 @@
<th>' . _('Asset') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Last Completed') . '</th>
- <th>' . _('Due By') . '</td>
+ <th>' . _('Due By') . '</th>
<th>' . _('Person') . '</th>
<th>' . _('Manager') . '</th>
<th>' . _('Now Complete') . '</th>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 15:44:56 UTC (rev 7967)
+++ trunk/doc/Change.log 2018-02-17 16:44:24 UTC (rev 7968)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: MaintenanceUserSchedule.php: Fix closing tag mismatch.
17/2/18 PaulT: GLJournalInquiry.php: Add missing = to value attribute.
17/02/18 Exson: Fixed the DB_escape_string bug for Array in session.inc and destroy cookie while users log out in Logout.php
16/2/18 Paul Becker (PaulT commit): header.php: Add link to the Dashboard in the AppInfoUserDiv. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8100)
|
|
From: <tu...@us...> - 2018-02-17 19:26:19
|
Revision: 7973
http://sourceforge.net/p/web-erp/reponame/7973
Author: turbopt
Date: 2018-02-17 19:26:16 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
header.php: Set the DOCTYPE to html5 declaration format, update the meta tag with Content-Type info, and add localStorage with DateFormat and Theme for upcoming changes to table column sorting and calendar handling improvements.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/header.php
Property Changed:
----------------
trunk/includes/header.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 18:45:53 UTC (rev 7972)
+++ trunk/doc/Change.log 2018-02-17 19:26:16 UTC (rev 7973)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: header.php: Set the DOCTYPE to html5 declaration format, update the meta tag with Content-Type info, and add localStorage with DateFormat and Theme for upcoming changes to table column sorting and calendar handling improvements.
17/2/18 PaulT: CustomerAllocations.php: Minor code shuffle to fix view page source message "Start tag 'div' seen in 'table'" reported in Firefox.
17/2/18 PaulT: Customers.php, ShopParameters.php: Fix view page source message "No space between attributes" reported in Firefox.
17/2/18 PaulT: Labels.php: Remove extra closing </td></tr> tag pair.
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2018-02-17 18:45:53 UTC (rev 7972)
+++ trunk/includes/header.php 2018-02-17 19:26:16 UTC (rev 7973)
@@ -1,5 +1,5 @@
<?php
-/* $Id: header.php 7744 2017-03-29 15:43:41Z rchacon $ */
+/* $Id$ */
// Titles and screen header
// Needs the file config.php loaded where the variables are defined for
@@ -14,40 +14,34 @@
$ViewTopic = isset($ViewTopic) ? '?ViewTopic=' . $ViewTopic : '';
$BookMark = isset($BookMark) ? '#' . $BookMark : '';
- $StrictXHTML=False;
- if (!headers_sent()){
- if ($StrictXHTML) {
- header('Content-type: application/xhtml+xml; charset=utf-8');
- } else {
- header('Content-type: text/html; charset=utf-8');
- }
- }
- if($Title == _('Copy a BOM to New Item Code')){//solve the cannot modify heaer information in CopyBOM.php scritps
+ if(isset($Title) && $Title == _('Copy a BOM to New Item Code')){//solve the cannot modify header information in CopyBOM.php scripts
ob_start();
}
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
- '<html xmlns="http://www.w3.org/1999/xhtml">',
- '<head>',
- '<link rel="icon" href="', $RootPath, '/favicon.ico" />',
- '<link rel="shortcut icon" href="', $RootPath, '/favicon.ico" />';
- if ($StrictXHTML) {
- echo '<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />';
- } else {
- echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />';
- }
+ echo '<!DOCTYPE html>';
- echo '<link href="', $RootPath, '/css/menu.css" rel="stylesheet" type="text/css" />',
- '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />',
- '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
- '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).
- '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
- '<title>', $Title, '</title>';
+ echo '<head>
+ <meta http-equiv="Content-Type" content="application/html; charset=utf-8; cache-control: no-cache, no-store, must-revalidate; Pragma: no-cache" />
+ <title>', $Title, '</title>
+ <link rel="icon" href="', $RootPath, '/favicon.ico" />
+ <link href="', $RootPath, '/css/menu.css" rel="stylesheet" type="text/css" />
+ <link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />
+ <link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <script defer="defer" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>
+ <script>
+ localStorage.setItem("DateFormat", "', $_SESSION['DefaultDateFormat'], '");
+ localStorage.setItem("Theme", "', $_SESSION['Theme'], '");
+ </script>';
// If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text:
if(isset($_SESSION['ShowPageHelp']) AND !$_SESSION['ShowPageHelp']) {
- echo '<style>.page_help_text, div.page_help_text {display:none;}</style>';
+ echo '<style>
+ .page_help_text, div.page_help_text {
+ display:none;
+ }
+ </style>';
}
echo '</head>',
@@ -81,9 +75,11 @@
$_SESSION['Favourites'][$_POST['ScriptName']] = $_POST['Title'];
}
}
+
if (isset($_POST['DelFromMenu'])) {
unset($_SESSION['Favourites'][$_POST['ScriptName']]);
}
+
if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) {
echo '<ul>';
foreach ($_SESSION['Favourites'] as $url=>$ttl) {
@@ -91,6 +87,7 @@
}
echo '</ul>';
}
+
echo '</li>'; //take off inline formatting, use CSS instead ===HJ===
if (count($_SESSION['AllowedPageSecurityTokens'])>1){
Property changes on: trunk/includes/header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
|
|
From: <tu...@us...> - 2018-02-17 17:46:26
|
Revision: 7970
http://sourceforge.net/p/web-erp/reponame/7970
Author: turbopt
Date: 2018-02-17 17:46:23 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
Labels.php: Remove extra closing </td></tr> tag pair.
Modified Paths:
--------------
trunk/Labels.php
trunk/doc/Change.log
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2018-02-17 17:02:36 UTC (rev 7969)
+++ trunk/Labels.php 2018-02-17 17:46:23 UTC (rev 7970)
@@ -522,7 +522,7 @@
<td>' . _('Column Width') . ' - (Cw):</td>
<td><input type="text" name="ColumnWidth" size="4" maxlength="4" value="' . $_POST['ColumnWidth'] . '" /></td>
</tr>
- </table></td></tr>
+ </table>
</td></tr>
</table>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 17:02:36 UTC (rev 7969)
+++ trunk/doc/Change.log 2018-02-17 17:46:23 UTC (rev 7970)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: Labels.php: Remove extra closing </td></tr> tag pair.
17/2/18 PaulT: FixedAssetLocations.php: Move closing condition brace to cover entire table output to avoid a stray closing table tag output if the condition is not met. Also, replace some style attributes with equivalent CSS.
17/2/18 PaulT: MaintenanceUserSchedule.php: Fix closing tag mismatch.
17/2/18 PaulT: GLJournalInquiry.php: Add missing = to value attribute.
|
|
From: <tu...@us...> - 2018-02-17 18:22:42
|
Revision: 7971
http://sourceforge.net/p/web-erp/reponame/7971
Author: turbopt
Date: 2018-02-17 18:22:39 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
Customers.php, ShopParameter.php: Fix view page source message "No space between attributes" reported in Firefox.
Modified Paths:
--------------
trunk/Customers.php
trunk/ShopParameters.php
trunk/doc/Change.log
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2018-02-17 17:46:23 UTC (rev 7970)
+++ trunk/Customers.php 2018-02-17 18:22:39 UTC (rev 7971)
@@ -457,7 +457,7 @@
if ($_SESSION['AutoDebtorNo']==0) {
echo '<tr>
<td>' . _('Customer Code') . ':</td>
- <td><input type="text" data-type="no-illegal-chars" tabindex="1" name="DebtorNo" required="required" autofocus="autofocus"title ="'._('Up to 10 characters for the customer code. The following characters are prohibited:') . ' \' " + . & \\ > <" placeholder="'._('alpha-numeric').'" size="11" maxlength="10" /></td></tr>';
+ <td><input type="text" data-type="no-illegal-chars" tabindex="1" name="DebtorNo" required="required" autofocus="autofocus" title ="'._('Up to 10 characters for the customer code. The following characters are prohibited:') . ' \' " + . & \\ > <" placeholder="'._('alpha-numeric').'" size="11" maxlength="10" /></td></tr>';
}
echo '<tr>
Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php 2018-02-17 17:46:23 UTC (rev 7970)
+++ trunk/ShopParameters.php 2018-02-17 18:22:39 UTC (rev 7971)
@@ -238,7 +238,7 @@
// Shop Customer
echo '<tr>
<td>' . _('Default Web Shop Customer Acount') . ':</td>
- <td><input type="text"size="12" maxlength="10" required="required" name="X_ShopDebtorNo" value="' . $_SESSION['ShopDebtorNo'] . '" /></td>
+ <td><input type="text" size="12" maxlength="10" required="required" name="X_ShopDebtorNo" value="' . $_SESSION['ShopDebtorNo'] . '" /></td>
<td>' . _('Select the customer account that is to be used for the web-store sales') . '</td>
</tr>';
// Shop Customer Branch
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 17:46:23 UTC (rev 7970)
+++ trunk/doc/Change.log 2018-02-17 18:22:39 UTC (rev 7971)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: Customers.php, ShopParameters.php: Fix view page source message "No space between attributes" reported in Firefox.
17/2/18 PaulT: Labels.php: Remove extra closing </td></tr> tag pair.
17/2/18 PaulT: FixedAssetLocations.php: Move closing condition brace to cover entire table output to avoid a stray closing table tag output if the condition is not met. Also, replace some style attributes with equivalent CSS.
17/2/18 PaulT: MaintenanceUserSchedule.php: Fix closing tag mismatch.
|
|
From: <tu...@us...> - 2018-02-17 18:45:56
|
Revision: 7972
http://sourceforge.net/p/web-erp/reponame/7972
Author: turbopt
Date: 2018-02-17 18:45:53 +0000 (Sat, 17 Feb 2018)
Log Message:
-----------
CustomerAllocations.php: Minor code shuffle to fix view page source message "Start tag 'div' seen in 'table'" reported in Firefox.
Modified Paths:
--------------
trunk/CustomerAllocations.php
trunk/doc/Change.log
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2018-02-17 18:22:39 UTC (rev 7971)
+++ trunk/CustomerAllocations.php 2018-02-17 18:45:53 UTC (rev 7972)
@@ -544,71 +544,75 @@
$result = DB_query($SQL);
$NoOfUnallocatedTrans = DB_num_rows($result);
- $CurrentTransaction = 1;
- $CurrentDebtor = '';
- echo '<table class="selection">';
- echo $TableHeader;
- while ($myrow = DB_fetch_array($result)) {
+ if ($NoOfUnallocatedTrans == 0) {
+ prnMsg(_('There are no allocations to be done'),'info');
+ }
+ else {
+ $CurrentTransaction = 1;
+ $CurrentDebtor = '';
+ echo '<table class="selection">';
+ echo $TableHeader;
- $AllocateLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '">' . _('Allocate') . '</a>';
+ while ($myrow = DB_fetch_array($result)) {
- if ( $CurrentDebtor != $myrow['debtorno'] ) {
- if ( $CurrentTransaction > 1 ) {
- echo '<tr class="striped_row">
- <td colspan="7" class="number"><b>' . locale_number_format($Balance,$CurrDecimalPlaces) . '</b></td>
- <td><b>' . $CurrCode . '</b></td>
- <td><b>' . _('Balance') . '</b></td>
- </tr>';
+ $AllocateLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '">' . _('Allocate') . '</a>';
+
+ if ( $CurrentDebtor != $myrow['debtorno'] ) {
+ if ( $CurrentTransaction > 1 ) {
+ echo '<tr class="striped_row">
+ <td colspan="7" class="number"><b>' . locale_number_format($Balance,$CurrDecimalPlaces) . '</b></td>
+ <td><b>' . $CurrCode . '</b></td>
+ <td><b>' . _('Balance') . '</b></td>
+ </tr>';
+ }
+
+ $Balance = 0;
+ $CurrentDebtor = $myrow['debtorno'];
+
+ $BalSQL= "SELECT SUM(ovamount+ovgst+ovfreight+ovdiscount-alloc) as total
+ FROM debtortrans
+ WHERE (type=12 OR type=11)
+ AND debtorno='" . $myrow['debtorno'] . "'
+ AND ovamount<0";
+ $BalResult = DB_query($BalSQL);
+ $BalRow = DB_fetch_array($BalResult);
+ $Balance = $BalRow['total'];
}
+ $CurrentTransaction++;
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ if (isset($Balance) AND abs($Balance) < -0.01 ) {
+ $AllocateLink = ' ';
+ }
- $Balance = 0;
- $CurrentDebtor = $myrow['debtorno'];
+ echo '<tr class="striped_row">
+ <td>' . _($myrow['typename']) . '</td>
+ <td>' . $myrow['name'] . '</td>
+ <td>' . $myrow['debtorno'] . '</td>
+ <td>' . $myrow['transno'] . '</td>
+ <td>' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td class="number">' . locale_number_format($myrow['total'],$CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$CurrDecimalPlaces) . '</td>
+ <td>' . $CurrCode . '</td>
+ <td>' . $AllocateLink . '</td>
+ </tr>';
- $BalSQL= "SELECT SUM(ovamount+ovgst+ovfreight+ovdiscount-alloc) as total
- FROM debtortrans
- WHERE (type=12 OR type=11)
- AND debtorno='" . $myrow['debtorno'] . "'
- AND ovamount<0";
- $BalResult = DB_query($BalSQL);
- $BalRow = DB_fetch_array($BalResult);
- $Balance = $BalRow['total'];
+ } //end loop around unallocated receipts and credit notes
+
+ if (!isset($Balance)) {
+ $Balance=0;
}
- $CurrentTransaction++;
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- if (isset($Balance) AND abs($Balance) < -0.01 ) {
- $AllocateLink = ' ';
- }
echo '<tr class="striped_row">
- <td>' . _($myrow['typename']) . '</td>
- <td>' . $myrow['name'] . '</td>
- <td>' . $myrow['debtorno'] . '</td>
- <td>' . $myrow['transno'] . '</td>
- <td>' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td class="number">' . locale_number_format($myrow['total'],$CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$CurrDecimalPlaces) . '</td>
- <td>' . $CurrCode . '</td>
- <td>' . $AllocateLink . '</td>
- </tr>';
-
- } //end loop around unallocated receipts and credit notes
-
- if (!isset($Balance)) {
- $Balance=0;
- }
- if ($NoOfUnallocatedTrans == 0) {
- prnMsg(_('There are no allocations to be done'),'info');
- } else {
- echo '<tr class="striped_row">
<td colspan="7" class="number"><b>' . locale_number_format($Balance,$CurrDecimalPlaces) . '</b></td>
<td><b>' . $CurrCode . '</b></td>
<td><b>' . _('Balance') . '</b></td>
- </tr>';
+ </tr>
+ </table>';
}
- echo '</table>
- <br />';
+
+ echo '<br />';
}
include('includes/footer.php');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 18:22:39 UTC (rev 7971)
+++ trunk/doc/Change.log 2018-02-17 18:45:53 UTC (rev 7972)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: CustomerAllocations.php: Minor code shuffle to fix view page source message "Start tag 'div' seen in 'table'" reported in Firefox.
17/2/18 PaulT: Customers.php, ShopParameters.php: Fix view page source message "No space between attributes" reported in Firefox.
17/2/18 PaulT: Labels.php: Remove extra closing </td></tr> tag pair.
17/2/18 PaulT: FixedAssetLocations.php: Move closing condition brace to cover entire table output to avoid a stray closing table tag output if the condition is not met. Also, replace some style attributes with equivalent CSS.
|
|
From: <tu...@us...> - 2018-02-18 01:29:22
|
Revision: 7974
http://sourceforge.net/p/web-erp/reponame/7974
Author: turbopt
Date: 2018-02-18 01:25:58 +0000 (Sun, 18 Feb 2018)
Log Message:
-----------
Tim (PaulT commit): MiscFunctions.js: Set the calendar click and change handlers to reference the localStorage DateFormat instead of the element's "alt" attribute value. (Know that this update requires the localStorage change applied with commit 7973)
Modified Paths:
--------------
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-17 19:26:16 UTC (rev 7973)
+++ trunk/doc/Change.log 2018-02-18 01:25:58 UTC (rev 7974)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 Tim (PaulT commit): MiscFunctions.js: Set the calendar click and change handlers to reference the localStorage DateFormat instead of the element's "alt" attribute value. (Know that this update requires the localStorage change applied with commit 7973)
17/2/18 PaulT: header.php: Set the DOCTYPE to html5 declaration format, update the meta tag with Content-Type info, and add localStorage with DateFormat and Theme for upcoming changes to table column sorting and calendar handling improvements.
17/2/18 PaulT: CustomerAllocations.php: Minor code shuffle to fix view page source message "Start tag 'div' seen in 'table'" reported in Firefox.
17/2/18 PaulT: Customers.php, ShopParameters.php: Fix view page source message "No space between attributes" reported in Firefox.
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2018-02-17 19:26:16 UTC (rev 7973)
+++ trunk/javascripts/MiscFunctions.js 2018-02-18 01:25:58 UTC (rev 7974)
@@ -282,11 +282,11 @@
}
function clickDate() {
- Calendar(this.name, this.alt);
+ Calendar(this.name, localStorage.DateFormat);
}
function changeDate() {
- isDate(this.value, this.alt);
+ isDate(this.value, localStorage.DateFormat);
}
function SortSelect() {
@@ -368,8 +368,8 @@
var ds=document.getElementsByTagName("input");
for(i=0;i<ds.length;i++) {
if(ds[i].className=="date") {
- ds[i].onclick=clickDate;
- ds[i].onchange=changeDate;
+ ds[i].onclick = clickDate;
+ ds[i].onchange = changeDate;
}
if(ds[i].getAttribute("data-type") == 'no-illegal-chars') ds[i].pattern="(?!^ +$)[^?\'\u0022+.&\\\\><]*";
if(ds[i].className=="number") ds[i].onkeypress=rTN;
|
|
From: <tu...@us...> - 2018-02-18 02:30:44
|
Revision: 7975
http://sourceforge.net/p/web-erp/reponame/7975
Author: turbopt
Date: 2018-02-18 02:30:38 +0000 (Sun, 18 Feb 2018)
Log Message:
-----------
PaulT: PO_SelectOSPurchOrder.php: Derived from Tim's code: add default current dates. (there may not yet be any purchorders records) / PaulT: do not show the order list table when there are no records to show. (avoids a table heading output without any associated row data)
Modified Paths:
--------------
trunk/PO_SelectOSPurchOrder.php
trunk/doc/Change.log
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2018-02-18 01:25:58 UTC (rev 7974)
+++ trunk/PO_SelectOSPurchOrder.php 2018-02-18 02:30:38 UTC (rev 7975)
@@ -156,8 +156,13 @@
FROM purchorders";
$DateResult = DB_query($DateSQL);
$DateRow = DB_fetch_array($DateResult);
- $DateFrom = $DateRow['fromdate'];
- $DateTo = $DateRow['todate'];
+ if ($DateRow['fromdate'] != null) {
+ $DateFrom = $DateRow['fromdate'];
+ $DateTo = $DateRow['todate'];
+ } else {
+ $DateFrom = date('Y-m-d');
+ $DateTo = date('Y-m-d');
+ }
} else {
$DateFrom = FormatDateForSQL($_POST['DateFrom']);
$DateTo = FormatDateForSQL($_POST['DateTo']);
@@ -581,96 +586,98 @@
$ErrMsg = _('No orders were returned by the SQL because');
$PurchOrdersResult = DB_query($SQL, $ErrMsg);
- /*show a table of the orders returned by the SQL */
+ if (DB_num_rows($PurchOrdersResult) > 0) {
+ /*show a table of the orders returned by the SQL */
- echo '<table cellpadding="2" width="97%" class="selection">';
+ echo '<table cellpadding="2" width="97%" class="selection">';
- if (isset($_POST['PODetails'])) {
- $BalHead = '<th class="ascending">' . _('Balance') .' (' . _('Stock ID') . '--' . _('Quantity') . ' )</th>';
- } else {
- $BalHead = '';
- }
- echo '<tr>
- <th class="ascending">' . _('Order #') . '</th>
- <th class="ascending">' . _('Order Date') . '</th>
- <th class="ascending">' . _('Delivery Date') . '</th>
- <th class="ascending">' . _('Initiated by') . '</th>
- <th class="ascending">' . _('Supplier') . '</th>
- ' . $BalHead . '
- <th class="ascending">' . _('Currency') . '</th>';
-
- if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
- echo '<th class="ascending">' . _('Order Total') . '</th>';
- }
- echo '<th class="ascending">' . _('Status') . '</th>
- <th>' . _('Print') . '</th>
- <th>' . _('Receive') . '</th>
- </tr>';
- $j = 1;
-
- while ($myrow = DB_fetch_array($PurchOrdersResult)) {
- $Bal = '';
if (isset($_POST['PODetails'])) {
- //lets retrieve the PO balance here to make it a standard sql query.
- $BalSql = "SELECT itemcode, quantityord - quantityrecd as balance FROM purchorderdetails WHERE orderno = '" . $myrow['orderno'] . "'";
- $ErrMsg = _('Failed to retrieve purchorder details');
- $BalResult = DB_query($BalSql,$ErrMsg);
- if (DB_num_rows($BalResult)>0) {
- while ($BalRow = DB_fetch_array($BalResult)) {
- $Bal .= '<br/>' . $BalRow['itemcode'] . ' -- ' . $BalRow['balance'];
- }
- }
- }
- if (isset($_POST['PODetails'])) {
- $BalRow = '<td width="250" style="word-break:break-all">' . $Bal . '</td>';
+ $BalHead = '<th class="ascending">' . _('Balance') .' (' . _('Stock ID') . '--' . _('Quantity') . ' )</th>';
} else {
- $BalRow = '';
+ $BalHead = '';
}
+ echo '<tr>
+ <th class="ascending">' . _('Order #') . '</th>
+ <th class="ascending">' . _('Order Date') . '</th>
+ <th class="ascending">' . _('Delivery Date') . '</th>
+ <th class="ascending">' . _('Initiated by') . '</th>
+ <th class="ascending">' . _('Supplier') . '</th>
+ ' . $BalHead . '
+ <th class="ascending">' . _('Currency') . '</th>';
- $ModifyPage = $RootPath . '/PO_Header.php?ModifyOrderNumber=' . $myrow['orderno'];
- if ($myrow['status'] == 'Printed') {
- $ReceiveOrder = '<a href="' . $RootPath . '/GoodsReceived.php?PONumber=' . $myrow['orderno'] . '">' . _('Receive') . '</a>';
- } else {
- $ReceiveOrder = '';
+ if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
+ echo '<th class="ascending">' . _('Order Total') . '</th>';
}
- if ($myrow['status'] == 'Authorised' AND $myrow['allowprint'] == 1) {
- $PrintPurchOrder = '<a target="_blank" href="' . $RootPath . '/PO_PDFPurchOrder.php?OrderNo=' . $myrow['orderno'] . '">' . _('Print') . '</a>';
- } elseif ($myrow['status'] == 'Authorisied' AND $myrow['allowprint'] == 0) {
- $PrintPurchOrder = _('Printed');
- } elseif ($myrow['status'] == 'Printed') {
- $PrintPurchOrder = '<a target="_blank" href="' . $RootPath . '/PO_PDFPurchOrder.php?OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
- ' . _('Print Copy') . '</a>';
- } else {
- $PrintPurchOrder = _('N/A');
- }
+ echo '<th class="ascending">' . _('Status') . '</th>
+ <th>' . _('Print') . '</th>
+ <th>' . _('Receive') . '</th>
+ </tr>';
+ $j = 1;
+ while ($myrow = DB_fetch_array($PurchOrdersResult)) {
+ $Bal = '';
+ if (isset($_POST['PODetails'])) {
+ //lets retrieve the PO balance here to make it a standard sql query.
+ $BalSql = "SELECT itemcode, quantityord - quantityrecd as balance FROM purchorderdetails WHERE orderno = '" . $myrow['orderno'] . "'";
+ $ErrMsg = _('Failed to retrieve purchorder details');
+ $BalResult = DB_query($BalSql,$ErrMsg);
+ if (DB_num_rows($BalResult)>0) {
+ while ($BalRow = DB_fetch_array($BalResult)) {
+ $Bal .= '<br/>' . $BalRow['itemcode'] . ' -- ' . $BalRow['balance'];
+ }
+ }
+ }
+ if (isset($_POST['PODetails'])) {
+ $BalRow = '<td width="250" style="word-break:break-all">' . $Bal . '</td>';
+ } else {
+ $BalRow = '';
+ }
- $FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
- $FormatedDeliveryDate = ConvertSQLDate($myrow['deliverydate']);
- $FormatedOrderValue = locale_number_format($myrow['ordervalue'], $myrow['currdecimalplaces']);
- $sql = "SELECT realname FROM www_users WHERE userid='" . $myrow['initiator'] . "'";
- $UserResult = DB_query($sql);
- $MyUserRow = DB_fetch_array($UserResult);
- $InitiatorName = $MyUserRow['realname'];
+ $ModifyPage = $RootPath . '/PO_Header.php?ModifyOrderNumber=' . $myrow['orderno'];
+ if ($myrow['status'] == 'Printed') {
+ $ReceiveOrder = '<a href="' . $RootPath . '/GoodsReceived.php?PONumber=' . $myrow['orderno'] . '">' . _('Receive') . '</a>';
+ } else {
+ $ReceiveOrder = '';
+ }
+ if ($myrow['status'] == 'Authorised' AND $myrow['allowprint'] == 1) {
+ $PrintPurchOrder = '<a target="_blank" href="' . $RootPath . '/PO_PDFPurchOrder.php?OrderNo=' . $myrow['orderno'] . '">' . _('Print') . '</a>';
+ } elseif ($myrow['status'] == 'Authorisied' AND $myrow['allowprint'] == 0) {
+ $PrintPurchOrder = _('Printed');
+ } elseif ($myrow['status'] == 'Printed') {
+ $PrintPurchOrder = '<a target="_blank" href="' . $RootPath . '/PO_PDFPurchOrder.php?OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
+ ' . _('Print Copy') . '</a>';
+ } else {
+ $PrintPurchOrder = _('N/A');
+ }
- echo '<tr class="striped_row">
- <td><a href="' . $ModifyPage . '">' . $myrow['orderno'] . '</a></td>
- <td>' . $FormatedOrderDate . '</td>
- <td>' . $FormatedDeliveryDate . '</td>
- <td>' . $InitiatorName . '</td>
- <td>' . $myrow['suppname'] . '</td>
- ' . $BalRow . '
- <td>' . $myrow['currcode'] . '</td>';
- if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
- echo '<td class="number">' . $FormatedOrderValue . '</td>';
- }
- echo '<td>' . _($myrow['status']) . '</td>
- <td>' . $PrintPurchOrder . '</td>
- <td>' . $ReceiveOrder . '</td>
- </tr>';
- } //end of while loop around purchase orders retrieved
- echo '</table>';
+ $FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
+ $FormatedDeliveryDate = ConvertSQLDate($myrow['deliverydate']);
+ $FormatedOrderValue = locale_number_format($myrow['ordervalue'], $myrow['currdecimalplaces']);
+ $sql = "SELECT realname FROM www_users WHERE userid='" . $myrow['initiator'] . "'";
+ $UserResult = DB_query($sql);
+ $MyUserRow = DB_fetch_array($UserResult);
+ $InitiatorName = $MyUserRow['realname'];
+
+ echo '<tr class="striped_row">
+ <td><a href="' . $ModifyPage . '">' . $myrow['orderno'] . '</a></td>
+ <td>' . $FormatedOrderDate . '</td>
+ <td>' . $FormatedDeliveryDate . '</td>
+ <td>' . $InitiatorName . '</td>
+ <td>' . $myrow['suppname'] . '</td>
+ ' . $BalRow . '
+ <td>' . $myrow['currcode'] . '</td>';
+ if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
+ echo '<td class="number">' . $FormatedOrderValue . '</td>';
+ }
+ echo '<td>' . _($myrow['status']) . '</td>
+ <td>' . $PrintPurchOrder . '</td>
+ <td>' . $ReceiveOrder . '</td>
+ </tr>';
+ } //end of while loop around purchase orders retrieved
+
+ echo '</table>';
+ }
}
echo '</div>
</form>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-18 01:25:58 UTC (rev 7974)
+++ trunk/doc/Change.log 2018-02-18 02:30:38 UTC (rev 7975)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/18 PaulT: PO_SelectOSPurchOrder.php: Derived from Tim's code: add default current dates. (there may not yet be any purchorders records) / PaulT: do not show the order list table when there are no records to show. (avoids a table heading output without any associated row data)
17/2/18 Tim (PaulT commit): MiscFunctions.js: Set the calendar click and change handlers to reference the localStorage DateFormat instead of the element's "alt" attribute value. (Know that this update requires the localStorage change applied with commit 7973)
17/2/18 PaulT: header.php: Set the DOCTYPE to html5 declaration format, update the meta tag with Content-Type info, and add localStorage with DateFormat and Theme for upcoming changes to table column sorting and calendar handling improvements.
17/2/18 PaulT: CustomerAllocations.php: Minor code shuffle to fix view page source message "Start tag 'div' seen in 'table'" reported in Firefox.
|
|
From: <tu...@us...> - 2018-02-22 09:49:01
|
Revision: 7976
http://sourceforge.net/p/web-erp/reponame/7976
Author: turbopt
Date: 2018-02-19 17:49:26 +0000 (Mon, 19 Feb 2018)
Log Message:
-----------
PaulT: Stocks.php: Fix navigation bar handling to avoid stockid loss and also disable navigation submit when at the first (or last) item. Change also adds a closing table tag, removes an extra double quote from two attributes, and a minor message layout improvement.
Modified Paths:
--------------
trunk/Stocks.php
trunk/doc/Change.log
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2018-02-18 02:30:38 UTC (rev 7975)
+++ trunk/Stocks.php 2018-02-19 17:49:26 UTC (rev 7976)
@@ -21,10 +21,22 @@
$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);//WARNING: if the last character is a ",", there are n+1 languages.
+$hasNext = true;
+$hasPrev = true;
+
if (isset($_POST['NextItem'])){
$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid>'" . $StockID . "' ORDER BY stockid ASC LIMIT 1");
- $NextItemRow = DB_fetch_row($Result);
- $StockID = $NextItemRow[0];
+
+ // Only change the StockID if we find a row.
+ // If not, the StockID is 'clobbered' with null and causes form havoc.
+ if ( DB_num_rows( $Result ) > 0 ) {
+ $NextItemRow = DB_fetch_row($Result);
+ $StockID = $NextItemRow[0];
+ }
+ else {
+ $hasNext = false;
+ }
+
foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
}
@@ -31,8 +43,17 @@
}
if (isset($_POST['PreviousItem'])){
$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid<'" . $StockID . "' ORDER BY stockid DESC LIMIT 1");
- $PreviousItemRow = DB_fetch_row($Result);
- $StockID = $PreviousItemRow[0];
+
+ // Only change the StockID if we find a row.
+ // If not, the StockID is 'clobbered' with null and causes form havoc.
+ if ( DB_num_rows( $Result ) > 0 ) {
+ $PreviousItemRow = DB_fetch_row($Result);
+ $StockID = $PreviousItemRow[0];
+ }
+ else {
+ $hasPrev = false;
+ }
+
foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
}
@@ -893,19 +914,22 @@
echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
-echo '<div>';
-if (isset($StockID)){
+echo '<div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input type="hidden" name="New" value="'.$New.'" />';
+
+if (isset($StockID) && $StockID != '' && $InputError == 0){
echo '<table width="100%">
<tr>
- <td width="5%"><input style="background:url(css/previous.png);width:26px;height:43px;" type="submit" name="PreviousItem" value="" /></td>
+ <td width="5%"><input style="background:url(css/previous.png);width:26px;height:43px;" type="submit" name="PreviousItem" value="" ' . ($hasPrev ? '' : 'disabled') . ' /></td>
<td width="90%"></td>
- <td width="5%"><input style="background:url(css/next.png);width:26px;height:43px;" type="submit" name="NextItem" value="" /></td>
- </tr>';
+ <td width="5%"><input style="background:url(css/next.png);width:26px;height:43px;" type="submit" name="NextItem" value="" ' . ($hasNext ? '' : 'disabled') . ' /></td>
+ </tr>
+ </table>';
}
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type="hidden" name="New" value="'.$New.'" />
- <table class="selection">';
+echo '<table class="selection">';
+
if (!isset($StockID) OR $StockID=='' or isset($_POST['UpdateCategories'])) {
/*If the page was called without $StockID passed to page then assume a new stock item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden StockID field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/
@@ -915,7 +939,7 @@
if ($New==1) {
echo '<tr>
<td>' . _('Item Code'). ':</td>
- <td><input type="text" ' . (in_array('StockID',$Errors) ? 'class="inputerror"' : '' ) .'" data-type="no-illegal-chars" autofocus="autofocus" required="required" value="'.$StockID.'" name="StockID" size="20" maxlength="20" title ="'._('Input the stock code, the following characters are prohibited:') . ' \' " + . & \\ > <" placeholder="'._('alpha-numeric only').'" /></td>
+ <td><input type="text" ' . (in_array('StockID',$Errors) ? 'class="inputerror"' : '' ) . ' data-type="no-illegal-chars" autofocus="autofocus" required="required" value="'.$StockID.'" name="StockID" size="20" maxlength="20" title ="'._('Input the stock code, the following characters are prohibited:') . ' \' " + . & \\ > <" placeholder="'._('alpha-numeric only').'" /></td>
</tr>';
} else {
echo '<tr>
@@ -1040,7 +1064,7 @@
}
echo '<tr>
<td>' . $LanguagesArray[$LanguageId]['LanguageName'] . ' ' . _('Long Description') . ':</td>
- <td><textarea name="'. $PostVariableName . '"" cols="40" rows="3">' . stripslashes(AddCarriageReturns($_POST[$PostVariableName])) . '</textarea></td>
+ <td><textarea name="'. $PostVariableName . '" cols="40" rows="3">' . stripslashes(AddCarriageReturns($_POST[$PostVariableName])) . '</textarea></td>
</tr>';
}
}
@@ -1451,10 +1475,9 @@
echo '<input type="submit" name="submit" value="' . _('Update') . '" />';
echo '<input type="submit" name="UpdateCategories" style="visibility:hidden;width:1px" value="' . _('Categories') . '" />';
- echo '<br />';
- prnMsg( _('Only click the Delete button if you are sure you wish to delete the item!') . _('Checks will be made to ensure that there are no stock movements, sales analysis records, sales order items or purchase order items for the item') . '. ' . _('No deletions will be allowed if they exist'), 'warn', _('WARNING'));
+ echo '<br /><br />';
+ prnMsg( _('Only click the Delete button if you are sure you wish to delete the item!') . '<br />' . _('Checks will be made to ensure that there are no stock movements, sales analysis records, sales order items or purchase order items for the item') . '. ' . _('No deletions will be allowed if they exist') . '.', 'warn', _('WARNING'));
echo '<br />
- <br />
<input type="submit" name="delete" value="' . _('Delete This Item') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
}
@@ -1462,4 +1485,4 @@
</div>
</form>';
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-18 02:30:38 UTC (rev 7975)
+++ trunk/doc/Change.log 2018-02-19 17:49:26 UTC (rev 7976)
@@ -1,5 +1,6 @@
webERP Change Log
+19/2/18 PaulT: Stocks.php: Fix navigation bar handling to avoid stockid loss and also disable navigation submit when at the first (or last) item. Change also adds a closing table tag, removes an extra double quote from two attributes, and a minor message layout improvement.
17/2/18 PaulT: PO_SelectOSPurchOrder.php: Derived from Tim's code: add default current dates. (there may not yet be any purchorders records) / PaulT: do not show the order list table when there are no records to show. (avoids a table heading output without any associated row data)
17/2/18 Tim (PaulT commit): MiscFunctions.js: Set the calendar click and change handlers to reference the localStorage DateFormat instead of the element's "alt" attribute value. (Know that this update requires the localStorage change applied with commit 7973)
17/2/18 PaulT: header.php: Set the DOCTYPE to html5 declaration format, update the meta tag with Content-Type info, and add localStorage with DateFormat and Theme for upcoming changes to table column sorting and calendar handling improvements.
|
|
From: <tu...@us...> - 2018-02-23 05:13:50
|
Revision: 7978
http://sourceforge.net/p/web-erp/reponame/7978
Author: turbopt
Date: 2018-02-23 05:13:47 +0000 (Fri, 23 Feb 2018)
Log Message:
-----------
PaulT: InventoryPlanning.php, InventoryValuation.php, StockCheck.php: Fix view page source message "No space between attributes" reported in Firefox.
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/InventoryValuation.php
trunk/StockCheck.php
trunk/doc/Change.log
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2018-02-20 13:18:01 UTC (rev 7977)
+++ trunk/InventoryPlanning.php 2018-02-23 05:13:47 UTC (rev 7978)
@@ -466,7 +466,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Select Inventory Categories') . ':</td>
- <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]" multiple="multiple">';
$SQL = 'SELECT categoryid, categorydescription
FROM stockcategory
ORDER BY categorydescription';
Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php 2018-02-20 13:18:01 UTC (rev 7977)
+++ trunk/InventoryValuation.php 2018-02-23 05:13:47 UTC (rev 7978)
@@ -224,7 +224,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Select Inventory Categories') . ':</td>
- <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]" multiple="multiple">';
$SQL = 'SELECT categoryid, categorydescription
FROM stockcategory
ORDER BY categorydescription';
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2018-02-20 13:18:01 UTC (rev 7977)
+++ trunk/StockCheck.php 2018-02-23 05:13:47 UTC (rev 7978)
@@ -260,7 +260,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Select Inventory Categories') . ':</td>
- <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]" multiple="multiple">';
$SQL = 'SELECT categoryid, categorydescription
FROM stockcategory
ORDER BY categorydescription';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-20 13:18:01 UTC (rev 7977)
+++ trunk/doc/Change.log 2018-02-23 05:13:47 UTC (rev 7978)
@@ -1,4 +1,6 @@
webERP Change Log
+
+23/2/18 PaulT: InventoryPlanning.php, InventoryValuation.php, StockCheck.php: Fix view page source message "No space between attributes" reported in Firefox.
20/2/18 Exson: sanitize scripts name in footer.inc and forbidden the use of InputSerialItemsSequential.php without login.
19/2/18 PaulT: Stocks.php: Fix navigation bar handling to avoid stockid loss and also disable navigation submit when at the first (or last) item. Change also adds a closing table tag, removes an extra double quote from two attributes, and a minor message layout improvement.
17/2/18 PaulT: PO_SelectOSPurchOrder.php: Derived from Tim's code: add default current dates. (there may not yet be any purchorders records) / PaulT: do not show the order list table when there are no records to show. (avoids a table heading output without any associated row data)
|
|
From: <tu...@us...> - 2018-02-23 06:08:25
|
Revision: 7979
http://sourceforge.net/p/web-erp/reponame/7979
Author: turbopt
Date: 2018-02-23 06:08:16 +0000 (Fri, 23 Feb 2018)
Log Message:
-----------
Tim (PaulT add table tags/commit): Add Tim's improved SortSelect() js function replacement. Change also requires <thead>, <tbody>, and (if needed) <tfoot> tags applied to tables that have sorting. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=7918) Also, change removes the 'alt' attribute from date inputs (handling replaced by commit 7974) within these modified files.
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AgedControlledInventory.php
trunk/BankMatching.php
trunk/CollectiveWorkOrderCost.php
trunk/CustItem.php
trunk/CustomerBalancesMovement.php
trunk/CustomerBranches.php
trunk/CustomerTypes.php
trunk/Dashboard.php
trunk/FixedAssetLocations.php
trunk/GLAccounts.php
trunk/ImportBankTransAnalysis.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestInquiry.php
trunk/Locations.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_SelectOSPurchOrder.php
trunk/PaymentMethods.php
trunk/Prices.php
trunk/PricesByCost.php
trunk/ProductSpecs.php
trunk/PurchData.php
trunk/PurchaseByPrefSupplier.php
trunk/QATests.php
trunk/RelatedItemsUpdate.php
trunk/SalesCategories.php
trunk/SalesTypes.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectQASamples.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/StockCategories.php
trunk/StockReorderLevel.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppPriceList.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierContacts.php
trunk/SupplierGRNAndInvoiceInquiry.php
trunk/SupplierInquiry.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTypes.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderEntry.php
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/AccountGroups.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -281,14 +281,17 @@
echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p><br />';
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Group Name') . '</th>
- <th class="ascending">' . _('Section') . '</th>
- <th class="ascending">' . _('Sequence In TB') . '</th>
- <th class="ascending">' . _('Profit and Loss') . '</th>
- <th class="ascending">' . _('Parent Group') . '</th>
- <th class="noprint" colspan="2"> </th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Group Name') . '</th>
+ <th class="ascending">' . _('Section') . '</th>
+ <th class="ascending">' . _('Sequence In TB') . '</th>
+ <th class="ascending">' . _('Profit and Loss') . '</th>
+ <th class="ascending">' . _('Parent Group') . '</th>
+ <th class="noprint" colspan="2"> </th>
+ </tr>
+ </thead>
+ <tbody>';
while($myrow = DB_fetch_array($result)) {
@@ -314,7 +317,8 @@
echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') . '</a></td></tr>';
} //END WHILE LIST LOOP
- echo '</table>';
+ echo '</tbody>
+ </table>';
} //end of ifs and buts!
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/AccountSections.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -166,7 +166,7 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$ErrMsg);
-/* echo '<div id="Report">';// Division to identify the report block.*/
+
echo '<p class="page_title_text"><img alt="" class="noprint" src="', $RootPath, '/css/', $Theme,
'/images/maintenance.png" title="', // Icon image.
_('Account Sections'), '" /> ', // Icon title.
@@ -174,11 +174,14 @@
echo '<br />
<table class="selection">
+ <thead>
<tr>
<th class="ascending">', _('Section Number'), '</th>
<th class="ascending">', _('Section Description'), '</th>
<th class="noprint" colspan="2"> </th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($result)) {
@@ -195,8 +198,8 @@
echo '</td>
</tr>';
} //END WHILE LIST LOOP
- echo '</table>';
-/* echo '</div>';// End div id="Report".*/
+ echo '</tbody>
+ </table>';
} //end of ifs and buts!
Modified: trunk/AgedControlledInventory.php
===================================================================
--- trunk/AgedControlledInventory.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/AgedControlledInventory.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -45,16 +45,19 @@
$TotalVal=0;
echo '<table>
- <tr>
- <th class="ascending">', _('Stock'), '</th>
- <th class="ascending">', _('Description'), '</th>
- <th class="ascending">', _('Batch'), '</th>
- <th class="ascending">', _('Quantity Remaining'), '</th>
- <th class="ascending">', _('Units'), '</th>
- <th class="ascending">', _('Inventory Value'), '</th>
- <th class="ascending">', _('Date'), '</th>
- <th class="ascending">', _('Days Old'), '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">', _('Stock'), '</th>
+ <th class="ascending">', _('Description'), '</th>
+ <th class="ascending">', _('Batch'), '</th>
+ <th class="ascending">', _('Quantity Remaining'), '</th>
+ <th class="ascending">', _('Units'), '</th>
+ <th class="ascending">', _('Inventory Value'), '</th>
+ <th class="ascending">', _('Date'), '</th>
+ <th class="ascending">', _('Days Old'), '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($LocQtyRow=DB_fetch_array($LocStockResult)) {
@@ -88,7 +91,8 @@
);
} //while
-echo '<tfoot>
+echo '</tbody>
+ <tfoot>
<tr class="striped_row">
<td colspan="3"><b>', _('Total'), '</b></td>
<td class="number"><b>', locale_number_format($TotalQty,2), '</b></td>
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/BankMatching.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -130,12 +130,12 @@
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr>
<td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('to') . ':</td>
- <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
+ <td><input tabindex="2" type="text" name="BeforeDate" class="date" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
</tr>';
echo '<tr>
<td colspan="3">' . _('Choose outstanding') . ' ' . $TypeName . ' ' . _('only or all') . ' ' . $TypeName . ' ' . _('in the date range') . ':</td>
@@ -275,15 +275,18 @@
$PaymentsResult = DB_query($sql, $ErrMsg);
echo '<table cellpadding="2" class="selection">
- <tr>
- <th class="ascending">' . _('Cheque No') . '</th>
- <th class="ascending">' . _('Ref') . '</th>
- <th class="ascending">' . _('Date') . '</th>
- <th class="ascending">' . $TypeName . '</th>
- <th class="ascending">' . _('Amount') . '</th>
- <th class="ascending">' . _('Outstanding') . '</th>
- <th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Cheque No') . '</th>
+ <th class="ascending">' . _('Ref') . '</th>
+ <th class="ascending">' . _('Date') . '</th>
+ <th class="ascending">' . $TypeName . '</th>
+ <th class="ascending">' . _('Amount') . '</th>
+ <th class="ascending">' . _('Outstanding') . '</th>
+ <th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
$i = 1; //no of rows counter
@@ -336,7 +339,8 @@
$i++;
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<br />
<div class="centre">
<input type="hidden" name="RowCounter" value="' . $i . '" />
Modified: trunk/CollectiveWorkOrderCost.php
===================================================================
--- trunk/CollectiveWorkOrderCost.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CollectiveWorkOrderCost.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -49,13 +49,17 @@
$result = DB_query($sql,$ErrMsg);
if (DB_num_rows($result)>0) {
echo '<table class="selection">
- <tr><th class="ascending">' . _('Item') . '</th>
- <th>' . _('Description') . '</th>
- <th class="ascending">' . _('Date Issued') . '</th>
- <th class="ascending">' . _('Issued Qty') . '</th>
- <th class="ascending">' . _('Issued Cost') . '</th>
- <th class="ascending">' . _('Work Order') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Item') . '</th>
+ <th>' . _('Description') . '</th>
+ <th class="ascending">' . _('Date Issued') . '</th>
+ <th class="ascending">' . _('Issued Qty') . '</th>
+ <th class="ascending">' . _('Issued Cost') . '</th>
+ <th class="ascending">' . _('Work Order') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
$TotalCost = 0;
while ($myrow = DB_fetch_array($result)){
@@ -71,9 +75,14 @@
<td>' . $myrow['reference'] . '</td>
</tr>';
}
- echo '<tr><td colspan="4"><b>' . _('Total Cost') . '</b></td>
- <td colspan="2"><b>' .locale_number_format($TotalCost,2) . '</b></td>
- </tr></table>';
+ echo '</tbody>
+ <tfoot>
+ <tr>
+ <td colspan="4"><b>' . _('Total Cost') . '</b></td>
+ <td colspan="2"><b>' .locale_number_format($TotalCost,2) . '</b></td>
+ </tr>
+ </tfoot>
+ </table>';
} else {
prnMsg(_('There are no data available'),'error');
include('includes/footer.php');
@@ -265,9 +274,9 @@
</td>
</tr>
<tr>
- <td colspan="2">' . _('Start Date From') . ':<input type="text" name="DateFrom" value="' . $_POST['DateFrom'] . '" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" />
+ <td colspan="2">' . _('Start Date From') . ':<input type="text" name="DateFrom" value="' . $_POST['DateFrom'] . '" class="date" />
- ' . _('Start Date To') . ':<input type="text" name="DateTo" value="' . $_POST['DateTo'] . '" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" />
+ ' . _('Start Date To') . ':<input type="text" name="DateTo" value="' . $_POST['DateTo'] . '" class="date" />
</td>
</tr>
</table>';
@@ -314,12 +323,15 @@
echo '<br />
<table cellpadding="2" class="selection">
- <tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Description') . '</th>
+ <th class="ascending">' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($StockItemsResult)) {
@@ -335,7 +347,8 @@
$myrow['units']);
}//end of while loop
- echo '</table>';
+ echo '</tbody>
+ </table>';
}
//end if stock search results to show
else {
@@ -427,21 +440,24 @@
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="wos">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table cellpadding="2" width="95%" class="selection">
- <tr>
- <th>' . _('Select') . '</th>
- <th>' . _('Modify') . '</th>
- <th class="ascending">' . _('Status') . '</th>
- <th>' . _('Issue To') . '</th>
- <th>' . _('Receive') . '</th>
- <th>' . _('Costing') . '</th>
- <th>' . _('Paperwork') . '</th>
- <th class="ascending">' . _('Item') . '</th>
- <th class="ascending">' . _('Quantity Required') . '</th>
- <th class="ascending">' . _('Quantity Received') . '</th>
- <th class="ascending">' . _('Quantity Outstanding') . '</th>
- <th class="ascending">' . _('Start Date') . '</th>
- <th class="ascending">' . _('Required Date') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th>' . _('Select') . '</th>
+ <th>' . _('Modify') . '</th>
+ <th class="ascending">' . _('Status') . '</th>
+ <th>' . _('Issue To') . '</th>
+ <th>' . _('Receive') . '</th>
+ <th>' . _('Costing') . '</th>
+ <th>' . _('Paperwork') . '</th>
+ <th class="ascending">' . _('Item') . '</th>
+ <th class="ascending">' . _('Quantity Required') . '</th>
+ <th class="ascending">' . _('Quantity Received') . '</th>
+ <th class="ascending">' . _('Quantity Outstanding') . '</th>
+ <th class="ascending">' . _('Start Date') . '</th>
+ <th class="ascending">' . _('Required Date') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($WorkOrdersResult)) {
@@ -490,7 +506,8 @@
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<div class="centre">
<input type="submit" value="' . _('Submit') . '" name="Submit" />
</form>';
Modified: trunk/CustItem.php
===================================================================
--- trunk/CustItem.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustItem.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -139,17 +139,18 @@
$NoCustItemData=1;
} else if ($StockID != '') {
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Customer') . '</th>
- <th>' . _('Customer Unit') . '</th>
- <th>' . _('Conversion Factor') . '</th>
- <th class="ascending">' . _('Customer Item') . '</th>
- <th class="ascending">' . _('Customer Description') . '</th>
+ echo '<table cellpadding="2" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Customer') . '</th>
+ <th>' . _('Customer Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th class="ascending">' . _('Customer Item') . '</th>
+ <th class="ascending">' . _('Customer Description') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
- </tr>';
- echo $TableHeader;
-
while ($myrow = DB_fetch_array($custitemResult)) {
printf('<tr class="striped_row">
<td>%s</td>
@@ -172,7 +173,8 @@
$StockID,
$myrow['debtorno']);
} //end of while loop
- echo '</table><br/>';
+ echo '</tbody>
+ </table><br/>';
} // end of there are rows to show
echo '<br/>';
} /* Only show the existing records if one is not being edited */
@@ -285,17 +287,19 @@
$StockUOM = 'each';
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
- <table cellpadding="2" colspan="7" class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Customer Name') . '</th>
- <th class="ascending">' . _('Currency') . '</th>
- <th class="ascending">' . _('Address 1') . '</th>
- <th class="ascending">' . _('Address 2') . '</th>
- <th class="ascending">' . _('Address 3') . '</th>
- </tr>';
- echo $TableHeader;
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table cellpadding="2" colspan="7" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Customer Name') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ <th class="ascending">' . _('Address 1') . '</th>
+ <th class="ascending">' . _('Address 2') . '</th>
+ <th class="ascending">' . _('Address 3') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($debtorsmasterResult)) {
printf('<tr class="striped_row">
@@ -318,7 +322,8 @@
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<br/>
</form>';
}
Modified: trunk/CustomerBalancesMovement.php
===================================================================
--- trunk/CustomerBalancesMovement.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustomerBalancesMovement.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -56,11 +56,11 @@
</tr>
<tr>
<td>' . _('Date From') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))) . '" /></td>
+ <td><input type="text" class="date" name="FromDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))) . '" /></td>
</tr>
<tr>
<td>' . _('Date To') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
+ <td><input type="text" class="date" name="ToDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
<tr>
<td>' . _('Create CSV') . ':</td>
@@ -111,6 +111,7 @@
if (!isset($_POST['CreateCSV'])){
echo '<table>
+ <thead>
<tr>
<th class="ascending">' . _('Customer') . ' </th>
<th class="ascending">' . _('Opening Balance') . '</th>
@@ -117,7 +118,9 @@
<th class="ascending">' . _('Debits') . '</th>
<th class="ascending">' . _('Credits') . '</th>
<th class="ascending">' . _('Balance') . '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
} else {
$CSVFile = '"' . _('Customer') . '","' . _('Opening Balance') . '","' . _('Debits') . '", "' . _('Credits') . '","' . _('Balance') . '"' . "\n";
}
@@ -185,7 +188,7 @@
}
if (!isset($_POST['CreateCSV'])){
- echo '</table>';
+ echo '</tbody></table>';
}
if ($_POST['Customer']==''){ //if there could be several customers being reported
if (!isset($_POST['CreateCSV'])){
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustomerBranches.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -397,18 +397,21 @@
_('Customer'), '" /> ',// Icon title.
_('Branches defined for'), ' ', $DebtorNo, ' - ', $myrow[0], '</p>';// Page title.
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Name') . '</th>
- <th class="ascending">' . _('Branch Contact') . '</th>
- <th class="ascending">' . _('Salesman') . '</th>
- <th class="ascending">' . _('Area') . '</th>
- <th class="ascending">' . _('Phone No') . '</th>
- <th class="ascending">' . _('Fax No') . '</th>
- <th class="ascending">' . _('Email') . '</th>
- <th class="ascending">' . _('Tax Group') . '</th>
- <th class="ascending">' . _('Enabled?') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Name') . '</th>
+ <th class="ascending">' . _('Branch Contact') . '</th>
+ <th class="ascending">' . _('Salesman') . '</th>
+ <th class="ascending">' . _('Area') . '</th>
+ <th class="ascending">' . _('Phone No') . '</th>
+ <th class="ascending">' . _('Fax No') . '</th>
+ <th class="ascending">' . _('Email') . '</th>
+ <th class="ascending">' . _('Tax Group') . '</th>
+ <th class="ascending">' . _('Enabled?') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
do {
@@ -453,7 +456,8 @@
} while ($myrow = DB_fetch_row($result));
//END WHILE LIST LOOP
- echo '</table>
+ echo '</tbody>
+ </table>
<br />
<table class="selection">
<tr>
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustomerTypes.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -184,10 +184,13 @@
$result = DB_query($sql);
echo '<br /><table class="selection">';
- echo '<tr>
- <th class="ascending">' . _('Type ID') . '</th>
- <th class="ascending">' . _('Type Name') . '</th>
- </tr>';
+ echo '<thead>
+ <tr>
+ <th class="ascending">' . _('Type ID') . '</th>
+ <th class="ascending">' . _('Type Name') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_row($result)) {
@@ -205,7 +208,7 @@
$myrow[0]);
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</tbody></table>';
}
//end of ifs and buts!
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/Dashboard.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -419,14 +419,16 @@
include('includes/GLPostings.inc');
echo '<br />
<h2>', _('Bank and Credit Card Balances'), '</h2>
- <table class="selection">',
-/* '<thead>',*/ // Need to update the sorting javascript.
- '<tr>
+ <table class="selection">
+ <thead>
+ <tr>
<th class="ascending">', _('GL Account'), '</th>
<th class="ascending">', _('Account Name'), '</th>
<th class="ascending">', _('Balance'), '</th>
- </tr>'
-/*, '</thead><tbody>'*/;// Need to update the sorting javascript.
+ </tr>
+ </thead>
+ <tbody>';
+
$FirstPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
$LastPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
$SelectedPeriod=$LastPeriodSelected;
@@ -529,8 +531,8 @@
<td class="number">', $DisplayBalance, '</td>
</tr>';
} //each bank account
- echo /*'</tbody>',*/// Need to update the sorting javascript.
- '</table>';
+ echo '</tbody>
+ </table>';
} //CashSecurity
if(in_array($OrderSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($OrderSecurity)) {
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/FixedAssetLocations.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -94,11 +94,14 @@
if (DB_num_rows($result) > 0) {
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Location ID') . '</th>
- <th class="ascending">' . _('Location Description') . '</th>
- <th class="ascending">' . _('Parent Location') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Location ID') . '</th>
+ <th class="ascending">' . _('Location Description') . '</th>
+ <th class="ascending">' . _('Parent Location') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($result)) {
echo '<tr>
@@ -111,7 +114,7 @@
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedLocation=', urlencode($myrow['locationid']), '">', _('Edit'), '</a></td></tr>';
}
- echo '</table>';
+ echo '</tbody></table>';
}
echo '<br /><form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/GLAccounts.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -297,6 +297,7 @@
echo '<br />
<table class="selection">
+ <thead>
<tr>
<th class="ascending">', _('Account Code'), '</th>
<th class="ascending">', _('Account Name'), '</th>
@@ -304,7 +305,9 @@
<th class="ascending">', _('P/L or B/S'), '</th>
<th class="ascending">', _('Cash Flows Activity'), '</th>
<th class="noprint" colspan="2"> </th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
$Sql = "SELECT
accountcode,
@@ -330,7 +333,7 @@
</tr>';
}// END foreach($Result as $MyRow).
- echo '</table>';
+ echo '</tbody></table>';
} //END IF selected ACCOUNT
//end of ifs and buts!
Modified: trunk/ImportBankTransAnalysis.php
===================================================================
--- trunk/ImportBankTransAnalysis.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/ImportBankTransAnalysis.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -199,6 +199,7 @@
}
} else { /*Allow GL Analysis == true */
echo '</p><table cellpadding="2" class="selection">
+ <thead>
<tr>
<th colspan="5">' . _('General ledger Analysis') . '</th>
</tr>
@@ -208,9 +209,11 @@
<th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['Statement']->CurrCode . '</th>
<th>' . _('Narrative') . '</th>
<th class="ascending">' . _('Tag') . '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
+
$TotalGLValue=0;
- $i=0;
foreach ( $_SESSION['Trans'][$TransID]->GLEntries AS $EnteredGLCode){
@@ -227,7 +230,9 @@
$TotalGLValue += $EnteredGLCode->Amount;
}
- echo '<tr>
+ echo '</tbody>
+ <tfoot>
+ <tr>
<td colspan="2" class="number">' . _('Total of GL Entries') . ':</td>
<td class="number">' . locale_number_format($TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</td>
</tr>
@@ -244,6 +249,7 @@
echo '<th colspan="5"><font size="4" color="green">' . _('Reconciled') . '</th>';
}
echo '</tr>
+ </tfoot>
</table>';
@@ -316,4 +322,4 @@
}
echo '</form>';
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/InternalStockRequest.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -238,7 +238,7 @@
</tr>
<tr>
<td>', _('Date when required'), ':</td>
- <td><input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="DispatchDate" maxlength="10" size="11" value="', $_SESSION['Request']->DispatchDate, '" /></td>
+ <td><input type="text" class="date" name="DispatchDate" maxlength="10" size="11" value="', $_SESSION['Request']->DispatchDate, '" /></td>
</tr>
<tr>
<td>', _('Narrative'), ':</td>
@@ -262,16 +262,19 @@
<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
<br />
<table class="selection">
- <tr>
- <th colspan="7"><h4>', _('Details of Items Requested'), '</h4></th>
- </tr>
- <tr>
- <th>', _('Line Number'), '</th>
- <th class="ascending">', _('Item Code'), '</th>
- <th class="ascending">', _('Item Description'), '</th>
- <th class="ascending">', _('Quantity Required'), '</th>
- <th>', _('UOM'), '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th colspan="7"><h4>', _('Details of Items Requested'), '</h4></th>
+ </tr>
+ <tr>
+ <th>', _('Line Number'), '</th>
+ <th class="ascending">', _('Item Code'), '</th>
+ <th class="ascending">', _('Item Description'), '</th>
+ <th class="ascending">', _('Quantity Required'), '</th>
+ <th>', _('UOM'), '</th>
+ </tr>
+ </thead>
+ <tbody>';
if (isset($_SESSION['Request']->LineItems)) {
foreach ($_SESSION['Request']->LineItems as $LineItems) {
@@ -287,7 +290,8 @@
}
}
-echo '</table>
+echo '</tbody>
+ </table>
<br />
<div class="centre">
<input type="submit" name="Submit" value="', _('Submit'), '" />
@@ -535,8 +539,6 @@
<input type="hidden" name="NextList" value="', ($Offset + 1), '" />
<input tabindex="', ($j+10), '" type="submit" name="Next" value="', _('Next'), '" /></td>
</tr>
- </thead>
- <tbody>
<tr>
<th class="ascending">', _('Code'), '</th>
<th class="ascending">', _('Description'), '</th>
@@ -546,7 +548,10 @@
<th class="ascending">', _('On Order'), '</th>
<th class="ascending">', _('Available'), '</th>
<th class="ascending">', _('Quantity'), '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
+
$ImageSource = _('No Image');
$i=0;
Modified: trunk/InternalStockRequestInquiry.php
===================================================================
--- trunk/InternalStockRequestInquiry.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/InternalStockRequestInquiry.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -161,9 +161,9 @@
$_POST['FromDate'] = '';
}
echo '<td>' . _('Date From') . '</td>
- <td><input type="t...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X