Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2011-12-07 07:03:44
|
Revision: 4763
http://web-erp.svn.sourceforge.net/web-erp/?rev=4763&view=rev
Author: daintree
Date: 2011-12-07 07:03:38 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-03 04:18:47 UTC (rev 4762)
+++ trunk/StockLocTransfer.php 2011-12-07 07:03:38 UTC (rev 4763)
@@ -22,56 +22,127 @@
unset($_POST['StockID' . $i]);
unset($_POST['StockQTY' . $i]);
}
- }
- $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;
- }
- // 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 />';
- }
+ } else {
+ if ($_FILES['SelectedTransferFile']['name']) { //start file processing
+ //initialize
+ $InputError = false;
+ $ErrorMessage='';
+ //get file handle
+ $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r');
+ $TotalItems=0;
+ //loop through file rows
+ while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
-/*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');
- }
+ //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');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ // cleanup the data (csv files often import with empty strings and such)
+ 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){
+ $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 />';
+ }
+ break;
+ case 1:
+ $Quantity = filter_number_format($myrow[$i]);
+ if (!is_numeric($Quantity)){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric');
+ }
+ break;
+ } // end switch statement
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $StockID . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+ $CheckStockRow = DB_fetch_array($result);
+ if ($myrow['quantity'] < $Quantity){
+ $InputError = True;
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $myrow['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;
+ } //end while there are lines in the CSV file
+ } //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
}
if(isset($_POST['Submit']) AND $InputError==False){
@@ -178,8 +249,14 @@
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
- echo '</select></td></tr></table>';
+ 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>';
+
echo '<table class="selection">';
$tableheader = '<tr><th>'. _('Item Code'). '</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-07 07:03:44
|
Revision: 4763
http://web-erp.svn.sourceforge.net/web-erp/?rev=4763&view=rev
Author: daintree
Date: 2011-12-07 07:03:38 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-03 04:18:47 UTC (rev 4762)
+++ trunk/StockLocTransfer.php 2011-12-07 07:03:38 UTC (rev 4763)
@@ -22,56 +22,127 @@
unset($_POST['StockID' . $i]);
unset($_POST['StockQTY' . $i]);
}
- }
- $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;
- }
- // 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 />';
- }
+ } else {
+ if ($_FILES['SelectedTransferFile']['name']) { //start file processing
+ //initialize
+ $InputError = false;
+ $ErrorMessage='';
+ //get file handle
+ $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r');
+ $TotalItems=0;
+ //loop through file rows
+ while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
-/*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');
- }
+ //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');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ // cleanup the data (csv files often import with empty strings and such)
+ 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){
+ $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 />';
+ }
+ break;
+ case 1:
+ $Quantity = filter_number_format($myrow[$i]);
+ if (!is_numeric($Quantity)){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric');
+ }
+ break;
+ } // end switch statement
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $StockID . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+ $CheckStockRow = DB_fetch_array($result);
+ if ($myrow['quantity'] < $Quantity){
+ $InputError = True;
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $myrow['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;
+ } //end while there are lines in the CSV file
+ } //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
}
if(isset($_POST['Submit']) AND $InputError==False){
@@ -178,8 +249,14 @@
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
- echo '</select></td></tr></table>';
+ 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>';
+
echo '<table class="selection">';
$tableheader = '<tr><th>'. _('Item Code'). '</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-22 13:01:33
|
Revision: 5135
http://web-erp.svn.sourceforge.net/web-erp/?rev=5135&view=rev
Author: ExsonQu
Date: 2012-03-22 13:01:24 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
22/3/2012 Exson: Fixed no control of accumulated quantity of the same item during transferring which lead to negative quantity of stock in StockLocTransfer.php reported by Rong.
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-03-22 12:36:15 UTC (rev 5134)
+++ trunk/StockLocTransfer.php 2012-03-22 13:01:24 UTC (rev 5135)
@@ -96,6 +96,7 @@
unset($_POST['StockQTY' . $i]);
}
}
+ $StockIDAccQty = array(); //set an array to hold all items' quantity
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
if (isset($_POST['Delete' . $i])){ //check box to delete the item is set
unset($_POST['StockID' . $i]);
@@ -136,6 +137,18 @@
$_POST['LinesCounter'] -= 10;
}
}
+ // Check the accumulated quantity for each item
+ if(isset($StockIDAccQty[$_POST['StockID'.$i]])){
+ $StockIDAccQty[$_POST['StockID'.$i]] += filter_number_format($_POST['StockQTY' . $i]);
+ if($myrow[0] < $StockIDAccQty[$_POST['StockID'.$i]]){
+ $InputError = True;
+ $ErrorMessage .=_('The part code entered of'). ' ' . $_POST['StockID'.$i] . ' '._('does not have enough stock available for transter due to accumulated quantity is over quantity on hand.').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ }else{
+ $StockIDAccQty[$_POST['StockID'.$i]] = filter_number_format($_POST['StockQTY' . $i]);
+ } //end of accumulated check
+
DB_free_result( $result );
$TotalItems++;
}
@@ -337,4 +350,4 @@
</div>';
include('includes/footer.inc');
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-22 13:01:33
|
Revision: 5135
http://web-erp.svn.sourceforge.net/web-erp/?rev=5135&view=rev
Author: ExsonQu
Date: 2012-03-22 13:01:24 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
22/3/2012 Exson: Fixed no control of accumulated quantity of the same item during transferring which lead to negative quantity of stock in StockLocTransfer.php reported by Rong.
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-03-22 12:36:15 UTC (rev 5134)
+++ trunk/StockLocTransfer.php 2012-03-22 13:01:24 UTC (rev 5135)
@@ -96,6 +96,7 @@
unset($_POST['StockQTY' . $i]);
}
}
+ $StockIDAccQty = array(); //set an array to hold all items' quantity
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
if (isset($_POST['Delete' . $i])){ //check box to delete the item is set
unset($_POST['StockID' . $i]);
@@ -136,6 +137,18 @@
$_POST['LinesCounter'] -= 10;
}
}
+ // Check the accumulated quantity for each item
+ if(isset($StockIDAccQty[$_POST['StockID'.$i]])){
+ $StockIDAccQty[$_POST['StockID'.$i]] += filter_number_format($_POST['StockQTY' . $i]);
+ if($myrow[0] < $StockIDAccQty[$_POST['StockID'.$i]]){
+ $InputError = True;
+ $ErrorMessage .=_('The part code entered of'). ' ' . $_POST['StockID'.$i] . ' '._('does not have enough stock available for transter due to accumulated quantity is over quantity on hand.').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ }else{
+ $StockIDAccQty[$_POST['StockID'.$i]] = filter_number_format($_POST['StockQTY' . $i]);
+ } //end of accumulated check
+
DB_free_result( $result );
$TotalItems++;
}
@@ -337,4 +350,4 @@
</div>';
include('includes/footer.inc');
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-16 09:52:01
|
Revision: 5247
http://web-erp.svn.sourceforge.net/web-erp/?rev=5247&view=rev
Author: tim_schofield
Date: 2012-04-16 09:51:52 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Add in a check for in transit stock to the bulk stock transfer dispatch screen
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-04-16 01:59:04 UTC (rev 5246)
+++ trunk/StockLocTransfer.php 2012-04-16 09:51:52 UTC (rev 5247)
@@ -23,59 +23,67 @@
unset($_POST['StockQTY' . $i]);
}
} else {
- if ($_FILES['SelectedTransferFile']['name']) { //start file processing
- //initialize
- $InputError = false;
- $ErrorMessage='';
- //get file handle
- $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r');
- $TotalItems=0;
- //loop through file rows
- while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
+ if ($_FILES['SelectedTransferFile']['name']) { //start file processing
+ //initialize
+ $InputError = false;
+ $ErrorMessage='';
+ //get file handle
+ $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r');
+ $TotalItems=0;
+ //loop through file rows
+ while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
- 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;
- }
+ 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++) {
- switch ($i) {
- case 0:
- $StockID = trim(mb_strtoupper($myrow[$i]));
- $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $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 />';
- }
- break;
- case 1:
- $Quantity = filter_number_format($myrow[$i]);
- if (!is_numeric($Quantity)){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric');
- }
- break;
- } // end switch statement
- if ($_SESSION['ProhibitNegativeStock']==1){
- // Only if stock exists at this location
- $result = DB_query("SELECT quantity
- FROM locstock
- WHERE stockid='" . $StockID . "'
- AND loccode='".$_POST['FromStockLocation']."'",
- $db);
- $CheckStockRow = DB_fetch_array($result);
- if ($CheckStockRow['quantity'] < $Quantity){
- $InputError = True;
- $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
- }
- }
- } // end for loop through the columns on the row being processed
+ // cleanup the data (csv files often import with empty strings and such)
+ $StockID='';
+ $Quantity=0;
+ for ($i=0; $i<count($myrow);$i++) {
+ switch ($i) {
+ case 0:
+ $StockID = trim(mb_strtoupper($myrow[$i]));
+ $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
+ $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 />';
+ }
+ break;
+ case 1:
+ $Quantity = filter_number_format($myrow[$i]);
+ if (!is_numeric($Quantity)){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric');
+ }
+ break;
+ } // end switch statement
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ $InTransitSQL="SELECT SUM(shipqty-recqty) as intransit
+ FROM loctransfers
+ WHERE stockid='" . $StockID . "'
+ AND shiploc='".$_POST['FromStockLocation']."'
+ AND shipqty>recqty";
+ $InTransitResult=DB_query($InTransitSQL, $db);
+ $InTransitRow=DB_fetch_array($InTransitResult);
+ $InTransitQuantity=$InTransitRow['intransit'];
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $StockID . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+ $CheckStockRow = DB_fetch_array($result);
+ if (($CheckStockRow['quantity']-$InTransitQuantity) < $Quantity){
+ $InputError = True;
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
+ }
+ }
+ } // end for loop through the columns on the row being processed
if ($StockID!='' AND $Quantity!=0){
$_POST['StockID' . $TotalItems] = $StockID;
$_POST['StockQTY' . $TotalItems] = $Quantity;
@@ -83,12 +91,12 @@
$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
+ } //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='';
-
+
if (isset($_POST['ClearAll'])){
unset($_POST['EnterMoreItems']);
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
@@ -123,15 +131,23 @@
$_POST['LinesCounter'] -= 10;
}
if ($_SESSION['ProhibitNegativeStock']==1){
+ $InTransitSQL="SELECT SUM(shipqty-recqty) as intransit
+ FROM loctransfers
+ WHERE stockid='" . $_POST['StockID' . $i] . "'
+ AND shiploc='".$_POST['FromStockLocation']."'
+ AND shipqty>recqty";
+ $InTransitResult=DB_query($InTransitSQL, $db);
+ $InTransitRow=DB_fetch_array($InTransitResult);
+ $InTransitQuantity=$InTransitRow['intransit'];
// 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])){
+
+ $myrow = DB_fetch_array($result);
+ if (($myrow['quantity']-$InTransitQuantity) < 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;
@@ -154,12 +170,12 @@
}
}//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;
@@ -171,9 +187,9 @@
if(isset($_POST['Submit']) AND $InputError==False){
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
-
+
DB_Txn_Begin($db);
-
+
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -237,11 +253,11 @@
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
-
+
echo '<tr>
<td>' . _('From Stock Location') . ':</td>
<td><select name="FromStockLocation">';
-
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['FromStockLocation'])){
if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -282,13 +298,13 @@
<td><input name="SelectedTransferFile" type="file" /></td>
</tr>
</table>';
-
- echo '<table class="selection">';
+ echo '<br /><table class="selection">';
+
$TableHeader = '<tr>
<th>'. _('Item Code'). '</th>
<th>'. _('Quantity'). '</th>
- <th>' . _('Clear All') . ':<input type="checkbox" name="ClearAll" /></th>
+ <th>' . _('Clear All') . ':<input type="checkbox" name="ClearAll" /></th>
</tr>';
echo $TableHeader;
@@ -308,7 +324,7 @@
$k=0;
}
$k++;
-
+
echo '<tr>
<td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
<td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i],'Variable') . '" /></td>
@@ -343,11 +359,11 @@
<input type="submit" name="EnterMoreItems" value="'. _('Add More Items'). '" />
<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
<br />';
-
+
echo '<script type="text/javascript">defaultControl(document.forms[0].StockID0);</script>';
-
+
echo '</form>
</div>';
include('includes/footer.inc');
}
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-16 09:52:03
|
Revision: 5247
http://web-erp.svn.sourceforge.net/web-erp/?rev=5247&view=rev
Author: tim_schofield
Date: 2012-04-16 09:51:52 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Add in a check for in transit stock to the bulk stock transfer dispatch screen
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-04-16 01:59:04 UTC (rev 5246)
+++ trunk/StockLocTransfer.php 2012-04-16 09:51:52 UTC (rev 5247)
@@ -23,59 +23,67 @@
unset($_POST['StockQTY' . $i]);
}
} else {
- if ($_FILES['SelectedTransferFile']['name']) { //start file processing
- //initialize
- $InputError = false;
- $ErrorMessage='';
- //get file handle
- $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r');
- $TotalItems=0;
- //loop through file rows
- while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
+ if ($_FILES['SelectedTransferFile']['name']) { //start file processing
+ //initialize
+ $InputError = false;
+ $ErrorMessage='';
+ //get file handle
+ $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r');
+ $TotalItems=0;
+ //loop through file rows
+ while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
- 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;
- }
+ 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++) {
- switch ($i) {
- case 0:
- $StockID = trim(mb_strtoupper($myrow[$i]));
- $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $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 />';
- }
- break;
- case 1:
- $Quantity = filter_number_format($myrow[$i]);
- if (!is_numeric($Quantity)){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric');
- }
- break;
- } // end switch statement
- if ($_SESSION['ProhibitNegativeStock']==1){
- // Only if stock exists at this location
- $result = DB_query("SELECT quantity
- FROM locstock
- WHERE stockid='" . $StockID . "'
- AND loccode='".$_POST['FromStockLocation']."'",
- $db);
- $CheckStockRow = DB_fetch_array($result);
- if ($CheckStockRow['quantity'] < $Quantity){
- $InputError = True;
- $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
- }
- }
- } // end for loop through the columns on the row being processed
+ // cleanup the data (csv files often import with empty strings and such)
+ $StockID='';
+ $Quantity=0;
+ for ($i=0; $i<count($myrow);$i++) {
+ switch ($i) {
+ case 0:
+ $StockID = trim(mb_strtoupper($myrow[$i]));
+ $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
+ $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 />';
+ }
+ break;
+ case 1:
+ $Quantity = filter_number_format($myrow[$i]);
+ if (!is_numeric($Quantity)){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric');
+ }
+ break;
+ } // end switch statement
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ $InTransitSQL="SELECT SUM(shipqty-recqty) as intransit
+ FROM loctransfers
+ WHERE stockid='" . $StockID . "'
+ AND shiploc='".$_POST['FromStockLocation']."'
+ AND shipqty>recqty";
+ $InTransitResult=DB_query($InTransitSQL, $db);
+ $InTransitRow=DB_fetch_array($InTransitResult);
+ $InTransitQuantity=$InTransitRow['intransit'];
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $StockID . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+ $CheckStockRow = DB_fetch_array($result);
+ if (($CheckStockRow['quantity']-$InTransitQuantity) < $Quantity){
+ $InputError = True;
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
+ }
+ }
+ } // end for loop through the columns on the row being processed
if ($StockID!='' AND $Quantity!=0){
$_POST['StockID' . $TotalItems] = $StockID;
$_POST['StockQTY' . $TotalItems] = $Quantity;
@@ -83,12 +91,12 @@
$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
+ } //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='';
-
+
if (isset($_POST['ClearAll'])){
unset($_POST['EnterMoreItems']);
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
@@ -123,15 +131,23 @@
$_POST['LinesCounter'] -= 10;
}
if ($_SESSION['ProhibitNegativeStock']==1){
+ $InTransitSQL="SELECT SUM(shipqty-recqty) as intransit
+ FROM loctransfers
+ WHERE stockid='" . $_POST['StockID' . $i] . "'
+ AND shiploc='".$_POST['FromStockLocation']."'
+ AND shipqty>recqty";
+ $InTransitResult=DB_query($InTransitSQL, $db);
+ $InTransitRow=DB_fetch_array($InTransitResult);
+ $InTransitQuantity=$InTransitRow['intransit'];
// 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])){
+
+ $myrow = DB_fetch_array($result);
+ if (($myrow['quantity']-$InTransitQuantity) < 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;
@@ -154,12 +170,12 @@
}
}//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;
@@ -171,9 +187,9 @@
if(isset($_POST['Submit']) AND $InputError==False){
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
-
+
DB_Txn_Begin($db);
-
+
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -237,11 +253,11 @@
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
-
+
echo '<tr>
<td>' . _('From Stock Location') . ':</td>
<td><select name="FromStockLocation">';
-
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['FromStockLocation'])){
if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -282,13 +298,13 @@
<td><input name="SelectedTransferFile" type="file" /></td>
</tr>
</table>';
-
- echo '<table class="selection">';
+ echo '<br /><table class="selection">';
+
$TableHeader = '<tr>
<th>'. _('Item Code'). '</th>
<th>'. _('Quantity'). '</th>
- <th>' . _('Clear All') . ':<input type="checkbox" name="ClearAll" /></th>
+ <th>' . _('Clear All') . ':<input type="checkbox" name="ClearAll" /></th>
</tr>';
echo $TableHeader;
@@ -308,7 +324,7 @@
$k=0;
}
$k++;
-
+
echo '<tr>
<td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
<td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i],'Variable') . '" /></td>
@@ -343,11 +359,11 @@
<input type="submit" name="EnterMoreItems" value="'. _('Add More Items'). '" />
<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
<br />';
-
+
echo '<script type="text/javascript">defaultControl(document.forms[0].StockID0);</script>';
-
+
echo '</form>
</div>';
include('includes/footer.inc');
}
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-05-03 08:46:21
|
Revision: 5312
http://web-erp.svn.sourceforge.net/web-erp/?rev=5312&view=rev
Author: tehonu
Date: 2012-05-03 08:46:12 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Changed Order By Location name (easier for users to identify than code)
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-05-03 08:39:49 UTC (rev 5311)
+++ trunk/StockLocTransfer.php 2012-05-03 08:46:12 UTC (rev 5312)
@@ -252,7 +252,7 @@
<th colspan="4"><input type="hidden" name="Trf_ID" value="' . $Trf_ID . '" /><h3>'. _('Inventory Location Transfer Shipment Reference').' # '. $Trf_ID. '</h3></th>
</tr>';
- $sql = "SELECT loccode, locationname FROM locations";
+ $sql = "SELECT loccode, locationname FROM locations ORDER BY locationname";
$resultStkLocs = DB_query($sql,$db);
echo '<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-05-03 08:46:24
|
Revision: 5312
http://web-erp.svn.sourceforge.net/web-erp/?rev=5312&view=rev
Author: tehonu
Date: 2012-05-03 08:46:12 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Changed Order By Location name (easier for users to identify than code)
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-05-03 08:39:49 UTC (rev 5311)
+++ trunk/StockLocTransfer.php 2012-05-03 08:46:12 UTC (rev 5312)
@@ -252,7 +252,7 @@
<th colspan="4"><input type="hidden" name="Trf_ID" value="' . $Trf_ID . '" /><h3>'. _('Inventory Location Transfer Shipment Reference').' # '. $Trf_ID. '</h3></th>
</tr>';
- $sql = "SELECT loccode, locationname FROM locations";
+ $sql = "SELECT loccode, locationname FROM locations ORDER BY locationname";
$resultStkLocs = DB_query($sql,$db);
echo '<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-07-23 03:38:35
|
Revision: 5528
http://web-erp.svn.sourceforge.net/web-erp/?rev=5528&view=rev
Author: tehonu
Date: 2012-07-23 03:38:28 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Ricard: Fix to prevent 1 transfer to have different dispatch times (+1 second) when transfer is long enough and CPU process is long
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-07-22 03:32:32 UTC (rev 5527)
+++ trunk/StockLocTransfer.php 2012-07-23 03:38:28 UTC (rev 5528)
@@ -189,7 +189,7 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
DB_Txn_Begin($db);
-
+ $Now = Date('Y-m-d H-i-s');
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -207,7 +207,7 @@
VALUES ('" . $_POST['Trf_ID'] . "',
'" . $_POST['StockID' . $i] . "',
'" . round(filter_number_format($_POST['StockQTY' . $i]), $DecimalRow['decimalplaces']) . "',
- '" . Date('Y-m-d H-i-s'). "',
+ '" . $Now . "',
'" . $_POST['FromStockLocation'] ."',
'" . $_POST['ToStockLocation'] . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to enter Location Transfer record for'). ' '.$_POST['StockID' . $i];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-07-23 03:38:35
|
Revision: 5528
http://web-erp.svn.sourceforge.net/web-erp/?rev=5528&view=rev
Author: tehonu
Date: 2012-07-23 03:38:28 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Ricard: Fix to prevent 1 transfer to have different dispatch times (+1 second) when transfer is long enough and CPU process is long
Modified Paths:
--------------
trunk/StockLocTransfer.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-07-22 03:32:32 UTC (rev 5527)
+++ trunk/StockLocTransfer.php 2012-07-23 03:38:28 UTC (rev 5528)
@@ -189,7 +189,7 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
DB_Txn_Begin($db);
-
+ $Now = Date('Y-m-d H-i-s');
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -207,7 +207,7 @@
VALUES ('" . $_POST['Trf_ID'] . "',
'" . $_POST['StockID' . $i] . "',
'" . round(filter_number_format($_POST['StockQTY' . $i]), $DecimalRow['decimalplaces']) . "',
- '" . Date('Y-m-d H-i-s'). "',
+ '" . $Now . "',
'" . $_POST['FromStockLocation'] ."',
'" . $_POST['ToStockLocation'] . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to enter Location Transfer record for'). ' '.$_POST['StockID' . $i];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X