Thread: [Weberp-svn] SF.net SVN: weberp:[4073] trunk/WorkOrderEntry.php
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
weberp-svn
|
From: <tim...@us...> - 2011-01-08 15:21:55
|
Revision: 4073
http://weberp.svn.sourceforge.net/weberp/?rev=4073&view=rev
Author: tim_schofield
Date: 2011-01-08 15:21:49 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Correct the quotes in the sql literals
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-01-08 15:21:39 UTC (rev 4072)
+++ trunk/WorkOrderEntry.php 2011-01-08 15:21:49 UTC (rev 4073)
@@ -443,7 +443,7 @@
}
$_POST['Controlled'.$i] =$WOItem['controlled'];
$_POST['Serialised'.$i] =$WOItem['serialised'];
- $HasWOSerialNosResult = DB_query('SELECT * FROM woserialnos WHERE wo=' . $_POST['WO'],$db);
+ $HasWOSerialNosResult = DB_query("SELECT * FROM woserialnos WHERE wo='" . $_POST['WO'] . "'",$db);
if (DB_num_rows($HasWOSerialNosResult)>0){
$_POST['HasWOSerialNos']=true;
} else {
@@ -457,7 +457,7 @@
echo '<tr><td class="label">' . _('Work Order Reference') . ':</td><td>' . $_POST['WO'] . '</td></tr>';
echo '<tr><td class="label">' . _('Factory Location') .':</td>
<td><select name="StockLocation">';
-$LocResult = DB_query('SELECT loccode,locationname FROM locations',$db);
+$LocResult = DB_query("SELECT loccode,locationname FROM locations",$db);
while ($LocRow = DB_fetch_array($LocResult)){
if ($_POST['StockLocation']==$LocRow['loccode']){
echo '<option selected value="' . $LocRow['loccode'] .'">' . $LocRow['locationname'] . '</option>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-01-29 11:49:18
|
Revision: 4511
http://weberp.svn.sourceforge.net/weberp/?rev=4511&view=rev
Author: tim_schofield
Date: 2011-01-29 11:49:12 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Correct brokeb links to select work order and create new work order
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-01-28 17:14:15 UTC (rev 4510)
+++ trunk/WorkOrderEntry.php 2011-01-29 11:49:12 UTC (rev 4511)
@@ -252,7 +252,7 @@
if (isset($_POST['submit'])) { //The update button has been clicked
- echo '<div class=centre><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . "'>" . _('Enter a new work order') . '</a>';
+ echo '<div class=centre><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Enter a new work order') . '</a>';
echo '<br><a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select an existing work order') . '</a>';
echo '<br><a href="'. $rootpath . '/WorkOrderCosting.php?' . SID . '&WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-02-28 15:57:41
|
Revision: 4631
http://weberp.svn.sourceforge.net/weberp/?rev=4631&view=rev
Author: tim_schofield
Date: 2011-02-28 15:57:35 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
Phil: Remove SID from href links
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-02-28 15:52:24 UTC (rev 4630)
+++ trunk/WorkOrderEntry.php 2011-02-28 15:57:35 UTC (rev 4631)
@@ -252,9 +252,9 @@
if (isset($_POST['submit'])) { //The update button has been clicked
- echo '<div class=centre><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Enter a new work order') . '</a>';
- echo '<br><a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select an existing work order') . '</a>';
- echo '<br><a href="'. $rootpath . '/WorkOrderCosting.php?' . SID . '&WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
+ echo '<div class=centre><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Enter a new work order') . '</a>';
+ echo '<br><a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
+ echo '<br><a href="'. $rootpath . '/WorkOrderCosting.php&WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
$Input_Error = false; //hope for the best
for ($i=1;$i<=$_POST['NumberOfOutputs'];$i++){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-04-22 07:34:56
|
Revision: 5206
http://weberp.svn.sourceforge.net/weberp/?rev=5206&view=rev
Author: tim_schofield
Date: 2011-04-22 07:34:50 +0000 (Fri, 22 Apr 2011)
Log Message:
-----------
Correct badly formed link
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-04-18 13:49:55 UTC (rev 5205)
+++ trunk/WorkOrderEntry.php 2011-04-22 07:34:50 UTC (rev 5206)
@@ -254,7 +254,7 @@
echo '<div class=centre><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Enter a new work order') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
- echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php&WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
+ echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
$Input_Error = false; //hope for the best
for ($i=1;$i<=$_POST['NumberOfOutputs'];$i++){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-06-14 09:02:13
|
Revision: 5379
http://weberp.svn.sourceforge.net/weberp/?rev=5379&view=rev
Author: tim_schofield
Date: 2011-06-14 09:02:07 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Correct quoting as per coding guidelines
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-06-14 09:00:35 UTC (rev 5378)
+++ trunk/WorkOrderEntry.php 2011-06-14 09:02:07 UTC (rev 5379)
@@ -579,13 +579,13 @@
</select>
<td><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</td>
-<td><input type="Text" name="Keywords" size=20 maxlength=25 value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
+<td><input type="Text" name="Keywords" size=20 maxlength=25 value=" <?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
<tr><td></td>
<td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="Text" name="StockCode" size=15 maxlength=18 value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
+ <td><input type="Text" name="StockCode" size=15 maxlength=18 value=" <?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
</tr>
</table>
- <br /><div class="centre"><input type=submit name="Search" value="<?php echo _('Search Now'); ?>">
+ <br /><div class="centre"><input type=submit name="Search" value=" <?php echo _('Search Now'); ?>">
<?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-01 12:52:49
|
Revision: 5493
http://weberp.svn.sourceforge.net/weberp/?rev=5493&view=rev
Author: tim_schofield
Date: 2011-07-01 12:52:43 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
Change the layout of the code
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-01 12:52:27 UTC (rev 5492)
+++ trunk/WorkOrderEntry.php 2011-07-01 12:52:43 UTC (rev 5493)
@@ -2,8 +2,6 @@
/* $Id$*/
-//$PageSecurity = 10;
-
include('includes/session.inc');
$title = _('Work Order Entry');
include('includes/header.inc');
@@ -209,10 +207,10 @@
if ($InputError==false){
$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*bom.quantity) AS cost
- FROM stockmaster INNER JOIN bom
- ON stockmaster.stockid=bom.component
- WHERE bom.parent='" . $NewItem . "'
- AND bom.loccode='" . $_POST['StockLocation'] . "'",
+ FROM stockmaster INNER JOIN bom
+ ON stockmaster.stockid=bom.component
+ WHERE bom.parent='" . $NewItem . "'
+ AND bom.loccode='" . $_POST['StockLocation'] . "'",
$db);
$CostRow = DB_fetch_row($CostResult);
if (is_null($CostRow[0]) OR $CostRow[0]==0){
@@ -303,10 +301,10 @@
if ($_POST['RecdQty'.$i]==0 AND (!isset($_POST['HasWOSerialNos'.$i]) or $_POST['HasWOSerialNos'.$i]==false)){
/* can only change location cost if QtyRecd=0 */
$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*bom.quantity) AS cost
- FROM stockmaster INNER JOIN bom
- ON stockmaster.stockid=bom.component
- WHERE bom.parent='" . $_POST['OutputItem'.$i] . "'
- AND bom.loccode='" . $_POST['StockLocation'] . "'",
+ FROM stockmaster INNER JOIN bom
+ ON stockmaster.stockid=bom.component
+ WHERE bom.parent='" . $_POST['OutputItem'.$i] . "'
+ AND bom.loccode='" . $_POST['StockLocation'] . "'",
$db);
$CostRow = DB_fetch_row($CostResult);
if (is_null($CostRow[0])){
@@ -354,7 +352,7 @@
// can't delete it there are open work issues
$HasTransResult = DB_query("SELECT * FROM stockmoves
WHERE (stockmoves.type= 26 OR stockmoves.type=28)
- AND reference LIKE '%" . $_POST['WO'] . "%'",$db);
+ AND reference " . LIKE . " '%" . $_POST['WO'] . "%'",$db);
if (DB_num_rows($HasTransResult)>0){
prnMsg(_('This work order cannot be deleted because it has issues or receipts related to it'),'error');
$CancelDelete=true;
@@ -398,7 +396,7 @@
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '" name="form">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br /><table class=selection>';
+echo '<br /><table class="selection">';
$sql="SELECT workorders.loccode,
requiredby,
@@ -488,7 +486,7 @@
<td class=number>' . number_format($myrow['costissued'],2) . '</td></tr>';
}
echo '</table>
- <br /><table class=selection>';
+ <br /><table class="selection">';
echo '<tr><th>' . _('Output Item') . '</th>
<th>' . _('Qty Required') . '</th>
<th>' . _('Qty Received') . '</th>
@@ -524,7 +522,7 @@
} else {
$LotOrSN = _('Batches');
}
- echo '<td><a href="' . $rootpath . '/WOSerialNos.php?' . SID . '&WO=' . $_POST['WO'] . '&StockID=' . $_POST['OutputItem' .$i] . '&Description=' . $_POST['OutputItemDesc' .$i] . '&Serialised=' . $_POST['Serialised' .$i] . '&NextSerialNo=' . $_POST['NextLotSNRef' .$i] . '">' . $LotOrSN . '</a></td>';
+ echo '<td><a href="' . $rootpath . '/WOSerialNos.php?WO=' . $_POST['WO'] . '&StockID=' . $_POST['OutputItem' .$i] . '&Description=' . $_POST['OutputItemDesc' .$i] . '&Serialised=' . $_POST['Serialised' .$i] . '&NextSerialNo=' . $_POST['NextLotSNRef' .$i] . '">' . $LotOrSN . '</a></td>';
}
}
echo '<td>';
@@ -639,7 +637,7 @@
$myrow['description'],
$myrow['units'],
$ImageSource,
- $_SERVER['PHP_SELF'] . '?' . SID . 'WO=' . $_POST['WO'] . '&NewItem=' . $myrow['stockid'].'&Line='.$i);
+ $_SERVER['PHP_SELF'] . '?WO=' . $_POST['WO'] . '&NewItem=' . $myrow['stockid'].'&Line='.$i);
$j++;
If ($j == 25){
@@ -660,9 +658,6 @@
echo '<script>defaultControl(document.forms[0].OutputQty"'.$_GET['Line'].'");</script>';
}
-
echo '</form>';
-
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...> - 2011-07-12 13:07:19
|
Revision: 5845
http://weberp.svn.sourceforge.net/weberp/?rev=5845&view=rev
Author: tim_schofield
Date: 2011-07-12 13:07:12 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Remove unnecessary use of SID
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-12 13:07:02 UTC (rev 5844)
+++ trunk/WorkOrderEntry.php 2011-07-12 13:07:12 UTC (rev 5845)
@@ -609,7 +609,7 @@
if (!in_array($myrow['stockid'],$ItemCodes)){
if (function_exists('imagecreatefrompng') ){
- $ImageSource = '<img src="GetStockImage.php?SID&automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64">';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64">';
} else {
if(file_exists($_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg')) {
$ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-14 15:36:18
|
Revision: 6058
http://weberp.svn.sourceforge.net/weberp/?rev=6058&view=rev
Author: tim_schofield
Date: 2011-07-14 15:36:12 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-14 15:36:02 UTC (rev 6057)
+++ trunk/WorkOrderEntry.php 2011-07-14 15:36:12 UTC (rev 6058)
@@ -556,7 +556,7 @@
ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
-echo '<table class=selection><tr><td>' . _('Select a stock category') . ':<select name="StockCat">';
+echo '<table class="selection"><tr><td>' . _('Select a stock category') . ':<select name="StockCat">';
if (!isset($_POST['StockCat'])){
echo '<option selected value="All">' . _('All') . '</option>';
@@ -593,7 +593,7 @@
if (DB_num_rows($SearchResult)>1){
- echo '<table cellpadding=2 colspan=7 class=selection>';
+ echo '<table cellpadding=2 colspan=7 class="selection">';
$TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Units') . '</th></tr>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-15 14:50:02
|
Revision: 6246
http://weberp.svn.sourceforge.net/weberp/?rev=6246&view=rev
Author: tim_schofield
Date: 2011-07-15 14:49:56 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-15 14:49:46 UTC (rev 6245)
+++ trunk/WorkOrderEntry.php 2011-07-15 14:49:56 UTC (rev 6246)
@@ -483,7 +483,7 @@
if (isset($WOResult)){
echo '<tr><td class="label">' . _('Accumulated Costs') . ':</td>
- <td class=number>' . number_format($myrow['costissued'],2) . '</td></tr>';
+ <td class="number">' . number_format($myrow['costissued'],2) . '</td></tr>';
}
echo '</table>
<br /><table class="selection">';
@@ -512,8 +512,8 @@
} else {
echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value=' . $_POST['OutputQty' . $i] . ' size=10 maxlength=10></td>';
}
- echo '<td class=number><input type="hidden" name="RecdQty' . $i . '" value=' . $_POST['RecdQty' .$i] . '>' . $_POST['RecdQty' .$i] .'</td>
- <td class=number>' . ($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]) . '</td>';
+ echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value=' . $_POST['RecdQty' .$i] . '>' . $_POST['RecdQty' .$i] .'</td>
+ <td class="number">' . ($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]) . '</td>';
if ($_POST['Controlled'.$i]==1){
echo '<td><input type="text" name="NextLotSNRef' .$i . '" value="' . $_POST['NextLotSNRef'.$i] . '"></td>';
if ($_SESSION['DefineControlledOnWOEntry']==1){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-16 09:40:07
|
Revision: 6442
http://weberp.svn.sourceforge.net/weberp/?rev=6442&view=rev
Author: tim_schofield
Date: 2011-07-16 09:40:01 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-16 09:39:47 UTC (rev 6441)
+++ trunk/WorkOrderEntry.php 2011-07-16 09:40:01 UTC (rev 6442)
@@ -453,7 +453,7 @@
}
}
-echo '<input type=hidden name="WO" value=' .$_POST['WO'] . '>';
+echo '<input type="hidden" name="WO" value=' .$_POST['WO'] . '>';
echo '<tr><td class="label">' . _('Work Order Reference') . ':</td><td>' . $_POST['WO'] . '</td></tr>';
echo '<tr><td class="label">' . _('Factory Location') .':</td>
<td><select name="StockLocation">';
@@ -539,7 +539,7 @@
echo '<input type="hidden" name="HasWOSerialNos' . $i .'" value="' . $_POST['HasWOSerialNos' . $i] . '">';
}
}
- echo '<input type=hidden name="NumberOfOutputs" value=' . ($i -1).'>';
+ echo '<input type="hidden" name="NumberOfOutputs" value="' . ($i -1).'" />';
}
echo '</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-16 12:50:54
|
Revision: 6536
http://weberp.svn.sourceforge.net/weberp/?rev=6536&view=rev
Author: tim_schofield
Date: 2011-07-16 12:50:48 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-16 12:50:37 UTC (rev 6535)
+++ trunk/WorkOrderEntry.php 2011-07-16 12:50:48 UTC (rev 6536)
@@ -250,7 +250,7 @@
if (isset($_POST['submit'])) { //The update button has been clicked
- echo '<div class=centre><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Enter a new work order') . '</a>';
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Enter a new work order') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-16 17:56:12
|
Revision: 6589
http://weberp.svn.sourceforge.net/weberp/?rev=6589&view=rev
Author: tim_schofield
Date: 2011-07-16 17:56:06 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-16 17:55:53 UTC (rev 6588)
+++ trunk/WorkOrderEntry.php 2011-07-16 17:56:06 UTC (rev 6589)
@@ -543,9 +543,9 @@
}
echo '</table>';
-echo '<div class="centre"><br /><input type=submit name="submit" value="' . _('Update') . '">';
+echo '<div class="centre"><br /><input type="submit" name="submit" value="' . _('Update') . '">';
-echo '<br /><input type=submit name="delete" value="' . _('Delete This Work Order') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">';
+echo '<br /><input type="submit" name="delete" value="' . _('Delete This Work Order') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">';
echo '<br /></div>';
@@ -583,7 +583,7 @@
<td><input type="Text" name="StockCode" size=15 maxlength=18 value=" <?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
</tr>
</table>
- <br /><div class="centre"><input type=submit name="Search" value=" <?php echo _('Search Now'); ?>">
+ <br /><div class="centre"><input type="submit" name="Search" value=" <?php echo _('Search Now'); ?>" />
<?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-22 19:19:38
|
Revision: 6840
http://weberp.svn.sourceforge.net/weberp/?rev=6840&view=rev
Author: tim_schofield
Date: 2011-07-22 19:19:31 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
Remove unnecessary white space
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-22 13:45:57 UTC (rev 6839)
+++ trunk/WorkOrderEntry.php 2011-07-22 19:19:31 UTC (rev 6840)
@@ -577,10 +577,10 @@
</select>
<td><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</td>
-<td><input type="Text" name="Keywords" size=20 maxlength=25 value=" <?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
+<td><input type="Text" name="Keywords" size=20 maxlength=25 value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
<tr><td></td>
<td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="Text" name="StockCode" size=15 maxlength=18 value=" <?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
+ <td><input type="Text" name="StockCode" size=15 maxlength=18 value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
</tr>
</table>
<br /><div class="centre"><input type="submit" name="Search" value=" <?php echo _('Search Now'); ?>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-26 13:39:33
|
Revision: 6857
http://weberp.svn.sourceforge.net/weberp/?rev=6857&view=rev
Author: tim_schofield
Date: 2011-07-26 13:39:27 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-26 13:39:16 UTC (rev 6856)
+++ trunk/WorkOrderEntry.php 2011-07-26 13:39:27 UTC (rev 6857)
@@ -460,7 +460,7 @@
$LocResult = DB_query("SELECT loccode,locationname FROM locations",$db);
while ($LocRow = DB_fetch_array($LocResult)){
if ($_POST['StockLocation']==$LocRow['loccode']){
- echo '<option selected value="' . $LocRow['loccode'] .'">' . $LocRow['locationname'] . '</option>';
+ echo '<option selected="True" value="' . $LocRow['loccode'] .'">' . $LocRow['locationname'] . '</option>';
} else {
echo '<option value="' . $LocRow['loccode'] .'">' . $LocRow['locationname'] . '</option>';
}
@@ -559,7 +559,7 @@
echo '<table class="selection"><tr><td>' . _('Select a stock category') . ':<select name="StockCat">';
if (!isset($_POST['StockCat'])){
- echo '<option selected value="All">' . _('All') . '</option>';
+ echo '<option selected="True" value="All">' . _('All') . '</option>';
$_POST['StockCat'] ='All';
} else {
echo '<option value="All">' . _('All') . '</option>';
@@ -568,7 +568,7 @@
while ($myrow1 = DB_fetch_array($result1)) {
if ($_POST['StockCat']==$myrow1['categoryid']){
- echo '<option selected value=' . $myrow1['categoryid'] . '>' . $myrow1['categorydescription'] . '</option>';
+ echo '<option selected="True" value=' . $myrow1['categoryid'] . '>' . $myrow1['categorydescription'] . '</option>';
} else {
echo '<option value='. $myrow1['categoryid'] . '>' . $myrow1['categorydescription'] . '</option>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-26 20:32:42
|
Revision: 7018
http://weberp.svn.sourceforge.net/weberp/?rev=7018&view=rev
Author: tim_schofield
Date: 2011-07-26 20:32:36 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-26 20:32:20 UTC (rev 7017)
+++ trunk/WorkOrderEntry.php 2011-07-26 20:32:36 UTC (rev 7018)
@@ -577,10 +577,10 @@
</select>
<td><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</td>
-<td><input type="Text" name="Keywords" size=20 maxlength=25 value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
+<td><input type="text" name="Keywords" size="20" maxlength="25" value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
<tr><td></td>
- <td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="Text" name="StockCode" size=15 maxlength=18 value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
+ <td><font size="3"><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
+ <td><input type="text" name="StockCode" size="15" maxlength="18" value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
</tr>
</table>
<br /><div class="centre"><input type="submit" name="Search" value=" <?php echo _('Search Now'); ?>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-27 20:46:05
|
Revision: 7104
http://weberp.svn.sourceforge.net/weberp/?rev=7104&view=rev
Author: tim_schofield
Date: 2011-07-27 20:45:59 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-27 20:45:44 UTC (rev 7103)
+++ trunk/WorkOrderEntry.php 2011-07-27 20:45:59 UTC (rev 7104)
@@ -470,16 +470,19 @@
$_POST['StartDate'] = Date($_SESSION['DefaultDateFormat']);
}
-echo '<tr><td class="label">' . _('Start Date') . ':</td><td><input type="text" name="StartDate" size=12 maxlength=12 value="' . $_POST['StartDate'] .
- '" class="date" alt="'.$_SESSION['DefaultDateFormat'].'"></td></tr>';
+echo '<tr>
+ <td class="label">' . _('Start Date') . ':</td>
+ <td><input type="text" name="StartDate" size="12" maxlength="12" value="' . $_POST['StartDate'] .'" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" /></td>
+ </tr>';
if (!isset($_POST['RequiredBy'])){
$_POST['RequiredBy'] = Date($_SESSION['DefaultDateFormat']);
}
-echo '<tr><td class="label">' . _('Required By') . ':</td>
- <td><input type="text" name="RequiredBy" size=12 maxlength=12 value="' . $_POST['RequiredBy'] .
- '" class="date" alt="'.$_SESSION['DefaultDateFormat'].'"></td></tr>';
+echo '<tr>
+ <td class="label">' . _('Required By') . ':</td>
+ <td><input type="text" name="RequiredBy" size="12" maxlength="12" value="' . $_POST['RequiredBy'] .'" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" /></td>
+ </tr>';
if (isset($WOResult)){
echo '<tr><td class="label">' . _('Accumulated Costs') . ':</td>
@@ -510,7 +513,7 @@
echo '<td style="text-align: right">' . $_POST['OutputQty' . $i] . '</td>';
echo '<input type="hidden" name="OutputQty' . $i .'" value=' . $_POST['OutputQty' . $i] . '>';
} else {
- echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value=' . $_POST['OutputQty' . $i] . ' size=10 maxlength=10></td>';
+ echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value="' . $_POST['OutputQty' . $i] . '" size="10" maxlength="10" /></td>';
}
echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value=' . $_POST['RecdQty' .$i] . '>' . $_POST['RecdQty' .$i] .'</td>
<td class="number">' . ($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]) . '</td>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-29 21:34:35
|
Revision: 7339
http://weberp.svn.sourceforge.net/weberp/?rev=7339&view=rev
Author: tim_schofield
Date: 2011-07-29 21:34:29 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-07-29 21:34:15 UTC (rev 7338)
+++ trunk/WorkOrderEntry.php 2011-07-29 21:34:29 UTC (rev 7339)
@@ -596,7 +596,7 @@
if (DB_num_rows($SearchResult)>1){
- echo '<table cellpadding=2 colspan=7 class="selection">';
+ echo '<table cellpadding=2 colspan="7" class="selection">';
$TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Units') . '</th></tr>';
@@ -612,10 +612,10 @@
if (!in_array($myrow['stockid'],$ItemCodes)){
if (function_exists('imagecreatefrompng') ){
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64">';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64" />';
} else {
if(file_exists($_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg')) {
- $ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg">';
+ $ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" />';
} else {
$ImageSource = _('No Image');
}
@@ -629,11 +629,11 @@
$k=1;
}
- printf('<td><font size=1>%s</font></td>
- <td><font size=1>%s</font></td>
- <td><font size=1>%s</font></td>
+ printf('<td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
<td>%s</td>
- <td><font size=1><a href="%s">'
+ <td><font size="1"><a href="%s">'
. _('Add to Work Order') . '</a></font></td>
</tr>',
$myrow['stockid'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-08-08 21:17:08
|
Revision: 7671
http://weberp.svn.sourceforge.net/weberp/?rev=7671&view=rev
Author: tim_schofield
Date: 2011-08-08 21:17:02 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-08-08 21:16:51 UTC (rev 7670)
+++ trunk/WorkOrderEntry.php 2011-08-08 21:17:02 UTC (rev 7671)
@@ -517,7 +517,7 @@
echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value="' . $_POST['RecdQty' .$i] . '" />' . $_POST['RecdQty' .$i] .'</td>
<td class="number">' . ($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]) . '</td>';
if ($_POST['Controlled'.$i]==1){
- echo '<td><input type="text" name="NextLotSNRef' .$i . '" value="' . $_POST['NextLotSNRef'.$i] . '"></td>';
+ echo '<td><input type="text" name="NextLotSNRef' .$i . '" value="' . $_POST['NextLotSNRef'.$i] . '" /></td>';
if ($_SESSION['DefineControlledOnWOEntry']==1){
if ($_POST['Serialised' . $i]==1){
$LotOrSN = _('S/Ns');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-08-28 07:17:34
|
Revision: 7968
http://weberp.svn.sourceforge.net/weberp/?rev=7968&view=rev
Author: tim_schofield
Date: 2011-08-28 07:17:28 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Automatically refresh when stock location is changed
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-08-28 07:17:06 UTC (rev 7967)
+++ trunk/WorkOrderEntry.php 2011-08-28 07:17:28 UTC (rev 7968)
@@ -392,7 +392,7 @@
}
}
-echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '" name="form">';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '" name="form1">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class="selection">';
@@ -455,7 +455,7 @@
echo '<input type="hidden" name="WO" value="' .$_POST['WO'] . '" />';
echo '<tr><td class="label">' . _('Work Order Reference') . ':</td><td>' . $_POST['WO'] . '</td></tr>';
echo '<tr><td class="label">' . _('Factory Location') .':</td>
- <td><select name="StockLocation">';
+ <td><select name="StockLocation" onChange="ReloadForm(form1.submit)">';
$LocResult = DB_query("SELECT loccode,locationname FROM locations",$db);
while ($LocRow = DB_fetch_array($LocResult)){
if ($_POST['StockLocation']==$LocRow['loccode']){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-08-30 20:16:12
|
Revision: 8042
http://weberp.svn.sourceforge.net/weberp/?rev=8042&view=rev
Author: tim_schofield
Date: 2011-08-30 20:16:06 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Format currency and stock amounts correctly
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-08-30 10:04:25 UTC (rev 8041)
+++ trunk/WorkOrderEntry.php 2011-08-30 20:16:06 UTC (rev 8042)
@@ -20,6 +20,12 @@
$LocCode=$_SESSION['UserStockLocation'];
}
+foreach ($_POST as $key=>$value) {
+ if (substr($key, 0, 9)=='OutputQty' or substr($key, 0, 7)=='RecdQty') {
+ $_POST[$key] = filter_number_input($value);
+ }
+}
+
// check for new or modify condition
if (isset($_REQUEST['WO']) and $_REQUEST['WO']!=''){
// modify
@@ -423,6 +429,7 @@
nextlotsnref,
controlled,
serialised,
+ stockmaster.decimalplaces,
nextserialno
FROM woitems INNER JOIN stockmaster
ON woitems.stockid=stockmaster.stockid
@@ -435,6 +442,7 @@
$_POST['OutputItemDesc'.$i]=$WOItem['description'];
$_POST['OutputQty' . $i]= $WOItem['qtyreqd'];
$_POST['RecdQty' .$i] =$WOItem['qtyrecd'];
+ $_POST['DecimalPlaces' . $i] = $WOItem['decimalplaces'];
if ($WOItem['serialised']==1 AND $WOItem['nextserialno']>0){
$_POST['NextLotSNRef' .$i]=$WOItem['nextserialno'];
} else {
@@ -485,7 +493,7 @@
if (isset($WOResult)){
echo '<tr><td class="label">' . _('Accumulated Costs') . ':</td>
- <td class="number">' . number_format($myrow['costissued'],2) . '</td></tr>';
+ <td class="number">' . currency_number_format($myrow['costissued'],$_SESSION['CompanyRecord']['currencydefault']) . '</td></tr>';
}
echo '</table>
<br /><table class="selection">';
@@ -509,13 +517,13 @@
echo '<td><input type="hidden" name="OutputItem' . $i . '" value="' . $_POST['OutputItem' .$i] . '" />' .
$_POST['OutputItem' . $i] . ' - ' . $_POST['OutputItemDesc' .$i] . '</td>';
if ($_POST['Controlled'.$i]==1 AND $_SESSION['DefineControlledOnWOEntry']==1){
- echo '<td style="text-align: right">' . $_POST['OutputQty' . $i] . '</td>';
- echo '<input type="hidden" name="OutputQty' . $i .'" value="' . $_POST['OutputQty' . $i] . '" />';
+ echo '<td class="number">' . stock_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '</td>';
+ echo '<input type="hidden" name="OutputQty' . $i .'" value="' . stock_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '" />';
} else {
- echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value="' . $_POST['OutputQty' . $i] . '" size="10" maxlength="10" /></td>';
+ echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value="' . stock_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '" size="10" maxlength="10" /></td>';
}
- echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value="' . $_POST['RecdQty' .$i] . '" />' . $_POST['RecdQty' .$i] .'</td>
- <td class="number">' . ($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]) . '</td>';
+ echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value="' . stock_number_format($_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) . '" />' . stock_number_format($_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) .'</td>
+ <td class="number">' . stock_number_format(($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]), $_POST['DecimalPlaces' . $i]) . '</td>';
if ($_POST['Controlled'.$i]==1){
echo '<td><input type="text" name="NextLotSNRef' .$i . '" value="' . $_POST['NextLotSNRef'.$i] . '" /></td>';
if ($_SESSION['DefineControlledOnWOEntry']==1){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-09-03 16:07:47
|
Revision: 8061
http://weberp.svn.sourceforge.net/weberp/?rev=8061&view=rev
Author: tim_schofield
Date: 2011-09-03 16:07:41 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Code layout changes
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-09-03 16:07:31 UTC (rev 8060)
+++ trunk/WorkOrderEntry.php 2011-09-03 16:07:41 UTC (rev 8061)
@@ -174,43 +174,43 @@
if (isset($NewItem) AND isset($_POST['WO'])){
- $InputError=false;
- $CheckItemResult = DB_query("SELECT mbflag,
+ $InputError=false;
+ $CheckItemResult = DB_query("SELECT mbflag,
eoq,
controlled
- FROM stockmaster
- WHERE stockid='" . $NewItem . "'",
- $db);
- if (DB_num_rows($CheckItemResult)==1){
- $CheckItemRow = DB_fetch_array($CheckItemResult);
- if ($CheckItemRow['controlled']==1 AND $_SESSION['DefineControlledOnWOEntry']==1){ //need to add serial nos or batches to determine quantity
- $EOQ = 0;
- } else {
- if (!isset($ReqQty)) {
- $ReqQty=$CheckItemRow['eoq'];
- }
- $EOQ = $ReqQty;
+ FROM stockmaster
+ WHERE stockid='" . $NewItem . "'",
+ $db);
+ if (DB_num_rows($CheckItemResult)==1){
+ $CheckItemRow = DB_fetch_array($CheckItemResult);
+ if ($CheckItemRow['controlled']==1 AND $_SESSION['DefineControlledOnWOEntry']==1){ //need to add serial nos or batches to determine quantity
+ $EOQ = 0;
+ } else {
+ if (!isset($ReqQty)) {
+ $ReqQty=$CheckItemRow['eoq'];
}
- if ($CheckItemRow['mbflag']!='M'){
- prnMsg(_('The item selected cannot be added to a work order because it is not a manufactured item'),'warn');
- $InputError=true;
- }
- } else {
- prnMsg(_('The item selected cannot be found in the database'),'error');
- $InputError = true;
- }
- $CheckItemResult = DB_query("SELECT stockid
+ $EOQ = $ReqQty;
+ }
+ if ($CheckItemRow['mbflag']!='M'){
+ prnMsg(_('The item selected cannot be added to a work order because it is not a manufactured item'),'warn');
+ $InputError=true;
+ }
+ } else {
+ prnMsg(_('The item selected cannot be found in the database'),'error');
+ $InputError = true;
+ }
+ $CheckItemResult = DB_query("SELECT stockid
FROM woitems
WHERE stockid='" . $NewItem . "'
AND wo='" .$_POST['WO'] . "'",
$db);
- if (DB_num_rows($CheckItemResult)==1){
- prnMsg(_('This item is already on the work order and cannot be added again'),'warn');
- $InputError=true;
- }
+ if (DB_num_rows($CheckItemResult)==1){
+ prnMsg(_('This item is already on the work order and cannot be added again'),'warn');
+ $InputError=true;
+ }
- if ($InputError==false){
+ if ($InputError==false){
$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*bom.quantity) AS cost
FROM stockmaster INNER JOIN bom
ON stockmaster.stockid=bom.component
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-09-25 20:30:36
|
Revision: 8185
http://weberp.svn.sourceforge.net/weberp/?rev=8185&view=rev
Author: tim_schofield
Date: 2011-09-25 20:30:30 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Remove all SELECT * references, only choose those fields that are needed
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2011-09-25 20:30:20 UTC (rev 8184)
+++ trunk/WorkOrderEntry.php 2011-09-25 20:30:30 UTC (rev 8185)
@@ -355,7 +355,7 @@
$CancelDelete=false; //always assume the best
// can't delete it there are open work issues
- $HasTransResult = DB_query("SELECT * FROM stockmoves
+ $HasTransResult = DB_query("SELECT transno FROM stockmoves
WHERE (stockmoves.type= 26 OR stockmoves.type=28)
AND reference " . LIKE . " '%" . $_POST['WO'] . "%'",$db);
if (DB_num_rows($HasTransResult)>0){
@@ -450,7 +450,7 @@
}
$_POST['Controlled'.$i] =$WOItem['controlled'];
$_POST['Serialised'.$i] =$WOItem['serialised'];
- $HasWOSerialNosResult = DB_query("SELECT * FROM woserialnos WHERE wo='" . $_POST['WO'] . "'",$db);
+ $HasWOSerialNosResult = DB_query("SELECT wo FROM woserialnos WHERE wo='" . $_POST['WO'] . "'",$db);
if (DB_num_rows($HasWOSerialNosResult)>0){
$_POST['HasWOSerialNos']=true;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-19 22:26:35
|
Revision: 8534
http://weberp.svn.sourceforge.net/weberp/?rev=8534&view=rev
Author: tim_schofield
Date: 2012-02-19 22:26:29 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Show the quantity remaining figure in the input box
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-02-19 22:26:19 UTC (rev 8533)
+++ trunk/WorkOrderEntry.php 2012-02-19 22:26:29 UTC (rev 8534)
@@ -518,9 +518,9 @@
$_POST['OutputItem' . $i] . ' - ' . $_POST['OutputItemDesc' .$i] . '</td>';
if ($_POST['Controlled'.$i]==1 AND $_SESSION['DefineControlledOnWOEntry']==1){
echo '<td class="number">' . locale_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '</td>';
- echo '<input type="hidden" name="OutputQty' . $i .'" value="' . locale_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '" />';
+ echo '<input type="hidden" name="OutputQty' . $i .'" value="' . locale_number_format($_POST['OutputQty' . $i]-$_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) . '" />';
} else {
- echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value="' . locale_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '" size="10" maxlength="10" /></td>';
+ echo'<td><input type="text" class="number" name="OutputQty' . $i . '" value="' . locale_number_format($_POST['OutputQty' . $i]-$_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) . '" size="10" maxlength="10" /></td>';
}
echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value="' . locale_number_format($_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) . '" />' . locale_number_format($_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) .'</td>
<td class="number">' . locale_number_format(($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]), $_POST['DecimalPlaces' . $i]) . '</td>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:28:31
|
Revision: 8698
http://weberp.svn.sourceforge.net/weberp/?rev=8698&view=rev
Author: tim_schofield
Date: 2012-04-28 21:28:25 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-04-28 12:35:00 UTC (rev 8697)
+++ trunk/WorkOrderEntry.php 2012-04-28 21:28:25 UTC (rev 8698)
@@ -553,9 +553,9 @@
}
echo '</table>';
-echo '<div class="centre"><br /><input type="submit" name="submit" value="' . _('Update') . '" />';
+echo '<div class="centre"><br /><button type="submit" name="submit">' . _('Update') . '</button>';
-echo '<br /><input type="submit" name="delete" value="' . _('Delete This Work Order') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
+echo '<br /><button type="submit" name="delete" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . _('Delete This Work Order') . '></button>';
echo '</div><br />';
@@ -600,7 +600,7 @@
<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr>
</table>
- <br /><div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
+ <br /><div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button></div>';
if (isset($SearchResult)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-05-11 16:27:47
|
Revision: 8885
http://weberp.svn.sourceforge.net/weberp/?rev=8885&view=rev
Author: tim_schofield
Date: 2012-05-11 16:27:41 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Do not reset header info when searching for parts
Modified Paths:
--------------
trunk/WorkOrderEntry.php
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-05-11 16:27:29 UTC (rev 8884)
+++ trunk/WorkOrderEntry.php 2012-05-11 16:27:41 UTC (rev 8885)
@@ -253,7 +253,7 @@
} //adding a new item to the work order
-if (isset($_POST['submit'])) { //The update button has been clicked
+if (isset($_POST['submit']) or isset($_POST['Search'])) { //The update button has been clicked
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') .'">' . _('Enter a new work order') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
@@ -338,9 +338,10 @@
$result = DB_query($sql_stmt,$db,$ErrMsg);
}
+ if (!isset($_POST['Search'])) {
+ prnMsg(_('The work order has been updated'),'success');
+ }
- prnMsg(_('The work order has been updated'),'success');
-
for ($i=1;$i<=$_POST['NumberOfOutputs'];$i++){
unset($_POST['OutputItem'.$i]);
unset($_POST['OutputQty'.$i]);
@@ -414,6 +415,7 @@
$WOResult = DB_query($sql,$db);
if (DB_num_rows($WOResult)==1){
+
$myrow = DB_fetch_array($WOResult);
$_POST['StartDate'] = ConvertSQLDate($myrow['startdate']);
$_POST['CostIssued'] = $myrow['costissued'];
@@ -553,9 +555,9 @@
}
echo '</table>';
-echo '<div class="centre"><br /><button type="submit" name="submit">' . _('Update') . '</button>';
+echo '<br /><div class="centre"><button type="submit" name="submit">' . _('Update') . '</button></div>';
-echo '<br /><button type="submit" name="delete" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . _('Delete This Work Order') . '></button>';
+echo '<br /><div class="centre"><button type="submit" name="delete" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . _('Delete This Work Order') . '</button>';
echo '</div><br />';
@@ -606,7 +608,7 @@
if (DB_num_rows($SearchResult)>1){
- echo '<table cellpadding="2" class="selection">';
+ echo '<br /><table cellpadding="2" class="selection">';
$TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Units') . '</th></tr>';
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