Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4576] trunk
|
From: <dai...@us...> - 2011-05-27 10:59:26
|
Revision: 4576
http://web-erp.svn.sourceforge.net/web-erp/?rev=4576&view=rev
Author: daintree
Date: 2011-05-27 10:59:20 +0000 (Fri, 27 May 2011)
Log Message:
-----------
bug fixes reported by Ricard/Exson
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/PO_Items.php
trunk/SelectProduct.php
trunk/Shipt_Select.php
trunk/StockTransfers.php
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/ContractBOM.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -167,7 +167,7 @@
if (isset($_POST['NewItem'])){ /* NewItem is set from the part selection list as the part code selected */
/* take the form entries and enter the data from the form into the PurchOrder class variable */
foreach ($_POST as $key => $value) {
- if (substr($key, 0, 3)=='qty') {
+ if (substr($key, 0, 3)=='Qty') {
$ItemCode=substr($key, 3, strlen($key)-3);
$Quantity=$value;
$AlreadyOnThisBOM = 0;
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/PO_Items.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -566,7 +566,12 @@
$PurchRow = DB_fetch_array($PurchDataResult);
$PurchPrice = $PurchRow['price']/$PurchRow['conversionfactor'];
$ConversionFactor = $PurchRow['conversionfactor'];
- $SupplierDescription = $PurchRow['suppliers_partno'] .' - ' . $PurchRow['supplierdescription'];
+ $SupplierDescription = $PurchRow['suppliers_partno'] .' - ';
+ if (strlen($PurchRow['supplierdescription'])>2){
+ $SupplierDescription .= $PurchRow['supplierdescription'];
+ } else {
+ $SupplierDescription .= $ItemRow['description'];
+ }
$SuppliersUnitOfMeasure = $PurchRow['suppliersuom'];
$SuppliersPartNo = $PurchRow['suppliers_partno'];
$LeadTime = $PurchRow['leadtime'];
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/SelectProduct.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -417,10 +417,9 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $_SERVER['HTTP_SCHEME'] .'://'. $_SERVER['HTTP_HOST'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
+ echo '<div class="centre"><img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
}
-
- if ($myrow['mbflag'] == 'B') {
+ if (($myrow['mbflag'] == 'B') AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
echo '<br />';
$SuppResult = DB_query("SELECT suppliers.suppname,
suppliers.supplierid,
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/Shipt_Select.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -250,17 +250,17 @@
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
} else {
- $SQL .= "WHERE shipments.supplierid='" . $SelectedSupplier ."'
+ $SQL .= " WHERE shipments.supplierid='" . $SelectedSupplier ."'
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] ."'";
}
} else { //no supplier selected
if (isset($SelectedStockItem)) {
- $SQL .= "WHERE purchorderdetails.itemcode='". $SelectedStockItem ."'
+ $SQL .= " WHERE purchorderdetails.itemcode='". $SelectedStockItem ."'
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
} else {
- $SQL .= "WHERE purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ $SQL .= " WHERE purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
}
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/StockTransfers.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -42,7 +42,7 @@
echo '<tr><td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
<td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='.$_POST['Quantity'].'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
-+ ._('Transfer').'</a></td>
+ ._('Transfer').'</a></td>
</tr>';
}
@@ -66,7 +66,7 @@
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer']) and $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ if (isset($_SESSION['Transfer']) AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
unset($_SESSION['Transfer']);
$NewTransfer = true;
}
@@ -121,10 +121,10 @@
}
-if (isset($_POST['Quantity']) and isset($_SESSION['Transfer']->TransferItem[0]->Controlled) and $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
+if (isset($_POST['Quantity']) AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled) AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
$_SESSION['Transfer']->TransferItem[0]->Quantity = $_POST['Quantity'];
}
-if ( isset($_POST['StockLocationFrom']) && $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
+if ( isset($_POST['StockLocationFrom']) AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
$_SESSION['Transfer']->StockLocationFrom = $_POST['StockLocationFrom'];
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
$_SESSION['Transfer']->TransferItem[0]->Quantity=$_POST['Quantity'];
@@ -149,7 +149,7 @@
echo '<p>';
prnMsg( _('The quantity entered must be numeric'), 'error' );
$InputError = true;
- } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity<=0){
+ } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity <= 0){
echo '<p>';
prnMsg( _('The quantity entered must be a positive number greater than zero'), 'error');
$InputError = true;
@@ -455,7 +455,7 @@
} else {
echo '<input type=text name="StockCode" size=21 value="" maxlength=20>';
}
-echo '</td><td><input type=submit name="CheckCode" VALUE="'._('Check Part').'"></td></tr>';
+echo '</td><td><input type=submit name="CheckCode" value="'._('Check Part').'"></td></tr>';
if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription) and strlen($_SESSION['Transfer']->TransferItem[0]->ItemDescription)>1){
echo '<tr><td colspan=3><font color=BLUE size=3>' . $_SESSION['Transfer']->TransferItem[0]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Transfer']->TransferItem[0]->PartUnit . ' )</font></td></tr>';
@@ -491,13 +491,13 @@
if ($myrow['loccode'] == $_SESSION['Transfer']->StockLocationTo){
echo '<option 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'] AND isset($_SESSION['Transfer'])){
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
$_SESSION['Transfer']->StockLocationTo=$myrow['loccode'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -506,10 +506,10 @@
echo '<tr><td>'._('Transfer Quantity').':</td>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled) and $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
+if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled) AND $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
echo '<td class=number><input type=hidden name="Quantity" value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity .
'><a href="' . $rootpath .'/StockTransferControlled.php?StockLocationFrom='.$_SESSION['Transfer']->StockLocationFrom.'">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
-} else if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
+} elseif (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '></td></tr>';
} else {
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 Value="0"></td></tr>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
