[Weberp-svn] SF.net SVN: weberp:[8761] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[8761] trunk
|
From: <tim...@us...> - 2012-05-01 17:37:20
|
Revision: 8761
http://weberp.svn.sourceforge.net/weberp/?rev=8761&view=rev
Author: tim_schofield
Date: 2012-05-01 17:37:13 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/PDFDIFOT.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPrintLabel.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockTransfer.php
trunk/PDFStockTransfer_departments.php
trunk/PDFSuppTransListing.php
trunk/includes/IndexArray.php
Modified: trunk/PDFDIFOT.php
===================================================================
--- trunk/PDFDIFOT.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFDIFOT.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -83,8 +83,8 @@
</table>
<br />
<div class="centre">
- <input type="submit" name="Go" value="' . _('Create PDF') . '" />
- </div>';
+ <button type="submit" name="Go">' . _('Create PDF') . '</button>
+ </div><br />';
if ($InputError==1){
prnMsg($msg,'error');
Modified: trunk/PDFLowGP.php
===================================================================
--- trunk/PDFLowGP.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFLowGP.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -141,7 +141,7 @@
<td><input type="text" class="number" name="GPMin" maxlength="6" size="6" value="' . locale_number_format($_POST['GPMin'],2) . '" /> %</td>
</tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="PrintPDF">' . _('Print PDF') . '</button></div><br />';
}
include('includes/footer.inc');
Modified: trunk/PDFOrderStatus.php
===================================================================
--- trunk/PDFOrderStatus.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFOrderStatus.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -64,7 +64,7 @@
echo '<tr><td>' . _('Back Order Only') . ':</td><td><select name="BackOrders">';
echo '<option selected="True" value="Yes">' . _('Only Show Back Orders') . '</option>';
echo '<option value="No">' . _('Show All Orders') . '</option>';
- echo '</select></td></tr></table><br /><div class="centre"><input type="submit" name="Go" value="' . _('Create PDF') . '" /></div>';
+ echo '</select></td></tr></table><br /><div class="centre"><button type="submit" name="Go">' . _('Create PDF') . '</button></div><br />';
include('includes/footer.inc');
exit;
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFOrdersInvoiced.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -73,7 +73,7 @@
}
echo '</select></td></tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="Go" value="' . _('Create PDF') . '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="Go">' . _('Create PDF') . '</button></div><br />';
include('includes/footer.inc');
exit;
Modified: trunk/PDFPeriodStockTransListing.php
===================================================================
--- trunk/PDFPeriodStockTransListing.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFPeriodStockTransListing.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -71,7 +71,7 @@
}
echo '</select></td></tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="Go" value="' . _('Create PDF') . '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="Go">' . _('Create PDF') . '</button></div><br />';
include('includes/footer.inc');
exit;
Modified: trunk/PDFPickingList.php
===================================================================
--- trunk/PDFPickingList.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFPickingList.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -37,7 +37,7 @@
}
echo '</select></td></tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Process" value="' . _('Print Picking Lists') . '" /></div></form>';
+ echo '<br /><div class="centre"><button type="submit" name="Process">' . _('Print Picking Lists') . '</buton></div><br /></form>';
include('includes/footer.inc');
exit();
}
Modified: trunk/PDFPrintLabel.php
===================================================================
--- trunk/PDFPrintLabel.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFPrintLabel.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -86,8 +86,8 @@
<input type="hidden" name="LabelID" value="' . $_POST['LabelID'] . '" />
<br />
<div class="centre">
- <input type="submit" name="PrintLabels" value="'. _('Print Labels'). '" />
- </div>
+ <button type="submit" name="PrintLabels">'. _('Print Labels'). '</button>
+ </div><br />
</form>';
exit;
}
Modified: trunk/PDFRemittanceAdvice.php
===================================================================
--- trunk/PDFRemittanceAdvice.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFRemittanceAdvice.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -135,6 +135,8 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"><table>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print Transfer Note') . '" alt="" />' . ' ' . $title.'</p><br />';
+
if (!isset($_POST['FromCriteria']) or mb_strlen($_POST['FromCriteria'])<1){
$DefaultFromCriteria = '1';
} else {
@@ -145,7 +147,7 @@
} else {
$DefaultToCriteria = $_POST['ToCriteria'];
}
- echo '<tr><td>' . _('From Supplier Code') . ':</font></td>
+ echo '<table class="selection"><tr><td>' . _('From Supplier Code') . ':</font></td>
<td><input type="text" maxlength="6" size="7" name="FromCriteria" value="' . $DefaultFromCriteria . '" /></td></tr>';
echo '<tr><td>' . _('To Supplier Code') . ':</td>
<td><input type="text" maxlength="6" size="7" name="ToCriteria" value="' . $DefaultToCriteria . '" /></td></tr>';
@@ -159,7 +161,7 @@
echo '<tr><td>' . _('Date Of Payment') . ':</td>
<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="PaymentDate" maxlength="11" size="12" value="' . $DefaultDate . '" /></td></tr>';
- echo '</table><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div></form>';
+ echo '</table><br /><div class="centre"><button type="submit" name="PrintPDF">' . _('Print PDF') . '</button></div></form><br />';
include ('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFStockCheckComparison.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -350,7 +350,7 @@
echo '<option selected="True" value="Leave">' . _('Do not Adjust System stock to Nil') . '</option>';
}
- echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF'). '"></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="PrintPDF">' . _('Print PDF'). '</button></div><br />';
include('includes/footer.inc');
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFStockLocTransfer.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -4,7 +4,7 @@
/* $Revision: 1.12 $ */
-$title = _('Stock Location Transfer Docket Error');
+$title = _('Stock Location Transfer Docket Reprint');
include('includes/session.inc');
include('includes/PDFStarter.php');
@@ -19,9 +19,9 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Reprint transfer docket').'</p><br />';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table><tr><td>'._('Transfer docket to reprint').'</td>';
- echo '<td><input type="text" class="number" size="10" name="TransferNo" /></td></tr></table>';
- echo '<div class="centre"><input type="submit" name="Print" value="' . _('Print') .'" />';
+ echo '<table class="selection"><tr><td>'._('Transfer docket to reprint').'</td>';
+ echo '<td><input type="text" class="number" size="10" name="TransferNo" /></td></tr></table><br />';
+ echo '<div class="centre"><button type="submit" name="Print">' . _('Create PDF') .'</button></div><br />';
include ('includes/footer.inc');
exit;
}
Modified: trunk/PDFStockTransfer.php
===================================================================
--- trunk/PDFStockTransfer.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFStockTransfer.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -24,7 +24,7 @@
echo '<td>'._('Print Stock Transfer Note').' : '.'</td>';
echo '<td><input type="text" class="number" name="TransferNo" maxlength="10" size="11" /></td></tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Process" value="' . _('Print Transfer Note') . '"></div></form>';
+ echo '<br /><div class="centre"><button type="submit" name="Process">' . _('Print Transfer Note') . '</button></div></form></br />';
include('includes/footer.inc');
exit();
}
Modified: trunk/PDFStockTransfer_departments.php
===================================================================
--- trunk/PDFStockTransfer_departments.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFStockTransfer_departments.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -16,16 +16,16 @@
}
if (!isset($_GET['TransferNo'])){ //still not set from a post then
//open a form for entering a transfer number
- $title = _('Transfer');
+ $title = _('Print an Internal Transfer Note');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print Transfer Note') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection"><tr>';
- echo '<td>'._('Imprimir Nota de Despacho').' : '.'</td>';
+ echo '<td>'._('Internal Transfer number to print').' : '.'</td>';
echo '<td><input type=text class="number" name="TransferNo" maxlength=10 size=11 /></td></tr>';
echo '</table>';
- echo '<br><div class="centre"><input type="submit" name="Process" value="' . _('Imprimir Nota') . '"></div></form>';
+ echo '<br><div class="centre"><button type="submit" name="Process">' . _('Print Transfer Note') . '</button></div></form><br />';
include('includes/footer.inc');
exit();
}
@@ -43,11 +43,19 @@
/*Print out the category totals */
-$sql="SELECT stockmaster.stockid, stockmaster.description, dispatchitems.quantity, departments.description as namedepartments,loccode,despatchdate
-FROM dispatch, dispatchitems, stockmaster, departments
-WHERE departments.departmentid=dispatch.departmentid and stockmaster.stockid = dispatchitems.itemid
-AND dispatch.dispatchid = dispatchitems.dispatchid
-AND dispatchitems.`dispatchid` ='".$_GET['TransferNo']."'";
+$sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ dispatchitems.quantity,
+ departments.description as namedepartments,
+ loccode,despatchdate
+ FROM dispatch
+ INNER JOIN dispatchitems
+ ON dispatch.dispatchid = dispatchitems.dispatchid
+ INNER JOIN stockmaster
+ ON stockmaster.stockid = dispatchitems.itemid
+ INNER JOIN departments
+ ON departments.departmentid=dispatch.departmentid
+ WHERE dispatchitems.`dispatchid` ='".$_GET['TransferNo']."'";
$result=DB_query($sql, $db);
if (DB_num_rows($result) == 0){
Modified: trunk/PDFSuppTransListing.php
===================================================================
--- trunk/PDFSuppTransListing.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/PDFSuppTransListing.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -40,13 +40,17 @@
echo '<option value="21">' . _('Credit Notes').'</option>';
echo '<option value="22">' . _('Payments').'</option>';
- echo '</select></td></tr>';
+ echo '</select></td></tr>';
- echo '</select></td></tr></table><br /><div class="centre"><input type="submit" name="Go" value="' . _('Create PDF') . '" /></div>';
+ echo '</table><br />
+ <div class="centre">
+ <button type="submit" name="Go">' . _('Create PDF') . '</button>
+ </div><br />
+ </form>';
- include('includes/footer.inc');
- exit;
+ include('includes/footer.inc');
+ exit;
} else {
include('includes/ConnectDB.inc');
Modified: trunk/includes/IndexArray.php
===================================================================
--- trunk/includes/IndexArray.php 2012-05-01 15:16:51 UTC (rev 8760)
+++ trunk/includes/IndexArray.php 2012-05-01 17:37:13 UTC (rev 8761)
@@ -216,6 +216,7 @@
$MenuItems['stock']['Reports']['Caption'] = array (_('Serial Item Research Tool'),
_('Print Price Labels'),
_('Reprint GRN'),
+ _('Reprint A Stock Transfer Note'),
_('Inventory Item Movements'),
_('Inventory Item Status'),
_('Inventory Item Usage'),
@@ -239,6 +240,7 @@
$MenuItems['stock']['Reports']['URL'] = array ('/StockSerialItemResearch.php',
'/PDFPrintLabel.php',
'/ReprintGRN.php',
+ '/PDFStockLocTransfer.php',
'/StockMovements.php',
'/StockStatus.php',
'/StockUsage.php',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
