Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5053] trunk
|
From: <vv...@us...> - 2012-03-07 23:06:41
|
Revision: 5053
http://web-erp.svn.sourceforge.net/web-erp/?rev=5053&view=rev
Author: vvs2012
Date: 2012-03-07 23:06:32 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/AuditTrail.php
trunk/BankMatching.php
trunk/CounterSales.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/GLAccountInquiry.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/PO_OrderDetails.php
trunk/PO_SelectPurchOrder.php
trunk/Prices_Customer.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/RecurringSalesOrders.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
trunk/SelectOrderItems.php
trunk/SpecialOrder.php
trunk/StockLocTransferReceive.php
trunk/SupplierInvoice.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/TaxAuthorityRates.php
trunk/UpgradeDatabase.php
trunk/WorkOrderCosting.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_index.php
trunk/includes/InputSerialItemsKeyed.php
trunk/includes/OutputSerialItems.php
trunk/reportwriter/FormMaker.php
trunk/reportwriter/admin/RCFunctions.inc
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/AuditTrail.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -198,7 +198,7 @@
if (isset($_SESSION['SQLString']['values'][$i]) and (trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) != "") &
(trim($_SESSION['SQLString']['fields'][$i]) != 'password') &
(trim($_SESSION['SQLString']['fields'][$i]) != 'www_users.password')) {
- echo '<tr bgcolor="' . $RowColour . '">';
+ echo '<tr style="background-color:' . $RowColour . '">';
echo '<td></td>
<td></td>
<td></td>
@@ -208,7 +208,7 @@
echo '</tr>';
}
}
- echo '<tr bgcolor="black"> <td colspan="6"></td> </tr>';
+ echo '<tr style="background-color:black"> <td colspan="6"></td> </tr>';
}
unset($_SESSION['SQLString']);
}
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/BankMatching.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -284,7 +284,7 @@
$Outstanding = $myrow['amt']- $myrow['amountcleared'];
if (ABS($Outstanding)<0.009){ /*the payment is cleared dont show the check box*/
- printf('<tr bgcolor="#CCCEEE">
+ printf('<tr style="background-color:#CCCEEE">
<td>%s</td>
<td>%s</td>
<td>%s</td>
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/CounterSales.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -226,11 +226,11 @@
if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Prev'])){
if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
- $msg='<div class="page_help_text">' . _('Item description has been used in search') . '.</div>';
+ $msg = _('Item description has been used in search');
} else if ($_POST['StockCode']!='' AND $_POST['Keywords']=='') {
- $msg='<div class="page_help_text">' . _('Item Code has been used in search') . '.</div>';
+ $msg = _('Item Code has been used in search');
} else if ($_POST['Keywords']=='' AND $_POST['StockCode']=='') {
- $msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>';
+ $msg = _('Stock Category has been used in search');
}
if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
@@ -241,7 +241,7 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
- stockmaster.decmimalplaces
+ stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
@@ -361,7 +361,8 @@
/* Always do the stuff below */
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectParts" method="post">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
//Get The exchange rate used for GPPercent calculations on adding or amending items
@@ -735,8 +736,8 @@
*/
echo '<br />
- <table width="90%" cellpadding="2" colspan="7">
- <tr bgcolor="#800000">';
+ <table width="90%" cellpadding="2">
+ <tr style="background-color:#800000">';
echo '<th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
<th>' . _('Quantity') . '</th>
@@ -768,7 +769,7 @@
if ($OrderLine->QOHatLoc < $OrderLine->Quantity AND ($OrderLine->MBflag=='B' OR $OrderLine->MBflag=='M')) {
/*There is a stock deficiency in the stock location selected */
- $RowStarter = '<tr bgcolor="#EEAABB">';
+ $RowStarter = '<tr style="background-color:#EEAABB">';
} elseif ($k==1){
$RowStarter = '<tr class="OddTableRows">';
$k=0;
@@ -778,10 +779,10 @@
}
echo $RowStarter;
- echo '<input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />';
+ echo '<td><input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />';
echo '<input type="hidden" name="ItemDue_' . $OrderLine->LineNumber . '" value="'.$OrderLine->ItemDue.'" />';
- echo '<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
+ echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
<td>' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
@@ -794,9 +795,9 @@
<td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
<td><input class="number" type="text" name="GPPercent_' . $OrderLine->LineNumber . '" size="3" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" /></td>';
} else {
- echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
+ echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" />
<input type="hidden" name="Discount_' . $OrderLine->LineNumber . '" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" />
- <input type="hidden" name="GPPercent_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />';
+ <input type="hidden" name="GPPercent_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->GPPercent,2) . '" /></td>';
}
echo '<td class="number">' . locale_number_format($SubTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
$LineDueDate = $OrderLine->ItemDue;
@@ -826,7 +827,7 @@
$_SESSION['Items'.$identifier]->TaxGLCodes=$TaxGLCodes;
echo '<td class="number">' . locale_number_format($TaxLineTotal ,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
echo '<td class="number">' . locale_number_format($SubTotal + $TaxLineTotal ,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . _('Delete') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . _('Delete') . '</a></td></tr>';
if ($_SESSION['AllowOrderLineItemNarrative'] == 1){
echo $RowStarter;
@@ -1988,9 +1989,9 @@
echo '<br /><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$rootpath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
+ echo '<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$rootpath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
} else {
- echo '<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$rootpath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
+ echo '<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$rootpath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
}
echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Sale') . '</a></div>';
@@ -2120,7 +2121,7 @@
$Available = $QOH - $DemandQty + $OnOrder;
- printf('<td>%s</font></td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
@@ -2153,7 +2154,7 @@
echo '</table>';
} //end of if Frequently Ordered Items > 0
if (isset($msg)){
- echo '<p><div class="centre"><b>' . $msg . '</b></div></p>';
+ echo '<div class="page_help_text"><p><b>' . $msg . '</b></p></div>';
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
echo _('Search for Items') . '</p>';
@@ -2180,25 +2181,28 @@
}
}
- ?>
+ echo '</select></td>
+ <td><b>' . _('Enter partial Description') . ':</b>
+ <input tabindex="2" type="text" name="Keywords" size="20" maxlength="25" value="';
+ if (isset($_POST['Keywords'])) echo $_POST['Keywords'];
+ echo '" /></td>
- </select></td>
- <td><b><?php echo _('Enter partial Description'); ?>:</b>
- <input tabindex="2" type="text" name="Keywords" size="20" maxlength="25" value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>" /></td>
+ <td align="right"><b> ' . _('OR') . ' </b><b>' . _('Enter extract of the Stock Code') . ':</b>
+ <input tabindex="3" type="text" name="StockCode" size="15" maxlength="18" value="';
+ if (isset($_POST['StockCode'])) echo $_POST['StockCode'];
+ echo '" /></td>
- <td align="right"><b><?php echo _('OR'); ?> </b><b><?php echo _('Enter extract of the Stock Code'); ?>:</b>
- <input tabindex="3" type="text" name="StockCode" size="15" maxlength="18" value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>" /></td>
-
</tr><tr>
- <td style="text-align:center" colspan="1"><input tabindex="4" type="submit" name="Search" value="<?php echo _('Search Now'); ?>" /></td>
- <td style="text-align:center" colspan="1"><input tabindex="5" type="submit" name="QuickEntry" value="<?php echo _('Use Quick Entry'); ?>" /></td>
+ <td style="text-align:center" colspan="1"><input tabindex="4" type="submit" name="Search" value="' . _('Search Now') . '" /></td>
+ <td style="text-align:center" colspan="1"><input tabindex="5" type="submit" name="QuickEntry" value="' . _('Use Quick Entry') . '" /></td>';
- <?php
if (!isset($_POST['PartSearch'])) {
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>';
}
echo '</tr></table><br />';
+ echo '</div>';
+ echo '</form>';
// Add some useful help as the order progresses
if (isset($SearchResult)) {
echo '<br />';
@@ -2209,7 +2213,8 @@
if (isset($SearchResult)) {
$j = 1;
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID .'identifier='.$identifier . '" method="post" name="orderform">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID .'identifier='.$identifier . '" method="post" id="orderform">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="table1">';
echo '<tr>
@@ -2310,7 +2315,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><input class="number" tabindex="'.strval($j+7).'" type="text" size="6" name="OrderQty%s" value="0" /></font><input type="hidden" name="StockID%s" value="%s" /></td>
+ <td><input class="number" tabindex="'.strval($j+7).'" type="text" size="6" name="OrderQty%s" value="0" /><input type="hidden" name="StockID%s" value="%s" /></td>
</tr>',
$myrow['stockid'],
$myrow['description'],
@@ -2330,55 +2335,58 @@
#end of page full new headings if
}
#end of while loop
+ echo '<tr><td>';
echo '<input type="hidden" name="CustRef" value="'.$_SESSION['Items'.$identifier]->CustRef.'" />';
echo '<input type="hidden" name="Comments" value="'.$_SESSION['Items'.$identifier]->Comments.'" />';
echo '<input type="hidden" name="DeliverTo" value="'.$_SESSION['Items'.$identifier]->DeliverTo.'" />';
echo '<input type="hidden" name="PhoneNo" value="'.$_SESSION['Items'.$identifier]->PhoneNo.'" />';
echo '<input type="hidden" name="Email" value="'.$_SESSION['Items'.$identifier]->Email.'" />';
+ echo '</td></tr>';
echo '<tr><td><input type="hidden" name="previous" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>';
echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sale').'" /></td>';
echo '<td><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
- echo '</table></form>';
+ echo '</table></div></form>';
echo $jsCall;
}#end if SearchResults to show
} /*end of PartSearch options to be displayed */
else { /* show the quick entry form variable */
- echo '<div class="page_help_text"><b>' . _('Use this form to add items quickly if the item codes are already known') . '</b></div><br />
- <table border="1">
+ echo '<div class="page_help_text"><b>' . _('Use this form to add items quickly if the item codes are already known') . '</b></div><br />';
+ if (count($_SESSION['Items'.$identifier]->LineItems)==0) {
+ echo '<input type="hidden" name="CustRef" value="'.$_SESSION['Items'.$identifier]->CustRef.'" />';
+ echo '<input type="hidden" name="Comments" value="'.$_SESSION['Items'.$identifier]->Comments.'" />';
+ echo '<input type="hidden" name="DeliverTo" value="'.$_SESSION['Items'.$identifier]->DeliverTo.'" />';
+ echo '<input type="hidden" name="PhoneNo" value="'.$_SESSION['Items'.$identifier]->PhoneNo.'" />';
+ echo '<input type="hidden" name="Email" value="'.$_SESSION['Items'.$identifier]->Email.'" />';
+ }
+ echo '<table border="1">
<tr>';
/*do not display colum unless customer requires po line number by sales order line*/
echo '<th>' . _('Item Code') . '</th>
<th>' . _('Quantity') . '</th>
</tr>';
$DefaultDeliveryDate = DateAdd(Date($_SESSION['DefaultDateFormat']),'d',$_SESSION['Items'.$identifier]->DeliveryDays);
- if (count($_SESSION['Items'.$identifier]->LineItems)==0) {
- echo '<input type="hidden" name="CustRef" value="'.$_SESSION['Items'.$identifier]->CustRef.'" />';
- echo '<input type="hidden" name="Comments" value="'.$_SESSION['Items'.$identifier]->Comments.'" />';
- echo '<input type="hidden" name="DeliverTo" value="'.$_SESSION['Items'.$identifier]->DeliverTo.'" />';
- echo '<input type="hidden" name="PhoneNo" value="'.$_SESSION['Items'.$identifier]->PhoneNo.'" />';
- echo '<input type="hidden" name="Email" value="'.$_SESSION['Items'.$identifier]->Email.'" />';
- }
for ($i=1;$i<=$_SESSION['QuickEntries'];$i++){
echo '<tr class="OddTableRow">';
/* Do not display colum unless customer requires po line number by sales order line*/
echo '<td><input type="text" name="part_' . $i . '" size="21" maxlength="20" /></td>
- <td><input type="text" class="number" name="qty_' . $i . '" size="6" maxlength="6" /></td>
- <input type="hidden" class="date" name="ItemDue_' . $i . '" value="' . $DefaultDeliveryDate . '" /></tr>';
+ <td><input type="text" class="number" name="qty_' . $i . '" size="6" maxlength="6" />
+ <input type="hidden" class="date" name="ItemDue_' . $i . '" value="' . $DefaultDeliveryDate . '" /></td></tr>';
}
- echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>';
-
echo '</table><br /><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '" />
<input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>';
+ echo '</div>';
+ echo '</form>';
+ echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>';
+
}
if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){
echo '<br /><div class="centre"><input type="submit" name="CancelOrder" value="' . _('Cancel Sale') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this sale?') . '\');" /></div>';
}
}
-echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CreditItemsControlled.php
===================================================================
--- trunk/CreditItemsControlled.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/CreditItemsControlled.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -75,7 +75,7 @@
echo '<br /><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Back to Credit Note Entry'). '</a>';
-echo '<br /><font size="2"<b>'. _('Credit of Controlled Item'). ' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('from') .' '. $_SESSION['CreditItems']->CustomerName . '</b></font></div>';
+echo '<br /><b>'. _('Credit of Controlled Item'). ' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('from') .' '. $_SESSION['CreditItems']->CustomerName . '</b></div>';
/** vars needed by InputSerialItem : **/
$LocationOut = $_SESSION['CreditItems']->Location;
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/CreditStatus.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -150,7 +150,8 @@
<tr>
<th>'. _('Status Code') .'</th>
<th>'. _('Description') .'</th>
- <th>'. _('Disallow Invoices') .'</th>';
+ <th>'. _('Disallow Invoices') .'</th>
+ </tr>';
$k=0; //row colour counter
while ($myrow=DB_fetch_array($result)) {
@@ -172,7 +173,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%s?SelectedReason=%s">' . _('Edit') . '</a></td>
- <td><a href="%s?SelectedReason=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this credit status record?') . '\');">'. _('Delete') .'</a></td>
+ <td><a href="%s?SelectedReason=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this credit status record?') . '\');">'. _('Delete') .'</a></td>
</tr>',
$myrow['reasoncode'],
$myrow['reasondescription'],
@@ -196,6 +197,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedReason) and ($InputError!=1)) {
@@ -256,6 +258,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/Credit_Invoice.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -257,16 +257,17 @@
if (!isset($_POST['ProcessCredit'])) {
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" colspan="7" class="selection"><tr>';
+ echo '<table cellpadding="2" class="selection">';
echo '<tr><th colspan="13">';
echo '<div class="centre"><b>' . _('Credit Invoice') . ' ' . $_SESSION['ProcessingCredit'] . '</b>
<b>'.' - ' . $_SESSION['CreditItems']->CustomerName . '</b>
- ' . _('Credit Note amounts stated in') . ' ' . $_SESSION['CreditItems']->DefaultCurrency . '</div>';
echo '</th></tr>';
- echo '<th>' . _('Item Code') . '</th>
+ echo '<tr><th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
<th>' . _('Invoiced') . '</th>
<th>' . _('Units') . '</th>
@@ -380,7 +381,7 @@
<td class="number">' . $DisplayGrossLineTotal . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td></tr>';
- echo '<tr' . $RowStarter . '><td colspan="12"><textarea tabindex="' . $j .'" name="Narrative_' . $LnItm->LineNumber . '" cols="100%" rows="1">' . $LnItm->Narrative . '</textarea><br /><hr></td></tr>';
+ echo '<tr ' . $RowStarter . '><td colspan="12"><textarea tabindex="' . $j .'" name="Narrative_' . $LnItm->LineNumber . '" cols="100%" rows="1">' . $LnItm->Narrative . '</textarea><br /><hr /></td></tr>';
$j++;
}
} /*end foreach loop displaying the invoice lines to credit */
@@ -443,10 +444,10 @@
if (!isset($_POST['ProcessCredit'])) {
echo '<tr>
<td colspan="7" class="number">' . _('Credit Totals') . '</td>
- <td class="number"><hr><b>' . $DisplayTotal . '</b><hr></td>
+ <td class="number"><hr /><b>' . $DisplayTotal . '</b><hr /></td>
<td colspan="2"></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal,$_SESSION['CreditItems']->CurrDecimalPlaces) . '<hr></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal+($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost),$_SESSION['CreditItems']->CurrDecimalPlaces) . '</b><hr></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal,$_SESSION['CreditItems']->CurrDecimalPlaces) . '</b><hr /></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal+($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost),$_SESSION['CreditItems']->CurrDecimalPlaces) . '</b><hr /></td>
</tr></table>';
}
$DefaultDispatchDate = Date($_SESSION['DefaultDateFormat']);
@@ -1513,7 +1514,7 @@
$j++;
echo '<input type="submit" tabindex="'.$j++.'" name="ProcessCredit" value="' . _('Process Credit') .'" /></div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/Currencies.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -52,7 +52,7 @@
$Errors[$i] = 'Abbreviation';
$i++;
}
- if (mb_strlen($_POST['Abbreviation']) > 3) {
+ if (mb_strlen($_POST['Abbreviation']) > 3 OR mb_strlen($_POST['Abbreviation']) < 1) {
$InputError = 1;
prnMsg(_('The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes'),'error');
$Errors[$i] = 'Abbreviation';
@@ -104,7 +104,7 @@
}
if (ContainsIllegalCharacters($_POST['Abbreviation'])) {
$InputError = 1;
- prnMsg( _('The currency code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
+ prnMsg( _('The currency code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'Abbreviation';
$i++;
}
@@ -231,7 +231,7 @@
while ($myrow = DB_fetch_array($result)) {
if ($myrow[1]==$FunctionalCurrency){
- echo '<tr bgcolor="#FFbbbb">';
+ echo '<tr style="background-color:#FFbbbb">';
} elseif ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -247,7 +247,7 @@
}
if ($myrow[1]!=$FunctionalCurrency){
- printf('<td><img src="%s" /></td>
+ printf('<td><img src="%s" alt="" /></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -255,8 +255,8 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><a href="%s&SelectedCurrency=%s">%s</a></td>
- <td><a href="%s&SelectedCurrency=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this currency?') . '\');">%s</a></td>
+ <td><a href="%s&SelectedCurrency=%s">%s</a></td>
+ <td><a href="%s&SelectedCurrency=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this currency?') . '\');">%s</a></td>
<td><a href="%s/ExchangeRateTrend.php?%s">' . _('Graph') . '</a></td>
</tr>',
$ImageFile,
@@ -274,9 +274,9 @@
$myrow['currabrev'],
_('Delete'),
$rootpath,
- '&CurrencyToShow=' . $myrow['currabrev']);
+ '&CurrencyToShow=' . $myrow['currabrev']);
} else {
- printf('<td><img src="%s" /></td>
+ printf('<td><img src="%s" alt="" /></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -309,6 +309,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCurrency) AND $SelectedCurrency!='') {
@@ -400,6 +401,7 @@
<div class="centre">
<input type="submit" name="submit" value="'._('Enter Information').'" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLAccountInquiry.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -177,14 +177,14 @@
$RunningTotal =$ChartDetailRow['bfwd'];
if ($RunningTotal < 0 ){ //its a credit balance b/fwd
- echo '<tr bgcolor="#FDFEEF">
+ echo '<tr style="background-color:#FDFEEF">
<td colspan="3"><b>' . _('Brought Forward Balance') . '</b><td>
</td></td>
<td class="number"><b>' . locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
<td></td>
</tr>';
} else { //its a debit balance b/fwd
- echo '<tr bgcolor="#FDFEEF">
+ echo '<tr style="background-color:#FDFEEF">
<td colspan="3"><b>' . _('Brought Forward Balance') . '</b></td>
<td class="number"><b>' . locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
<td colspan="2"></td>
@@ -213,7 +213,7 @@
$ChartDetailsResult = DB_query($sql,$db,$ErrMsg);
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
- echo '<tr bgcolor="#FDFEEF">
+ echo '<tr style="background-color:#FDFEEF">
<td colspan="3"><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
if ($PeriodTotal < 0 ){ //its a credit balance b/fwd
if ($PandLAccount==True) {
@@ -290,7 +290,7 @@
}
- echo '<tr bgcolor="#FDFEEF"><td colspan="3"><b>';
+ echo '<tr style="background-color:#FDFEEF"><td colspan="3"><b>';
if ($PandLAccount==True){
echo _('Total Period Movement');
} else { /*its a balance sheet account*/
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLBalanceSheet.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -422,9 +422,9 @@
if ($_POST['Detail']=='Detailed'){
echo '<tr>
<td colspan="2"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
</tr>';
}
@@ -446,9 +446,9 @@
if ($_POST['Detail']=='Detailed'){
echo '<tr>
<td colspan="2"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
</tr>';
}
@@ -474,17 +474,17 @@
if ($_POST['Detail']=='Detailed'){
echo '<tr>
<td colspan="2"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
</tr>';
} else {
echo '<tr>
<td colspan="3"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
</tr>';
}
@@ -575,9 +575,9 @@
if ($_POST['Detail']=='Detailed'){
echo '<tr>
<td colspan="2"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
</tr>';
}
@@ -595,9 +595,9 @@
if ($_POST['Detail']=='Detailed'){
echo '<tr>
<td colspan="2"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
</tr>';
}
@@ -615,17 +615,17 @@
if ($_POST['Detail']=='Detailed'){
echo '<tr>
<td colspan="2"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
</tr>';
} else {
echo '<tr>
<td colspan="3"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
</tr>';
}
@@ -650,9 +650,9 @@
echo '<tr>
<td colspan="3"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
</tr>';
printf('<tr>
@@ -666,9 +666,9 @@
echo '<tr>
<td colspan="3"></td>
- <td><hr></td>
+ <td><hr /></td>
<td></td>
- <td><hr></td>
+ <td><hr /></td>
</tr>';
echo '</table>';
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLBudgets.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -184,13 +184,13 @@
for ($i=1; $i<=12; $i++) {
echo '<tr>';
echo '<th>'. $PeriodEnd[$CurrentYearEndPeriod-(24-$i)] .'</th>';
- echo '<td bgcolor="d2e5e8" class="number">'.locale_number_format($Actual[$CurrentYearEndPeriod-(24-$i)],$_SESSION['CompanyRecord']['decimalplaces']).'</td>';
+ echo '<td style="background-color:d2e5e8" class="number">'.locale_number_format($Actual[$CurrentYearEndPeriod-(24-$i)],$_SESSION['CompanyRecord']['decimalplaces']).'</td>';
echo '<td><input type="text" class="number" size="14" name="'.$i.'last" value="'.locale_number_format($Budget[$CurrentYearEndPeriod-(24-$i)],$_SESSION['CompanyRecord']['decimalplaces']) .'" /></td>';
echo '<th>'. $PeriodEnd[$CurrentYearEndPeriod-(12-$i)] .'</th>';
- echo '<td bgcolor="d2e5e8" class="number">'.locale_number_format($Actual[$CurrentYearEndPeriod-(12-$i)],$_SESSION['CompanyRecord']['decimalplaces']).'</td>';
+ echo '<td style="background-color:d2e5e8" class="number">'.locale_number_format($Actual[$CurrentYearEndPeriod-(12-$i)],$_SESSION['CompanyRecord']['decimalplaces']).'</td>';
echo '<td><input type="text" class="number" size="14" name="'.$i.'this" value="'. locale_number_format($Budget[$CurrentYearEndPeriod-(12-$i)],$_SESSION['CompanyRecord']['decimalplaces']) .'" /></td>';
echo '<th>'. $PeriodEnd[$CurrentYearEndPeriod+($i)] .'</th>';
- echo '<td bgcolor="d2e5e8" class="number">'.locale_number_format($Actual[$CurrentYearEndPeriod+$i],$_SESSION['CompanyRecord']['decimalplaces']).'</td>';
+ echo '<td style="background-color:d2e5e8" class="number">'.locale_number_format($Actual[$CurrentYearEndPeriod+$i],$_SESSION['CompanyRecord']['decimalplaces']).'</td>';
echo '<td><input type="text" class="number" size="14" name="'.$i.'next" value="'. locale_number_format($Budget[$CurrentYearEndPeriod+$i],$_SESSION['CompanyRecord']['decimalplaces']) .'" /></td>';
echo '</tr>';
$LastYearActual=$LastYearActual+$Actual[$CurrentYearEndPeriod-(24-$i)];
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLProfit_Loss.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -1171,7 +1171,7 @@
<td colspan="6"><hr /></td>
</tr>';
- printf('<tr bgcolor="#ffffff">
+ printf('<tr style="background-color:#ffffff">
<td colspan="2"><font size="4" color="blue"><b>'._('Profit').' - '._('Loss').'</b></font></td>
<td></td>
<td class="number">%s</td>
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLTagProfit_Loss.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -920,7 +920,7 @@
<td colspan="2"><hr /></td>
</tr>';
- printf('<tr bgcolor="#ffffff">
+ printf('<tr style="background-color:#ffffff">
<td colspan="2"><font size="4" color="blue"><b>'._('Surplus').' - '._('Deficit').'</b></font></td>
<td></td>
<td class="number">%s</td>
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLTransInquiry.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -178,7 +178,7 @@
}
DB_free_result($TransResult);
- echo '<tr bgcolor="#FFFFFF">
+ echo '<tr style="background-color:#FFFFFF">
<td class="number" colspan="3"><b>' . _('Total') . '</b></td>
<td class="number">' . locale_number_format(($DebitTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format((-$CreditTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/GLTrialBalance.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -707,7 +707,7 @@
- printf('<tr bgcolor="#ffffff">
+ printf('<tr style="background-color:#ffffff">
<td colspan="2"><b>' . _('Check Totals') . '</b></td>
<td class="number">%s</td>
<td class="number">%s</td>
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/PO_OrderDetails.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -174,10 +174,10 @@
echo '<tr class="OsRow">';
} else {
if ($k==1){
- echo '<tr bgcolor="#CCCCCC">';
+ echo '<tr style="background-color:#CCCCCC">';
$k=0;
} else {
- echo '<tr bgcolor="#EEEEEE">';
+ echo '<tr style="background-color:#EEEEEE">';
$k=1;
}
}
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/PO_SelectPurchOrder.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -219,10 +219,10 @@
$k = 0; //row colour counter
while ($myrow = DB_fetch_array($StockItemsResult)) {
if ($k == 1) {
- echo '<tr bgcolor="#CCCCCC">';
+ echo '<tr style="background-color:#CCCCCC">';
$k = 0;
} else {
- echo '<tr bgcolor="#EEEEEE">';
+ echo '<tr style="background-color:#EEEEEE">';
$k = 1;
}
echo '<td><input type="submit" name="SelectedStockItem" value="' . $myrow['stockid'] . '"</td>
@@ -442,10 +442,10 @@
$k = 0; //row colour counter
while ($myrow = DB_fetch_array($PurchOrdersResult)) {
if ($k == 1) { /*alternate bgcolour of row for highlighting */
- echo '<tr bgcolor="#CCCCCC">';
+ echo '<tr style="background-color:#CCCCCC">';
$k = 0;
} else {
- echo '<tr bgcolor="#EEEEEE">';
+ echo '<tr style="background-color:#EEEEEE">';
$k++;
}
$ViewPurchOrder = $rootpath . '/PO_OrderDetails.php?OrderNo=' . $myrow['orderno'];
Modified: trunk/Prices_Customer.php
===================================================================
--- trunk/Prices_Customer.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/Prices_Customer.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -267,7 +267,7 @@
} else {
$EndDateDisplay = ConvertSQLDate($myrow['enddate']);
}
- echo '<tr bgcolor="#CCCCCC">
+ echo '<tr style="background-color:#CCCCCC">
<td class="number">'.locale_number_format($myrow['price'],$CurrDecimalPlaces).'</td>
<td>' . $Branch.'</td>
<td>'.$myrow['units'].'</td>
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/PrintCustTrans.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -689,7 +689,7 @@
echo '<table class="table1">
<tr><td VALIGN=TOP WIDTH="10%"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#BBBBBB"><b>';
+ <td style="background-color:#BBBBBB"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -719,10 +719,10 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Charge To') . ':</b></td>
+ <td align=left style="background-color:#BBBBBB"><b>' . _('Charge To') . ':</b></td>
</tr>
<tr>
- <td bgcolor="#EEEEEE">';
+ <td style="background-color:#EEEEEE">';
echo $myrow['name'] .
'<br />' . $myrow['address1'] .
'<br />' . $myrow['address2'] .
@@ -744,11 +744,11 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Charge Branch') . ':</b></td>
- <td align=left bgcolor="#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 bgcolor="#EEEEEE">' .$myrow['brname'] .
+ <td style="background-color:#EEEEEE">' .$myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -756,7 +756,7 @@
'<br />' . $myrow['braddress5'] .
'<br />' . $myrow['braddress6'] . '</td>';
- echo '<td bgcolor="#EEEEEE">' . $myrow['deliverto'] .
+ echo '<td style="background-color:#EEEEEE">' . $myrow['deliverto'] .
'<br />' . $myrow['deladd1'] .
'<br />' . $myrow['deladd2'] .
'<br />' . $myrow['deladd3'] .
@@ -765,26 +765,26 @@
'<br />' . $myrow['deladd6'] . '</td>
</tr>
</table>
- <hr>';
+ <hr />';
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Your Order Ref') . '</b></td>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Our Order No') . '</b></td>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Order Date') . '</b></td>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Invoice Date') . '</b></td>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Sales Person') . '</font></b></td>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Shipper') . '</b></td>
- <td align=left bgcolor="#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') . '</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>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . $myrow['customerref'] . '</td>
- <td bgcolor="#EEEEEE">' .$myrow['orderno'] . '</td>
- <td bgcolor="#EEEEEE">' . ConvertSQLDate($myrow['orddate']) . '</td>
- <td bgcolor="#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['salesmanname'] . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['shippername'] . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['consignment'] . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['customerref'] . '</td>
+ <td style="background-color:#EEEEEE">' .$myrow['orderno'] . '</td>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['orddate']) . '</td>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['shippername'] . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['consignment'] . '</td>
</tr>
</table>';
@@ -807,10 +807,10 @@
} else { /* then its a credit note */
echo '<table width="50%"><tr>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Branch') . ':</b></td>
+ <td align=left style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' .$myrow['brname'] .
+ <td style="background-color:#EEEEEE">' .$myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -818,13 +818,13 @@
'<br />' . $myrow['braddress5'] .
'<br />' . $myrow['braddress6'] . '</td>
</tr></table>';
- echo '<hr><table class="table1"><tr>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Date') . '</b></td>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Sales Person') . '</font></b></td>
+ 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>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['salesmanname'] . '</td>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
</tr></table>';
$sql ="SELECT stockmoves.stockid,
@@ -922,7 +922,7 @@
echo '</table>
<table class="table1">
<tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#BBBBBB"><b>';
+ <td style="background-color:#BBBBBB"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -971,7 +971,7 @@
$PageNumber++;
echo '<table class="table1">
<tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#BBBBBB"><b>';
+ <td style="background-color:#BBBBBB"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') .' ';
@@ -1035,20 +1035,20 @@
/*Print out the invoice text entered */
echo '<table class=table1><tr>
<td class="number">' . _('Sub Total') . '</td>
- <td class="number" bgcolor="#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" bgcolor="#EEEEEE">' . $DisplayFreight . '</td></tr>';
+ <td class="number" style="background-color:#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
- <td class="number" bgcolor="#EEEEEE">' . $DisplayTax . '</td></tr>';
+ <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" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td>
+ <td class="number" style="background-color:#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td>
</tr>';
} else {
echo '<tr>
<td class="number"><font color=RED><b>' . _('TOTAL CREDIT') .'</b></font></td>
- <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></U></font></td>
+ <td class="number" style="background-color:#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></U></font></td>
</tr>';
}
echo '</table>';
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/PrintCustTransPortrait.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -725,7 +725,7 @@
echo '<table class="table1">
<tr>
<td valign=top width="10%"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbbbbb"><b>';
+ <td style="background-color:#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -759,10 +759,10 @@
echo '<table class="table1">
<tr>
- <td align="left" bgcolor="#bbbbbb"><b>' . _('Charge To') . ':</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Charge To') . ':</b></td>
</tr>
<tr>
- <td bgcolor="#eeeeee">';
+ <td style="background-color:#eeeeee">';
echo $myrow['name'] .
'<br />' . $myrow['address1'] .
'<br />' . $myrow['address2'] .
@@ -785,11 +785,11 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
- <td align=left bgcolor="#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 bgcolor="#eeeeee">' .$myrow['brname'] .
+ <td style="background-color:#eeeeee">' .$myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -798,7 +798,7 @@
'<br />' . $myrow['braddress6'] .
'</td>';
- echo '<td bgcolor="#eeeeee">' . $myrow['deliverto'] .
+ echo '<td style="background-color:#eeeeee">' . $myrow['deliverto'] .
'<br />' . $myrow['deladd1'] .
'<br />' . $myrow['deladd2'] .
'<br />' . $myrow['deladd3'] .
@@ -807,26 +807,26 @@
'<br />' . $myrow['deladd6'] .
'</td>';
echo '</tr>
- </table><hr>';
+ </table><hr />';
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Your Order Ref') . '</b></td>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Our Order No') . '</b></td>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Order Date') . '</b></td>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Invoice Date') . '</b></td>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Sales Person') . '</font></b></td>
- <td align=left bgcolor="#bbbbbb"><b>' . _('Shipper') . '</b></td>
- <td align=left bgcolor="#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') . '</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>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . $myrow['customerref'] . '</td>
- <td bgcolor="#EEEEEE">' .$myrow['orderno'] . '</td>
- <td bgcolor="#EEEEEE">' . ConvertSQLDate($myrow['orddate']) . '</td>
- <td bgcolor="#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['salesmanname'] . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['shippername'] . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['consignment'] . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['customerref'] . '</td>
+ <td style="background-color:#EEEEEE">' .$myrow['orderno'] . '</td>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['orddate']) . '</td>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['shippername'] . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['consignment'] . '</td>
</tr>
</table>';
@@ -849,10 +849,10 @@
echo '<table width="50%">
<tr>
- <td align=left bgcolor="#BBBBBB"><b>' . _('Branch') . ':</b></td>
+ <td align=left style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . $myrow['brname'] .
+ <td style="background-color:#EEEEEE">' . $myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -861,15 +861,15 @@
'<br />' . $myrow['braddress6'] .
'</td>
</tr></table>';
- echo '<hr>
+ echo '<hr />
<table class="table1">
<tr>
- <td align="left" bgcolor="#bbbbbb"><b>' . _('Date') . '</b></td>
- <td align=left bgcolor="#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') . '</font></b></td>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td bgcolor="#EEEEEE">' . $myrow['salesmanname'] . '</td>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
</tr>
</table>';
@@ -889,7 +889,7 @@
AND stockmoves.show_on_inv_crds=1";
}
- echo '<hr>';
+ echo '<hr />';
echo '<div class="centre"><font size="2">' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</font></div>';
$result=DB_query($sql,$db);
@@ -973,7 +973,7 @@
<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbbbbb"><b>';
+ <td style="background-color:#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -1029,7 +1029,7 @@
echo '<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbbbbb"><b>';
+ <td style="background-color:#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') .' ';
} else {
@@ -1099,17 +1099,17 @@
/*Print out the invoice text entered */
echo '<table class="table1"><tr>
<td class="number">' . _('Sub Total') . '</td>
- <td class="number" bgcolor="#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" bgcolor="#EEEEEE">' . $DisplayFreight . '</td></tr>';
+ <td class="number" style="background-color:#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
- <td class="number" bgcolor="#EEEEEE">' . $DisplayTax . '</td></tr>';
+ <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" bgcolor="#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>';
+ <td class="number" style="background-color:#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>';
} else {
echo '<tr><td class="number"><font color="red"><b>' . _('TOTAL CREDIT') . '</b></font></td>
- <td class="number" bgcolor="#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>';
+ <td class="number" style="background-color:#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>';
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/RecurringSalesOrders.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -500,7 +500,7 @@
echo '<input type="hidden" name="ExistingRecurrOrderNo" value="' . $_POST['ExistingRecurrOrderNo'] . '" />';
echo '<input type="submit" name="Process" value="' . _('Update Recurring Order Details') . '" />';
- echo '<hr>';
+ echo '<hr />';
echo '<br /><br /><input type="submit" name="DeleteRecurringOrder" value="' . _('Delete Recurring Order') . ' ' . $_POST['ExistingRecurrOrderNo'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this recurring order template?') . '\');" />';
}
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/SalesByTypePeriodInquiry.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -379,10 +379,10 @@
<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
if ($k==1){
- echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="OddTableRows">';
} else {
- echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="EvenTableRows">';
}
$PrdTotalOrders =0;
@@ -414,10 +414,10 @@
<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
if ($k==1){
- echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="OddTableRows">';
} else {
- echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="EvenTableRows">';
}
$PrdTotalOrders =0;
@@ -449,10 +449,10 @@
<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
if ($k==1){
- echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="OddTableRows">';
} else {
- echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="EvenTableRows">';
}
$PrdTotalOrders =0;
@@ -484,10 +484,10 @@
<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
if ($k==1){
- echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="OddTableRows">';
} else {
- echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="EvenTableRows">';
}
$PrdTotalOrders =0;
@@ -545,10 +545,10 @@
<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
if ($k==1){
- echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="OddTableRows">';
} else {
- echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows"><td colspan="8"><hr /></td></tr>';
echo '<tr class="EvenTableRows">';
}
echo '<td colspan="2" class="number">' . _('GRAND Total') . '</td>
Modified: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php 2012-03-07 08:21:36 UTC (rev 5052)
+++ trunk/SalesCategoryPeriodInquiry.php 2012-03-07 23:06:32 UTC (rev 5053)
@@ -198,10 +198,10 @@
} //loop around category sales for the period
if ($k==1){
- echo '<tr class="EvenTableRows"><t...
[truncated message content] |
