Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4764] trunk
|
From: <dai...@us...> - 2011-12-08 18:48:08
|
Revision: 4764
http://web-erp.svn.sourceforge.net/web-erp/?rev=4764&view=rev
Author: daintree
Date: 2011-12-08 18:48:01 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/StockStatus.php
trunk/Z_ImportFixedAssets.php
trunk/index.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/StockLocTransfer.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -33,26 +33,23 @@
//loop through file rows
while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
- //check for correct number of fields
- $FieldCount = count($myrow);
- if ($FieldCount != 2)){
- prnMsg (_('File contains') . ' '. $FieldCount . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error');
+ if (count($myrow) != 2){
+ prnMsg (_('File contains') . ' '. count($myrow) . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error');
fclose($FileHandle);
include('includes/footer.inc');
exit;
}
// cleanup the data (csv files often import with empty strings and such)
+ $StockID='';
+ $Quantity=0;
for ($i=0; $i<count($myrow);$i++) {
- $StockID='';
- $Quantity=0;
- $myrow[$i] = trim($myrow[$i]);
switch ($i) {
case 0:
$StockID = trim(mb_strtoupper($myrow[$i]));
$result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]==0){
+ $StockIDCheck = DB_fetch_row($result);
+ if ($StockIDCheck[0]==0){
$InputError = True;
$ErrorMessage .= _('The part code entered of'). ' ' . $StockID . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
}
@@ -73,76 +70,77 @@
AND loccode='".$_POST['FromStockLocation']."'",
$db);
$CheckStockRow = DB_fetch_array($result);
- if ($myrow['quantity'] < $Quantity){
+ if ($CheckStockRow['quantity'] < $Quantity){
$InputError = True;
- $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $myrow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
}
}
-
- if ($StockID!='' AND $Quantity!=0){
- $_POST['StockID' . $RowCounter] = $StockID;
- $_POST['StockQTY' . $RowCounter] = $Quantity;
- }
} // end for loop through the columns on the row being processed
- $TotalItems++;
- $_POST['LinesCounter']=$TotalItems;
+ if ($StockID!='' AND $Quantity!=0){
+ $_POST['StockID' . $TotalItems] = $StockID;
+ $_POST['StockQTY' . $TotalItems] = $Quantity;
+ $StockID='';
+ $Quantity=0;
+ $TotalItems++;
+ }
} //end while there are lines in the CSV file
+ $_POST['LinesCounter']=$TotalItems;
} //end if there is a CSV file to import
else { // process the manually input lines
- $ErrorMessage='';
- for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
- if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
- $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
- $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]==0){
- $InputError = True;
- $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
- $_POST['LinesCounter'] -= 10;
- }
- DB_free_result( $result );
- if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />';
- $_POST['LinesCounter'] -= 10;
- }
- if (filter_number_format($_POST['StockQTY' . $i]) <= 0){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />';
- $_POST['LinesCounter'] -= 10;
- }
- if ($_SESSION['ProhibitNegativeStock']==1){
- // Only if stock exists at this location
- $result = DB_query("SELECT quantity
- FROM locstock
- WHERE stockid='" . $_POST['StockID' . $i] . "'
- AND loccode='".$_POST['FromStockLocation']."'",
- $db);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){
- $InputError = True;
- $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />';
- $_POST['LinesCounter'] -= 10;
- }
- }
- DB_free_result( $result );
- $TotalItems++;
- }
- }//for all LinesCounter
- }
-
- if ($TotalItems == 0){
- $InputError = True;
- $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />';
- }
-
- /*Ship location and Receive location are different */
- if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){
- $InputError=True;
- $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from');
- }
- } //end if the transfer is not a duplicated
+ $ErrorMessage='';
+ for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
+ $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
+ $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]==0){
+ $InputError = True;
+ $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ DB_free_result( $result );
+ if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ if (filter_number_format($_POST['StockQTY' . $i]) <= 0){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $_POST['StockID' . $i] . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){
+ $InputError = True;
+ $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ }
+ DB_free_result( $result );
+ $TotalItems++;
+ }
+ }//for all LinesCounter
+ }
+
+ if ($TotalItems == 0){
+ $InputError = True;
+ $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />';
+ }
+
+ /*Ship location and Receive location are different */
+ if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){
+ $InputError=True;
+ $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from');
+ }
+ } //end if the transfer is not a duplicated
}
if(isset($_POST['Submit']) AND $InputError==False){
@@ -203,7 +201,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
'" alt="" />' . ' ' . $title . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method=post>';
+ echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -252,11 +250,11 @@
echo '</select></td></tr>';
echo '<tr>
- <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td>
- <td><input name="SelectedTransferFile" type="file" /></td>
- </tr>
- </table>';
-
+ <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td>
+ <td><input name="SelectedTransferFile" type="file" /></td>
+ </tr>
+ </table>';
+
echo '<table class="selection">';
$tableheader = '<tr><th>'. _('Item Code'). '</th>
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/StockStatus.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -2,8 +2,6 @@
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Stock Status');
Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/Z_ImportFixedAssets.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -276,7 +276,7 @@
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif ( isset($_POST['gettemplate']) OR isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldNames). '"<br /><br /><br />';
@@ -288,7 +288,7 @@
<br />
<br />
';
- echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method=post>';
+ echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '">';
echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/index.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -236,7 +236,7 @@
</td>
<td class="menu_group_items"> <!-- Orders Maintenance options -->
- <table width="100%">
+ <table width="100%" class="table_index" >
<tr>
<td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php">' . _('Select Contract') . '</a></p>'; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
