Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5452] trunk
|
From: <dai...@us...> - 2012-06-24 07:52:39
|
Revision: 5452
http://web-erp.svn.sourceforge.net/web-erp/?rev=5452&view=rev
Author: daintree
Date: 2012-06-24 07:52:33 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
added title/tooltip of long description to a number of stock scripts
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/RecurringSalesOrders.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/ConfirmDispatch_Invoice.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -131,6 +131,7 @@
$LineItemsSQL = "SELECT stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.controlled,
stockmaster.serialised,
stockmaster.volume,
@@ -167,6 +168,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -319,7 +321,7 @@
echo $RowStarter;
echo '<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>
<td class="number">' . locale_number_format($LnItm->QtyInv,$LnItm->DecimalPlaces) . '</td>';
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/CounterSales.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -783,7 +783,7 @@
echo '<input type="hidden" name="ItemDue_' . $OrderLine->LineNumber . '" value="'.$OrderLine->ItemDue.'" />';
echo '<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) . '" />';
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/Credit_Invoice.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -99,6 +99,7 @@
$LineItemsSQL = "SELECT stockmoves.stkmoveno,
stockmoves.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.mbflag,
@@ -136,6 +137,7 @@
$_SESSION['CreditItems']->add_to_cart($myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['price'],
$myrow['discountpercent'],
$myrow['units'],
@@ -329,7 +331,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 05:49:39 UTC (rev 5451)
+++ trunk/DeliveryDetails.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -865,7 +865,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 05:49:39 UTC (rev 5451)
+++ trunk/RecurringSalesOrders.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -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 05:49:39 UTC (rev 5451)
+++ trunk/SelectCreditItems.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -442,6 +442,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -466,6 +467,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),
@@ -608,6 +610,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -632,6 +635,7 @@
if ($_SESSION['CreditItems'.$identifier]->add_to_cart ($myrow['stockid'],
1,
$myrow['description'],
+ $myrow['longdescription'],
GetPrice($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
$_SESSION['CreditItems'.$identifier]->Branch,
@@ -708,7 +712,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(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectOrderItems.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -190,6 +190,7 @@
$LineItemsSQL = "SELECT salesorderdetails.orderlineno,
salesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -226,6 +227,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -747,6 +749,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -758,6 +761,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -777,6 +781,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -788,6 +793,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -803,6 +809,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -813,6 +820,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -1391,7 +1399,7 @@
}
echo '<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){
@@ -1484,6 +1492,7 @@
$SQL="SELECT stockmaster.units,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
salesorderdetails.stkcode,
SUM(qtyinvoiced) salesqty
@@ -1588,8 +1597,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</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>
@@ -1599,6 +1608,7 @@
</td>
</tr>',
$myrow['stockid'],
+ $myrow['longdescription'],
$myrow['description'],
$myrow['units'],
locale_number_format($QOH, $QOHRow['decimalplaces']),
@@ -1775,8 +1785,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</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>
@@ -1786,6 +1796,7 @@
</td>
</tr>',
$myrow['stockid'],
+ $myrow['longdescription'],
$myrow['description'],
$myrow['units'],
locale_number_format($QOH,$QOHRow['decimalplaces']),
@@ -1882,4 +1893,4 @@
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectProduct.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -53,6 +53,7 @@
$StockID = $_SESSION['SelectedStockItem'];
}
$result = DB_query("SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockcategory.stocktype,
stockmaster.units,
@@ -79,7 +80,7 @@
}
echo '<table width="90%">
<tr>
- <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
+ <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b title="' . $myrow['longdescription'] . '">' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
</tr>';
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/doc/Change.log 2012-06-24 07:52:33 UTC (rev 5452)
@@ -1,7 +1,9 @@
webERP Change Log
-24/06/2012: Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
-24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+24/06/2012 Phil: Added tooltip/title showing long description on many scripts where short description is currently shown SelectOrderItems.php SelectCreditItems.php CreditInvoice.php DeliveryDetails.php CounterSales.php RecurringSalesOrders.php
+24/06/2012 Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
+24/06/2012 Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+
24/6/2012 Release 4.08.1
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/includes/DefineCartClass.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -77,6 +77,7 @@
function add_to_cart($StockID,
$Qty,
$Descr,
+ $LongDescr,
$Price,
$Disc=0,
$UOM,
@@ -116,6 +117,7 @@
$this->LineItems[$LineNumber] = new LineDetails($LineNumber,
$StockID,
$Descr,
+ $LongDescr,
$Qty,
$Price,
$Disc,
@@ -418,6 +420,7 @@
Var $LineNumber;
Var $StockID;
Var $ItemDescription;
+ Var $LongDescription;
Var $Quantity;
Var $Price;
Var $DiscountPercent;
@@ -448,6 +451,7 @@
function LineDetails ($LineNumber,
$StockItem,
$Descr,
+ $LongDescr,
$Qty,
$Prc,
$DiscPercent,
@@ -475,6 +479,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 05:49:39 UTC (rev 5451)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 07:52:33 UTC (rev 5452)
@@ -32,6 +32,7 @@
if ($AlreadyOnThisOrder!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -133,6 +134,7 @@
$_SESSION['Items'.$identifier]->add_to_cart ($NewItem,
$NewItemQty,
$myItemRow['description'],
+ $myItemRow['longdescription'],
$Price,
$Discount,
$myItemRow['units'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
