[Weberp-svn] SF.net SVN: weberp:[8733] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[8733] trunk
|
From: <tim...@us...> - 2012-04-29 19:21:22
|
Revision: 8733
http://weberp.svn.sourceforge.net/weberp/?rev=8733&view=rev
Author: tim_schofield
Date: 2012-04-29 19:21:15 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SuppInvGRNs.php
trunk/SupplierInvoice.php
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-04-29 19:21:05 UTC (rev 8732)
+++ trunk/SuppInvGRNs.php 2012-04-29 19:21:15 UTC (rev 8733)
@@ -111,9 +111,9 @@
/*Show all the selected GRNs so far from the SESSION['SuppTrans']->GRNs array */
echo '<table cellpadding="1" class="selection">';
-echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('Invoiced Goods Received Selected') . '</font></th></tr>';
+echo '<tr><th colspan="8" class="header">' . _('Invoiced Goods Received Selected') . '</th></tr>';
-$tableheader = '<tr bgcolor="#800000">
+$tableheader = '<tr>
<th>' . _('Sequence') . ' #</th>
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -262,7 +262,7 @@
echo '<input type="hidden" name="ShiptRef" value="' . $GRNTmp->ShiptRef . '" />';
// }
- echo '<div class="centre"><p><input type="submit" name="ModifyGRN" value="' . _('Modify Line') . '" /></p></div>';
+ echo '<div class="centre"><p><button type="submit" name="ModifyGRN">' . _('Modify Line') . '</button></p></div>';
echo '<input type="hidden" name="GRNNumber" value="' . $GRNTmp->GRNNo . '" />';
echo '<input type="hidden" name="ItemCode" value="' . $GRNTmp->ItemCode . '" />';
@@ -279,9 +279,9 @@
} else {
if (count( $_SESSION['SuppTransTmp']->GRNs)>0){ /*if there are any outstanding GRNs then */
echo '<table cellpadding="1" class="selection">';
- echo '<tr><th colspan="10"><font size="3" color="#616161">' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName.'</font></th></tr>';
+ echo '<tr><th colspan="10" class="header">' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName.'</th></tr>';
- $tableheader = '<tr bgcolor=#800000><th>' . _('Select') . '</th>
+ $tableheader = '<tr><th>' . _('Select') . '</th>
<th>' . _('Sequence') . ' #</th>
<th>' . _('Order') . '</th>
<th>' . _('Item Code') . '</th>
@@ -301,7 +301,7 @@
if (isset($POs[$GRNTmp->PONo]) and $POs[$GRNTmp->PONo] != $GRNTmp->PONo) {
$POs[$GRNTmp->PONo] = $GRNTmp->PONo;
- echo '<tr><td><input type="submit" name="AddPOToTrans" value="' . $GRNTmp->PONo . '" /></td><td colspan="3" />' . _('Add Whole PO to Invoice') . '</td></tr>';
+ echo '<tr><td><button type="submit" name="AddPOToTrans" value="' . $GRNTmp->PONo . '" />' . $GRNTmp->PONo . '</button></td><td colspan="3" />' . _('Add Whole PO to Invoice') . '</td></tr>';
}
if (isset($_POST['SelectAll'])) {
echo '<tr><td><input type="checkbox" checked name="GRNNo_' . $GRNTmp->GRNNo . '" /></td>';
@@ -320,9 +320,9 @@
</tr>';
}
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="SelectAll" value="' . _('Select All') . '" />';
- echo '<input type="submit" name="DeSelectAll" value="' . _('Deselect All') . '" />';
- echo '<br /><input type="submit" name="AddGRNToTrans" value="' . _('Add to Invoice') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="SelectAll">' . _('Select All') . '</button>';
+ echo '<button type="submit" name="DeSelectAll">' . _('Deselect All') . '</button>';
+ echo '<br /><button type="submit" name="AddGRNToTrans">' . _('Add to Invoice') . '</button></div>';
}
}
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-04-29 19:21:05 UTC (rev 8732)
+++ trunk/SupplierInvoice.php 2012-04-29 19:21:15 UTC (rev 8733)
@@ -181,7 +181,7 @@
if (!isset($_POST['PostInvoice'])){
- if (isset($_POST['GRNS']) and $_POST['GRNS'] == _('Purchase Orders')){
+ if (isset($_POST['GRNS'])){
/*This ensures that any changes in the page are stored in the session before calling the grn page */
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/SuppInvGRNs.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against goods received page') .
@@ -189,7 +189,7 @@
'<a href="' . $rootpath . '/SuppInvGRNs.php">' . _('click here') . '</a> ' . _('to continue') . '</div><br />';
exit;
}
- if (isset($_POST['Shipts']) AND $_POST['Shipts'] == _('Shipments')){
+ if (isset($_POST['Shipts'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/SuppShiptChgs.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against shipments page') .
@@ -197,7 +197,7 @@
'<a href="' . $rootpath . '/SuppShiptChgs.php">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
- if (isset($_POST['GL']) AND $_POST['GL'] == _('General Ledger')){
+ if (isset($_POST['GL'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/SuppTransGLAnalysis.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against the general ledger page') .
@@ -205,7 +205,7 @@
'<a href="' . $rootpath . '/SuppTransGLAnalysis.php">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
- if (isset($_POST['Contracts']) AND $_POST['Contracts'] == _('Contracts')){
+ if (isset($_POST['Contracts'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/SuppContractChgs.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against contracts page') .
@@ -213,7 +213,7 @@
'<a href="' . $rootpath . '/SuppContractChgs.php">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
- if (isset($_POST['FixedAssets']) AND $_POST['FixedAssets'] == _('Fixed Assets')){
+ if (isset($_POST['FixedAssets'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/SuppFixedAssetChgs.php">';
echo '<DIV class="centre">' . _('You should automatically be forwarded to the entry of invoice amounts against fixed assets page') .
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
