Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5235] trunk
|
From: <vv...@us...> - 2012-04-08 19:55:56
|
Revision: 5235
http://web-erp.svn.sourceforge.net/web-erp/?rev=5235&view=rev
Author: vvs2012
Date: 2012-04-08 19:55:49 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
Modified: trunk/PrintCustOrder.php
===================================================================
--- trunk/PrintCustOrder.php 2012-04-08 02:56:40 UTC (rev 5234)
+++ trunk/PrintCustOrder.php 2012-04-08 19:55:49 UTC (rev 5235)
@@ -20,9 +20,11 @@
<br />
<table class="table_index">
<tr><td class="menu_group_item">
+ <ul>
<li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
<li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
- </td>
+ </ul>
+ </td>
</tr>
</table>
</div>
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2012-04-08 02:56:40 UTC (rev 5234)
+++ trunk/PrintCustOrder_generic.php 2012-04-08 19:55:49 UTC (rev 5235)
@@ -19,8 +19,10 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ <ul>
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php?">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </ul>
</td>
</tr>
</table>
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2012-04-08 02:56:40 UTC (rev 5234)
+++ trunk/PrintCustStatements.php 2012-04-08 19:55:49 UTC (rev 5235)
@@ -414,17 +414,21 @@
/*if FromTransNo is not set then show a form to allow input of either a single statement number or a range of statements to be printed. Also get the last statement number created to show the user where the current range is up to */
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"><table class="selection">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr><td>' . _('Starting Customer statement to print (Customer code)'). '
- </td><td><input type="text" max="6" size="7" name="FromCust" value="1" /></td></tr>
+ </td><td><input type="text" maxlength="6" size="7" name="FromCust" value="1" /></td></tr>
<tr><td>'. _('Ending Customer statement to print (Customer code)').'</td><td>
- <input type="text" max="6" size="7" name="ToCust" value="zzzzzz" /></td></tr></table>
+ <input type="text" maxlength="6" size="7" name="ToCust" value="zzzzzz" /></td></tr></table>
<br /><div class="centre">
<input type="submit" name="PrintPDF" value="' .
_('Print All Statements in the Range Selected').'" />
</div>';
+ echo '</div>
+ </form>';
}
echo '<br /><br /><br />';
include('includes/footer.inc');
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2012-04-08 02:56:40 UTC (rev 5234)
+++ trunk/PrintCustTrans.php 2012-04-08 19:55:49 UTC (rev 5235)
@@ -502,11 +502,12 @@
/* if FromTransNo is not set then show a form to allow input of either a single invoice number or a range of invoices to be printed. Also get the last invoice number created to show the user where the current range is up to */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Landscape Mode)') . '</div>';
+ echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Landscape Mode)') . '</p></div>';
echo '<table class="table1">
- <tr><td>' . _('Print Invoices or Credit Notes') . '</td><td><select name=InvOrCredit>';
+ <tr><td>' . _('Print Invoices or Credit Notes') . '</td><td><select name="InvOrCredit">';
if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)) {
echo '<option selected="selected" value="Invoice">' . _('Invoices') . '</option>';
@@ -517,7 +518,7 @@
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Print EDI Transactions') . '</td><td><select name=PrintEDI>';
+ echo '<tr><td>' . _('Print EDI Transactions') . '</td><td><select name="PrintEDI">';
if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)) {
@@ -536,7 +537,7 @@
echo '<tr><td>' . _('End invoice/credit note number to print') . '</td>
<td><input type="text" class="number" maxlength="6" size="7" name="ToTransNo" /></td></tr>
</table>';
- echo '<div class="centre"><input type="submit" name="Print" value="' . _('Print') . '" /><p>';
+ echo '<div class="centre"><input type="submit" name="Print" value="' . _('Print') . '" /><br />';
echo '<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
$sql = "SELECT typeno FROM systypes WHERE typeid=10";
@@ -554,6 +555,8 @@
echo '<br /><b>' . _('The last credit note created was number') . ' ' . $myrow[0] . '</b>
<br />' . _('A sequential range can be printed using the same method as for invoices above') . '. ' . _('A single credit note can be printed by only entering a start transaction number') .
'</div>';
+ echo '</div>
+ </form>';
} else {
@@ -680,7 +683,7 @@
AND in_array(1, $_SESSION['AllowedPageSecurityTokens'])
AND $myrow['debtorno'] != $_SESSION['CustomerID']){
- echo '<p><font color="red" size="4">' . _('This transaction is addressed to another customer and cannot be displayed for privacy reasons') . '. ' . _('Please select only transactions relevant to your company');
+ echo '<p class="bad">' . _('This transaction is addressed to another customer and cannot be displayed for privacy reasons') . '. ' . _('Please select only transactions relevant to your company');
exit;
}
@@ -688,21 +691,21 @@
$PageNumber = 1;
echo '<table class="table1">
- <tr><td VALIGN=TOP WIDTH="10%"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td style="background-color:#BBBBBB"><b>';
+ <tr><td valign="top" style="width:10%"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
- echo '<font size="4">' . _('TAX INVOICE') . ' ';
+ echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
- echo '<font color="red" size="4">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
- echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font><br /><font size="1">' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
</tr>
</table>';
/* Now print out the logo and company name and address */
echo '<table class="table1">
- <tr><td><font size="4" color="#333333"><b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></font><br />';
+ <tr><td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
@@ -713,13 +716,13 @@
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td width="50%" class="number">';
+ echo '</td><td style="width:50%" class="number">';
/* Now the customer charged to details in a sub table within a cell of the main table*/
echo '<table class="table1">
<tr>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Charge To') . ':</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Charge To') . ':</b></td>
</tr>
<tr>
<td style="background-color:#EEEEEE">';
@@ -744,8 +747,8 @@
echo '<table class="table1">
<tr>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Charge Branch') . ':</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Delivered To') . ':</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Charge Branch') . ':</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' .$myrow['brname'] .
@@ -769,13 +772,13 @@
echo '<table class="table1">
<tr>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Your Order Ref') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Our Order No') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Order Date') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Invoice Date') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</font></b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Shipper') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Consignment Ref') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Your Order Ref') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Our Order No') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Order Date') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Invoice Date') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Shipper') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Consignment Ref') . '</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' . $myrow['customerref'] . '</td>
@@ -807,7 +810,7 @@
} else { /* then its a credit note */
echo '<table width="50%"><tr>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' .$myrow['brname'] .
@@ -819,8 +822,8 @@
'<br />' . $myrow['braddress6'] . '</td>
</tr></table>';
echo '<hr /><table class="table1"><tr>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Date') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</font></b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Date') . '</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
@@ -844,7 +847,7 @@
}
echo '<hr />';
- echo '<div class="centre"><font size="2">' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</font></div>';
+ echo '<div class="centre"><h4>' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</h4></div>';
$result=DB_query($sql,$db);
if (DB_error_no($db)!=0) {
@@ -921,19 +924,19 @@
$PageNumber++;
echo '</table>
<table class="table1">
- <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td style="background-color:#BBBBBB"><b>';
+ <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
- echo '<font size="4">' . _('TAX INVOICE') . ' ';
+ echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
- echo '<font color=RED size="4">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
- echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font><br /><font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td></tr></table>';
+ echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td></tr></table>';
/*Now print out company name and address */
echo '<table class="table1"><tr>
- <td><font size="4" color="#333333"><b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></font><br />';
+ <td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
@@ -970,19 +973,19 @@
/* head up a new invoice/credit note page */
$PageNumber++;
echo '<table class="table1">
- <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td style="background-color:#BBBBBB"><b>';
+ <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
- echo '<font size="4">' . _('TAX INVOICE') .' ';
+ echo '<h2>' . _('TAX INVOICE') .' ';
} else {
- echo '<font color=RED size="4">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
- echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font><br /><font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td></tr><table>';
+ echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td></tr><table>';
/* Print out the logo and company name and address */
echo '<table class="table1">
- <tr><td><font size="4" color="#333333"><b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></font><br />';
+ <tr><td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
@@ -1033,9 +1036,9 @@
}
/*Print out the invoice text entered */
- echo '<table class=table1><tr>
+ echo '<table class="table1"><tr>
<td class="number">' . _('Sub Total') . '</td>
- <td class="number" style="background-color:#EEEEEE" width="15%">' . $DisplaySubTot . '</td></tr>';
+ <td class="number" style="background-color:#EEEEEE;width:15%">' . $DisplaySubTot . '</td></tr>';
echo '<tr><td class="number">' . _('Freight') . '</td>
<td class="number" style="background-color:#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
@@ -1043,12 +1046,12 @@
if ($InvOrCredit=='Invoice'){
echo '<tr>
<td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
- <td class="number" style="background-color:#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td>
+ <td class="number" style="background-color:#EEEEEE"><b>' . $DisplayTotal . '</b></td>
</tr>';
} else {
echo '<tr>
- <td class="number"><font color=RED><b>' . _('TOTAL CREDIT') .'</b></font></td>
- <td class="number" style="background-color:#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></U></font></td>
+ <td class="number" style="color:red"><b>' . _('TOTAL CREDIT') .'</b></td>
+ <td class="number" style="background-color:#EEEEEE;color:red"><b>' . $DisplayTotal . '</b></td>
</tr>';
}
echo '</table>';
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-04-08 02:56:40 UTC (rev 5234)
+++ trunk/PrintCustTransPortrait.php 2012-04-08 19:55:49 UTC (rev 5235)
@@ -523,6 +523,7 @@
/*if FromTransNo is not set then show a form to allow input of either a single invoice number or a range of invoices to be printed. Also get the last invoice number created to show the user where the current range is up to */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
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') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Portrait Mode)') . '</p>';
@@ -563,11 +564,11 @@
</tr>';
echo '<tr>
<td>' . _('Start invoice/credit note number to print') . '</td>
- <td><input class="number" type="text" max="6" size="7" name="FromTransNo" /></td>
+ <td><input class="number" type="text" maxlength="6" size="7" name="FromTransNo" /></td>
</tr>';
echo '<tr>
<td>' . _('End invoice/credit note number to print') . '</td>
- <td><input class="number" type="text" max="6" size="7" name="ToTransNo" /></td>
+ <td><input class="number" type="text" maxlength="6" size="7" name="ToTransNo" /></td>
</tr>
</table>';
echo '<div class="centre">
@@ -590,6 +591,8 @@
$myrow = DB_fetch_row($result);
echo '<br /><b>' . _('The last credit note created was number') . ' ' . $myrow[0] . '</b><br />' . _('A sequential range can be printed using the same method as for invoices above') . '. ' . _('A single credit note can be printed by only entering a start transaction number') . '</div>';
+ echo '</div>
+ </form>';
} else {
@@ -714,7 +717,7 @@
$myrow = DB_fetch_array($result);
/* Then there's an invoice (or credit note) to print. So print out the invoice header and GST Number from the company record */
if (count($_SESSION['AllowedPageSecurityTokens'])==1 AND in_array(1, $_SESSION['AllowedPageSecurityTokens']) AND $myrow['debtorno'] != $_SESSION['CustomerID']){
- echo '<p><font color="red" size="4">' . _('This transaction is addressed to another customer and cannot be displayed for privacy reasons') . '. ' . _('Please select only transactions relevant to your company');
+ echo '<p class="bad">' . _('This transaction is addressed to another customer and cannot be displayed for privacy reasons') . '. ' . _('Please select only transactions relevant to your company');
exit;
}
@@ -723,23 +726,23 @@
echo '<table class="table1">
<tr>
- <td valign=top width="10%"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td style="background-color:#bbbbbb"><b>';
+ <td valign="top" style="width:10%"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <td style="background-color:#bbbbbb">';
if ($InvOrCredit=='Invoice') {
- echo '<font size="4">' . _('TAX INVOICE') . ' ';
+ echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
- echo '<font color="red" size="4">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
- echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font>
- <br /><font size="1">' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ echo _('Number') . ' ' . $FromTransNo . '</h2>
+ <br />' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
</tr>
</table>';
/*Now print out the logo and company name and address */
- echo '<table class"table1">
+ echo '<table class="table1">
<tr>
- <td><font size="4" color="#333"><b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></font>
+ <td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2>
<br />';
echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
@@ -752,7 +755,7 @@
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
echo '</td>
- <td width="50%" class="number">';
+ <td style="width:50%" class="number">';
/*Now the customer charged to details in a sub table within a cell of the main table*/
@@ -784,8 +787,8 @@
echo '<table class="table1">
<tr>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
<td style="background-color:#eeeeee">' .$myrow['brname'] .
@@ -810,13 +813,13 @@
echo '<table class="table1">
<tr>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Your Order Ref') . '</b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Our Order No') . '</b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Order Date') . '</b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Invoice Date') . '</b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Sales Person') . '</font></b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Shipper') . '</b></td>
- <td align=left style="background-color:#bbbbbb"><b>' . _('Consignment Ref') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Your Order Ref') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Our Order No') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Order Date') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Invoice Date') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Sales Person') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Shipper') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Consignment Ref') . '</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' . $myrow['customerref'] . '</td>
@@ -848,7 +851,7 @@
echo '<table width="50%">
<tr>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' . $myrow['brname'] .
@@ -864,7 +867,7 @@
<table class="table1">
<tr>
<td align="left" style="background-color:#bbbbbb"><b>' . _('Date') . '</b></td>
- <td align=left style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</font></b></td>
+ <td align="left" style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</b></td>
</tr>';
echo '<tr>
<td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
@@ -889,7 +892,7 @@
}
echo '<hr />';
- echo '<div class="centre"><font size="2">' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</font></div>';
+ echo '<div class="centre"><h4>' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</h4></div>';
$result=DB_query($sql,$db);
if (DB_error_no($db)!=0) {
@@ -971,22 +974,22 @@
echo '</table>
<table class="table1">
<tr>
- <td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td style="background-color:#bbbbbb"><b>';
+ <td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <td style="background-color:#bbbbbb">';
if ($InvOrCredit=='Invoice') {
- echo '<font size="4">' . _('TAX INVOICE') . ' ';
+ echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
- echo '<font color="red" size="4">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
- echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font><br /><font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
</tr>
</table>';
/*Now print out company name and address */
echo '<table class="table1">
<tr>
- <td><font size="4" color="#333"><b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></font><br />';
+ <td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
@@ -1027,23 +1030,22 @@
$PageNumber++;
echo '<table class="table1">
<tr>
- <td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td style="background-color:#bbbbbb"><b>';
+ <td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <td style="background-color:#bbbbbb">';
if ($InvOrCredit=='Invoice') {
- echo '<font size="4">' . _('TAX INVOICE') .' ';
+ echo '<h2>' . _('TAX INVOICE') .' ';
} else {
- echo '<font color="red" size="4">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
- echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font>
- <br />
- <font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</font></td>
+ echo _('Number') . ' ' . $FromTransNo . '</h2>
+ <br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
</tr>
</table>';
/*Print out the logo and company name and address */
echo '<table class="table1">
<tr>
- <td><font size="4" color="#333"><b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></font><br />';
+ <td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
@@ -1098,17 +1100,17 @@
/*Print out the invoice text entered */
echo '<table class="table1"><tr>
<td class="number">' . _('Sub Total') . '</td>
- <td class="number" style="background-color:#EEEEEE" width="15%">' . $DisplaySubTot . '</td></tr>';
+ <td class="number" style="background-color:#EEEEEE;width:15%">' . $DisplaySubTot . '</td></tr>';
echo '<tr><td class="number">' . _('Freight') . '</td>
<td class="number" style="background-color:#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
<td class="number" style="background-color:#EEEEEE">' . $DisplayTax . '</td></tr>';
if ($InvOrCredit=='Invoice'){
echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
- <td class="number" style="background-color:#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>';
+ <td class="number" style="background-color:#EEEEEE"><b>' . $DisplayTotal . '</b></td></tr>';
} else {
- echo '<tr><td class="number"><font color="red"><b>' . _('TOTAL CREDIT') . '</b></font></td>
- <td class="number" style="background-color:#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>';
+ echo '<tr><td class="number" style="color:red"><b>' . _('TOTAL CREDIT') . '</b></td>
+ <td class="number" style="background-color:#EEEEEE;color:red"><b>' . $DisplayTotal . '</b></td></tr>';
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2012-04-08 02:56:40 UTC (rev 5234)
+++ trunk/PurchData.php 2012-04-08 19:55:49 UTC (rev 5235)
@@ -224,9 +224,9 @@
<td class="number">%s</td>
<td class="number">%s ' . _('days') . '</td>
<td>%s</td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Copy=1&EffectiveFrom=%s">' . _('Copy') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this suppliers price?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Copy=1&EffectiveFrom=%s">' . _('Copy') . '</a></td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this suppliers price?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['suppname'],
locale_number_format($myrow['price'], $myrow['currdecimalplaces']),
@@ -286,11 +286,12 @@
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
}
if (!isset($_POST['SearchSupplier'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <table cellpadding="3" class="selection">
- <tr>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+ echo '<table cellpadding="3" class="selection">
+ <tr>';
echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
echo '<td><b>' . _('OR') . '</b></td>';
@@ -300,6 +301,7 @@
echo '<div class="centre">
<input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" />
</div>
+ </div>
</form>';
include ('includes/footer.inc');
exit;
@@ -372,9 +374,10 @@
}
if (isset($SuppliersResult)) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <table cellpadding="2" class="selection">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Supplier Name') . '</th>
@@ -398,8 +401,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td>%s</td>
- </tr>',
+ <td>%s',
$myrow['supplierid'],
$myrow['suppname'],
$myrow['currcode'],
@@ -408,11 +410,13 @@
$myrow['address3']);
echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
- echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" />';
+ echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" /></td></tr>';
}
//end of while loop
- echo '</table><br/></form>';
+ echo '</table><br/>';
+ echo '</div>
+ </form>';
}
//end if results to show
@@ -467,10 +471,11 @@
$StockUOM=$myrow['units'];
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">
<tr>
- <th colspan="3"><font color="navy" size="3">' . _('Data for Purchasing') . ' ' . $StockID . ' ' . _('from') . ' '. $SupplierID . '</font></th>
+ <th colspan="3"><h3>' . _('Data for Purchasing') . ' ' . $StockID . ' ' . _('from') . ' '. $SupplierID . '</h3></th>
</tr>';
if (!isset($SupplierID)) {
$SupplierID = '';
@@ -481,19 +486,17 @@
</tr>';
} else {
echo '<tr>
- <td>' . _('Supplier Name') . ':</td>
- <input type="hidden" name="SupplierID" maxlength="10" size="11" value="' . $SupplierID . '" />';
- if ($SupplierID!='') {
- echo '<td>'.$SuppName;
- }
- if (!isset($SuppName) OR $SuppName = "") {
- echo '(' . _('A search facility is available below if necessary') . ')';
+ <td>' . _('Supplier Name') . ':
+ <input type="hidden" name="SupplierID" maxlength="10" size="11" value="' . $SupplierID . '" />
+ </td>';
+ if (!isset($SuppName) OR $SuppName == "") {
+ echo '<td>(' . _('A search facility is available below if necessary') . ')';
} else {
echo '<td>'.$SuppName;
}
echo '</td></tr>';
}
- echo '<td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" />';
+ echo '<tr><td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" /></td></tr>';
if (!isset($CurrCode)) {
$CurrCode = '';
}
@@ -516,7 +519,7 @@
$_POST['MinOrderQty'] = '1';
}
echo '<tr><td>' . _('Currency') . ':</td>
- <td><input type="hidden" name="CurrCode" . value="' . $CurrCode . '" />' . $CurrCode . '</td></tr>';
+ <td><input type="hidden" name="CurrCode" value="' . $CurrCode . '" />' . $CurrCode . '</td></tr>';
echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
<td><input type="text" class="number" name="Price" maxlength="12" size="12" value="' . $_POST['Price'] . '" /></td></tr>';
echo '<tr><td>' . _('Date Updated') . ':</td>
@@ -564,11 +567,13 @@
echo '<div class="centre">';
if (isset($StockLocation) and isset($StockID) AND mb_strlen($StockID) != 0) {
echo '<br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
- echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
- echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
}
- echo '</form></div>';
+ echo '</div>';
+ echo '</div>
+ </form>';
}
include ('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
