[Weberp-svn] SF.net SVN: weberp:[4195] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[4195] trunk
|
From: <tim...@us...> - 2011-01-09 12:28:28
|
Revision: 4195
http://weberp.svn.sourceforge.net/weberp/?rev=4195&view=rev
Author: tim_schofield
Date: 2011-01-09 12:28:19 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Updates to purchase orders for conversion factor and order status
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/includes/DefinePOClass.php
trunk/includes/PO_ReadInOrder.inc
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-01-09 12:15:06 UTC (rev 4194)
+++ trunk/PO_Header.php 2011-01-09 12:28:19 UTC (rev 4195)
@@ -58,11 +58,11 @@
}
}
-if (isset($_POST['UpdateStat']) AND $_POST['UpdateStat']!='') {
+if (isset($_POST['UpdateStatus']) AND $_POST['UpdateStatus']!='') {
/*The cancel button on the header screen - to delete order */
- $OK_to_updstat = 1;
+ $OKToUpdateStatus = 1;
$OldStatus=$_SESSION['PO'.$identifier]->Status;
- $NewStatus=$_POST['Stat'];
+ $NewStatus=$_POST['Status'];
$EmailSQL="SELECT email FROM www_users WHERE userid='".$_SESSION['PO'.$identifier]->Initiator."'";
$EmailResult=DB_query($EmailSQL, $db);
$EmailRow=DB_fetch_array($EmailResult);
@@ -773,7 +773,6 @@
echo '<tr><td><a href="' .$rootpath . "/GoodsReceived.php?" . SID . "&PONumber=" .
$_SESSION['PO'.$identifier]->OrderNo . "&identifier=".$identifier.'">'._('Receive this order').'</a></td></tr>';
}
- echo '<td>' . _('Status') . ' : </td><td><select name="Stat" onChange="ReloadForm(form1.UpdateStat)">';
switch ($_SESSION['PO'.$identifier]->Status) {
case '':
@@ -808,22 +807,23 @@
break;
}
+ echo '<td>' . _('Status') . ' : </td><td><select name="Status" onChange="ReloadForm(UpdateStatus)">';
foreach ($StatusList as $Status) {
- if ($_SESSION['PO'.$identifier]->Stat == $Status){
+ if ($_SESSION['PO'.$identifier]->Status == $Status){
echo '<option selected value="' . $Status . '">' . _($Status) . '</option>';
} else {
echo '<option value="'.$Status.'">' . _($Status) . '</option>';
}
- echo '</select></td></tr>';
+ } //end its not a new order
+ echo '</select></td></tr>';
- echo '<tr><td>' . _('Status Comment') . ':</td>
+ echo '<tr><td>' . _('Status Comment') . ':</td>
<td><input type=text name="StatusComments" size=50></td></tr>
- <tr><td colspan=2><b>' . $_SESSION['PO'.$identifier]->StatusComments .'</b></td></tr>';
- //need to use single quotes as double quotes inside the string of StatusComments
- echo "<input type='hidden' name='StatusCommentsComplete' value='" . $_SESSION['PO'.$identifier]->StatusComments ."'>";
- echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'"></td>';
- } //end its not a new order
+ <tr><td colspan=2><b>' . $_SESSION['PO'.$identifier]->StatComments .'</b></td></tr>';
+ //need to use single quotes as double quotes inside the string of StatusComments
+ echo "<input type='hidden' name='StatusCommentsComplete' value='" . $_SESSION['PO'.$identifier]->StatComments ."'>";
+ echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'"></td>';
echo '</tr></table></td>';
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-01-09 12:15:06 UTC (rev 4194)
+++ trunk/PO_Items.php 2011-01-09 12:28:19 UTC (rev 4195)
@@ -39,6 +39,8 @@
*/
$sql = "SELECT stockmaster.description,
purchdata.suppliers_partno,
+ purchdata.conversionfactor,
+ purchdata.suppliersuom,
stockmaster.pkg_type,
stockmaster.units,
stockmaster.netweight,
@@ -53,15 +55,16 @@
_('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
- $myrow = DB_fetch_row($result);
+ $myrow = DB_fetch_array($result);
- $_POST['ItemDescription'] = $myrow[0];
- $_POST['Suppliers_PartNo'] = $myrow[1];
- $_POST['Package'] = $myrow[2];
- $_POST['uom'] = $myrow[3];
- $_POST['nw'] = $myrow[4];
- $_POST['gw'] = $myrow[5];
- $_POST['CuFt'] = $myrow[6];
+ $_POST['ItemDescription'] = $myrow['description'];
+ $_POST['Suppliers_PartNo'] = $myrow['suppliers_partno'];
+ $_POST['ConversionFactor'] = $myrow['conversionfactor'];
+ $_POST['Package'] = $myrow['pkg_type'];
+ $_POST['uom'] = $myrow['suppliersuom'];
+ $_POST['nw'] = $myrow['netweight'];
+ $_POST['gw'] = $myrow['kgs'];
+ $_POST['CuFt'] = $myrow['volume'];
} // end if (isset($_POST['StockID2']) && $_GET['Edit']=='')
if (isset($_POST['UpdateLines']) OR isset($_POST['Commit'])) {
@@ -187,6 +190,7 @@
jobref,
itemno,
uom,
+ conversionfactor,
suppliers_partno,
subtotal_amount,
package,
@@ -209,6 +213,7 @@
'" . $POLine->JobRef . "',
'" . $POLine->ItemNo . "',
'" . $POLine->SuppUOM . "',
+ '" . $POLine->ConversionFactor . "',
'" . $POLine->Suppliers_PartNo . "',
'" . $POLine->SubTotal_Amount . "',
'" . $POLine->Package . "',
@@ -334,8 +339,8 @@
shiptref='" . $POLine->ShiptRef . "',
jobref='" . $POLine->JobRef . "',
itemno='" . $POLine->ItemNo . "',
- uom='" . $POLine->uom . "',
- uom='" . $POLine->ConversionFactor. "',
+ uom='" . $POLine->UOM . "',
+ conversionfactor='" . $POLine->ConversionFactor. "',
suppliers_partno='" . $POLine->Suppliers_PartNo . "',
subtotal_amount='" . $POLine->SubTotal_Amount . "',
package='" . $POLine->Package . "',
@@ -358,8 +363,8 @@
shiptref='" . $POLine->ShiptRef . "',
jobref='" . $POLine->JobRef . "',
itemno='" . $POLine->ItemNo . "',
- uom='" . $POLine->uom . "',
- uom='" . $POLine->ConversionFactor . "',
+ uom='" . $POLine->UOM. "',
+ conversionfactor='" . $POLine->ConversionFactor . "',
suppliers_partno='" . $POLine->Suppliers_PartNo . "',
subtotal_amount='" . $POLine->SubTotal_Amount . "',
package='" . $POLine->Package . "',
@@ -816,7 +821,7 @@
$Quantity, /* Qty */
$myrow['description'],
$myrow['price'],
- $myrow['units'],
+ $myrow['unitname'],
$myrow['stockact'],
$_SESSION['PO'.$identifier]->DeliveryDate,
0,
@@ -945,28 +950,8 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $UomSQL="SELECT conversionfactor,
- suppliersuom,
- unitsofmeasure.
- unitname
- FROM purchdata
- LEFT JOIN unitsofmeasure
- ON purchdata.suppliersuom=unitsofmeasure.unitid
- WHERE supplierno='".$_SESSION['PO'.$identifier]->SupplierID."'
- AND stockid='".$POLine->StockID."'";
-
- $UomResult=DB_query($UomSQL, $db);
- if (DB_num_rows($UomResult)>0) {
- $UomRow=DB_fetch_array($UomResult);
- if (strlen($UomRow['suppliersuom'])>0) {
- $Uom=$UomRow['unitname'];
- } else {
- $Uom=$POLine->Units;
- }
- } else {
- $Uom=$POLine->Units;
- }
- echo '<input type="hidden" name="ConversionFactor" value="'.$UomRow['conversionfactor'].'" />';
+ $Uom=$POLine->UOM;
+ echo '<input type="hidden" name="ConversionFactor" value="'.$POLine->ConversionFactor.'" />';
echo '<td>' . $POLine->StockID . '</td>
<td>' . $POLine->ItemDescription . '</td>
<td><input type="text" class="number" name="Qty' . $POLine->LineNo .'" size="11" value="' . $DisplayQuantity . '"></td>
Modified: trunk/includes/DefinePOClass.php
===================================================================
--- trunk/includes/DefinePOClass.php 2011-01-09 12:15:06 UTC (rev 4194)
+++ trunk/includes/DefinePOClass.php 2011-01-09 12:28:19 UTC (rev 4195)
@@ -225,7 +225,7 @@
Var $GLActName;
Var $Quantity;
Var $Price;
- Var $Units; //errrrr what is uom for then
+ Var $UOM; //errrrr what is uom for then
Var $ReqDelDate;
Var $QtyInv;
Var $QtyReceived;
@@ -295,7 +295,7 @@
$this->Quantity = $Qty;
$this->ReqDelDate = $ReqDelDate;
$this->Price = $Price;
- $this->Units = $UOM;
+ $this->UOM = $UOM;
$this->QtyReceived = $QtyRecd;
$this->QtyInv = $QtyInv;
$this->GLCode = $GLCode;
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2011-01-09 12:15:06 UTC (rev 4194)
+++ trunk/includes/PO_ReadInOrder.inc 2011-01-09 12:28:19 UTC (rev 4195)
@@ -15,7 +15,7 @@
/*read in all the guff from the selected order into the PO PurchOrder Class variable */
- $OrderHeaderSQL = 'SELECT purchorders.supplierno,
+ $OrderHeaderSQL = "SELECT purchorders.supplierno,
suppliers.suppname,
purchorders.comments,
purchorders.orddate,
@@ -53,7 +53,7 @@
LEFT JOIN locations ON purchorders.intostocklocation=locations.loccode,
suppliers
WHERE purchorders.supplierno = suppliers.supplierid
- AND purchorders.orderno = ' . $_GET['ModifyOrderNumber'];
+ AND purchorders.orderno = '" . $_GET['ModifyOrderNumber'] . "'";
$ErrMsg = _('The order cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used and failed was');
@@ -94,7 +94,7 @@
$_SESSION['PO'.$identifier]->Version = $myrow['version'];
$_SESSION['PO'.$identifier]->Port = $myrow['port'];
$_SESSION['PO'.$identifier]->Status = $myrow['status'];
- $_SESSION['PO'.$identifier]->StatusComments = $myrow['stat_comment'];
+ $_SESSION['PO'.$identifier]->StatComments = $myrow['stat_comment'];
$_SESSION['PO'.$identifier]->DeliveryDate = ConvertSQLDate($myrow['deliverydate']);
$_SESSION['ExistingOrder'] = $_SESSION['PO'.$identifier]->OrderNo;
$_SESSION['PO'.$identifier]->PaymentTerms= $myrow['paymentterms'];
@@ -152,7 +152,8 @@
cuft,
total_quantity,
total_amount,
- assetid
+ assetid,
+ uom
FROM purchorderdetails
LEFT JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
@@ -187,27 +188,27 @@
} else {
$StockID = $myrow['itemcode'];
}
- $LatestPurchDataSQL='SELECT max(effectivefrom)
+ $LatestPurchDataSQL="SELECT max(effectivefrom)
FROM purchdata
- WHERE supplierno="'.$_SESSION['PO'.$identifier]->SupplierID.'"
- AND stockid="'. $StockID.'"
- AND effectivefrom<="'.$_SESSION['PO'.$identifier]->Orig_OrderDate.'"';
+ WHERE supplierno='".$_SESSION['PO'.$identifier]->SupplierID."'
+ AND stockid='". $StockID."'
+ AND effectivefrom<='".$_SESSION['PO'.$identifier]->Orig_OrderDate."'";
$LatestPurchDataResult=DB_query($LatestPurchDataSQL, $db);
$LatestPurchDataRow=DB_fetch_row($LatestPurchDataResult);
if ($LatestPurchDataRow[0] != '') {
- $sql='SELECT unitsofmeasure.unitname,
+ $sql="SELECT unitsofmeasure.unitname,
suppliers_partno,
conversionfactor
FROM purchdata
LEFT JOIN unitsofmeasure
ON purchdata.suppliersuom=unitsofmeasure.unitid
- WHERE supplierno="'.$_SESSION['PO'.$identifier]->SupplierID.'"
- AND stockid="'.$StockID.'"
- AND effectivefrom="'.$LatestPurchDataRow[0].'"';
+ WHERE supplierno='".$_SESSION['PO'.$identifier]->SupplierID."'
+ AND stockid='".$StockID."'
+ AND effectivefrom='".$LatestPurchDataRow[0]."'";
$PurchDataResult=DB_query($sql, $db);
$myrow2=DB_fetch_array($PurchDataResult);
} else {
- $sql='SELECT units as unitname, stockid as suppliers_partno FROM stockmaster WHERE stockid="'.$StockID.'"';
+ $sql="SELECT units as unitname, stockid as suppliers_partno FROM stockmaster WHERE stockid='".$StockID."'";
$PurchDataResult=DB_query($sql, $db);
$myrow2=DB_fetch_array($PurchDataResult);
$myrow2['conversionfactor']=1;
@@ -220,7 +221,7 @@
$myrow['quantityord'],
stripslashes($myrow['itemdescription']),
$myrow['unitprice'],
- $Units,
+ $myrow['uom'],
$GLCode,
ConvertSQLDate($myrow['deliverydate']),
$myrow['shiptref'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
