Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7947] trunk
|
From: <tu...@us...> - 2018-02-10 00:49:33
|
Revision: 7947
http://sourceforge.net/p/web-erp/reponame/7947
Author: turbopt
Date: 2018-02-10 00:49:30 +0000 (Sat, 10 Feb 2018)
Log Message:
-----------
Paul Becker (PaulT commit): StockLocMovements.php, StockMovements.php: Add serial number column to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8088)
Modified Paths:
--------------
trunk/StockLocMovements.php
trunk/StockMovements.php
trunk/doc/Change.log
Modified: trunk/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php 2018-02-10 00:05:31 UTC (rev 7946)
+++ trunk/StockLocMovements.php 2018-02-10 00:49:30 UTC (rev 7947)
@@ -71,10 +71,12 @@
stockmoves.price,
stockmoves.discountpercent,
stockmoves.newqoh,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces,
+ stockserialmoves.serialno
FROM stockmoves
INNER JOIN systypes ON stockmoves.type=systypes.typeid
INNER JOIN stockmaster ON stockmoves.stockid=stockmaster.stockid
+ LEFT JOIN stockserialmoves ON stockmoves.stkmoveno=stockserialmoves.stockmoveno
WHERE stockmoves.loccode='" . $_POST['StockLocation'] . "'
AND stockmoves.trandate >= '". $SQLAfterDate . "'
AND stockmoves.trandate <= '" . $SQLBeforeDate . "'
@@ -96,7 +98,8 @@
<th>' . _('Price') . '</th>
<th>' . _('Discount') . '</th>
<th>' . _('Quantity on Hand') . '</th>
- </tr>';
+ <th>' . _('Serial No.') . '</th>
+ </tr>';
echo $tableheader;
$j = 1;
@@ -116,6 +119,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
+ <td class="number">%s</td>
</tr>',
mb_strtoupper($myrow['stockid']),
mb_strtoupper($myrow['stockid']),
@@ -128,7 +132,8 @@
$myrow['reference'],
locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']));
+ locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
+ $myrow['serialno']);
$j++;
If ($j == 16){
$j=1;
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2018-02-10 00:05:31 UTC (rev 7946)
+++ trunk/StockMovements.php 2018-02-10 00:49:30 UTC (rev 7947)
@@ -33,7 +33,7 @@
}
echo '<br />
<table class="selection">';
-echo '<tr><th colspan="10">' . _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" />';
+echo '<tr><th colspan="12">' . _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" />';
echo ' ' . _('From Stock Location') . ':<select name="StockLocation"> ';
@@ -64,7 +64,7 @@
echo '</select></th>
</tr>';
echo '<tr>
- <th colspan="10">' . _('Show Movements between') . ': <input type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="12" value="' . $_POST['AfterDate'] . '" /> ' . _('and') . ': <input type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="12" value="' . $_POST['BeforeDate'] . '" /><input type="submit" name="ShowMoves" value="' . _('Show Stock Movements') . '" /></th>
+ <th colspan="12">' . _('Show Movements between') . ': <input type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="12" value="' . $_POST['AfterDate'] . '" /> ' . _('and') . ': <input type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="12" value="' . $_POST['BeforeDate'] . '" /><input type="submit" name="ShowMoves" value="' . _('Show Stock Movements') . '" /></th>
</tr>';
$SQLBeforeDate = FormatDateForSQL($_POST['BeforeDate']);
@@ -83,10 +83,12 @@
stockmoves.price,
stockmoves.discountpercent,
stockmoves.newqoh,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces,
+ stockserialmoves.serialno
FROM stockmoves
INNER JOIN systypes ON stockmoves.type=systypes.typeid
INNER JOIN stockmaster ON stockmoves.stockid=stockmaster.stockid
+ LEFT JOIN stockserialmoves ON stockmoves.stkmoveno=stockserialmoves.stockmoveno
WHERE stockmoves.loccode='" . $_POST['StockLocation'] . "'
AND stockmoves.trandate >= '". $SQLAfterDate . "'
AND stockmoves.stockid = '" . $StockID . "'
@@ -111,6 +113,7 @@
<th>' . _('Price') . '</th>
<th>' . _('Discount') . '</th>
<th>' . _('New Qty') . '</th>
+ <th>' . _('Serial No.') . '</th>
</tr>';
echo $tableheader;
@@ -135,6 +138,7 @@
<td class="number">%s</td>
<td class="number">%s%%</td>
<td class="number">%s</td>
+ <td class="number">%s</td>
</tr>',
$RootPath,
$myrow['transno'],
@@ -148,7 +152,8 @@
$myrow['reference'],
locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']));
+ locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
+ $myrow['serialno']);
} elseif ($myrow['type']==11){
@@ -164,6 +169,7 @@
<td class="number">%s</td>
<td class="number">%s%%</td>
<td class="number">%s</td>
+ <td class="number">%s</td>
</tr>',
$RootPath,
$myrow['transno'],
@@ -177,7 +183,8 @@
$myrow['reference'],
locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']));
+ locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
+ $myrow['serialno']);
} else {
printf('<tr class="striped_row">
@@ -192,6 +199,7 @@
<td class="number">%s</td>
<td class="number">%s%%</td>
<td class="number">%s</td>
+ <td class="number">%s</td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -203,7 +211,8 @@
$myrow['reference'],
locale_number_format($myrow['price'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['discountpercent']*100,2),
- locale_number_format($myrow['newqoh'],$myrow['decimalplaces']));
+ locale_number_format($myrow['newqoh'],$myrow['decimalplaces']),
+ $myrow['serialno']);
}
//end of page full new headings if
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-10 00:05:31 UTC (rev 7946)
+++ trunk/doc/Change.log 2018-02-10 00:49:30 UTC (rev 7947)
@@ -1,5 +1,6 @@
webERP Change Log
+9/2/18 Paul Becker (PaulT commit): StockLocMovements.php, StockMovements.php: Add serial number column to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8088)
9/2/18 Paul Becker (PaulT commit): InternalStockRequestFulfill.php: Add controlled stock handling within this script. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8086)
9/2/18 Tim/PaulT: MRPPlannedPurchaseOrders.php, MRPPlannedWorkOrders.php: Fix conversion factor matter noted by Tim, use DB_table_exists() from commit 7943 to replace table check query, and minor rework to 'missing cell' handling from commit 7939.
9/2/18 PaulT: Replace old method of table row alternating color handing with improved CSS. Also, this change removes some empty/unused properties from a few css file and removes old URL 'SID' references in files already modified for this commit. Due to SVN issues with TestPlanResults.php, this one file will be committed later.
|
