[Weberp-svn] SF.net SVN: weberp:[9059] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[9059] trunk
|
From: <tim...@us...> - 2012-06-24 11:11:30
|
Revision: 9059
http://weberp.svn.sourceforge.net/weberp/?rev=9059&view=rev
Author: tim_schofield
Date: 2012-06-24 11:11:22 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Phil: added title/tooltip of long description to a number of stock scripts
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/RecurringSalesOrders.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/ConfirmDispatch_Invoice.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -121,6 +121,7 @@
$LineItemsSQL = "SELECT stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.controlled,
stockmaster.serialised,
stockmaster.volume,
@@ -161,6 +162,7 @@
$_SESSION['Items']->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -314,7 +316,7 @@
$_SESSION['Items']->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
echo '<td>'.$LnItm->StockID.'</td>
- <td>'.$LnItm->ItemDescription.'</td>
+ <td title="'. $LnItm->LongDescription . '">'.$LnItm->ItemDescription.'</td>
<td class="number">' . number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
<td>'.$LnItm->Units.'</td>
<td class="number">' . number_format($LnItm->QtyInv,$LnItm->DecimalPlaces) . '</td>';
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/Credit_Invoice.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -100,6 +100,7 @@
$LineItemsSQL = "SELECT stockmoves.stkmoveno,
stockmoves.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.mbflag,
@@ -138,6 +139,7 @@
$_SESSION['CreditItems']->add_to_cart($myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['price'],
$myrow['discountpercent'],
$myrow['units'],
@@ -312,7 +314,7 @@
$j++;
echo '<tr '.$RowStarter.'><td>' . $LnItm->StockID . '</td>
- <td>' . $LnItm->ItemDescription . '</td>
+ <td title="'. $LnItm->LongDescription . '">' . $LnItm->ItemDescription . '</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
<td>' . $LnItm->Units . '</td>';
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/DeliveryDetails.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -874,7 +874,7 @@
}
echo '<td>'.$StockItem->StockID.'</td>
- <td>'.$StockItem->ItemDescription.'</td>
+ <td title="'. $StockItem->LongDescription . '">'.$StockItem->ItemDescription.'</td>
<td class="number">'.$DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
<td class="number">'.$DisplayPrice.'</td>
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/RecurringSalesOrders.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -105,6 +105,7 @@
/*need to look up customer name from debtors master then populate the line items array with the sales order details records */
$LineItemsSQL = "SELECT recurrsalesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -130,6 +131,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -347,7 +349,7 @@
}
echo '<td>'.$StockItem->StockID.'</td>
- <td>'.$StockItem->ItemDescription.'</td>
+ <td title="'. $StockItem->LongDescription . '">'.$StockItem->ItemDescription.'</td>
<td class="number">'.$DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
<td class="number">'.$DisplayPrice.'</td>
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/SelectCreditItems.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -206,6 +206,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.decimalplaces,
stockmaster.units as stockunits
FROM stockmaster, stockcategory
@@ -219,6 +220,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.decimalplaces,
stockmaster.units as stockunits
FROM stockmaster,
@@ -238,6 +240,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.decimalplaces,
stockmaster.units as stockunits
FROM stockmaster,
@@ -252,6 +255,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.decimalplaces,
stockmaster.units as stockunits
FROM stockmaster,
@@ -268,6 +272,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.decimalplaces,
stockmaster.units as stockunits
FROM stockmaster, stockcategory
@@ -280,6 +285,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.decimalplaces,
stockmaster.units as stockunits
FROM stockmaster,
@@ -368,6 +374,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units as stockunits,
stockmaster.volume,
@@ -392,6 +399,7 @@
if ($_SESSION['CreditItems'.$identifier]->add_to_cart ($myrow['stockid'],
$NewItemQty,
$myrow['description'],
+ $myrow['longdescription'],
GetPrice ($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
$_SESSION['CreditItems'.$identifier]->Branch, $db),
@@ -539,6 +547,7 @@
foreach ($NewItem_array as $key=>$value) {
$NewItem=$key;
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units as stockunits,
stockmaster.volume,
@@ -569,6 +578,7 @@
$myrow['stockid'],
$value,
$myrow['description'],
+ $myrow['longdescription'],
$Price[0],
0,
$_POST['Units'.$myrow['stockid']],
@@ -647,7 +657,7 @@
}
echo $RowStarter . '<td>' . $LineItem->StockID . '</td>
- <td>' . $LineItem->ItemDescription . '</td>';
+ <td title="'. $LineItem->LongDescription . '">' . $LineItem->ItemDescription . '</td>';
if ($LineItem->Controlled==0){
echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format($LineItem->Quantity, $LineItem->DecimalPlaces) . '" /></td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/SelectOrderItems.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -198,6 +198,7 @@
$LineItemsSQL = "SELECT salesorderdetails.orderlineno,
salesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -251,6 +252,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -651,6 +653,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units as stockunits,
stockmaster.decimalplaces
FROM stockmaster,
@@ -664,6 +667,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units as stockunits,
stockmaster.decimalplaces
FROM stockmaster,
@@ -685,6 +689,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units as stockunits,
stockmaster.decimalplaces
FROM stockmaster,
@@ -698,6 +703,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units as stockunits,
stockmaster.decimalplaces
FROM stockmaster,
@@ -715,6 +721,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units as stockunits,
stockmaster.decimalplaces
FROM stockmaster,
@@ -727,6 +734,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units as stockunits,
stockmaster.decimalplaces
FROM stockmaster,
@@ -1248,7 +1256,7 @@
}
echo '<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
- <td>' . $OrderLine->ItemDescription . '</td>';
+ <td title="'. $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity, $OrderLine->DecimalPlaces) . '" />';
if ($QtyRemain != $QtyOrdered){
@@ -1413,6 +1421,7 @@
$SQL="SELECT stockmaster.units,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
salesorderdetails.stkcode,
SUM(qtyinvoiced) salesqty
@@ -1525,8 +1534,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</font></td>
+ <td title="%s">%s</td>
<td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -1536,6 +1545,7 @@
</tr>',
$myrow['stockid'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['units'],
locale_number_format($QOH, $DecimalPlaces),
locale_number_format($DemandQty, $DecimalPlaces),
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/SelectProduct.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -99,6 +99,7 @@
$StockID = $_SESSION['SelectedStockItem'];
}
$result = DB_query("SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockcategory.stocktype,
stockmaster.units,
@@ -123,7 +124,9 @@
} else {
$ItemStatus = '';
}
- echo '<table width="95%" class="selection"><tr><th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . ' ' . $ItemStatus . '</b></th></tr>';
+ echo '<table width="95%" class="selection">
+ <tr>
+ <th title="'. $myrow['longdescription'] . '" colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . ' ' . $ItemStatus . '</b></th></tr>';
echo '<tr><td width="40%" valign="top">
<table align="left" style="background: transparent;">'; //nested table
echo '<tr><th style="text-align:right;"><b>' . _('Item Type:') . '</b></th>
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/includes/DefineCartClass.php 2012-06-24 11:11:22 UTC (rev 9059)
@@ -73,6 +73,7 @@
function add_to_cart($StockID,
$Qty,
$Descr,
+ $LongDescr,
$Price,
$Disc=0,
$Units,
@@ -114,6 +115,7 @@
$this->LineItems[$LineNumber] = new LineDetails($LineNumber,
$StockID,
$Descr,
+ $LongDescr,
$Qty,
$Price,
$Disc,
@@ -429,6 +431,7 @@
var $LineNumber;
var $StockID;
var $ItemDescription;
+ var $LongDescription;
var $Quantity;
var $Price;
var $DiscountPercent;
@@ -463,6 +466,7 @@
function LineDetails ($LineNumber,
$StockItem,
$Descr,
+ $LongDescr,
$Qty,
$Prc,
$DiscPercent,
@@ -493,6 +497,7 @@
$this->LineNumber = $LineNumber;
$this->StockID =$StockItem;
$this->ItemDescription = $Descr;
+ $this->LongDescription = $LongDescr;
$this->Quantity = $Qty;
$this->Price = $Prc;
$this->DiscountPercent = $DiscPercent;
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 10:37:05 UTC (rev 9058)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 11:11:22 UTC (rev 9059)
@@ -31,6 +31,7 @@
if ($AlreadyOnThisOrder!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -136,6 +137,7 @@
$_SESSION['Items'.$identifier]->add_to_cart ($NewItem,
$NewItemQty,
$myItemRow['description'],
+ $myItemRow['longdescription'],
$Price,
$Discount,
$_POST['Units'.$NewItem],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
