Menu
▾
▴
web-erp-svn
|
From: <vv...@us...> - 2012-03-06 21:05:59
|
Revision: 5044
http://web-erp.svn.sourceforge.net/web-erp/?rev=5044&view=rev
Author: vvs2012
Date: 2012-03-06 21:05:52 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/COGSGLPostings.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -106,7 +106,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
$myrow['area'],
$myrow['stkcat'],
$myrow['salestype'],
@@ -204,7 +204,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
@@ -228,6 +228,7 @@
echo '<br />';
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($SelectedCOGSPostingID)) {
@@ -353,6 +354,7 @@
<div class="centre">
<input tabindex="5" type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ConfirmDispatch_Invoice.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -267,6 +267,7 @@
<br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/***************************************************************
@@ -327,7 +328,7 @@
if (isset($_POST['ProcessInvoice'])) {
echo '<td class="number">' . locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</td>';
} else {
- echo '<td class="number"><input type="hidden" name="' . $LnItm->LineNumber . '_QtyDispatched" value="' . $LnItm->QtyDispatched . '" /><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">' .locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</a></td>';
+ echo '<td class="number"><input type="hidden" name="' . $LnItm->LineNumber . '_QtyDispatched" value="' . $LnItm->QtyDispatched . '" /><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">' .locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</a></td>';
}
} else {
if (isset($_POST['ProcessInvoice'])) {
@@ -395,7 +396,7 @@
if ($LnItm->Controlled==1){
if (!isset($_POST['ProcessInvoice'])) {
- echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
+ echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
if ($LnItm->Serialised==1){
echo _('Enter Serial Numbers');
} else { /*Just batch/roll/lot control */
@@ -1613,9 +1614,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 '<a href="'.$rootpath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />';
echo '<a href="'.$rootpath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />';
@@ -1666,7 +1667,7 @@
</div>
<input type="hidden" name="ShipVia" value="' . $_SESSION['Items'.$identifier]->ShipVia . '" />';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ContractBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -216,6 +216,7 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
echo '<form name="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (count($_SESSION['Contract'.$identifier]->ContractBOM)>0){
@@ -227,7 +228,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="7"><font color="navy" size="2">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</font></th>
+ <th colspan="7">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</th>
</tr>';
}
@@ -263,7 +264,7 @@
<td>' . $ContractComponent->UOM . '</td>
<td class="number">' . locale_number_format($ContractComponent->ItemCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . $DisplayLineTotal . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '&Delete=' . $ContractComponent->ComponentID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the contract BOM?') . '\');">' . _('Delete') . '</a></td></tr>';
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '&Delete=' . $ContractComponent->ComponentID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the contract BOM?') . '\');">' . _('Delete') . '</a></td></tr>';
$TotalCost += $LineTotal;
}
@@ -317,17 +318,17 @@
}
echo '</select></td>
- <td><font size="2">' . _('Enter text extracts in the description') . ':</font></td>
+ <td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td>
</tr>
<tr>
<td></td>
- <td><font size="3"> <b>' . _('OR') . ' </b></font><font size="2">' . _('Enter extract of the Stock Code') . ':</font></td>
+ <td><b>' . _('OR') . ' </b>' . _('Enter extract of the Stock Code') . ':</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr>
<tr>
<td></td>
- <td><font size="3"><b>' . _('OR') . ' </b></font><font size="2"><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></font></td>
+ <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td>
</tr>
</table>
<br />
@@ -364,7 +365,7 @@
}
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
} else {
$ImageSource = '<i>'._('No Image').'</i>';
}
@@ -398,6 +399,7 @@
}#end if SearchResults to show
echo '<hr />
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ContractCosting.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -432,12 +432,14 @@
if ($_SESSION['Contract'.$identifier]->Status ==2){//the contract is an order being processed now
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedContract=' . $_SESSION['Contract'.$identifier]->ContractRef . '&identifier=' . $identifier . '">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedContract=' . $_SESSION['Contract'.$identifier]->ContractRef . '&identifier=' . $identifier . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
<div class="centre">
<input type="submit" name="CloseContract" value="' . _('Close Contract') . '" onclick="return confirm(\'' . _('Closing the contract will prevent further stock being issued to it and charges being made against it. Variances will be taken to the profit and loss account. Are You Sure?') . '\');" />
</div>
+ </div>
</form>';
}
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ContractOtherReqts.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -76,6 +76,7 @@
/* This is where the other requirement as entered/modified should be displayed reflecting any deletions or insertions*/
echo '<form name="ContractReqtsForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" 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/contract.png" title="' . _('Contract Other Requirements') . '" alt="" /> ' . _('Contract Other Requirements') . ' - ' . $_SESSION['Contract'.$identifier]->CustomerName.'</p>';
@@ -165,7 +166,7 @@
<div class="centre">
<input type="submit" name="EnterNewRequirement" value="' . _('Enter New Contract Requirement') . '" />
</div>
-
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/Contracts.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -373,7 +373,7 @@
$DbgMsg = _('The SQL that failed to update the quotation was');
$UpdQuoteResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
prnMsg(_('The contract quotation has been updated based on the new contract cost and margin'),'success');
- echo '<br /><a href="' .$rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . _('Go to Quotation') . ' ' . $_SESSION['Contract'.$identifier]->OrderNo . '</a>';
+ echo '<br /><a href="' .$rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . _('Go to Quotation') . ' ' . $_SESSION['Contract'.$identifier]->OrderNo . '</a>';
}
if ($ExistingContract['status'] == 0 AND $_POST['Status']==1){
@@ -747,6 +747,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' .
_('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="3" colspan="4" class="selection">
@@ -807,7 +808,9 @@
//end of while loop
echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
- echo '</table></form>';
+ echo '</table>
+ </div>
+ </form>';
}//end if results to show
@@ -815,6 +818,7 @@
} else { /*A customer is already selected so get into the contract setup proper */
echo '<form name="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
@@ -936,7 +940,7 @@
if ($_SESSION['Contract'.$identifier]->Status >=1) {
echo '<tr>
<td>' . _('Quotation Reference/Sales Order No') . ':</td>
- <td><a href="' . $rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . $_SESSION['Contract'.$identifier]->OrderNo . '</a></td>
+ <td><a href="' . $rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . $_SESSION['Contract'.$identifier]->OrderNo . '</a></td>
</tr>';
}
if ($_SESSION['Contract'.$identifier]->Status!=2 and isset($_SESSION['Contract'.$identifier]->WO)) {
@@ -1049,7 +1053,8 @@
</div>
</p>';
}
- echo '</form>';
+ echo '</div>
+ </form>';
} /*end of if customer selected and entering contract header*/
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-03-06 21:05:59
|
Revision: 5044
http://web-erp.svn.sourceforge.net/web-erp/?rev=5044&view=rev
Author: vvs2012
Date: 2012-03-06 21:05:52 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/COGSGLPostings.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -106,7 +106,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
$myrow['area'],
$myrow['stkcat'],
$myrow['salestype'],
@@ -204,7 +204,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
@@ -228,6 +228,7 @@
echo '<br />';
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($SelectedCOGSPostingID)) {
@@ -353,6 +354,7 @@
<div class="centre">
<input tabindex="5" type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ConfirmDispatch_Invoice.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -267,6 +267,7 @@
<br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/***************************************************************
@@ -327,7 +328,7 @@
if (isset($_POST['ProcessInvoice'])) {
echo '<td class="number">' . locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</td>';
} else {
- echo '<td class="number"><input type="hidden" name="' . $LnItm->LineNumber . '_QtyDispatched" value="' . $LnItm->QtyDispatched . '" /><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">' .locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</a></td>';
+ echo '<td class="number"><input type="hidden" name="' . $LnItm->LineNumber . '_QtyDispatched" value="' . $LnItm->QtyDispatched . '" /><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">' .locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</a></td>';
}
} else {
if (isset($_POST['ProcessInvoice'])) {
@@ -395,7 +396,7 @@
if ($LnItm->Controlled==1){
if (!isset($_POST['ProcessInvoice'])) {
- echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
+ echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
if ($LnItm->Serialised==1){
echo _('Enter Serial Numbers');
} else { /*Just batch/roll/lot control */
@@ -1613,9 +1614,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 '<a href="'.$rootpath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />';
echo '<a href="'.$rootpath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />';
@@ -1666,7 +1667,7 @@
</div>
<input type="hidden" name="ShipVia" value="' . $_SESSION['Items'.$identifier]->ShipVia . '" />';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ContractBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -216,6 +216,7 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
echo '<form name="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (count($_SESSION['Contract'.$identifier]->ContractBOM)>0){
@@ -227,7 +228,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="7"><font color="navy" size="2">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</font></th>
+ <th colspan="7">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</th>
</tr>';
}
@@ -263,7 +264,7 @@
<td>' . $ContractComponent->UOM . '</td>
<td class="number">' . locale_number_format($ContractComponent->ItemCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . $DisplayLineTotal . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '&Delete=' . $ContractComponent->ComponentID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the contract BOM?') . '\');">' . _('Delete') . '</a></td></tr>';
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '&Delete=' . $ContractComponent->ComponentID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the contract BOM?') . '\');">' . _('Delete') . '</a></td></tr>';
$TotalCost += $LineTotal;
}
@@ -317,17 +318,17 @@
}
echo '</select></td>
- <td><font size="2">' . _('Enter text extracts in the description') . ':</font></td>
+ <td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td>
</tr>
<tr>
<td></td>
- <td><font size="3"> <b>' . _('OR') . ' </b></font><font size="2">' . _('Enter extract of the Stock Code') . ':</font></td>
+ <td><b>' . _('OR') . ' </b>' . _('Enter extract of the Stock Code') . ':</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr>
<tr>
<td></td>
- <td><font size="3"><b>' . _('OR') . ' </b></font><font size="2"><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></font></td>
+ <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td>
</tr>
</table>
<br />
@@ -364,7 +365,7 @@
}
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
} else {
$ImageSource = '<i>'._('No Image').'</i>';
}
@@ -398,6 +399,7 @@
}#end if SearchResults to show
echo '<hr />
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ContractCosting.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -432,12 +432,14 @@
if ($_SESSION['Contract'.$identifier]->Status ==2){//the contract is an order being processed now
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedContract=' . $_SESSION['Contract'.$identifier]->ContractRef . '&identifier=' . $identifier . '">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedContract=' . $_SESSION['Contract'.$identifier]->ContractRef . '&identifier=' . $identifier . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
<div class="centre">
<input type="submit" name="CloseContract" value="' . _('Close Contract') . '" onclick="return confirm(\'' . _('Closing the contract will prevent further stock being issued to it and charges being made against it. Variances will be taken to the profit and loss account. Are You Sure?') . '\');" />
</div>
+ </div>
</form>';
}
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/ContractOtherReqts.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -76,6 +76,7 @@
/* This is where the other requirement as entered/modified should be displayed reflecting any deletions or insertions*/
echo '<form name="ContractReqtsForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" 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/contract.png" title="' . _('Contract Other Requirements') . '" alt="" /> ' . _('Contract Other Requirements') . ' - ' . $_SESSION['Contract'.$identifier]->CustomerName.'</p>';
@@ -165,7 +166,7 @@
<div class="centre">
<input type="submit" name="EnterNewRequirement" value="' . _('Enter New Contract Requirement') . '" />
</div>
-
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-03-06 07:43:43 UTC (rev 5043)
+++ trunk/Contracts.php 2012-03-06 21:05:52 UTC (rev 5044)
@@ -373,7 +373,7 @@
$DbgMsg = _('The SQL that failed to update the quotation was');
$UpdQuoteResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
prnMsg(_('The contract quotation has been updated based on the new contract cost and margin'),'success');
- echo '<br /><a href="' .$rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . _('Go to Quotation') . ' ' . $_SESSION['Contract'.$identifier]->OrderNo . '</a>';
+ echo '<br /><a href="' .$rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . _('Go to Quotation') . ' ' . $_SESSION['Contract'.$identifier]->OrderNo . '</a>';
}
if ($ExistingContract['status'] == 0 AND $_POST['Status']==1){
@@ -747,6 +747,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' .
_('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="3" colspan="4" class="selection">
@@ -807,7 +808,9 @@
//end of while loop
echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
- echo '</table></form>';
+ echo '</table>
+ </div>
+ </form>';
}//end if results to show
@@ -815,6 +818,7 @@
} else { /*A customer is already selected so get into the contract setup proper */
echo '<form name="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
@@ -936,7 +940,7 @@
if ($_SESSION['Contract'.$identifier]->Status >=1) {
echo '<tr>
<td>' . _('Quotation Reference/Sales Order No') . ':</td>
- <td><a href="' . $rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . $_SESSION['Contract'.$identifier]->OrderNo . '</a></td>
+ <td><a href="' . $rootpath . '/SelectSalesOrder.php?OrderNumber=' . $_SESSION['Contract'.$identifier]->OrderNo . '&Quotations=Quotes_Only">' . $_SESSION['Contract'.$identifier]->OrderNo . '</a></td>
</tr>';
}
if ($_SESSION['Contract'.$identifier]->Status!=2 and isset($_SESSION['Contract'.$identifier]->WO)) {
@@ -1049,7 +1053,8 @@
</div>
</p>';
}
- echo '</form>';
+ echo '</div>
+ </form>';
} /*end of if customer selected and entering contract header*/
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-03-06 23:02:34
|
Revision: 5045
http://web-erp.svn.sourceforge.net/web-erp/?rev=5045&view=rev
Author: vvs2012
Date: 2012-03-06 23:02:27 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/InputSerialItemsKeyed.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/COGSGLPostings.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -105,8 +105,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow['area'],
$myrow['stkcat'],
$myrow['salestype'],
@@ -203,8 +203,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
@@ -341,7 +341,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
} //end while loop
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/ConfirmDispatch_Invoice.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -273,7 +273,7 @@
/***************************************************************
Line Item Display
***************************************************************/
-echo '<table width="90%" cellpadding="2" colspan="7" class="selection">
+echo '<table width="90%" cellpadding="2" class="selection">
<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description' ) . '</th>
@@ -317,6 +317,7 @@
$_SESSION['Items'.$identifier]->totalVolume += ($LnItm->QtyDispatched * $LnItm->Volume);
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
+ echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
<td>'.$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
@@ -545,10 +546,10 @@
echo '<tr>
<td colspan="10" class="number">' . _('Invoice Totals'). '</td>
- <td class="number:><hr><b>'.$DisplaySubTotal.'</b><hr></td>
+ <td class="number"><hr /><b>'.$DisplaySubTotal.'</b><hr /></td>
<td colspan="2"></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
</tr>';
if (! isset($_POST['DispatchDate']) OR ! Is_Date($_POST['DispatchDate'])){
@@ -629,7 +630,9 @@
} //end of loop around items on the order for negative check
if ($NegativesFound){
- echo '<div class="centre">
+ echo '</div>';
+ echo '</form>';
+ echo '<div class="centre">
<input type="submit" name="Update" value="' . _('Update'). '" /></div>';
include('includes/footer.inc');
exit;
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/ContractBOM.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -215,7 +215,7 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
-echo '<form name="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
+echo '<form id="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -341,7 +341,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1" colspan="7">';
+ echo '<table cellpadding="1">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/Contracts.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -746,11 +746,11 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' .
_('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" id="CustomerSelection" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table cellpadding="3" colspan="4" class="selection">
+ echo '<table cellpadding="3" class="selection">
<tr>
<td><h5>' . _('Part of the Customer Branch Name') . ':</h5></td>
<td><input tabindex="1" type="text" name="CustKeywords" size="20" maxlength="25" /></td>
@@ -763,13 +763,13 @@
</tr>
</table>
<br /><div class="centre"><input tabindex="4" type="submit" name="SearchCustomers" value="' . _('Search Now') . '" />
- <input tabindex="5" type="submit" action="reset" value="' . _('Reset') .'" /></div>';
+ <input tabindex="5" type="submit" name="reset" value="' . _('Reset') .'" /></div>';
if (isset($result_CustSelect)) {
- echo '<table cellpadding="2" class="selection">';
+ echo '<br /><table cellpadding="2" class="selection">';
- $TableHeader = '<br /><tr>
+ $TableHeader = '<tr>
<th>' . _('Customer') . '</th>
<th>' . _('Branch') . '</th>
<th>' . _('Contact') . '</th>
@@ -791,12 +791,12 @@
$k=1;
}
if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
+ echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8').'" /></td>
- <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'" />
+ echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8').'" />
+ <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'" /></td>
<td>'.htmlspecialchars($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
<td>'.$myrow['phoneno'].'</td>
<td>'.$myrow['faxno'].'</td>
@@ -806,18 +806,17 @@
//end of page full new headings if
}
//end of while loop
- echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
+ echo '<tr><td><input type="hidden" name="JustSelectedACustomer" value="Yes" /></td></tr>';
- echo '</table>
- </div>
- </form>';
-
+ echo '</table>';
}//end if results to show
+ echo '</div>
+ </form>';
//end if RequireCustomerSelection
} else { /*A customer is already selected so get into the contract setup proper */
- echo '<form name="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<form id="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -883,7 +882,7 @@
</tr>
<tr>
<td>' . _('Contract Description') . ':</td>
- <td><textarea name="ContractDescription" style="width:100%" rows="5">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
+ <td><textarea name="ContractDescription" style="width:100%" rows="5" cols="40">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
</tr><tr>
<td>'. _('Drawing File') . ' .jpg' . ' ' . _('format only') .':</td>
<td><input type="file" id="Drawing" name="Drawing" /></td>
@@ -1047,11 +1046,10 @@
echo '</div>';
}
if ($_SESSION['Contract'.$identifier]->Status!=2) {
- echo '<p>
- <div class="centre">
- <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
- </div>
- </p>';
+ echo '<div class="centre">
+ <br />
+ <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
+ </div>';
}
echo '</div>
</form>';
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/CopyBOM.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -6,10 +6,10 @@
*/
/* $Id$*/
+include('includes/session.inc');
+
$title = _('Copy a BOM to New Item Code');
-include('includes/session.inc');
-
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -122,6 +122,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT stockid,
@@ -141,8 +142,8 @@
echo '</select></td>
</tr>';
echo '<tr>
- <td><input type="radio" name="type" value="N" checked="" />' . _(' To New Stock ID') . '</td></td><td>';
- echo '<input type="text" maxlength="20" name="tostkid" /></td></tr>';
+ <td><input type="radio" name="type" value="N" />' . _(' To New Stock ID') . '</td>';
+ echo '<td><input type="text" maxlength="20" name="tostkid" /></td></tr>';
$sql = "SELECT stockid,
description
@@ -153,15 +154,18 @@
if (DB_num_rows($result) > 0) {
echo '<tr>
- <td><input type="radio" name="type" value="E" />'._('To Existing Stock ID') . '</td><td>';
- echo '<select name="exstkid">';
+ <td><input type="radio" name="type" value="E" />'._('To Existing Stock ID') . '</td>';
+ echo '<td><select name="exstkid">';
while($row = DB_fetch_row($result)) {
echo '<option value="'.$row[0].'">'.$row[0].' -- '.$row[1].'</option>';
}
- echo '</select>';
+ echo '</select></td>';
+ echo '</tr>';
}
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Submit" value="Submit" /></div></form>';
+ echo '<br /><div class="centre"><input type="submit" name="Submit" value="Submit" /></div>
+ </div>
+ </form>';
include('includes/footer.inc');
}
Modified: trunk/includes/InputSerialItems.php
===================================================================
--- trunk/includes/InputSerialItems.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItems.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -49,45 +49,47 @@
$valid = true;
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?identifier='.$identifier.'" enctype="multipart/form-data" >';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="hidden" name="LineNo" value="' . $LineNo . '">';
-echo '<input type="hidden" name="StockID" value="'. $StockID. '">';
-echo '<table class=selection><tr><td>';
-echo '<input type="radio" name=EntryType onClick="submit();" ';
+echo '<input type="hidden" name="LineNo" value="' . $LineNo . '" />';
+echo '<input type="hidden" name="StockID" value="'. $StockID. '" />';
+echo '<table class="selection"><tr><td>';
+echo '<input type="radio" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='KEYED') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
-echo 'value="KEYED">'. _('Keyed Entry');
-echo '</TD>';
+echo 'value="KEYED" />'. _('Keyed Entry');
+echo '</td>';
if ($LineItem->Serialised==1){
echo '<td>';
- echo '<input type="radio" name=EntryType onClick="submit();" ';
+ echo '<input type="radio" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='SEQUENCE') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
- echo ' value="SEQUENCE">'. _('Sequential');
+ echo ' value="SEQUENCE" />'. _('Sequential');
echo '</td>';
}
-echo '<td valign=bottom>';
-echo '<input type="radio" id="FileEntry" name="EntryType" onClick="submit();" ';
+echo '<td valign="bottom">';
+echo '<input type="radio" id="FileEntry" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='FILE') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
-echo ' value="FILE">'. _('File Upload');
-echo ' <input type="file" name="ImportFile" onClick="document.getElementById(\'FileEntry\').checked=true;" >';
-echo '</td></tr><tr><td colspan=3>';
-echo '<div class="centre"><input type="submit" value="'. _('Set Entry Type'). ':"></div>';
+echo ' value="FILE" />'. _('File Upload');
+echo ' <input type="file" name="ImportFile" onclick="document.getElementById(\'FileEntry\').checked=true;" />';
+echo '</td></tr><tr><td colspan="3">';
+echo '<div class="centre"><input type="submit" value="'. _('Set Entry Type'). ':" /></div>';
echo '</td></tr></table>';
+echo '</div>';
echo '</form>';
global $tableheader;
/* Link to clear the list and start from scratch */
-$EditLink = '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&EditControlled=true&StockID=' . $LineItem->StockID .
- '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
-$RemoveLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&DELETEALL=YES&StockID=' . $LineItem->StockID .
- '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br /></div>';
+$EditLink = '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&EditControlled=true&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
+$RemoveLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&DELETEALL=YES&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br /></div>';
$sql="SELECT perishable
FROM stockmaster
WHERE stockid='".$StockID."'";
Modified: trunk/includes/InputSerialItemsFile.php
===================================================================
--- trunk/includes/InputSerialItemsFile.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItemsFile.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -44,7 +44,7 @@
echo '<td>' . $Bundle->BundleRef . '</td>';
if ($LineItem->Serialised==0){
- echo '<td align=right>' . locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ echo '<td align="right">' . locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
}
}
@@ -54,14 +54,14 @@
/*Display the totals and rule off before allowing new entries */
if ($LineItem->Serialised==1){
- echo '<tr><td align=right><b>'. _('Total Quantity'). ': ' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
- echo '<tr><td><hr></td></tr>';
+ echo '<tr><td align="right"><b>'. _('Total Quantity'). ': ' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td><hr /></td></tr>';
} else {
- echo '<tr><td align=right><b>'. _('Total Quantity'). ':</b></td><td align=right><b>' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
- echo '<tr><td colspan=2><hr></td></tr>';
+ echo '<tr><td align="right"><b>'. _('Total Quantity'). ':</b></td><td align="right"><b>' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td colspan="2"><hr /></td></tr>';
}
-echo '</table><hr>';
+echo '</table><hr />';
//DISPLAY FILE INFO
@@ -75,7 +75,7 @@
$msg = _('Please Choose a file and then click Set Entry Type to upload a file for import');
prnMsg($msg);
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit();
}
@@ -86,7 +86,7 @@
_('Type').':'.$_FILES['ImportFile']['type'].'<br />';
echo '<br />'._('Error was').' '.$_FILES['ImportFile']['error'].'<br />';
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit();
} elseif ($_FILES['ImportFile']['name']!=''){
@@ -100,7 +100,7 @@
if (!move_uploaded_file($_FILES['ImportFile']['tmp_name'],$_SESSION['CurImportFile']['tmp_name'])){
prnMsg(_('Error moving temporary file') . '. ' . _('Please check your configuration'),'error' );
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit;
}
@@ -150,7 +150,7 @@
<input type="hidden" name="EntryType" value="FILE">
</form>
<p>'. _('1st 10 Lines of File'). '....
- <hr width=15%>
+ <hr width=15% />
<pre>';
echo $contents;
@@ -160,7 +160,7 @@
} else {
//Otherwise we have all valid records. show the first (100) for visual verification.
echo _('Below are the 1st 100 records as parsed');
- echo '<hr width=20%>';
+ echo '<hr width=20% />';
foreach($LineItem->SerialItems as $SItem){
echo $SItem->BundleRef.'<br />';
$i++;
Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItemsKeyed.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -75,6 +75,14 @@
/*Close off old table */
echo '</table></td><td valign="top">';
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" id="Ga6uF5Wa" method="post">
+ <div>
+ <input type="hidden" name="LineNo" value="' . $LineNo . '" />
+ <input type="hidden" name="StockID" value="' . $StockID . '" />
+ <input type="hidden" name="EntryType" value="KEYED" />';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
/*Start a new table for the Serial/Batch ref input in one column (as a sub table
then the multi select box for selection of existing bundle/serial nos for dispatch if applicable*/
//echo '<TABLE><TR><TD valign=TOP>';
@@ -83,12 +91,6 @@
echo '<table class="selection">';
echo $tableheader;
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" name="Ga6uF5Wa" method="post">
- <input type="hidden" name="LineNo" value="' . $LineNo . '">
- <input type="hidden" name="StockID" value="' . $StockID . '">
- <input type="hidden" name="EntryType" value="KEYED">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ( isset($_GET['EditControlled']) ) {
$EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
} elseif ( isset($_POST['EditControlled']) ){
@@ -102,19 +104,19 @@
foreach ($LineItem->SerialItems as $Bundle){
echo '<tr>
- <td valign=top><input type="text" name="SerialNo'. $StartAddingAt .'" value="' .$Bundle->BundleRef.'" size="21" maxlength="20" /></td>';
+ <td valign="top"><input type="text" name="SerialNo'. $StartAddingAt .'" value="' .$Bundle->BundleRef.'" size="21" maxlength="20" /></td>';
/*if the item is controlled not serialised - batch quantity required so just enter bundle refs
into the form for entry of quantities manually */
if ($LineItem->Serialised==1){
- echo '<input type="hidden" name="Qty' . $StartAddingAt .'" Value=1></TR>';
+ echo '<input type="hidden" name="Qty' . $StartAddingAt .'" value="1" /></TR>';
} else if ($LineItem->Serialised==0 and $Perishable==1) {
- echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size=11
- value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10"></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size="11"
+ value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10" /></tr>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size=11
- value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10"></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size="11"
+ value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10" /></tr>';
}
$StartAddingAt++;
@@ -123,7 +125,7 @@
for ($i=0;$i < 10;$i++){
- echo '<tr><td valign=top><input type="text" name="SerialNo'. ($StartAddingAt+$i) .'" size="21" maxlength="20" /></td>';
+ echo '<tr><td valign="top"><input type="text" name="SerialNo'. ($StartAddingAt+$i) .'" size="21" maxlength="20" /></td>';
/*if the item is controlled not serialised - batch quantity required so just enter bundle refs
into the form for entry of quantities manually */
@@ -136,11 +138,11 @@
value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" /></td></tr>';
}
} else if ($LineItem->Serialised==0 and $Perishable==1) {
- echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength="10" /></td>';
- echo '<td><input type="text" class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size=11
+ echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size="11" maxlength="10" /></td>';
+ echo '<td><input type="text" class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size="11"
value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" /></td></tr>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength="10"></td></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size="11" maxlength="10" /></td></tr>';
}
}
@@ -149,7 +151,7 @@
<div class="centre">
<input type="submit" name="AddBatches" value="'. _('Enter'). '" />
</div>
-
+ </div>
</form>
</td>
<td valign="top">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-03-06 23:02:33
|
Revision: 5045
http://web-erp.svn.sourceforge.net/web-erp/?rev=5045&view=rev
Author: vvs2012
Date: 2012-03-06 23:02:27 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/InputSerialItemsKeyed.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/COGSGLPostings.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -105,8 +105,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow['area'],
$myrow['stkcat'],
$myrow['salestype'],
@@ -203,8 +203,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
@@ -341,7 +341,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
} //end while loop
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/ConfirmDispatch_Invoice.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -273,7 +273,7 @@
/***************************************************************
Line Item Display
***************************************************************/
-echo '<table width="90%" cellpadding="2" colspan="7" class="selection">
+echo '<table width="90%" cellpadding="2" class="selection">
<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description' ) . '</th>
@@ -317,6 +317,7 @@
$_SESSION['Items'.$identifier]->totalVolume += ($LnItm->QtyDispatched * $LnItm->Volume);
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
+ echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
<td>'.$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
@@ -545,10 +546,10 @@
echo '<tr>
<td colspan="10" class="number">' . _('Invoice Totals'). '</td>
- <td class="number:><hr><b>'.$DisplaySubTotal.'</b><hr></td>
+ <td class="number"><hr /><b>'.$DisplaySubTotal.'</b><hr /></td>
<td colspan="2"></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
</tr>';
if (! isset($_POST['DispatchDate']) OR ! Is_Date($_POST['DispatchDate'])){
@@ -629,7 +630,9 @@
} //end of loop around items on the order for negative check
if ($NegativesFound){
- echo '<div class="centre">
+ echo '</div>';
+ echo '</form>';
+ echo '<div class="centre">
<input type="submit" name="Update" value="' . _('Update'). '" /></div>';
include('includes/footer.inc');
exit;
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/ContractBOM.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -215,7 +215,7 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
-echo '<form name="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
+echo '<form id="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -341,7 +341,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1" colspan="7">';
+ echo '<table cellpadding="1">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/Contracts.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -746,11 +746,11 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' .
_('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" id="CustomerSelection" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table cellpadding="3" colspan="4" class="selection">
+ echo '<table cellpadding="3" class="selection">
<tr>
<td><h5>' . _('Part of the Customer Branch Name') . ':</h5></td>
<td><input tabindex="1" type="text" name="CustKeywords" size="20" maxlength="25" /></td>
@@ -763,13 +763,13 @@
</tr>
</table>
<br /><div class="centre"><input tabindex="4" type="submit" name="SearchCustomers" value="' . _('Search Now') . '" />
- <input tabindex="5" type="submit" action="reset" value="' . _('Reset') .'" /></div>';
+ <input tabindex="5" type="submit" name="reset" value="' . _('Reset') .'" /></div>';
if (isset($result_CustSelect)) {
- echo '<table cellpadding="2" class="selection">';
+ echo '<br /><table cellpadding="2" class="selection">';
- $TableHeader = '<br /><tr>
+ $TableHeader = '<tr>
<th>' . _('Customer') . '</th>
<th>' . _('Branch') . '</th>
<th>' . _('Contact') . '</th>
@@ -791,12 +791,12 @@
$k=1;
}
if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
+ echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8').'" /></td>
- <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'" />
+ echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8').'" />
+ <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'" /></td>
<td>'.htmlspecialchars($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
<td>'.$myrow['phoneno'].'</td>
<td>'.$myrow['faxno'].'</td>
@@ -806,18 +806,17 @@
//end of page full new headings if
}
//end of while loop
- echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
+ echo '<tr><td><input type="hidden" name="JustSelectedACustomer" value="Yes" /></td></tr>';
- echo '</table>
- </div>
- </form>';
-
+ echo '</table>';
}//end if results to show
+ echo '</div>
+ </form>';
//end if RequireCustomerSelection
} else { /*A customer is already selected so get into the contract setup proper */
- echo '<form name="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<form id="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -883,7 +882,7 @@
</tr>
<tr>
<td>' . _('Contract Description') . ':</td>
- <td><textarea name="ContractDescription" style="width:100%" rows="5">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
+ <td><textarea name="ContractDescription" style="width:100%" rows="5" cols="40">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
</tr><tr>
<td>'. _('Drawing File') . ' .jpg' . ' ' . _('format only') .':</td>
<td><input type="file" id="Drawing" name="Drawing" /></td>
@@ -1047,11 +1046,10 @@
echo '</div>';
}
if ($_SESSION['Contract'.$identifier]->Status!=2) {
- echo '<p>
- <div class="centre">
- <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
- </div>
- </p>';
+ echo '<div class="centre">
+ <br />
+ <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
+ </div>';
}
echo '</div>
</form>';
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/CopyBOM.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -6,10 +6,10 @@
*/
/* $Id$*/
+include('includes/session.inc');
+
$title = _('Copy a BOM to New Item Code');
-include('includes/session.inc');
-
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -122,6 +122,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT stockid,
@@ -141,8 +142,8 @@
echo '</select></td>
</tr>';
echo '<tr>
- <td><input type="radio" name="type" value="N" checked="" />' . _(' To New Stock ID') . '</td></td><td>';
- echo '<input type="text" maxlength="20" name="tostkid" /></td></tr>';
+ <td><input type="radio" name="type" value="N" />' . _(' To New Stock ID') . '</td>';
+ echo '<td><input type="text" maxlength="20" name="tostkid" /></td></tr>';
$sql = "SELECT stockid,
description
@@ -153,15 +154,18 @@
if (DB_num_rows($result) > 0) {
echo '<tr>
- <td><input type="radio" name="type" value="E" />'._('To Existing Stock ID') . '</td><td>';
- echo '<select name="exstkid">';
+ <td><input type="radio" name="type" value="E" />'._('To Existing Stock ID') . '</td>';
+ echo '<td><select name="exstkid">';
while($row = DB_fetch_row($result)) {
echo '<option value="'.$row[0].'">'.$row[0].' -- '.$row[1].'</option>';
}
- echo '</select>';
+ echo '</select></td>';
+ echo '</tr>';
}
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Submit" value="Submit" /></div></form>';
+ echo '<br /><div class="centre"><input type="submit" name="Submit" value="Submit" /></div>
+ </div>
+ </form>';
include('includes/footer.inc');
}
Modified: trunk/includes/InputSerialItems.php
===================================================================
--- trunk/includes/InputSerialItems.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItems.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -49,45 +49,47 @@
$valid = true;
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?identifier='.$identifier.'" enctype="multipart/form-data" >';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="hidden" name="LineNo" value="' . $LineNo . '">';
-echo '<input type="hidden" name="StockID" value="'. $StockID. '">';
-echo '<table class=selection><tr><td>';
-echo '<input type="radio" name=EntryType onClick="submit();" ';
+echo '<input type="hidden" name="LineNo" value="' . $LineNo . '" />';
+echo '<input type="hidden" name="StockID" value="'. $StockID. '" />';
+echo '<table class="selection"><tr><td>';
+echo '<input type="radio" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='KEYED') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
-echo 'value="KEYED">'. _('Keyed Entry');
-echo '</TD>';
+echo 'value="KEYED" />'. _('Keyed Entry');
+echo '</td>';
if ($LineItem->Serialised==1){
echo '<td>';
- echo '<input type="radio" name=EntryType onClick="submit();" ';
+ echo '<input type="radio" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='SEQUENCE') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
- echo ' value="SEQUENCE">'. _('Sequential');
+ echo ' value="SEQUENCE" />'. _('Sequential');
echo '</td>';
}
-echo '<td valign=bottom>';
-echo '<input type="radio" id="FileEntry" name="EntryType" onClick="submit();" ';
+echo '<td valign="bottom">';
+echo '<input type="radio" id="FileEntry" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='FILE') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
-echo ' value="FILE">'. _('File Upload');
-echo ' <input type="file" name="ImportFile" onClick="document.getElementById(\'FileEntry\').checked=true;" >';
-echo '</td></tr><tr><td colspan=3>';
-echo '<div class="centre"><input type="submit" value="'. _('Set Entry Type'). ':"></div>';
+echo ' value="FILE" />'. _('File Upload');
+echo ' <input type="file" name="ImportFile" onclick="document.getElementById(\'FileEntry\').checked=true;" />';
+echo '</td></tr><tr><td colspan="3">';
+echo '<div class="centre"><input type="submit" value="'. _('Set Entry Type'). ':" /></div>';
echo '</td></tr></table>';
+echo '</div>';
echo '</form>';
global $tableheader;
/* Link to clear the list and start from scratch */
-$EditLink = '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&EditControlled=true&StockID=' . $LineItem->StockID .
- '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
-$RemoveLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&DELETEALL=YES&StockID=' . $LineItem->StockID .
- '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br /></div>';
+$EditLink = '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&EditControlled=true&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
+$RemoveLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&DELETEALL=YES&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br /></div>';
$sql="SELECT perishable
FROM stockmaster
WHERE stockid='".$StockID."'";
Modified: trunk/includes/InputSerialItemsFile.php
===================================================================
--- trunk/includes/InputSerialItemsFile.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItemsFile.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -44,7 +44,7 @@
echo '<td>' . $Bundle->BundleRef . '</td>';
if ($LineItem->Serialised==0){
- echo '<td align=right>' . locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ echo '<td align="right">' . locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
}
}
@@ -54,14 +54,14 @@
/*Display the totals and rule off before allowing new entries */
if ($LineItem->Serialised==1){
- echo '<tr><td align=right><b>'. _('Total Quantity'). ': ' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
- echo '<tr><td><hr></td></tr>';
+ echo '<tr><td align="right"><b>'. _('Total Quantity'). ': ' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td><hr /></td></tr>';
} else {
- echo '<tr><td align=right><b>'. _('Total Quantity'). ':</b></td><td align=right><b>' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
- echo '<tr><td colspan=2><hr></td></tr>';
+ echo '<tr><td align="right"><b>'. _('Total Quantity'). ':</b></td><td align="right"><b>' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td colspan="2"><hr /></td></tr>';
}
-echo '</table><hr>';
+echo '</table><hr />';
//DISPLAY FILE INFO
@@ -75,7 +75,7 @@
$msg = _('Please Choose a file and then click Set Entry Type to upload a file for import');
prnMsg($msg);
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit();
}
@@ -86,7 +86,7 @@
_('Type').':'.$_FILES['ImportFile']['type'].'<br />';
echo '<br />'._('Error was').' '.$_FILES['ImportFile']['error'].'<br />';
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit();
} elseif ($_FILES['ImportFile']['name']!=''){
@@ -100,7 +100,7 @@
if (!move_uploaded_file($_FILES['ImportFile']['tmp_name'],$_SESSION['CurImportFile']['tmp_name'])){
prnMsg(_('Error moving temporary file') . '. ' . _('Please check your configuration'),'error' );
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit;
}
@@ -150,7 +150,7 @@
<input type="hidden" name="EntryType" value="FILE">
</form>
<p>'. _('1st 10 Lines of File'). '....
- <hr width=15%>
+ <hr width=15% />
<pre>';
echo $contents;
@@ -160,7 +160,7 @@
} else {
//Otherwise we have all valid records. show the first (100) for visual verification.
echo _('Below are the 1st 100 records as parsed');
- echo '<hr width=20%>';
+ echo '<hr width=20% />';
foreach($LineItem->SerialItems as $SItem){
echo $SItem->BundleRef.'<br />';
$i++;
Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItemsKeyed.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -75,6 +75,14 @@
/*Close off old table */
echo '</table></td><td valign="top">';
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" id="Ga6uF5Wa" method="post">
+ <div>
+ <input type="hidden" name="LineNo" value="' . $LineNo . '" />
+ <input type="hidden" name="StockID" value="' . $StockID . '" />
+ <input type="hidden" name="EntryType" value="KEYED" />';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
/*Start a new table for the Serial/Batch ref input in one column (as a sub table
then the multi select box for selection of existing bundle/serial nos for dispatch if applicable*/
//echo '<TABLE><TR><TD valign=TOP>';
@@ -83,12 +91,6 @@
echo '<table class="selection">';
echo $tableheader;
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" name="Ga6uF5Wa" method="post">
- <input type="hidden" name="LineNo" value="' . $LineNo . '">
- <input type="hidden" name="StockID" value="' . $StockID . '">
- <input type="hidden" name="EntryType" value="KEYED">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ( isset($_GET['EditControlled']) ) {
$EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
} elseif ( isset($_POST['EditControlled']) ){
@@ -102,19 +104,19 @@
foreach ($LineItem->SerialItems as $Bundle){
echo '<tr>
- <td valign=top><input type="text" name="SerialNo'. $StartAddingAt .'" value="' .$Bundle->BundleRef.'" size="21" maxlength="20" /></td>';
+ <td valign="top"><input type="text" name="SerialNo'. $StartAddingAt .'" value="' .$Bundle->BundleRef.'" size="21" maxlength="20" /></td>';
/*if the item is controlled not serialised - batch quantity required so just enter bundle refs
into the form for entry of quantities manually */
if ($LineItem->Serialised==1){
- echo '<input type="hidden" name="Qty' . $StartAddingAt .'" Value=1></TR>';
+ echo '<input type="hidden" name="Qty' . $StartAddingAt .'" value="1" /></TR>';
} else if ($LineItem->Serialised==0 and $Perishable==1) {
- echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size=11
- value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10"></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size="11"
+ value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10" /></tr>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size=11
- value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10"></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size="11"
+ value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10" /></tr>';
}
$StartAddingAt++;
@@ -123,7 +125,7 @@
for ($i=0;$i < 10;$i++){
- echo '<tr><td valign=top><input type="text" name="SerialNo'. ($StartAddingAt+$i) .'" size="21" maxlength="20" /></td>';
+ echo '<tr><td valign="top"><input type="text" name="SerialNo'. ($StartAddingAt+$i) .'" size="21" maxlength="20" /></td>';
/*if the item is controlled not serialised - batch quantity required so just enter bundle refs
into the form for entry of quantities manually */
@@ -136,11 +138,11 @@
value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" /></td></tr>';
}
} else if ($LineItem->Serialised==0 and $Perishable==1) {
- echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength="10" /></td>';
- echo '<td><input type="text" class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size=11
+ echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size="11" maxlength="10" /></td>';
+ echo '<td><input type="text" class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size="11"
value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" /></td></tr>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength="10"></td></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size="11" maxlength="10" /></td></tr>';
}
}
@@ -149,7 +151,7 @@
<div class="centre">
<input type="submit" name="AddBatches" value="'. _('Enter'). '" />
</div>
-
+ </div>
</form>
</td>
<td valign="top">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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 @@
i...
[truncated message content] |
|
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 @@
i...
[truncated message content] |
|
From: <dai...@us...> - 2012-03-08 05:47:59
|
Revision: 5054
http://web-erp.svn.sourceforge.net/web-erp/?rev=5054&view=rev
Author: daintree
Date: 2012-03-08 05:47:53 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
Ricards changes for product image
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/doc/README.txt
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/SelectProduct.php 2012-03-08 05:47:53 UTC (rev 5054)
@@ -411,9 +411,7 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- if (file_exists($_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg')){
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture') . '</a><br />';
- }
+ echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</a><br />';
}
if ($Its_A_Dummy == False) {
echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
@@ -430,7 +428,11 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&StockID=' . $StockID . '&text=' . $StockID . '&width=120&height=120" />';
+ if ($_SESSION['ShowStockidOnImages'] == "0"){
+ echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&width=120&height=120&StockID=' . $StockID . '&text=""' . '" />';
+ }else{
+ echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&StockID=' . $StockID . '&text=' . $StockID . '&width=120&height=120" />';
+ }
}
if (($myrow['mbflag'] == 'B')
AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/SystemParameters.php 2012-03-08 05:47:53 UTC (rev 5054)
@@ -193,6 +193,9 @@
if ($_SESSION['MaxImageSize'] != $_POST['X_MaxImageSize'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_MaxImageSize']."' WHERE confname = 'MaxImageSize'";
}
+ if ($_SESSION['ShowStockidOnImages'] != $_POST['X_ShowStockidOnImages'] ) {
+ $sql[] = "UPDATE config SET confvalue = '".$_POST['X_ShowStockidOnImages']."' WHERE confname = 'ShowStockidOnImages'";
+ }
//new number must be shown
if ($_SESSION['NumberOfMonthMustBeShown'] != $_POST['X_NumberOfMonthMustBeShown'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_NumberOfMonthMustBeShown']."' WHERE confname = 'NumberOfMonthMustBeShown'";
@@ -701,16 +704,29 @@
</tr>';
//DefaultDisplayRecordsMax
-echo '<tr style="outline: 1px solid"><td>' . _('Default Maximum Number of Records to Show') . ':</td>
- <td><input type="text" class="number" name="X_DefaultDisplayRecordsMax" size="4" maxlength="3" value="' . $_SESSION['DefaultDisplayRecordsMax'] . '" /></td>
- <td>' . _('When pages have code to limit the number of returned records - such as select customer, select supplier and select item, then this will be the default number of records to show for a user who has not changed this for themselves in user settings.') . '</td>
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Default Maximum Number of Records to Show') . ':</td>
+ <td><input type="text" class="number" name="X_DefaultDisplayRecordsMax" size="4" maxlength="3" value="' . $_SESSION['DefaultDisplayRecordsMax'] . '" /></td>
+ <td>' . _('When pages have code to limit the number of returned records - such as select customer, select supplier and select item, then this will be the default number of records to show for a user who has not changed this for themselves in user settings.') . '</td>
</tr>';
+// ShowStockidOnImage
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Show Stockid on images') . ':</td>
+ <td><select name="X_ShowStockidOnImages">
+ <option '.($_SESSION['ShowStockidOnImages'] ?'selected ':'').'value="1">'._('Yes').'</option>
+ <option '.(!$_SESSION['ShowStockidOnImages'] ?'selected ':'').'value="0">'._('No').'</option>
+ </select></td>
+ <td>' . _('Show the code inside the thumbnail image of the items') . '</td>
+ </tr>';
+
+
//MaxImageSize
-echo '<tr style="outline: 1px solid"><td>' . _('Maximum Size in KB of uploaded images') . ':</td>
- <td><input type="text" class="number" name="X_MaxImageSize" size="4" maxlength="3" value="' . $_SESSION['MaxImageSize'] . '" /></td>
- <td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
-</tr>';
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Maximum Size in KB of uploaded images') . ':</td>
+ <td><input type="text" class="number" name="X_MaxImageSize" size="4" maxlength="3" value="' . $_SESSION['MaxImageSize'] . '" /></td>
+ <td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
+ </tr>';
//NumberOfMonthMustBeShown
$sql = "SELECT confvalue
FROM `config`
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/doc/Change.log 2012-03-08 05:47:53 UTC (rev 5054)
@@ -1,9 +1,11 @@
webERP Change Log
+
+8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustmentsControlled.php. Reported by Soujiro
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustments.php. Reported by Soujiro
-6/3/2012 Exson: Rule out 'Pending' status PO from On Order Quantity in ReorderLevel.php Suggested by Brian May
-6/3/2012 Exson: Remove carriage return and feed line from Quotation PDF file in PDFQuotation.php Reported by Thomas_lie
-03/06/2012 Exson: add condition to prevent blank stock category description in StockCategories.php
+6/3/12 Exson: Rule out 'Pending' status PO from On Order Quantity in ReorderLevel.php Suggested by Brian May
+6/3/12 Exson: Remove carriage return and feed line from Quotation PDF file in PDFQuotation.php Reported by Thomas_lie
+03/06/12 Exson: add condition to prevent blank stock category description in StockCategories.php
6/3/12 Exson: BankMatching.php sql error due to extra single quotation. Reported by PakRichard
5/3/12 Exson/Tim: PrintCustTransPortrait.php html elements failed to display. Reported by rfthomas
3/3/12 Phil: SelectProduct.php checked for existence of part pic before displaying a link that could potnetially fail
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/doc/README.txt 2012-03-08 05:47:53 UTC (rev 5054)
@@ -53,13 +53,10 @@
LEGAL
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-Copyright weberp.org 2011 - Contact: in...@we...
\ No newline at end of file
+Copyright weberp.org 2003-2012 - Contact: in...@we...
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-08 05:47:59
|
Revision: 5054
http://web-erp.svn.sourceforge.net/web-erp/?rev=5054&view=rev
Author: daintree
Date: 2012-03-08 05:47:53 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
Ricards changes for product image
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/doc/README.txt
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/SelectProduct.php 2012-03-08 05:47:53 UTC (rev 5054)
@@ -411,9 +411,7 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- if (file_exists($_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg')){
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture') . '</a><br />';
- }
+ echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</a><br />';
}
if ($Its_A_Dummy == False) {
echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
@@ -430,7 +428,11 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&StockID=' . $StockID . '&text=' . $StockID . '&width=120&height=120" />';
+ if ($_SESSION['ShowStockidOnImages'] == "0"){
+ echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&width=120&height=120&StockID=' . $StockID . '&text=""' . '" />';
+ }else{
+ echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&StockID=' . $StockID . '&text=' . $StockID . '&width=120&height=120" />';
+ }
}
if (($myrow['mbflag'] == 'B')
AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/SystemParameters.php 2012-03-08 05:47:53 UTC (rev 5054)
@@ -193,6 +193,9 @@
if ($_SESSION['MaxImageSize'] != $_POST['X_MaxImageSize'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_MaxImageSize']."' WHERE confname = 'MaxImageSize'";
}
+ if ($_SESSION['ShowStockidOnImages'] != $_POST['X_ShowStockidOnImages'] ) {
+ $sql[] = "UPDATE config SET confvalue = '".$_POST['X_ShowStockidOnImages']."' WHERE confname = 'ShowStockidOnImages'";
+ }
//new number must be shown
if ($_SESSION['NumberOfMonthMustBeShown'] != $_POST['X_NumberOfMonthMustBeShown'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_NumberOfMonthMustBeShown']."' WHERE confname = 'NumberOfMonthMustBeShown'";
@@ -701,16 +704,29 @@
</tr>';
//DefaultDisplayRecordsMax
-echo '<tr style="outline: 1px solid"><td>' . _('Default Maximum Number of Records to Show') . ':</td>
- <td><input type="text" class="number" name="X_DefaultDisplayRecordsMax" size="4" maxlength="3" value="' . $_SESSION['DefaultDisplayRecordsMax'] . '" /></td>
- <td>' . _('When pages have code to limit the number of returned records - such as select customer, select supplier and select item, then this will be the default number of records to show for a user who has not changed this for themselves in user settings.') . '</td>
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Default Maximum Number of Records to Show') . ':</td>
+ <td><input type="text" class="number" name="X_DefaultDisplayRecordsMax" size="4" maxlength="3" value="' . $_SESSION['DefaultDisplayRecordsMax'] . '" /></td>
+ <td>' . _('When pages have code to limit the number of returned records - such as select customer, select supplier and select item, then this will be the default number of records to show for a user who has not changed this for themselves in user settings.') . '</td>
</tr>';
+// ShowStockidOnImage
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Show Stockid on images') . ':</td>
+ <td><select name="X_ShowStockidOnImages">
+ <option '.($_SESSION['ShowStockidOnImages'] ?'selected ':'').'value="1">'._('Yes').'</option>
+ <option '.(!$_SESSION['ShowStockidOnImages'] ?'selected ':'').'value="0">'._('No').'</option>
+ </select></td>
+ <td>' . _('Show the code inside the thumbnail image of the items') . '</td>
+ </tr>';
+
+
//MaxImageSize
-echo '<tr style="outline: 1px solid"><td>' . _('Maximum Size in KB of uploaded images') . ':</td>
- <td><input type="text" class="number" name="X_MaxImageSize" size="4" maxlength="3" value="' . $_SESSION['MaxImageSize'] . '" /></td>
- <td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
-</tr>';
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Maximum Size in KB of uploaded images') . ':</td>
+ <td><input type="text" class="number" name="X_MaxImageSize" size="4" maxlength="3" value="' . $_SESSION['MaxImageSize'] . '" /></td>
+ <td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
+ </tr>';
//NumberOfMonthMustBeShown
$sql = "SELECT confvalue
FROM `config`
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/doc/Change.log 2012-03-08 05:47:53 UTC (rev 5054)
@@ -1,9 +1,11 @@
webERP Change Log
+
+8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustmentsControlled.php. Reported by Soujiro
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustments.php. Reported by Soujiro
-6/3/2012 Exson: Rule out 'Pending' status PO from On Order Quantity in ReorderLevel.php Suggested by Brian May
-6/3/2012 Exson: Remove carriage return and feed line from Quotation PDF file in PDFQuotation.php Reported by Thomas_lie
-03/06/2012 Exson: add condition to prevent blank stock category description in StockCategories.php
+6/3/12 Exson: Rule out 'Pending' status PO from On Order Quantity in ReorderLevel.php Suggested by Brian May
+6/3/12 Exson: Remove carriage return and feed line from Quotation PDF file in PDFQuotation.php Reported by Thomas_lie
+03/06/12 Exson: add condition to prevent blank stock category description in StockCategories.php
6/3/12 Exson: BankMatching.php sql error due to extra single quotation. Reported by PakRichard
5/3/12 Exson/Tim: PrintCustTransPortrait.php html elements failed to display. Reported by rfthomas
3/3/12 Phil: SelectProduct.php checked for existence of part pic before displaying a link that could potnetially fail
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/doc/README.txt 2012-03-08 05:47:53 UTC (rev 5054)
@@ -53,13 +53,10 @@
LEGAL
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-Copyright weberp.org 2011 - Contact: in...@we...
\ No newline at end of file
+Copyright weberp.org 2003-2012 - Contact: in...@we...
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-11 09:13:29
|
Revision: 5062
http://web-erp.svn.sourceforge.net/web-erp/?rev=5062&view=rev
Author: daintree
Date: 2012-03-11 09:13:20 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Language updates - James Dupin French - Dr Magbt Salib Arabic
Modified Paths:
--------------
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Added Paths:
-----------
trunk/locale/ar_EG.utf8/
trunk/locale/ar_EG.utf8/LC_MESSAGES/
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2012-03-08 10:02:55 UTC (rev 5061)
+++ trunk/build/make_release.sh 2012-03-11 09:13:20 UTC (rev 5062)
@@ -9,6 +9,7 @@
xgettext --no-wrap --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
+msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/de_DE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/en_US.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
@@ -38,6 +39,7 @@
msgmerge -U --backup=off locale/zh_HK.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgfmt -o locale/ar_EG.utf8/LC_MESSAGES/messages.mo locale/ar_EG.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/cs_CZ.utf8/LC_MESSAGES/messages.mo locale/cs_CZ.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/de_DE.utf8/LC_MESSAGES/messages.mo locale/de_DE.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/el_GR.utf8/LC_MESSAGES/messages.mo locale/el_GR.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-08 10:02:55 UTC (rev 5061)
+++ trunk/doc/Change.log 2012-03-11 09:13:20 UTC (rev 5062)
@@ -1,5 +1,7 @@
webERP Change Log
+11/3/12 Dr. Magdy Salib - ar_EG.utf8 arabic translation started
+11/3/12 James Dupin: French language translation update
8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustmentsControlled.php. Reported by Soujiro
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustments.php. Reported by Soujiro
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-03-08 10:02:55 UTC (rev 5061)
+++ trunk/includes/LanguagesArray.php 2012-03-11 09:13:20 UTC (rev 5062)
@@ -16,6 +16,11 @@
$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['ar_EG.utf8']['LanguageName'] = _('Arabic Eygptian');
+$LanguagesArray['ar_EG.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['ar_EG.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['ar_EG.utf8']['ThousandsSeparator'] = ' ';
+
$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
Added: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Property changes on: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-03-11 09:13:20 UTC (rev 5062)
@@ -0,0 +1,35293 @@
+# Arabic translation for web-erp
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the web-erp package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: web-erp\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-04 22:15+1200\n"
+"PO-Revision-Date: 2012-01-26 10:26+0000\n"
+"Last-Translator: JC_Chuck <Unknown>\n"
+"Language-Team: Arabic <ar...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+
+#: AccountGroups.php:9 index.php:1273
+msgid "Account Groups"
+msgstr "مجموعات العضوية"
+
+#: AccountGroups.php:19
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء "
+"االتحقق من وجود استدعاء ذاتي"
+
+#: AccountGroups.php:20
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+
+#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
+#: AccountGroups.php:187
+msgid "The SQL that was used to retrieve the information was"
+msgstr "الطلب المستخدم لإسترجاع المعلومات كان"
+
+#: AccountGroups.php:58
+msgid "Could not check whether the group exists because"
+msgstr "لم يتم التحقق من وجود المجموعة بسبب"
+
+#: AccountGroups.php:65
+msgid "The account group name already exists in the database"
+msgstr "اسم المجموعة موجود مسبقاً"
+
+#: AccountGroups.php:71
+msgid "The account group name cannot contain the character"
+msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة"
+
+#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
+#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:32
+msgid "or the character"
+msgstr "او الحرف"
+
+#: AccountGroups.php:77
+msgid "The account group name must be at least one character long"
+msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+
+#: AccountGroups.php:84
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+
+#: AccountGroups.php:95
+msgid "Could not check whether the group is recursive because"
+msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن"
+
+#: AccountGroups.php:107
+msgid "The section in accounts must be an integer"
+msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
+
+#: AccountGroups.php:113
+msgid "The sequence in the trial balance must be an integer"
+msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح"
+
+#: AccountGroups.php:119
+msgid "The sequence in the TB must be numeric and less than"
+msgstr ""
+
+#: AccountGroups.php:136
+msgid "An error occurred in updating the account group"
+msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+
+#: AccountGroups.php:137
+msgid "The SQL that was used to update the account group was"
+msgstr ""
+
+#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
+msgid "Record Updated"
+msgstr "تم التحديث"
+
+#: AccountGroups.php:157
+msgid "An error occurred in inserting the account group"
+msgstr "حدث خطأ ما اثناء اضافة المجموعة"
+
+#: AccountGroups.php:158
+msgid "The SQL that was used to insert the account group was"
+msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+
+#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
+msgid "Record inserted"
+msgstr "تمت الإضافة بنجاح"
+
+#: AccountGroups.php:176
+msgid ""
+"An error occurred in retrieving the group information from chartmaster"
+msgstr ""
+
+#: AccountGroups.php:181
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr ""
+
+#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
+#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
+#: Currencies.php:144 Currencies.php:152 Currencies.php:159
+#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
+#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
+#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
+#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
+#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
+#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
+#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
+#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
+#: PcExpenses.php:119 SalesCategories.php:127 SalesCategories.php:135
+#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
+#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
+#: Stocks.php:471 Stocks.php:480 Stocks.php:488 Stocks.php:496 Stocks.php:504
+#: Stocks.php:512 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
+#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
+#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:142
+#: UnitsOfMeasure.php:149 WorkCentres.php:90 WorkCentres.php:96
+#: WWW_Access.php:87
+msgid "There are"
+msgstr "يوجد"
+
+#: AccountGroups.php:182
+msgid "general ledger accounts that refer to this account group"
+msgstr ""
+
+#: AccountGroups.php:186
+msgid "An error occurred in retrieving the parent group information"
+msgstr ""
+
+#: AccountGroups.php:191
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+
+#: AccountGroups.php:192
+msgid "account groups that have this group as its/there parent account group"
+msgstr ""
+
+#: AccountGroups.php:195
+msgid "An error occurred in deleting the account group"
+msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+
+#: AccountGroups.php:196
+msgid "The SQL that was used to delete the account group was"
+msgstr ""
+
+#: AccountGroups.php:198
+msgid "group has been deleted"
+msgstr "تم حذف المجموعة"
+
+#: AccountGroups.php:223
+msgid "The sql that was used to retrieve the account group information was "
+msgstr ""
+
+#: AccountGroups.php:224
+msgid "Could not get account groups because"
+msgstr "لم يتمكن الحصول على مجموات العضو لان"
+
+#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
+#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
+#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
+#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
+#: CounterSales.php:1940 CounterSales.php:2062 Credit_Invoice.php:257
+#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
+#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
+#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
+#: EDIMessageFormat.php:106 FixedAssetList.php:8 FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13 FixedAssetRegister.php:232
+#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
+#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:369
+#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
+#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
+#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
+#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
+#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
+#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
+#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
+#: PurchData.php:141 PurchData.php:231 PurchData.php:250
+#: RecurringSalesOrders.php:307 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
+#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
+#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
+#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:204
+#: SelectCreditItems.php:272 SelectCustomer.php:315 SelectGLAccount.php:19
+#: SelectGLAccount.php:79 SelectOrderItems.php:605 SelectOrderItems.php:1436
+#: SelectOrderItems.php:1556 SelectProduct.php:456 SelectSalesOrder.php:155
+#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
+#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
+#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
+#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
+#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
+#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:60
+#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
+#: WorkOrderCosting.php:14 WorkOrderEntry.php:12 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
+#: WWW_Users.php:38 Z_BottomUpCosts.php:51
+msgid "Search"
+msgstr "إبحث"
+
+#: AccountGroups.php:230
+msgid "Group Name"
+msgstr "إسم المجموعة"
+
+#: AccountGroups.php:231 EDIMessageFormat.php:131
+msgid "Section"
+msgstr "قسم"
+
+#: AccountGroups.php:232 AccountGroups.php:396
+msgid "Sequence In TB"
+msgstr ""
+
+#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
+#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
+#: SelectGLAccount.php:45 SelectGLAccount.php:59
+msgid "Profit and Loss"
+msgstr ""
+
+#: AccountGroups.php:234 AccountGroups.php:341
+msgid "Parent Group"
+msgstr ""
+
+#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
+#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
+#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
+#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
+#: CompanyPreferences.php:451 CompanyPreferences.php:453
+#: CompanyPreferences.php:463 CompanyPreferences.php:465
+#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
+#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
+#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
+#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
+#: Locations.php:373 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
+#: MRP.php:542 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:264 PaymentMethods.php:270 PDFChequeListing.php:63
+#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
+#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
+#: PO_Header.php:758 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
+#: PurchData.php:189 PurchData.php:469 PurchData.php:472
+#: RecurringSalesOrders.php:479 RecurringSalesOrders.php:482
+#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
+#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
+#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
+#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
+#: Stocks.php:867 Stocks.php:869 Stocks.php:887 Stocks.php:889
+#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
+#: SystemParameters.php:373 SystemParameters.php:405 SystemParameters.php:450
+#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
+#: SystemParameters.php:589 SystemParameters.php:597 SystemParameters.php:615
+#: SystemParameters.php:622 SystemParameters.php:746 SystemParameters.php:877
+#: SystemParameters.php:879 SystemParameters.php:889 SystemParameters.php:891
+#: SystemParameters.php:945 SystemParameters.php:957 SystemParameters.php:959
+#: TaxGroups.php:292 TaxGroups.php:295 TaxGroups.php:344 WWW_Users.php:610
+#: WWW_Users.php:612
+msgid "Yes"
+msgstr "موافق"
+
+#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
+#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
+#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
+#: CompanyPreferences.php:438 CompanyPreferences.php:442
+#: CompanyPreferences.php:450 CompanyPreferences.php:454
+#: CompanyPreferences.php:462 CompanyPreferences.php:466
+#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
+#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
+#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
+#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
+#: Locations.php:375 MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536
+#: MRP.php:540 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:265 PaymentMethods.php:271 PDFChequeListing.php:62
+#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:757 PO_PDFPurchOrder.php:368 PO_PDFPurchOrder.php:371
+#: PurchData.php:192 PurchData.php:470 PurchData.php:473
+#: RecurringSalesOrders.php:478 RecurringSalesOrders.php:481
+#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
+#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
+#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
+#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
+#: Stocks.php:862 Stocks.php:864 Stocks.php:882 Stocks.php:884
+#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
+#: SystemParameters.php:374 SystemParameters.php:406 SystemParameters.php:451
+#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
+#: SystemParameters.php:590 SystemParameters.php:598 SystemParameters.php:616
+#: SystemParameters.php:623 SystemParameters.php:747 SystemParameters.php:876
+#: SystemParameters.php:880 SystemParameters.php:888 SystemParameters.php:892
+#: SystemParameters.php:946 SystemParameters.php:956 SystemParameters.php:960
+#: TaxGroups.php:293 TaxGroups.php:296 TaxGroups.php:346 WWW_Users.php:609
+#: WWW_Users.php:613 includes/PDFLowGPPageHeader.inc:44
+#: includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "ﻻ"
+
+#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:131
+#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
+#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
+#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
+#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
+#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
+#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
+#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
+#: Labels.php:414 Locations.php:382 MRPDemands.php:304 MRPDemandTypes.php:122
+#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
+#: PcClaimExpensesFromTab.php:229 PcExpenses.php:176 PcTabs.php:188
+#: PcTypeTabs.php:171 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
+#: Prices.php:227 PurchData.php:202 SalesCategories.php:263
+#: SalesGLPostings.php:135 SalesGLPostings.php:247 SalesPeople.php:210
+#: SalesTypes.php:206 SelectCustomer.php:607 SelectCustomer.php:623
+#: SelectCustomer.php:645 SelectCustomer.php:661 SelectCustomer.php:683
+#: SelectCustomer.php:699 Shippers.php:144 StockCategories.php:244
+#: SupplierContacts.php:156 SupplierTypes.php:192 SuppLoginSetup.php:274
+#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
+#: TaxProvinces.php:178 UnitsOfMeasure.php:201 WorkCentres.php:138
+#: WWW_Access.php:127 WWW_Users.php:312 includes/InputSerialItems.php:88
+#, php-format
+msgid "Edit"
+msgstr "تحرير"
+
+#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:132
+#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
+#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
+#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
+#: CounterSales.php:741 Credit_Invoice.php:386 CreditStatus.php:176
+#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
+#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
+#: DiscountMatrix.php:178 EDIMessageFormat.php:153
+#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
+#: GLAccounts.php:320 GLJournal.php:403 Labels.php:414 Locations.php:383
+#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
+#: Payments.php:961 PaymentTerms.php:204 PcAssignCashToTab.php:255
+#: PcClaimExpensesFromTab.php:230 PcExpenses.php:177 PcExpensesTypeTab.php:161
+#: PcTabs.php:189 PcTypeTabs.php:172 PO_AuthorisationLevels.php:150
+#: PO_Items.php:976 Prices_Customer.php:284 Prices.php:228 PurchData.php:203
+#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
+#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
+#: SalesTypes.php:207 SelectCreditItems.php:747 SelectCustomer.php:608
+#: SelectCustomer.php:624 SelectCustomer.php:646 SelectCustomer.php:662
+#: SelectCustomer.php:684 SelectCustomer.php:700 SelectOrderItems.php:1363
+#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
+#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
+#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:135
+#: SupplierContacts.php:157 SupplierTypes.php:194 SuppLoginSetup.php:275
+#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
+#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
+#: UnitsOfMeasure.php:202 WorkCentres.php:139 WOSerialNos.php:300
+#: WWW_Access.php:128 WWW_Users.php:313 includes/InputSerialItemsKeyed.php:54
+#, php-format
+msgid "Delete"
+msgstr "حذف"
+
+#: AccountGroups.php:274
+msgid "Review Account Groups"
+msgstr ""
+
+#: AccountGroups.php:294
+msgid "An error occurred in retrieving the account group information"
+msgstr ""
+
+#: AccountGroups.php:295
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr ""
+
+#: AccountGroups.php:298
+msgid "The account group name does not exist in the database"
+msgstr ""
+
+#: AccountGroups.php:314 GLAccounts.php:250 GLAccounts.php:299
+#: Z_ImportGLAccountGroups.php:28
+msgid "Account Group"
+msgstr ""
+
+#: AccountGroups.php:338
+msgid "Account Group Name"
+msgstr ""
+
+#: AccountGroups.php:348 AccountGroups.php:350
+msgid "Top Level Group"
+msgstr ""
+
+#: AccountGroups.php:364
+msgid "Section In Accounts"
+msgstr ""
+
+#: AccountGroups.php:401 AccountSections.php:262 AddCustomerContacts.php:208
+#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:222
+#: BankAccounts.php:373 BOMs.php:725 COGSGLPostings.php:347
+#: CreditStatus.php:247 Currencies.php:339 CustLoginSetup.php:611
+#: DiscountMatrix.php:141 EDIMessageFormat.php:249
+#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
+#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
+#: Locations.php:553 MRPDemands.php:402 MRPDemandTypes.php:182
+#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
+#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
+#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
+#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
+#: SupplierContacts.php:251 SuppLoginSetup.php:532 TaxAuthorities.php:313
+#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:253
+#: WorkCentres.php:261 WWW_Users.php:643
+msgid "Enter Information"
+msgstr "أدخل المعلومات"
+
+#: AccountSections.php:9 index.php:1278
+msgid "Account Sections"
+msgstr "أعدادات العضو"
+
+#: AccountSections.php:68
+msgid "The account section already exists in the database"
+msgstr "قسم العضو موجود مسبقا فى قاعدة البيانات"
+
+#: AccountSections.php:75
+msgid "The account section name cannot contain the character"
+msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
+
+#: AccountSections.php:81
+msgid "The account section name must contain at least one character"
+msgstr "يجب ان يحتوى اسم العضو على الاقل حرف واحد"
+
+#: AccountSections.php:87 AccountSections.php:93
+msgid "The section number must be an integer"
+msgstr "قسم الرقم يجب ان يكون عدد صحيح"
+
+#: AccountSections.php:138
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr ""
+
+#: AccountSections.php:139
+msgid "general ledger accounts groups that refer to this account section"
+msgstr ""
+
+#: AccountSections.php:150
+msgid "section has been deleted"
+msgstr ""
+
+#: AccountSections.php:175
+msgid "Could not get account group sections because"
+msgstr ""
+
+#: AccountSections.php:181 AccountSections.php:238 AccountSections.php:255
+msgid "Section Number"
+msgstr "رقم القطاع"
+
+#: AccountSections.php:182 AccountSections.php:258
+msgid "Section Description"
+msgstr "وصف القطاع"
+
+#: AccountSections.php:199
+msgid "Restricted"
+msgstr "محظور"
+
+#: AccountSections.php:210
+msgid "Review Account Sections"
+msgstr "راجع أعدادات العضوية"
+
+#: AccountSections.php:228
+msgid "Could not retrieve the requested section please try again."
+msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
+
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:601
+#: SelectCustomer.php:630
+msgid "Customer Contacts"
+msgstr ""
+
+#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:24
+#: Z_CheckDebtorsControl.php:21
+msgid "Back to Customers"
+msgstr "العودة الى العملاء"
+
+#: AddCustomerContacts.php:26
+msgid "Contacts for Customer: <b>"
+msgstr ""
+
+#: AddCustomerContacts.php:29
+msgid "Edit contact for <b>"
+msgstr ""
+
+#: AddCustomerContacts.php:41
+msgid "The Contact must be an integer."
+msgstr ""
+
+#: AddCustomerContacts.php:44
+msgid "The contact's name must be forty characters or less long"
+msgstr ""
+
+#: AddCustomerContacts.php:47
+msgid "The contact's name may not be empty"
+msgstr ""
+
+#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
+#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
+#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:230
+#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:60
+#: PcTabs.php:60 PcTypeTabs.php:59 PO_Items.php:381 SalesAnalReptCols.php:129
+#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:355 Suppliers.php:514
+#: SupplierTypes.php:69
+msgid "has been updated"
+msgstr ""
+
+#: AddCustomerContacts.php:70
+msgid "The contact record has been added"
+msgstr ""
+
+#: AddCustomerContacts.php:98
+msgid "The contact record has been deleted"
+msgstr ""
+
+#: AddCustomerContacts.php:112 CompanyPreferences.php:229
+#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
+#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:603
+#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:144
+#: SupplierCredit.php:433 SupplierInvoice.php:407 SuppTransGLAnalysis.php:96
+#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
+#: includes/PDFTaxPageHeader.inc:37
+msgid "Name"
+msgstr ""
+
+#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:900
+#: Customers.php:906 Customers.php:972 SelectCustomer.php:604
+#: WWW_Access.php:111 WWW_Access.php:172
+msgid "Role"
+msgstr ""
+
+#: AddCustomerContacts.php:114 Customers.php:973
+msgid "Phone no"
+msgstr ""
+
+#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:902
+#: Customers.php:908 Customers.php:974 PcAssignCashToTab.php:216
+#: PcAssignCashToTab.php:341 PcAuthorizeExpenses.php:85
+#: PcClaimExpensesFromTab.php:195 PcClaimExpensesFromTab.php:348
+#: PcReportTab.php:348 SelectCustomer.php:606 SystemParameters.php:313
+#: WOSerialNos.php:277 WOSerialNos.php:279
+msgid "Notes"
+msgstr ""
+
+#: AddCustomerContacts.php:149
+msgid "Review all contacts for this Customer"
+msgstr ""
+
+#: AddCustomerContacts.php:179
+msgid "Contact Code"
+msgstr ""
+
+#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:219
+msgid "Contact Name"
+msgstr ""
+
+#: AddCustomerContacts.php:196 Contracts.php:766 PDFRemittanceAdvice.php:247
+#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:225
+#: SelectCustomer.php:461 SelectOrderItems.php:638
+#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:113
+#: includes/PDFTransPageHeaderPortrait.inc:105
+msgid "Phone"
+msgstr ""
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:638
+#: SelectCustomer.php:668
+msgid "Customer Notes"
+msgstr ""
+
+#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+msgid "Back to Select Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:31
+msgid "The contact priority must be an integer."
+msgstr ""
+
+#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr ""
+
+#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+msgid "The contact's notes may not be empty"
+msgstr ""
+
+#: AddCustomerNotes.php:60
+msgid "The contact notes record has been added"
+msgstr ""
+
+#: AddCustomerNotes.php:87
+msgid "The contact note record has been deleted"
+msgstr ""
+
+#: AddCustomerNotes.php:98
+msgid "Notes for Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
+#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
+#: BankMatching.php:223 BankReconciliation.php:184 BankReconciliation.php:256
+#: ContractCosting.php:149 CustomerAllocations.php:332
+#: CustomerAllocations.php:358 CustomerInquiry.php:191
+#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154
+#: GLAccountReport.php:369 GLTransInquiry.php:45 MRPCalendar.php:217
+#: PaymentAllocations.php:77 PcAssignCashToTab.php:212
+#: PcAuthorizeExpenses.php:81 PDFRemittanceAdvice.php:308
+#: PrintCustTrans.php:678 PrintCustTransPortrait.ph...
[truncated message content] |
|
From: <dai...@us...> - 2012-03-11 09:13:29
|
Revision: 5062
http://web-erp.svn.sourceforge.net/web-erp/?rev=5062&view=rev
Author: daintree
Date: 2012-03-11 09:13:20 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Language updates - James Dupin French - Dr Magbt Salib Arabic
Modified Paths:
--------------
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Added Paths:
-----------
trunk/locale/ar_EG.utf8/
trunk/locale/ar_EG.utf8/LC_MESSAGES/
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2012-03-08 10:02:55 UTC (rev 5061)
+++ trunk/build/make_release.sh 2012-03-11 09:13:20 UTC (rev 5062)
@@ -9,6 +9,7 @@
xgettext --no-wrap --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
+msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/de_DE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/en_US.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
@@ -38,6 +39,7 @@
msgmerge -U --backup=off locale/zh_HK.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgfmt -o locale/ar_EG.utf8/LC_MESSAGES/messages.mo locale/ar_EG.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/cs_CZ.utf8/LC_MESSAGES/messages.mo locale/cs_CZ.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/de_DE.utf8/LC_MESSAGES/messages.mo locale/de_DE.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/el_GR.utf8/LC_MESSAGES/messages.mo locale/el_GR.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-08 10:02:55 UTC (rev 5061)
+++ trunk/doc/Change.log 2012-03-11 09:13:20 UTC (rev 5062)
@@ -1,5 +1,7 @@
webERP Change Log
+11/3/12 Dr. Magdy Salib - ar_EG.utf8 arabic translation started
+11/3/12 James Dupin: French language translation update
8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustmentsControlled.php. Reported by Soujiro
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustments.php. Reported by Soujiro
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-03-08 10:02:55 UTC (rev 5061)
+++ trunk/includes/LanguagesArray.php 2012-03-11 09:13:20 UTC (rev 5062)
@@ -16,6 +16,11 @@
$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['ar_EG.utf8']['LanguageName'] = _('Arabic Eygptian');
+$LanguagesArray['ar_EG.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['ar_EG.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['ar_EG.utf8']['ThousandsSeparator'] = ' ';
+
$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
Added: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Property changes on: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-03-11 09:13:20 UTC (rev 5062)
@@ -0,0 +1,35293 @@
+# Arabic translation for web-erp
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the web-erp package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: web-erp\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-04 22:15+1200\n"
+"PO-Revision-Date: 2012-01-26 10:26+0000\n"
+"Last-Translator: JC_Chuck <Unknown>\n"
+"Language-Team: Arabic <ar...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+
+#: AccountGroups.php:9 index.php:1273
+msgid "Account Groups"
+msgstr "مجموعات العضوية"
+
+#: AccountGroups.php:19
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء "
+"االتحقق من وجود استدعاء ذاتي"
+
+#: AccountGroups.php:20
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+
+#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
+#: AccountGroups.php:187
+msgid "The SQL that was used to retrieve the information was"
+msgstr "الطلب المستخدم لإسترجاع المعلومات كان"
+
+#: AccountGroups.php:58
+msgid "Could not check whether the group exists because"
+msgstr "لم يتم التحقق من وجود المجموعة بسبب"
+
+#: AccountGroups.php:65
+msgid "The account group name already exists in the database"
+msgstr "اسم المجموعة موجود مسبقاً"
+
+#: AccountGroups.php:71
+msgid "The account group name cannot contain the character"
+msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة"
+
+#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
+#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:32
+msgid "or the character"
+msgstr "او الحرف"
+
+#: AccountGroups.php:77
+msgid "The account group name must be at least one character long"
+msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+
+#: AccountGroups.php:84
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+
+#: AccountGroups.php:95
+msgid "Could not check whether the group is recursive because"
+msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن"
+
+#: AccountGroups.php:107
+msgid "The section in accounts must be an integer"
+msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
+
+#: AccountGroups.php:113
+msgid "The sequence in the trial balance must be an integer"
+msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح"
+
+#: AccountGroups.php:119
+msgid "The sequence in the TB must be numeric and less than"
+msgstr ""
+
+#: AccountGroups.php:136
+msgid "An error occurred in updating the account group"
+msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+
+#: AccountGroups.php:137
+msgid "The SQL that was used to update the account group was"
+msgstr ""
+
+#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
+msgid "Record Updated"
+msgstr "تم التحديث"
+
+#: AccountGroups.php:157
+msgid "An error occurred in inserting the account group"
+msgstr "حدث خطأ ما اثناء اضافة المجموعة"
+
+#: AccountGroups.php:158
+msgid "The SQL that was used to insert the account group was"
+msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+
+#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
+msgid "Record inserted"
+msgstr "تمت الإضافة بنجاح"
+
+#: AccountGroups.php:176
+msgid ""
+"An error occurred in retrieving the group information from chartmaster"
+msgstr ""
+
+#: AccountGroups.php:181
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr ""
+
+#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
+#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
+#: Currencies.php:144 Currencies.php:152 Currencies.php:159
+#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
+#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
+#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
+#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
+#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
+#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
+#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
+#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
+#: PcExpenses.php:119 SalesCategories.php:127 SalesCategories.php:135
+#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
+#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
+#: Stocks.php:471 Stocks.php:480 Stocks.php:488 Stocks.php:496 Stocks.php:504
+#: Stocks.php:512 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
+#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
+#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:142
+#: UnitsOfMeasure.php:149 WorkCentres.php:90 WorkCentres.php:96
+#: WWW_Access.php:87
+msgid "There are"
+msgstr "يوجد"
+
+#: AccountGroups.php:182
+msgid "general ledger accounts that refer to this account group"
+msgstr ""
+
+#: AccountGroups.php:186
+msgid "An error occurred in retrieving the parent group information"
+msgstr ""
+
+#: AccountGroups.php:191
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+
+#: AccountGroups.php:192
+msgid "account groups that have this group as its/there parent account group"
+msgstr ""
+
+#: AccountGroups.php:195
+msgid "An error occurred in deleting the account group"
+msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+
+#: AccountGroups.php:196
+msgid "The SQL that was used to delete the account group was"
+msgstr ""
+
+#: AccountGroups.php:198
+msgid "group has been deleted"
+msgstr "تم حذف المجموعة"
+
+#: AccountGroups.php:223
+msgid "The sql that was used to retrieve the account group information was "
+msgstr ""
+
+#: AccountGroups.php:224
+msgid "Could not get account groups because"
+msgstr "لم يتمكن الحصول على مجموات العضو لان"
+
+#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
+#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
+#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
+#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
+#: CounterSales.php:1940 CounterSales.php:2062 Credit_Invoice.php:257
+#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
+#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
+#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
+#: EDIMessageFormat.php:106 FixedAssetList.php:8 FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13 FixedAssetRegister.php:232
+#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
+#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:369
+#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
+#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
+#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
+#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
+#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
+#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
+#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
+#: PurchData.php:141 PurchData.php:231 PurchData.php:250
+#: RecurringSalesOrders.php:307 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
+#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
+#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
+#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:204
+#: SelectCreditItems.php:272 SelectCustomer.php:315 SelectGLAccount.php:19
+#: SelectGLAccount.php:79 SelectOrderItems.php:605 SelectOrderItems.php:1436
+#: SelectOrderItems.php:1556 SelectProduct.php:456 SelectSalesOrder.php:155
+#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
+#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
+#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
+#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
+#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
+#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:60
+#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
+#: WorkOrderCosting.php:14 WorkOrderEntry.php:12 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
+#: WWW_Users.php:38 Z_BottomUpCosts.php:51
+msgid "Search"
+msgstr "إبحث"
+
+#: AccountGroups.php:230
+msgid "Group Name"
+msgstr "إسم المجموعة"
+
+#: AccountGroups.php:231 EDIMessageFormat.php:131
+msgid "Section"
+msgstr "قسم"
+
+#: AccountGroups.php:232 AccountGroups.php:396
+msgid "Sequence In TB"
+msgstr ""
+
+#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
+#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
+#: SelectGLAccount.php:45 SelectGLAccount.php:59
+msgid "Profit and Loss"
+msgstr ""
+
+#: AccountGroups.php:234 AccountGroups.php:341
+msgid "Parent Group"
+msgstr ""
+
+#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
+#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
+#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
+#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
+#: CompanyPreferences.php:451 CompanyPreferences.php:453
+#: CompanyPreferences.php:463 CompanyPreferences.php:465
+#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
+#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
+#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
+#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
+#: Locations.php:373 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
+#: MRP.php:542 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:264 PaymentMethods.php:270 PDFChequeListing.php:63
+#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
+#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
+#: PO_Header.php:758 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
+#: PurchData.php:189 PurchData.php:469 PurchData.php:472
+#: RecurringSalesOrders.php:479 RecurringSalesOrders.php:482
+#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
+#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
+#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
+#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
+#: Stocks.php:867 Stocks.php:869 Stocks.php:887 Stocks.php:889
+#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
+#: SystemParameters.php:373 SystemParameters.php:405 SystemParameters.php:450
+#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
+#: SystemParameters.php:589 SystemParameters.php:597 SystemParameters.php:615
+#: SystemParameters.php:622 SystemParameters.php:746 SystemParameters.php:877
+#: SystemParameters.php:879 SystemParameters.php:889 SystemParameters.php:891
+#: SystemParameters.php:945 SystemParameters.php:957 SystemParameters.php:959
+#: TaxGroups.php:292 TaxGroups.php:295 TaxGroups.php:344 WWW_Users.php:610
+#: WWW_Users.php:612
+msgid "Yes"
+msgstr "موافق"
+
+#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
+#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
+#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
+#: CompanyPreferences.php:438 CompanyPreferences.php:442
+#: CompanyPreferences.php:450 CompanyPreferences.php:454
+#: CompanyPreferences.php:462 CompanyPreferences.php:466
+#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
+#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
+#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
+#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
+#: Locations.php:375 MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536
+#: MRP.php:540 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:265 PaymentMethods.php:271 PDFChequeListing.php:62
+#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:757 PO_PDFPurchOrder.php:368 PO_PDFPurchOrder.php:371
+#: PurchData.php:192 PurchData.php:470 PurchData.php:473
+#: RecurringSalesOrders.php:478 RecurringSalesOrders.php:481
+#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
+#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
+#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
+#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
+#: Stocks.php:862 Stocks.php:864 Stocks.php:882 Stocks.php:884
+#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
+#: SystemParameters.php:374 SystemParameters.php:406 SystemParameters.php:451
+#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
+#: SystemParameters.php:590 SystemParameters.php:598 SystemParameters.php:616
+#: SystemParameters.php:623 SystemParameters.php:747 SystemParameters.php:876
+#: SystemParameters.php:880 SystemParameters.php:888 SystemParameters.php:892
+#: SystemParameters.php:946 SystemParameters.php:956 SystemParameters.php:960
+#: TaxGroups.php:293 TaxGroups.php:296 TaxGroups.php:346 WWW_Users.php:609
+#: WWW_Users.php:613 includes/PDFLowGPPageHeader.inc:44
+#: includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "ﻻ"
+
+#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:131
+#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
+#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
+#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
+#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
+#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
+#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
+#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
+#: Labels.php:414 Locations.php:382 MRPDemands.php:304 MRPDemandTypes.php:122
+#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
+#: PcClaimExpensesFromTab.php:229 PcExpenses.php:176 PcTabs.php:188
+#: PcTypeTabs.php:171 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
+#: Prices.php:227 PurchData.php:202 SalesCategories.php:263
+#: SalesGLPostings.php:135 SalesGLPostings.php:247 SalesPeople.php:210
+#: SalesTypes.php:206 SelectCustomer.php:607 SelectCustomer.php:623
+#: SelectCustomer.php:645 SelectCustomer.php:661 SelectCustomer.php:683
+#: SelectCustomer.php:699 Shippers.php:144 StockCategories.php:244
+#: SupplierContacts.php:156 SupplierTypes.php:192 SuppLoginSetup.php:274
+#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
+#: TaxProvinces.php:178 UnitsOfMeasure.php:201 WorkCentres.php:138
+#: WWW_Access.php:127 WWW_Users.php:312 includes/InputSerialItems.php:88
+#, php-format
+msgid "Edit"
+msgstr "تحرير"
+
+#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:132
+#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
+#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
+#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
+#: CounterSales.php:741 Credit_Invoice.php:386 CreditStatus.php:176
+#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
+#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
+#: DiscountMatrix.php:178 EDIMessageFormat.php:153
+#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
+#: GLAccounts.php:320 GLJournal.php:403 Labels.php:414 Locations.php:383
+#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
+#: Payments.php:961 PaymentTerms.php:204 PcAssignCashToTab.php:255
+#: PcClaimExpensesFromTab.php:230 PcExpenses.php:177 PcExpensesTypeTab.php:161
+#: PcTabs.php:189 PcTypeTabs.php:172 PO_AuthorisationLevels.php:150
+#: PO_Items.php:976 Prices_Customer.php:284 Prices.php:228 PurchData.php:203
+#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
+#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
+#: SalesTypes.php:207 SelectCreditItems.php:747 SelectCustomer.php:608
+#: SelectCustomer.php:624 SelectCustomer.php:646 SelectCustomer.php:662
+#: SelectCustomer.php:684 SelectCustomer.php:700 SelectOrderItems.php:1363
+#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
+#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
+#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:135
+#: SupplierContacts.php:157 SupplierTypes.php:194 SuppLoginSetup.php:275
+#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
+#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
+#: UnitsOfMeasure.php:202 WorkCentres.php:139 WOSerialNos.php:300
+#: WWW_Access.php:128 WWW_Users.php:313 includes/InputSerialItemsKeyed.php:54
+#, php-format
+msgid "Delete"
+msgstr "حذف"
+
+#: AccountGroups.php:274
+msgid "Review Account Groups"
+msgstr ""
+
+#: AccountGroups.php:294
+msgid "An error occurred in retrieving the account group information"
+msgstr ""
+
+#: AccountGroups.php:295
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr ""
+
+#: AccountGroups.php:298
+msgid "The account group name does not exist in the database"
+msgstr ""
+
+#: AccountGroups.php:314 GLAccounts.php:250 GLAccounts.php:299
+#: Z_ImportGLAccountGroups.php:28
+msgid "Account Group"
+msgstr ""
+
+#: AccountGroups.php:338
+msgid "Account Group Name"
+msgstr ""
+
+#: AccountGroups.php:348 AccountGroups.php:350
+msgid "Top Level Group"
+msgstr ""
+
+#: AccountGroups.php:364
+msgid "Section In Accounts"
+msgstr ""
+
+#: AccountGroups.php:401 AccountSections.php:262 AddCustomerContacts.php:208
+#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:222
+#: BankAccounts.php:373 BOMs.php:725 COGSGLPostings.php:347
+#: CreditStatus.php:247 Currencies.php:339 CustLoginSetup.php:611
+#: DiscountMatrix.php:141 EDIMessageFormat.php:249
+#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
+#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
+#: Locations.php:553 MRPDemands.php:402 MRPDemandTypes.php:182
+#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
+#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
+#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
+#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
+#: SupplierContacts.php:251 SuppLoginSetup.php:532 TaxAuthorities.php:313
+#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:253
+#: WorkCentres.php:261 WWW_Users.php:643
+msgid "Enter Information"
+msgstr "أدخل المعلومات"
+
+#: AccountSections.php:9 index.php:1278
+msgid "Account Sections"
+msgstr "أعدادات العضو"
+
+#: AccountSections.php:68
+msgid "The account section already exists in the database"
+msgstr "قسم العضو موجود مسبقا فى قاعدة البيانات"
+
+#: AccountSections.php:75
+msgid "The account section name cannot contain the character"
+msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
+
+#: AccountSections.php:81
+msgid "The account section name must contain at least one character"
+msgstr "يجب ان يحتوى اسم العضو على الاقل حرف واحد"
+
+#: AccountSections.php:87 AccountSections.php:93
+msgid "The section number must be an integer"
+msgstr "قسم الرقم يجب ان يكون عدد صحيح"
+
+#: AccountSections.php:138
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr ""
+
+#: AccountSections.php:139
+msgid "general ledger accounts groups that refer to this account section"
+msgstr ""
+
+#: AccountSections.php:150
+msgid "section has been deleted"
+msgstr ""
+
+#: AccountSections.php:175
+msgid "Could not get account group sections because"
+msgstr ""
+
+#: AccountSections.php:181 AccountSections.php:238 AccountSections.php:255
+msgid "Section Number"
+msgstr "رقم القطاع"
+
+#: AccountSections.php:182 AccountSections.php:258
+msgid "Section Description"
+msgstr "وصف القطاع"
+
+#: AccountSections.php:199
+msgid "Restricted"
+msgstr "محظور"
+
+#: AccountSections.php:210
+msgid "Review Account Sections"
+msgstr "راجع أعدادات العضوية"
+
+#: AccountSections.php:228
+msgid "Could not retrieve the requested section please try again."
+msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
+
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:601
+#: SelectCustomer.php:630
+msgid "Customer Contacts"
+msgstr ""
+
+#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:24
+#: Z_CheckDebtorsControl.php:21
+msgid "Back to Customers"
+msgstr "العودة الى العملاء"
+
+#: AddCustomerContacts.php:26
+msgid "Contacts for Customer: <b>"
+msgstr ""
+
+#: AddCustomerContacts.php:29
+msgid "Edit contact for <b>"
+msgstr ""
+
+#: AddCustomerContacts.php:41
+msgid "The Contact must be an integer."
+msgstr ""
+
+#: AddCustomerContacts.php:44
+msgid "The contact's name must be forty characters or less long"
+msgstr ""
+
+#: AddCustomerContacts.php:47
+msgid "The contact's name may not be empty"
+msgstr ""
+
+#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
+#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
+#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:230
+#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:60
+#: PcTabs.php:60 PcTypeTabs.php:59 PO_Items.php:381 SalesAnalReptCols.php:129
+#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:355 Suppliers.php:514
+#: SupplierTypes.php:69
+msgid "has been updated"
+msgstr ""
+
+#: AddCustomerContacts.php:70
+msgid "The contact record has been added"
+msgstr ""
+
+#: AddCustomerContacts.php:98
+msgid "The contact record has been deleted"
+msgstr ""
+
+#: AddCustomerContacts.php:112 CompanyPreferences.php:229
+#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
+#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:603
+#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:144
+#: SupplierCredit.php:433 SupplierInvoice.php:407 SuppTransGLAnalysis.php:96
+#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
+#: includes/PDFTaxPageHeader.inc:37
+msgid "Name"
+msgstr ""
+
+#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:900
+#: Customers.php:906 Customers.php:972 SelectCustomer.php:604
+#: WWW_Access.php:111 WWW_Access.php:172
+msgid "Role"
+msgstr ""
+
+#: AddCustomerContacts.php:114 Customers.php:973
+msgid "Phone no"
+msgstr ""
+
+#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:902
+#: Customers.php:908 Customers.php:974 PcAssignCashToTab.php:216
+#: PcAssignCashToTab.php:341 PcAuthorizeExpenses.php:85
+#: PcClaimExpensesFromTab.php:195 PcClaimExpensesFromTab.php:348
+#: PcReportTab.php:348 SelectCustomer.php:606 SystemParameters.php:313
+#: WOSerialNos.php:277 WOSerialNos.php:279
+msgid "Notes"
+msgstr ""
+
+#: AddCustomerContacts.php:149
+msgid "Review all contacts for this Customer"
+msgstr ""
+
+#: AddCustomerContacts.php:179
+msgid "Contact Code"
+msgstr ""
+
+#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:219
+msgid "Contact Name"
+msgstr ""
+
+#: AddCustomerContacts.php:196 Contracts.php:766 PDFRemittanceAdvice.php:247
+#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:225
+#: SelectCustomer.php:461 SelectOrderItems.php:638
+#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:113
+#: includes/PDFTransPageHeaderPortrait.inc:105
+msgid "Phone"
+msgstr ""
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:638
+#: SelectCustomer.php:668
+msgid "Customer Notes"
+msgstr ""
+
+#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+msgid "Back to Select Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:31
+msgid "The contact priority must be an integer."
+msgstr ""
+
+#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr ""
+
+#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+msgid "The contact's notes may not be empty"
+msgstr ""
+
+#: AddCustomerNotes.php:60
+msgid "The contact notes record has been added"
+msgstr ""
+
+#: AddCustomerNotes.php:87
+msgid "The contact note record has been deleted"
+msgstr ""
+
+#: AddCustomerNotes.php:98
+msgid "Notes for Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
+#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
+#: BankMatching.php:223 BankReconciliation.php:184 BankReconciliation.php:256
+#: ContractCosting.php:149 CustomerAllocations.php:332
+#: CustomerAllocations.php:358 CustomerInquiry.php:191
+#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154
+#: GLAccountReport.php:369 GLTransInquiry.php:45 MRPCalendar.php:217
+#: PaymentAllocations.php:77 PcAssignCashToTab.php:212
+#: PcAuthorizeExpenses.php:81 PDFRemittanceAdvice.php:308
+#: PrintCustTrans.php:678 PrintCustTransPortrait.ph...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-11 19:41:17
|
Revision: 5063
http://web-erp.svn.sourceforge.net/web-erp/?rev=5063&view=rev
Author: vvs2012
Date: 2012-03-11 19:41:09 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/GLAccounts.php
trunk/MRPDemands.php
trunk/PaymentMethods.php
trunk/PcTabs.php
trunk/SalesTypes.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/WorkCentres.php
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustEDISetup.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -28,7 +28,7 @@
if (ContainsIllegalCharacters($_POST['EDIReference'])
OR mb_strstr($_POST['EDIReference'],' ')) {
$InputError = 1;
- prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
+ prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
}
if (mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)){
$InputError = 1;
@@ -70,6 +70,7 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class="selection">';
@@ -108,7 +109,7 @@
echo '<option selected="selected" value="1">'._('Enabled') . '</option>';
}
-echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td>
+echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td>
</tr>';
echo '<tr><td>'._('Enable Receiving of EDI Orders') . ':</td>
@@ -157,6 +158,7 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="submit" value="' ._('Update EDI Configuration'). '" /></div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustLoginSetup.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -48,7 +48,7 @@
prnMsg(_('The user ID entered must be at least 4 characters long'),'error');
} elseif (ContainsIllegalCharacters($_POST['UserID']) OR mb_strstr($_POST['UserID'],' ')) {
$InputError = 1;
- prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
+ prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
} elseif (mb_strlen($_POST['Password'])<5){
if (!$SelectedUser){
$InputError = 1;
@@ -124,6 +124,7 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">
@@ -147,7 +148,7 @@
echo '<tr>
<td>' . _('Password') . ':</td>
- <td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" />
+ <td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" /></td>
</tr>
<tr>
<td>' . _('Full Name') . ':</td>
@@ -161,9 +162,9 @@
<td>' . _('Email Address') .':</td>
<td><input type="text" name="Email" value="' . $_POST['Email'] .'" size="32" maxlength="55" /></td>
</tr>
- <input type="hidden" name="Access" value="1" />
- <tr>
- <td>' . _('Branch Code') . ':</td>
+ <tr>
+ <td><input type="hidden" name="Access" value="1" />
+ ' . _('Branch Code') . ':</td>
<td><select name="BranchCode">';
$sql = "SELECT branchcode FROM custbranch WHERE debtorno = '" . $_SESSION['CustomerID'] . "'";
@@ -182,7 +183,7 @@
echo '<option value="' . $myrow['branchcode'] . '">' . $myrow['branchcode'] . '</option>';
}
}
-
+echo '</select></td></tr>';
echo '<tr><td>' . _('Reports Page Size') .':</td>
<td><select name="PageSize">';
@@ -271,6 +272,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
if (isset($_GET['SelectedUser'])) {
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustWhereAlloc.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -7,6 +7,7 @@
include('includes/header.inc');
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">
@@ -153,7 +154,7 @@
} // end if there are allocations against the transaction
} //got the ID of the transaction to find allocations for
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerAllocations.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -337,16 +337,17 @@
if (isset($_POST['AllocTrans'])) {
// Page called with trans number
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="AllocTrans" value="' . $_POST['AllocTrans'] . '" />';
// Show trans already allocated and potential new allocations
- echo '<p><table class="selection">';
+ echo '<table class="selection">';
echo '<tr>
<th colspan="7">
<div class="centre">
- <font color="blue"><b>' . $_SESSION['Alloc']->DebtorNo . ' - ' . $_SESSION['Alloc']->CustomerName . '</b></font>
+ <b>' . $_SESSION['Alloc']->DebtorNo . ' - ' . $_SESSION['Alloc']->CustomerName . '</b>
</div>';
if ($_SESSION['Alloc']->TransExRate != 1) {
@@ -397,8 +398,8 @@
<td class="number">' . locale_number_format($balance,$_SESSION['Alloc']->CurrDecimalPlaces) . '</td>
</tr>';
} else {
- echo '<input type="hidden" name="YetToAlloc' . $Counter . '" value="' . round($YetToAlloc,$_SESSION['Alloc']->CurrDecimalPlaces) . '" /></td>';
- echo '<td class="number"><input tabindex="' . $j .'" type="checkbox" name="All' . $Counter . '"';
+ echo '<td class="number"><input type="hidden" name="YetToAlloc' . $Counter . '" value="' . round($YetToAlloc,$_SESSION['Alloc']->CurrDecimalPlaces) . '" />';
+ echo '<input tabindex="' . $j .'" type="checkbox" name="All' . $Counter . '"';
if (ABS($AllocnItem->AllocAmt-$YetToAlloc) < 0.01) {
echo ' checked="checked" />';
@@ -418,10 +419,11 @@
echo '<tr>
<td colspan="5" class="number"><b>'._('Total Allocated').':</b></td>
- <td class="number"><b><u>' . locale_number_format($TotalAllocated,$_SESSION['Alloc']->CurrDecimalPlaces) . '</u></b></td>';
+ <td class="number"><b>' . locale_number_format($TotalAllocated,$_SESSION['Alloc']->CurrDecimalPlaces) . '</b></td>';
$j++;
echo '<td colspan="2">
<input tabindex="'.$j.'" type="submit" name="RefreshAllocTotal" value="' . _('Recalculate Total To Allocate') . '" /></td>
+ </tr>
<tr>
<td colspan="5" class="number"><b>'._('Left to allocate').'</b></td>
<td class="number"><b>' . locale_number_format(-$_SESSION['Alloc']->TransAmt-$TotalAllocated,$_SESSION['Alloc']->CurrDecimalPlaces).'</b></td>
@@ -432,7 +434,9 @@
<div class="centre">
<input tabindex="' . $j . '" type="submit" name="UpdateDatabase" value="' . _('Process Allocations') . '" />
<input tabindex="' . $j . '" type="submit" name="Cancel" value="' . _('Cancel') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
} elseif (isset($_GET['DebtorNo'])) {
// Page called with customer code
@@ -488,9 +492,9 @@
<td class="number">' . locale_number_format($myrow['total'],$myrow['currdecimalplaces']) . '</td>
<td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$myrow['currdecimalplaces']) . '</td>
<td>' . $myrow['currcode'] . '</td>';
- echo '<td><a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '>' . _('Allocate') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '">' . _('Allocate') . '</a></td></tr>';
}
- echo '</table><p>';
+ echo '</table>';
} else {
/* Page called with no parameters */
unset($_SESSION['Alloc']->Allocs);
@@ -529,7 +533,7 @@
$k=0;
while ($myrow = DB_fetch_array($result)) {
- $AllocateLink = '<a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '>' . _('Allocate') . '</a>';
+ $AllocateLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '">' . _('Allocate') . '</a>';
if ( $CurrentDebtor != $myrow['debtorno'] ) {
if ( $CurrentTransaction > 1 ) {
@@ -595,10 +599,7 @@
<br />';
}
-echo '</td>
- </tr>
- </table>';
-
+
include('includes/footer.inc');
?>
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerBranches.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -48,7 +48,7 @@
if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
- prnMsg(_('The Branch code cannot contain any of the following characters')." - & \'",'error');
+ prnMsg(_('The Branch code cannot contain any of the following characters')." - & \'",'error');
$Errors[$i] = 'BranchCode';
$i++;
}
@@ -104,8 +104,8 @@
echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
$address = $_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4'];
- $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
- $request_url = $base_url . '&q=' . urlencode($address);
+ $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
+ $request_url = $base_url . '&q=' . urlencode($address);
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die('url not loading');
$coordinates = $xml->Response->Placemark->Point->coordinates;
$coordinatesSplit = explode(",", $coordinates);
@@ -360,7 +360,7 @@
$TotalEnable = 0;
$TotalDisable = 0;
if ($myrow) {
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
echo '<table class="selection">
<tr>
@@ -396,8 +396,8 @@
<td><a href="Mailto:%s">%s</a></td>
<td>%s</td>
<td>%s</td>
- <td><a href="%s?DebtorNo=%s&SelectedBranch=%s">%s</td>
- <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this branch?') . '");\'>%s</td></tr>',
+ <td><a href="%s?DebtorNo=%s&SelectedBranch=%s">%s</a></td>
+ <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this branch?') . '");\'>%s</a></td></tr>',
$myrow[10],
$myrow[2],
$myrow[5],
@@ -464,6 +464,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($SelectedBranch)) {
@@ -536,10 +537,10 @@
echo '<input type="hidden" name="SelectedBranch" value="' . $SelectedBranch . '" />';
echo '<input type="hidden" name="BranchCode" value="' . $_POST['BranchCode'] . '" />';
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>';
if (isset($SelectedBranch)) {
- echo '<div class="centre"><a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '>' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '">' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
}
echo '<br />
<table class="selection">
@@ -583,7 +584,7 @@
if (!isset($_POST['BranchCode'])) {
$_POST['BranchCode']='';
}
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
echo '<table class="selection">
<tr>
<td>'._('Branch Code'). ':</td>
@@ -593,11 +594,12 @@
}
- echo '<input type="hidden" name="DebtorNo" value="'. $DebtorNo . '" />';
+ echo '<tr>
+ <td>';
+ echo '<input type="hidden" name="DebtorNo" value="'. $DebtorNo . '" />';
- echo '<tr>
- <td>'._('Branch Name').':</td>';
+ echo _('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
echo '<td><input tabindex="2" type="text" name="BrName" size="41" maxlength="40" value="'. $_POST['BrName'].'" /></td>
</tr>';
@@ -904,6 +906,7 @@
<div class="centre">
<input tabindex="28" type="submit" name="submit" value="' . _('Enter Branch') . '" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerInquiry.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -135,11 +135,11 @@
echo '<table class="selection" width="70%">
<tr>
- <th width="20%">' . _('Total Balance') . '</th>
- <th width="20%">' . _('Current') . '</th>
- <th width="20%">' . _('Now Due') . '</th>
- <th width="20%">' . $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th>
- <th width="20%">' . _('Over') . ' ' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th></tr>';
+ <th style="width:20%">' . _('Total Balance') . '</th>
+ <th style="width:20%">' . _('Current') . '</th>
+ <th style="width:20%">' . _('Now Due') . '</th>
+ <th style="width:20%">' . $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th>
+ <th style="width:20%">' . _('Over') . ' ' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th></tr>';
echo '<tr>
<td class="number">' . locale_number_format($CustomerRecord['balance'],$CustomerRecord['decimalplaces']) . '</td>
@@ -153,11 +153,13 @@
echo '<br />
<div class="centre">
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'
. _('Show all transactions after') . ': <input tabindex="1" type="text" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" value="' . $_POST['TransAfterDate'] . '" maxlength="10" size="12" />
<input tabindex="2" type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" />
- </div>
+ </div>
</form>
+ </div>
<br />';
$DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']);
@@ -237,22 +239,22 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td width="200">%s</td>
+ <td style="width:200px">%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>';
- $CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') .'<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" /></a></td>';
+ $CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') .'<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" alt="" /></a></td>';
- $PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" /></a></td>
- <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
- <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" /></a></td>';
+ $PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" alt="" /></a></td>
+ <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
+ <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" alt="" /></a></td>';
- $PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td>
- <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
- <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" /></a></td>';
+ $PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td>
+ <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
+ <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" alt="" /></a></td>';
/* assumed allowed page security token 3 allows the user to create credits for invoices */
if (in_array(3,$_SESSION['AllowedPageSecurityTokens']) AND $myrow['type']==10){
@@ -264,8 +266,8 @@
/* format string with GL inquiry options and for invoice to be credited */
printf($BaseFormatString . $CreditInvoiceFormatString . $PreviewInvoiceFormatString .
- '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . '
- <img src="' .$rootpath. '/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" /></a></td>
+ '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . '
+ <img src="' .$rootpath. '/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
</tr>',
//$BaseFormatString parameters
$myrow['typename'],
@@ -360,8 +362,8 @@
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
$PreviewCreditFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath .'/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
- <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$rootpath.'/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" /></a></td></tr>',
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath .'/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$rootpath.'/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>',
//$BaseFormatString parameters
$myrow['typename'],
$myrow['transno'],
@@ -393,7 +395,7 @@
} else {
printf($BaseFormatString .
$PreviewCreditFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="%s/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="%s/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -426,8 +428,8 @@
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
- <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$rootpath . '/css/' . $theme .'/images/gl.png" title="' . _('View the GL Entries') . '" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$rootpath . '/css/' . $theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -446,7 +448,7 @@
$myrow['transno']);
} else { //no permission for GLTrans Inquiries
printf($BaseFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -466,7 +468,7 @@
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
+ '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
$myrow['typename'],
$myrow['transno'],
ConvertSQLDate($myrow['trandate']),
@@ -497,7 +499,7 @@
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
+ '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
$myrow['typename'],
$myrow['transno'],
ConvertSQLDate($myrow['trandate']),
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerReceipt.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -729,7 +729,8 @@
/*set up the form whatever */
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '" method="post" name="form1">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '" method="post" id="form1">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*show the batch header details and the entries in the batch so far */
@@ -755,7 +756,7 @@
<table class="selection">
<tr>
<td>' . _('Bank Account') . ':</td>
- <td><select tabindex="1" name="BankAccount" onChange="ReloadForm(form1.BatchInput)">';
+ <td><select tabindex="1" name="BankAccount" onchange="ReloadForm(form1.BatchInput)">';
if (DB_num_rows($AccountsResults)==0){
echo '</select></td>
@@ -785,11 +786,11 @@
echo '<tr>
<td>' . _('Date Banked') . ':</td>
- <td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '" /></td>
+ <td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '" /></td>
</tr>
<tr>
<td>' . _('Currency') . ':</td>
- <td><select tabindex="3" name="Currency" onChange="ReloadForm(form1.BatchInput)">';
+ <td><select tabindex="3" name="Currency" onchange="ReloadForm(form1.BatchInput)">';
if (!isset($_SESSION['ReceiptBatch']->Currency)){
$_SESSION['ReceiptBatch']->Currency=$_SESSION['CompanyRecord']['currencydefault'];
@@ -994,7 +995,7 @@
echo '<br />
<table class="selection">
<tr>
- <th colspan="2"><font size="2" color="navy">' . _('General Ledger Receipt Entry') . '</font></th>
+ <th colspan="2">' . _('General Ledger Receipt Entry') . '</th>
</tr>';
//Select the tag
@@ -1101,15 +1102,15 @@
echo '<br />';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Select a Customer') . '</b>
+ <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Select a Customer') . '</p>
<table class="selection">
<tr>
<td>' . _('Text in the Customer') . ' ' . '<b>' . _('name') . '</b>:</td>
<td><input tabindex="9" type="text" name="Keywords" size="15" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Text extract in the Customer') . ' ' . '<b>' . _('code') . '</b>:</td>
<td><input tabindex="10" type="text" name="CustCode" size="10" maxlength="18" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Customer invoice number') . ':</td>
<td><input tabindex="11" type="text" name="CustInvNo" size="8" maxlength="8" /></td>
</tr>
@@ -1170,6 +1171,7 @@
<input tabindex="13" type="submit" name="CommitBatch" value="' . _('Accept and Process Batch') . '" />
</div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerTransInquiry.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -13,6 +13,7 @@
<br />';
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">
@@ -58,6 +59,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowResults" value="' . _('Show Transactions') . '" />
</div>
+ </div>
</form>';
if (isset($_POST['ShowResults']) && $_POST['TransType'] != ''){
@@ -128,7 +130,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td width="200">%s</td>
+ <td style="width:200px">%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/Custom...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-11 19:41:17
|
Revision: 5063
http://web-erp.svn.sourceforge.net/web-erp/?rev=5063&view=rev
Author: vvs2012
Date: 2012-03-11 19:41:09 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/GLAccounts.php
trunk/MRPDemands.php
trunk/PaymentMethods.php
trunk/PcTabs.php
trunk/SalesTypes.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/WorkCentres.php
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustEDISetup.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -28,7 +28,7 @@
if (ContainsIllegalCharacters($_POST['EDIReference'])
OR mb_strstr($_POST['EDIReference'],' ')) {
$InputError = 1;
- prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
+ prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
}
if (mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)){
$InputError = 1;
@@ -70,6 +70,7 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class="selection">';
@@ -108,7 +109,7 @@
echo '<option selected="selected" value="1">'._('Enabled') . '</option>';
}
-echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td>
+echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td>
</tr>';
echo '<tr><td>'._('Enable Receiving of EDI Orders') . ':</td>
@@ -157,6 +158,7 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="submit" value="' ._('Update EDI Configuration'). '" /></div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustLoginSetup.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -48,7 +48,7 @@
prnMsg(_('The user ID entered must be at least 4 characters long'),'error');
} elseif (ContainsIllegalCharacters($_POST['UserID']) OR mb_strstr($_POST['UserID'],' ')) {
$InputError = 1;
- prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
+ prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
} elseif (mb_strlen($_POST['Password'])<5){
if (!$SelectedUser){
$InputError = 1;
@@ -124,6 +124,7 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">
@@ -147,7 +148,7 @@
echo '<tr>
<td>' . _('Password') . ':</td>
- <td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" />
+ <td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" /></td>
</tr>
<tr>
<td>' . _('Full Name') . ':</td>
@@ -161,9 +162,9 @@
<td>' . _('Email Address') .':</td>
<td><input type="text" name="Email" value="' . $_POST['Email'] .'" size="32" maxlength="55" /></td>
</tr>
- <input type="hidden" name="Access" value="1" />
- <tr>
- <td>' . _('Branch Code') . ':</td>
+ <tr>
+ <td><input type="hidden" name="Access" value="1" />
+ ' . _('Branch Code') . ':</td>
<td><select name="BranchCode">';
$sql = "SELECT branchcode FROM custbranch WHERE debtorno = '" . $_SESSION['CustomerID'] . "'";
@@ -182,7 +183,7 @@
echo '<option value="' . $myrow['branchcode'] . '">' . $myrow['branchcode'] . '</option>';
}
}
-
+echo '</select></td></tr>';
echo '<tr><td>' . _('Reports Page Size') .':</td>
<td><select name="PageSize">';
@@ -271,6 +272,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
if (isset($_GET['SelectedUser'])) {
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustWhereAlloc.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -7,6 +7,7 @@
include('includes/header.inc');
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">
@@ -153,7 +154,7 @@
} // end if there are allocations against the transaction
} //got the ID of the transaction to find allocations for
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerAllocations.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -337,16 +337,17 @@
if (isset($_POST['AllocTrans'])) {
// Page called with trans number
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="AllocTrans" value="' . $_POST['AllocTrans'] . '" />';
// Show trans already allocated and potential new allocations
- echo '<p><table class="selection">';
+ echo '<table class="selection">';
echo '<tr>
<th colspan="7">
<div class="centre">
- <font color="blue"><b>' . $_SESSION['Alloc']->DebtorNo . ' - ' . $_SESSION['Alloc']->CustomerName . '</b></font>
+ <b>' . $_SESSION['Alloc']->DebtorNo . ' - ' . $_SESSION['Alloc']->CustomerName . '</b>
</div>';
if ($_SESSION['Alloc']->TransExRate != 1) {
@@ -397,8 +398,8 @@
<td class="number">' . locale_number_format($balance,$_SESSION['Alloc']->CurrDecimalPlaces) . '</td>
</tr>';
} else {
- echo '<input type="hidden" name="YetToAlloc' . $Counter . '" value="' . round($YetToAlloc,$_SESSION['Alloc']->CurrDecimalPlaces) . '" /></td>';
- echo '<td class="number"><input tabindex="' . $j .'" type="checkbox" name="All' . $Counter . '"';
+ echo '<td class="number"><input type="hidden" name="YetToAlloc' . $Counter . '" value="' . round($YetToAlloc,$_SESSION['Alloc']->CurrDecimalPlaces) . '" />';
+ echo '<input tabindex="' . $j .'" type="checkbox" name="All' . $Counter . '"';
if (ABS($AllocnItem->AllocAmt-$YetToAlloc) < 0.01) {
echo ' checked="checked" />';
@@ -418,10 +419,11 @@
echo '<tr>
<td colspan="5" class="number"><b>'._('Total Allocated').':</b></td>
- <td class="number"><b><u>' . locale_number_format($TotalAllocated,$_SESSION['Alloc']->CurrDecimalPlaces) . '</u></b></td>';
+ <td class="number"><b>' . locale_number_format($TotalAllocated,$_SESSION['Alloc']->CurrDecimalPlaces) . '</b></td>';
$j++;
echo '<td colspan="2">
<input tabindex="'.$j.'" type="submit" name="RefreshAllocTotal" value="' . _('Recalculate Total To Allocate') . '" /></td>
+ </tr>
<tr>
<td colspan="5" class="number"><b>'._('Left to allocate').'</b></td>
<td class="number"><b>' . locale_number_format(-$_SESSION['Alloc']->TransAmt-$TotalAllocated,$_SESSION['Alloc']->CurrDecimalPlaces).'</b></td>
@@ -432,7 +434,9 @@
<div class="centre">
<input tabindex="' . $j . '" type="submit" name="UpdateDatabase" value="' . _('Process Allocations') . '" />
<input tabindex="' . $j . '" type="submit" name="Cancel" value="' . _('Cancel') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
} elseif (isset($_GET['DebtorNo'])) {
// Page called with customer code
@@ -488,9 +492,9 @@
<td class="number">' . locale_number_format($myrow['total'],$myrow['currdecimalplaces']) . '</td>
<td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$myrow['currdecimalplaces']) . '</td>
<td>' . $myrow['currcode'] . '</td>';
- echo '<td><a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '>' . _('Allocate') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '">' . _('Allocate') . '</a></td></tr>';
}
- echo '</table><p>';
+ echo '</table>';
} else {
/* Page called with no parameters */
unset($_SESSION['Alloc']->Allocs);
@@ -529,7 +533,7 @@
$k=0;
while ($myrow = DB_fetch_array($result)) {
- $AllocateLink = '<a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '>' . _('Allocate') . '</a>';
+ $AllocateLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?AllocTrans=' . $myrow['id'] . '">' . _('Allocate') . '</a>';
if ( $CurrentDebtor != $myrow['debtorno'] ) {
if ( $CurrentTransaction > 1 ) {
@@ -595,10 +599,7 @@
<br />';
}
-echo '</td>
- </tr>
- </table>';
-
+
include('includes/footer.inc');
?>
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerBranches.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -48,7 +48,7 @@
if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
- prnMsg(_('The Branch code cannot contain any of the following characters')." - & \'",'error');
+ prnMsg(_('The Branch code cannot contain any of the following characters')." - & \'",'error');
$Errors[$i] = 'BranchCode';
$i++;
}
@@ -104,8 +104,8 @@
echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
$address = $_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4'];
- $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
- $request_url = $base_url . '&q=' . urlencode($address);
+ $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
+ $request_url = $base_url . '&q=' . urlencode($address);
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die('url not loading');
$coordinates = $xml->Response->Placemark->Point->coordinates;
$coordinatesSplit = explode(",", $coordinates);
@@ -360,7 +360,7 @@
$TotalEnable = 0;
$TotalDisable = 0;
if ($myrow) {
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
echo '<table class="selection">
<tr>
@@ -396,8 +396,8 @@
<td><a href="Mailto:%s">%s</a></td>
<td>%s</td>
<td>%s</td>
- <td><a href="%s?DebtorNo=%s&SelectedBranch=%s">%s</td>
- <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this branch?') . '");\'>%s</td></tr>',
+ <td><a href="%s?DebtorNo=%s&SelectedBranch=%s">%s</a></td>
+ <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this branch?') . '");\'>%s</a></td></tr>',
$myrow[10],
$myrow[2],
$myrow[5],
@@ -464,6 +464,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($SelectedBranch)) {
@@ -536,10 +537,10 @@
echo '<input type="hidden" name="SelectedBranch" value="' . $SelectedBranch . '" />';
echo '<input type="hidden" name="BranchCode" value="' . $_POST['BranchCode'] . '" />';
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>';
if (isset($SelectedBranch)) {
- echo '<div class="centre"><a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '>' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '">' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
}
echo '<br />
<table class="selection">
@@ -583,7 +584,7 @@
if (!isset($_POST['BranchCode'])) {
$_POST['BranchCode']='';
}
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
echo '<table class="selection">
<tr>
<td>'._('Branch Code'). ':</td>
@@ -593,11 +594,12 @@
}
- echo '<input type="hidden" name="DebtorNo" value="'. $DebtorNo . '" />';
+ echo '<tr>
+ <td>';
+ echo '<input type="hidden" name="DebtorNo" value="'. $DebtorNo . '" />';
- echo '<tr>
- <td>'._('Branch Name').':</td>';
+ echo _('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
echo '<td><input tabindex="2" type="text" name="BrName" size="41" maxlength="40" value="'. $_POST['BrName'].'" /></td>
</tr>';
@@ -904,6 +906,7 @@
<div class="centre">
<input tabindex="28" type="submit" name="submit" value="' . _('Enter Branch') . '" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerInquiry.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -135,11 +135,11 @@
echo '<table class="selection" width="70%">
<tr>
- <th width="20%">' . _('Total Balance') . '</th>
- <th width="20%">' . _('Current') . '</th>
- <th width="20%">' . _('Now Due') . '</th>
- <th width="20%">' . $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th>
- <th width="20%">' . _('Over') . ' ' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th></tr>';
+ <th style="width:20%">' . _('Total Balance') . '</th>
+ <th style="width:20%">' . _('Current') . '</th>
+ <th style="width:20%">' . _('Now Due') . '</th>
+ <th style="width:20%">' . $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th>
+ <th style="width:20%">' . _('Over') . ' ' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th></tr>';
echo '<tr>
<td class="number">' . locale_number_format($CustomerRecord['balance'],$CustomerRecord['decimalplaces']) . '</td>
@@ -153,11 +153,13 @@
echo '<br />
<div class="centre">
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'
. _('Show all transactions after') . ': <input tabindex="1" type="text" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" value="' . $_POST['TransAfterDate'] . '" maxlength="10" size="12" />
<input tabindex="2" type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" />
- </div>
+ </div>
</form>
+ </div>
<br />';
$DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']);
@@ -237,22 +239,22 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td width="200">%s</td>
+ <td style="width:200px">%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>';
- $CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') .'<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" /></a></td>';
+ $CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') .'<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" alt="" /></a></td>';
- $PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" /></a></td>
- <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
- <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" /></a></td>';
+ $PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" alt="" /></a></td>
+ <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
+ <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" alt="" /></a></td>';
- $PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td>
- <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
- <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" /></a></td>';
+ $PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td>
+ <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
+ <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" alt="" /></a></td>';
/* assumed allowed page security token 3 allows the user to create credits for invoices */
if (in_array(3,$_SESSION['AllowedPageSecurityTokens']) AND $myrow['type']==10){
@@ -264,8 +266,8 @@
/* format string with GL inquiry options and for invoice to be credited */
printf($BaseFormatString . $CreditInvoiceFormatString . $PreviewInvoiceFormatString .
- '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . '
- <img src="' .$rootpath. '/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" /></a></td>
+ '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . '
+ <img src="' .$rootpath. '/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
</tr>',
//$BaseFormatString parameters
$myrow['typename'],
@@ -360,8 +362,8 @@
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
$PreviewCreditFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath .'/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
- <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$rootpath.'/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" /></a></td></tr>',
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath .'/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$rootpath.'/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>',
//$BaseFormatString parameters
$myrow['typename'],
$myrow['transno'],
@@ -393,7 +395,7 @@
} else {
printf($BaseFormatString .
$PreviewCreditFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="%s/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="%s/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -426,8 +428,8 @@
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
- <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$rootpath . '/css/' . $theme .'/images/gl.png" title="' . _('View the GL Entries') . '" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$rootpath . '/css/' . $theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -446,7 +448,7 @@
$myrow['transno']);
} else { //no permission for GLTrans Inquiries
printf($BaseFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$rootpath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -466,7 +468,7 @@
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
+ '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
$myrow['typename'],
$myrow['transno'],
ConvertSQLDate($myrow['trandate']),
@@ -497,7 +499,7 @@
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
+ '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>',
$myrow['typename'],
$myrow['transno'],
ConvertSQLDate($myrow['trandate']),
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerReceipt.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -729,7 +729,8 @@
/*set up the form whatever */
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '" method="post" name="form1">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '" method="post" id="form1">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*show the batch header details and the entries in the batch so far */
@@ -755,7 +756,7 @@
<table class="selection">
<tr>
<td>' . _('Bank Account') . ':</td>
- <td><select tabindex="1" name="BankAccount" onChange="ReloadForm(form1.BatchInput)">';
+ <td><select tabindex="1" name="BankAccount" onchange="ReloadForm(form1.BatchInput)">';
if (DB_num_rows($AccountsResults)==0){
echo '</select></td>
@@ -785,11 +786,11 @@
echo '<tr>
<td>' . _('Date Banked') . ':</td>
- <td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '" /></td>
+ <td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '" /></td>
</tr>
<tr>
<td>' . _('Currency') . ':</td>
- <td><select tabindex="3" name="Currency" onChange="ReloadForm(form1.BatchInput)">';
+ <td><select tabindex="3" name="Currency" onchange="ReloadForm(form1.BatchInput)">';
if (!isset($_SESSION['ReceiptBatch']->Currency)){
$_SESSION['ReceiptBatch']->Currency=$_SESSION['CompanyRecord']['currencydefault'];
@@ -994,7 +995,7 @@
echo '<br />
<table class="selection">
<tr>
- <th colspan="2"><font size="2" color="navy">' . _('General Ledger Receipt Entry') . '</font></th>
+ <th colspan="2">' . _('General Ledger Receipt Entry') . '</th>
</tr>';
//Select the tag
@@ -1101,15 +1102,15 @@
echo '<br />';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Select a Customer') . '</b>
+ <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Select a Customer') . '</p>
<table class="selection">
<tr>
<td>' . _('Text in the Customer') . ' ' . '<b>' . _('name') . '</b>:</td>
<td><input tabindex="9" type="text" name="Keywords" size="15" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Text extract in the Customer') . ' ' . '<b>' . _('code') . '</b>:</td>
<td><input tabindex="10" type="text" name="CustCode" size="10" maxlength="18" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Customer invoice number') . ':</td>
<td><input tabindex="11" type="text" name="CustInvNo" size="8" maxlength="8" /></td>
</tr>
@@ -1170,6 +1171,7 @@
<input tabindex="13" type="submit" name="CommitBatch" value="' . _('Accept and Process Batch') . '" />
</div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/CustomerTransInquiry.php 2012-03-11 19:41:09 UTC (rev 5063)
@@ -13,6 +13,7 @@
<br />';
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">
@@ -58,6 +59,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowResults" value="' . _('Show Transactions') . '" />
</div>
+ </div>
</form>';
if (isset($_POST['ShowResults']) && $_POST['TransType'] != ''){
@@ -128,7 +130,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td width="200">%s</td>
+ <td style="width:200px">%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2012-03-11 09:13:20 UTC (rev 5062)
+++ trunk/Custom...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-11 21:30:07
|
Revision: 5064
http://web-erp.svn.sourceforge.net/web-erp/?rev=5064&view=rev
Author: vvs2012
Date: 2012-03-11 21:29:58 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Added missing file encodings_maps.php to TCPDF
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/includes/tcpdf/encodings_maps.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-11 19:41:09 UTC (rev 5063)
+++ trunk/doc/Change.log 2012-03-11 21:29:58 UTC (rev 5064)
@@ -1,5 +1,6 @@
webERP Change Log
+11/3/12 Vitaly: Added missing file encodings_maps.php to TCPDF
11/3/12 Dr. Magdy Salib - ar_EG.utf8 arabic translation started
11/3/12 James Dupin: French language translation update
8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
Added: trunk/includes/tcpdf/encodings_maps.php
===================================================================
--- trunk/includes/tcpdf/encodings_maps.php (rev 0)
+++ trunk/includes/tcpdf/encodings_maps.php 2012-03-11 21:29:58 UTC (rev 5064)
@@ -0,0 +1,846 @@
+<?php
+//============================================================+
+// File name : encodings_maps.php
+// Version : 1.0.001
+// Begin : 2011-10-01
+// Last Update : 2011-11-15
+// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - in...@te...
+// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// -------------------------------------------------------------------
+// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD
+//
+// This file is part of TCPDF software library.
+//
+// TCPDF is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// TCPDF is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
+//
+// See LICENSE.TXT file for more information.
+// -------------------------------------------------------------------
+//
+// Description : Unicode data for TCPDF library.
+//
+//============================================================+
+
+/**
+ * @file
+ * Font encodings maps class for TCPDF library.
+ * @author Nicola Asuni
+ * @package com.tecnick.tcpdf
+ * @since 5.9.123 (2011-10-01)
+ */
+
+/**
+ * @class TCPDF_ENCODING_MAPS
+ * This is a PHP class containing Font encodings maps class for TCPDF library.
+ * @package com.tecnick.tcpdf
+ * @version 1.0.000
+ * @author Nicola Asuni - in...@te...
+ */
+class TCPDF_ENCODING_MAPS {
+
+/**
+ * Array of Encoding Maps.
+ * @public
+ */
+public $encmap = array(
+
+// encoding map for: cp1251
+'cp1251' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'afii10051',129=>'afii10052',130=>'quotesinglbase',131=>'afii10100',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'Euro',137=>'perthousand',138=>'afii10058',139=>'guilsinglleft',140=>'afii10059',141=>'afii10061',142=>'afii10060',143=>'afii10145',
+144=>'afii10099',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'.notdef',153=>'trademark',154=>'afii10106',155=>'guilsinglright',156=>'afii10107',157=>'afii10109',158=>'afii10108',159=>'afii10193',
+160=>'space',161=>'afii10062',162=>'afii10110',163=>'afii10057',164=>'currency',165=>'afii10050',166=>'brokenbar',167=>'section',
+168=>'afii10023',169=>'copyright',170=>'afii10053',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'afii10056',
+176=>'degree',177=>'plusminus',178=>'afii10055',179=>'afii10103',180=>'afii10098',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'afii10071',185=>'afii61352',186=>'afii10101',187=>'guillemotright',188=>'afii10105',189=>'afii10054',190=>'afii10102',191=>'afii10104',
+192=>'afii10017',193=>'afii10018',194=>'afii10019',195=>'afii10020',196=>'afii10021',197=>'afii10022',198=>'afii10024',199=>'afii10025',
+200=>'afii10026',201=>'afii10027',202=>'afii10028',203=>'afii10029',204=>'afii10030',205=>'afii10031',206=>'afii10032',207=>'afii10033',
+208=>'afii10034',209=>'afii10035',210=>'afii10036',211=>'afii10037',212=>'afii10038',213=>'afii10039',214=>'afii10040',215=>'afii10041',
+216=>'afii10042',217=>'afii10043',218=>'afii10044',219=>'afii10045',220=>'afii10046',221=>'afii10047',222=>'afii10048',223=>'afii10049',
+224=>'afii10065',225=>'afii10066',226=>'afii10067',227=>'afii10068',228=>'afii10069',229=>'afii10070',230=>'afii10072',231=>'afii10073',
+232=>'afii10074',233=>'afii10075',234=>'afii10076',235=>'afii10077',236=>'afii10078',237=>'afii10079',238=>'afii10080',239=>'afii10081',
+240=>'afii10082',241=>'afii10083',242=>'afii10084',243=>'afii10085',244=>'afii10086',245=>'afii10087',246=>'afii10088',247=>'afii10089',
+248=>'afii10090',249=>'afii10091',250=>'afii10092',251=>'afii10093',252=>'afii10094',253=>'afii10095',254=>'afii10096',255=>'afii10097'),
+
+// encoding map for: iso-8859-4
+'iso-8859-4' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',
+136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',
+152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'Aogonek',162=>'kgreenlandic',163=>'Rcommaaccent',164=>'currency',165=>'Itilde',166=>'Lcommaaccent',167=>'section',
+168=>'dieresis',169=>'Scaron',170=>'Emacron',171=>'Gcommaaccent',172=>'Tbar',173=>'hyphen',174=>'Zcaron',175=>'macron',
+176=>'degree',177=>'aogonek',178=>'ogonek',179=>'rcommaaccent',180=>'acute',181=>'itilde',182=>'lcommaaccent',183=>'caron',
+184=>'cedilla',185=>'scaron',186=>'emacron',187=>'gcommaaccent',188=>'tbar',189=>'Eng',190=>'zcaron',191=>'eng',
+192=>'Amacron',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Iogonek',
+200=>'Ccaron',201=>'Eacute',202=>'Eogonek',203=>'Edieresis',204=>'Edotaccent',205=>'Iacute',206=>'Icircumflex',207=>'Imacron',
+208=>'Dcroat',209=>'Ncommaaccent',210=>'Omacron',211=>'Kcommaaccent',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',
+216=>'Oslash',217=>'Uogonek',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Utilde',222=>'Umacron',223=>'germandbls',
+224=>'amacron',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'iogonek',
+232=>'ccaron',233=>'eacute',234=>'eogonek',235=>'edieresis',236=>'edotaccent',237=>'iacute',238=>'icircumflex',239=>'imacron',
+240=>'dcroat',241=>'ncommaaccent',242=>'omacron',243=>'kcommaaccent',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',
+248=>'oslash',249=>'uogonek',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'utilde',254=>'umacron',255=>'dotaccent'),
+
+// encoding map for: cp1255
+'cp1255' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'circumflex',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'tilde',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'afii57636',165=>'yen',166=>'brokenbar',167=>'section',
+168=>'dieresis',169=>'copyright',170=>'multiply',171=>'guillemotleft',172=>'logicalnot',173=>'sfthyphen',174=>'registered',175=>'macron',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'middot',
+184=>'cedilla',185=>'onesuperior',186=>'divide',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',
+192=>'afii57799',193=>'afii57801',194=>'afii57800',195=>'afii57802',196=>'afii57793',197=>'afii57794',198=>'afii57795',199=>'afii57798',
+200=>'afii57797',201=>'afii57806',202=>'.notdef',203=>'afii57796',204=>'afii57807',205=>'afii57839',206=>'afii57645',207=>'afii57841',
+208=>'afii57842',209=>'afii57804',210=>'afii57803',211=>'afii57658',212=>'afii57716',213=>'afii57717',214=>'afii57718',215=>'gereshhebrew',
+216=>'gershayimhebrew',217=>'.notdef',218=>'.notdef',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'.notdef',
+224=>'afii57664',225=>'afii57665',226=>'afii57666',227=>'afii57667',228=>'afii57668',229=>'afii57669',230=>'afii57670',231=>'afii57671',
+232=>'afii57672',233=>'afii57673',234=>'afii57674',235=>'afii57675',236=>'afii57676',237=>'afii57677',238=>'afii57678',239=>'afii57679',
+240=>'afii57680',241=>'afii57681',242=>'afii57682',243=>'afii57683',244=>'afii57684',245=>'afii57685',246=>'afii57686',247=>'afii57687',
+248=>'afii57688',249=>'afii57689',250=>'afii57690',251=>'.notdef',252=>'.notdef',253=>'afii299',254=>'afii300',255=>'.notdef'),
+
+// encoding map for: iso-8859-11
+'iso-8859-11' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',
+136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',
+152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'kokaithai',162=>'khokhaithai',163=>'khokhuatthai',164=>'khokhwaithai',165=>'khokhonthai',166=>'khorakhangthai',167=>'ngonguthai',
+168=>'chochanthai',169=>'chochingthai',170=>'chochangthai',171=>'sosothai',172=>'chochoethai',173=>'yoyingthai',174=>'dochadathai',175=>'topatakthai',
+176=>'thothanthai',177=>'thonangmonthothai',178=>'thophuthaothai',179=>'nonenthai',180=>'dodekthai',181=>'totaothai',182=>'thothungthai',183=>'thothahanthai',
+184=>'thothongthai',185=>'nonuthai',186=>'bobaimaithai',187=>'poplathai',188=>'phophungthai',189=>'fofathai',190=>'phophanthai',191=>'fofanthai',
+192=>'phosamphaothai',193=>'momathai',194=>'yoyakthai',195=>'roruathai',196=>'ruthai',197=>'lolingthai',198=>'luthai',199=>'wowaenthai',
+200=>'sosalathai',201=>'sorusithai',202=>'sosuathai',203=>'hohipthai',204=>'lochulathai',205=>'oangthai',206=>'honokhukthai',207=>'paiyannoithai',
+208=>'saraathai',209=>'maihanakatthai',210=>'saraaathai',211=>'saraamthai',212=>'saraithai',213=>'saraiithai',214=>'sarauethai',215=>'saraueethai',
+216=>'sarauthai',217=>'sarauuthai',218=>'phinthuthai',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'bahtthai',
+224=>'saraethai',225=>'saraaethai',226=>'saraothai',227=>'saraaimaimuanthai',228=>'saraaimaimalaithai',229=>'lakkhangyaothai',230=>'maiyamokthai',231=>'maitaikhuthai',
+232=>'maiekthai',233=>'maithothai',234=>'maitrithai',235=>'maichattawathai',236=>'thanthakhatthai',237=>'nikhahitthai',238=>'yamakkanthai',239=>'fongmanthai',
+240=>'zerothai',241=>'onethai',242=>'twothai',243=>'threethai',244=>'fourthai',245=>'fivethai',246=>'sixthai',247=>'seventhai',
+248=>'eightthai',249=>'ninethai',250=>'angkhankhuthai',251=>'khomutthai',252=>'.notdef',253=>'.notdef',254=>'.notdef',255=>'.notdef'),
+
+// encoding map for: cp1257
+'cp1257' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'.notdef',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'.notdef',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'dieresis',142=>'caron',143=>'cedilla',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'.notdef',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'macron',158=>'ogonek',159=>'.notdef',
+160=>'space',161=>'.notdef',162=>'cent',163=>'sterling',164=>'currency',165=>'.notdef',166=>'brokenbar',167=>'section',
+168=>'Oslash',169=>'copyright',170=>'Rcommaaccent',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'AE',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'oslash',185=>'onesuperior',186=>'rcommaaccent',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'ae',
+192=>'Aogonek',193=>'Iogonek',194=>'Amacron',195=>'Cacute',196=>'Adieresis',197=>'Aring',198=>'Eogonek',199=>'Emacron',
+200=>'Ccaron',201=>'Eacute',202=>'Zacute',203=>'Edotaccent',204=>'Gcommaaccent',205=>'Kcommaaccent',206=>'Imacron',207=>'Lcommaaccent',
+208=>'Scaron',209=>'Nacute',210=>'Ncommaaccent',211=>'Oacute',212=>'Omacron',213=>'Otilde',214=>'Odieresis',215=>'multiply',
+216=>'Uogonek',217=>'Lslash',218=>'Sacute',219=>'Umacron',220=>'Udieresis',221=>'Zdotaccent',222=>'Zcaron',223=>'germandbls',
+224=>'aogonek',225=>'iogonek',226=>'amacron',227=>'cacute',228=>'adieresis',229=>'aring',230=>'eogonek',231=>'emacron',
+232=>'ccaron',233=>'eacute',234=>'zacute',235=>'edotaccent',236=>'gcommaaccent',237=>'kcommaaccent',238=>'imacron',239=>'lcommaaccent',
+240=>'scaron',241=>'nacute',242=>'ncommaaccent',243=>'oacute',244=>'omacron',245=>'otilde',246=>'odieresis',247=>'divide',
+248=>'uogonek',249=>'lslash',250=>'sacute',251=>'umacron',252=>'udieresis',253=>'zdotaccent',254=>'zcaron',255=>'dotaccent'),
+
+// encoding map for: cp1258
+'cp1258' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'circumflex',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'OE',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'tilde',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'oe',157=>'.notdef',158=>'.notdef',159=>'Ydieresis',
+160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',
+168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',
+192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Abreve',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',
+200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'gravecomb',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',
+208=>'Dcroat',209=>'Ntilde',210=>'hookabovecomb',211=>'Oacute',212=>'Ocircumflex',213=>'Ohorn',214=>'Odieresis',215=>'multiply',
+216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Uhorn',222=>'tildecomb',223=>'germandbls',
+224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'abreve',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',
+232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'acutecomb',237=>'iacute',238=>'icircumflex',239=>'idieresis',
+240=>'dcroat',241=>'ntilde',242=>'dotbelowcomb',243=>'oacute',244=>'ocircumflex',245=>'ohorn',246=>'odieresis',247=>'divide',
+248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'uhorn',254=>'dong',255=>'ydieresis'),
+
+// encoding map for: cp1253
+'cp1253' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'.notdef',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'.notdef',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'dieresistonos',162=>'Alphatonos',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',
+168=>'dieresis',169=>'copyright',170=>'.notdef',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'afii00208',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'tonos',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'Epsilontonos',185=>'Etatonos',186=>'Iotatonos',187=>'guillemotright',188=>'Omicrontonos',189=>'onehalf',190=>'Upsilontonos',191=>'Omegatonos',
+192=>'iotadieresistonos',193=>'Alpha',194=>'Beta',195=>'Gamma',196=>'Delta',197=>'Epsilon',198=>'Zeta',199=>'Eta',
+200=>'Theta',201=>'Iota',202=>'Kappa',203=>'Lambda',204=>'Mu',205=>'Nu',206=>'Xi',207=>'Omicron',
+208=>'Pi',209=>'Rho',210=>'.notdef',211=>'Sigma',212=>'Tau',213=>'Upsilon',214=>'Phi',215=>'Chi',
+216=>'Psi',217=>'Omega',218=>'Iotadieresis',219=>'Upsilondieresis',220=>'alphatonos',221=>'epsilontonos',222=>'etatonos',223=>'iotatonos',
+224=>'upsilondieresistonos',225=>'alpha',226=>'beta',227=>'gamma',228=>'delta',229=>'epsilon',230=>'zeta',231=>'eta',
+232=>'theta',233=>'iota',234=>'kappa',235=>'lambda',236=>'mu',237=>'nu',238=>'xi',239=>'omicron',
+240=>'pi',241=>'rho',242=>'sigma1',243=>'sigma',244=>'tau',245=>'upsilon',246=>'phi',247=>'chi',
+248=>'psi',249=>'omega',250=>'iotadieresis',251=>'upsilondieresis',252=>'omicrontonos',253=>'upsilontonos',254=>'omegatonos',255=>'.notdef'),
+
+// encoding map for: cp874
+'cp874' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-11 21:30:07
|
Revision: 5064
http://web-erp.svn.sourceforge.net/web-erp/?rev=5064&view=rev
Author: vvs2012
Date: 2012-03-11 21:29:58 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Added missing file encodings_maps.php to TCPDF
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/includes/tcpdf/encodings_maps.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-11 19:41:09 UTC (rev 5063)
+++ trunk/doc/Change.log 2012-03-11 21:29:58 UTC (rev 5064)
@@ -1,5 +1,6 @@
webERP Change Log
+11/3/12 Vitaly: Added missing file encodings_maps.php to TCPDF
11/3/12 Dr. Magdy Salib - ar_EG.utf8 arabic translation started
11/3/12 James Dupin: French language translation update
8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
Added: trunk/includes/tcpdf/encodings_maps.php
===================================================================
--- trunk/includes/tcpdf/encodings_maps.php (rev 0)
+++ trunk/includes/tcpdf/encodings_maps.php 2012-03-11 21:29:58 UTC (rev 5064)
@@ -0,0 +1,846 @@
+<?php
+//============================================================+
+// File name : encodings_maps.php
+// Version : 1.0.001
+// Begin : 2011-10-01
+// Last Update : 2011-11-15
+// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - in...@te...
+// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// -------------------------------------------------------------------
+// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD
+//
+// This file is part of TCPDF software library.
+//
+// TCPDF is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// TCPDF is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
+//
+// See LICENSE.TXT file for more information.
+// -------------------------------------------------------------------
+//
+// Description : Unicode data for TCPDF library.
+//
+//============================================================+
+
+/**
+ * @file
+ * Font encodings maps class for TCPDF library.
+ * @author Nicola Asuni
+ * @package com.tecnick.tcpdf
+ * @since 5.9.123 (2011-10-01)
+ */
+
+/**
+ * @class TCPDF_ENCODING_MAPS
+ * This is a PHP class containing Font encodings maps class for TCPDF library.
+ * @package com.tecnick.tcpdf
+ * @version 1.0.000
+ * @author Nicola Asuni - in...@te...
+ */
+class TCPDF_ENCODING_MAPS {
+
+/**
+ * Array of Encoding Maps.
+ * @public
+ */
+public $encmap = array(
+
+// encoding map for: cp1251
+'cp1251' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'afii10051',129=>'afii10052',130=>'quotesinglbase',131=>'afii10100',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'Euro',137=>'perthousand',138=>'afii10058',139=>'guilsinglleft',140=>'afii10059',141=>'afii10061',142=>'afii10060',143=>'afii10145',
+144=>'afii10099',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'.notdef',153=>'trademark',154=>'afii10106',155=>'guilsinglright',156=>'afii10107',157=>'afii10109',158=>'afii10108',159=>'afii10193',
+160=>'space',161=>'afii10062',162=>'afii10110',163=>'afii10057',164=>'currency',165=>'afii10050',166=>'brokenbar',167=>'section',
+168=>'afii10023',169=>'copyright',170=>'afii10053',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'afii10056',
+176=>'degree',177=>'plusminus',178=>'afii10055',179=>'afii10103',180=>'afii10098',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'afii10071',185=>'afii61352',186=>'afii10101',187=>'guillemotright',188=>'afii10105',189=>'afii10054',190=>'afii10102',191=>'afii10104',
+192=>'afii10017',193=>'afii10018',194=>'afii10019',195=>'afii10020',196=>'afii10021',197=>'afii10022',198=>'afii10024',199=>'afii10025',
+200=>'afii10026',201=>'afii10027',202=>'afii10028',203=>'afii10029',204=>'afii10030',205=>'afii10031',206=>'afii10032',207=>'afii10033',
+208=>'afii10034',209=>'afii10035',210=>'afii10036',211=>'afii10037',212=>'afii10038',213=>'afii10039',214=>'afii10040',215=>'afii10041',
+216=>'afii10042',217=>'afii10043',218=>'afii10044',219=>'afii10045',220=>'afii10046',221=>'afii10047',222=>'afii10048',223=>'afii10049',
+224=>'afii10065',225=>'afii10066',226=>'afii10067',227=>'afii10068',228=>'afii10069',229=>'afii10070',230=>'afii10072',231=>'afii10073',
+232=>'afii10074',233=>'afii10075',234=>'afii10076',235=>'afii10077',236=>'afii10078',237=>'afii10079',238=>'afii10080',239=>'afii10081',
+240=>'afii10082',241=>'afii10083',242=>'afii10084',243=>'afii10085',244=>'afii10086',245=>'afii10087',246=>'afii10088',247=>'afii10089',
+248=>'afii10090',249=>'afii10091',250=>'afii10092',251=>'afii10093',252=>'afii10094',253=>'afii10095',254=>'afii10096',255=>'afii10097'),
+
+// encoding map for: iso-8859-4
+'iso-8859-4' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',
+136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',
+152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'Aogonek',162=>'kgreenlandic',163=>'Rcommaaccent',164=>'currency',165=>'Itilde',166=>'Lcommaaccent',167=>'section',
+168=>'dieresis',169=>'Scaron',170=>'Emacron',171=>'Gcommaaccent',172=>'Tbar',173=>'hyphen',174=>'Zcaron',175=>'macron',
+176=>'degree',177=>'aogonek',178=>'ogonek',179=>'rcommaaccent',180=>'acute',181=>'itilde',182=>'lcommaaccent',183=>'caron',
+184=>'cedilla',185=>'scaron',186=>'emacron',187=>'gcommaaccent',188=>'tbar',189=>'Eng',190=>'zcaron',191=>'eng',
+192=>'Amacron',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Iogonek',
+200=>'Ccaron',201=>'Eacute',202=>'Eogonek',203=>'Edieresis',204=>'Edotaccent',205=>'Iacute',206=>'Icircumflex',207=>'Imacron',
+208=>'Dcroat',209=>'Ncommaaccent',210=>'Omacron',211=>'Kcommaaccent',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',
+216=>'Oslash',217=>'Uogonek',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Utilde',222=>'Umacron',223=>'germandbls',
+224=>'amacron',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'iogonek',
+232=>'ccaron',233=>'eacute',234=>'eogonek',235=>'edieresis',236=>'edotaccent',237=>'iacute',238=>'icircumflex',239=>'imacron',
+240=>'dcroat',241=>'ncommaaccent',242=>'omacron',243=>'kcommaaccent',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',
+248=>'oslash',249=>'uogonek',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'utilde',254=>'umacron',255=>'dotaccent'),
+
+// encoding map for: cp1255
+'cp1255' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'circumflex',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'tilde',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'afii57636',165=>'yen',166=>'brokenbar',167=>'section',
+168=>'dieresis',169=>'copyright',170=>'multiply',171=>'guillemotleft',172=>'logicalnot',173=>'sfthyphen',174=>'registered',175=>'macron',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'middot',
+184=>'cedilla',185=>'onesuperior',186=>'divide',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',
+192=>'afii57799',193=>'afii57801',194=>'afii57800',195=>'afii57802',196=>'afii57793',197=>'afii57794',198=>'afii57795',199=>'afii57798',
+200=>'afii57797',201=>'afii57806',202=>'.notdef',203=>'afii57796',204=>'afii57807',205=>'afii57839',206=>'afii57645',207=>'afii57841',
+208=>'afii57842',209=>'afii57804',210=>'afii57803',211=>'afii57658',212=>'afii57716',213=>'afii57717',214=>'afii57718',215=>'gereshhebrew',
+216=>'gershayimhebrew',217=>'.notdef',218=>'.notdef',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'.notdef',
+224=>'afii57664',225=>'afii57665',226=>'afii57666',227=>'afii57667',228=>'afii57668',229=>'afii57669',230=>'afii57670',231=>'afii57671',
+232=>'afii57672',233=>'afii57673',234=>'afii57674',235=>'afii57675',236=>'afii57676',237=>'afii57677',238=>'afii57678',239=>'afii57679',
+240=>'afii57680',241=>'afii57681',242=>'afii57682',243=>'afii57683',244=>'afii57684',245=>'afii57685',246=>'afii57686',247=>'afii57687',
+248=>'afii57688',249=>'afii57689',250=>'afii57690',251=>'.notdef',252=>'.notdef',253=>'afii299',254=>'afii300',255=>'.notdef'),
+
+// encoding map for: iso-8859-11
+'iso-8859-11' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',
+136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',
+152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'kokaithai',162=>'khokhaithai',163=>'khokhuatthai',164=>'khokhwaithai',165=>'khokhonthai',166=>'khorakhangthai',167=>'ngonguthai',
+168=>'chochanthai',169=>'chochingthai',170=>'chochangthai',171=>'sosothai',172=>'chochoethai',173=>'yoyingthai',174=>'dochadathai',175=>'topatakthai',
+176=>'thothanthai',177=>'thonangmonthothai',178=>'thophuthaothai',179=>'nonenthai',180=>'dodekthai',181=>'totaothai',182=>'thothungthai',183=>'thothahanthai',
+184=>'thothongthai',185=>'nonuthai',186=>'bobaimaithai',187=>'poplathai',188=>'phophungthai',189=>'fofathai',190=>'phophanthai',191=>'fofanthai',
+192=>'phosamphaothai',193=>'momathai',194=>'yoyakthai',195=>'roruathai',196=>'ruthai',197=>'lolingthai',198=>'luthai',199=>'wowaenthai',
+200=>'sosalathai',201=>'sorusithai',202=>'sosuathai',203=>'hohipthai',204=>'lochulathai',205=>'oangthai',206=>'honokhukthai',207=>'paiyannoithai',
+208=>'saraathai',209=>'maihanakatthai',210=>'saraaathai',211=>'saraamthai',212=>'saraithai',213=>'saraiithai',214=>'sarauethai',215=>'saraueethai',
+216=>'sarauthai',217=>'sarauuthai',218=>'phinthuthai',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'bahtthai',
+224=>'saraethai',225=>'saraaethai',226=>'saraothai',227=>'saraaimaimuanthai',228=>'saraaimaimalaithai',229=>'lakkhangyaothai',230=>'maiyamokthai',231=>'maitaikhuthai',
+232=>'maiekthai',233=>'maithothai',234=>'maitrithai',235=>'maichattawathai',236=>'thanthakhatthai',237=>'nikhahitthai',238=>'yamakkanthai',239=>'fongmanthai',
+240=>'zerothai',241=>'onethai',242=>'twothai',243=>'threethai',244=>'fourthai',245=>'fivethai',246=>'sixthai',247=>'seventhai',
+248=>'eightthai',249=>'ninethai',250=>'angkhankhuthai',251=>'khomutthai',252=>'.notdef',253=>'.notdef',254=>'.notdef',255=>'.notdef'),
+
+// encoding map for: cp1257
+'cp1257' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'.notdef',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'.notdef',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'dieresis',142=>'caron',143=>'cedilla',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'.notdef',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'macron',158=>'ogonek',159=>'.notdef',
+160=>'space',161=>'.notdef',162=>'cent',163=>'sterling',164=>'currency',165=>'.notdef',166=>'brokenbar',167=>'section',
+168=>'Oslash',169=>'copyright',170=>'Rcommaaccent',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'AE',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'oslash',185=>'onesuperior',186=>'rcommaaccent',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'ae',
+192=>'Aogonek',193=>'Iogonek',194=>'Amacron',195=>'Cacute',196=>'Adieresis',197=>'Aring',198=>'Eogonek',199=>'Emacron',
+200=>'Ccaron',201=>'Eacute',202=>'Zacute',203=>'Edotaccent',204=>'Gcommaaccent',205=>'Kcommaaccent',206=>'Imacron',207=>'Lcommaaccent',
+208=>'Scaron',209=>'Nacute',210=>'Ncommaaccent',211=>'Oacute',212=>'Omacron',213=>'Otilde',214=>'Odieresis',215=>'multiply',
+216=>'Uogonek',217=>'Lslash',218=>'Sacute',219=>'Umacron',220=>'Udieresis',221=>'Zdotaccent',222=>'Zcaron',223=>'germandbls',
+224=>'aogonek',225=>'iogonek',226=>'amacron',227=>'cacute',228=>'adieresis',229=>'aring',230=>'eogonek',231=>'emacron',
+232=>'ccaron',233=>'eacute',234=>'zacute',235=>'edotaccent',236=>'gcommaaccent',237=>'kcommaaccent',238=>'imacron',239=>'lcommaaccent',
+240=>'scaron',241=>'nacute',242=>'ncommaaccent',243=>'oacute',244=>'omacron',245=>'otilde',246=>'odieresis',247=>'divide',
+248=>'uogonek',249=>'lslash',250=>'sacute',251=>'umacron',252=>'udieresis',253=>'zdotaccent',254=>'zcaron',255=>'dotaccent'),
+
+// encoding map for: cp1258
+'cp1258' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'circumflex',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'OE',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'tilde',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'oe',157=>'.notdef',158=>'.notdef',159=>'Ydieresis',
+160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',
+168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',
+192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Abreve',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',
+200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'gravecomb',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',
+208=>'Dcroat',209=>'Ntilde',210=>'hookabovecomb',211=>'Oacute',212=>'Ocircumflex',213=>'Ohorn',214=>'Odieresis',215=>'multiply',
+216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Uhorn',222=>'tildecomb',223=>'germandbls',
+224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'abreve',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',
+232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'acutecomb',237=>'iacute',238=>'icircumflex',239=>'idieresis',
+240=>'dcroat',241=>'ntilde',242=>'dotbelowcomb',243=>'oacute',244=>'ocircumflex',245=>'ohorn',246=>'odieresis',247=>'divide',
+248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'uhorn',254=>'dong',255=>'ydieresis'),
+
+// encoding map for: cp1253
+'cp1253' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',
+120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',
+128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',
+136=>'.notdef',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',
+144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',
+152=>'.notdef',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',
+160=>'space',161=>'dieresistonos',162=>'Alphatonos',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',
+168=>'dieresis',169=>'copyright',170=>'.notdef',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'afii00208',
+176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'tonos',181=>'mu',182=>'paragraph',183=>'periodcentered',
+184=>'Epsilontonos',185=>'Etatonos',186=>'Iotatonos',187=>'guillemotright',188=>'Omicrontonos',189=>'onehalf',190=>'Upsilontonos',191=>'Omegatonos',
+192=>'iotadieresistonos',193=>'Alpha',194=>'Beta',195=>'Gamma',196=>'Delta',197=>'Epsilon',198=>'Zeta',199=>'Eta',
+200=>'Theta',201=>'Iota',202=>'Kappa',203=>'Lambda',204=>'Mu',205=>'Nu',206=>'Xi',207=>'Omicron',
+208=>'Pi',209=>'Rho',210=>'.notdef',211=>'Sigma',212=>'Tau',213=>'Upsilon',214=>'Phi',215=>'Chi',
+216=>'Psi',217=>'Omega',218=>'Iotadieresis',219=>'Upsilondieresis',220=>'alphatonos',221=>'epsilontonos',222=>'etatonos',223=>'iotatonos',
+224=>'upsilondieresistonos',225=>'alpha',226=>'beta',227=>'gamma',228=>'delta',229=>'epsilon',230=>'zeta',231=>'eta',
+232=>'theta',233=>'iota',234=>'kappa',235=>'lambda',236=>'mu',237=>'nu',238=>'xi',239=>'omicron',
+240=>'pi',241=>'rho',242=>'sigma1',243=>'sigma',244=>'tau',245=>'upsilon',246=>'phi',247=>'chi',
+248=>'psi',249=>'omega',250=>'iotadieresis',251=>'upsilondieresis',252=>'omicrontonos',253=>'upsilontonos',254=>'omegatonos',255=>'.notdef'),
+
+// encoding map for: cp874
+'cp874' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',
+8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',
+16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',
+24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',
+32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',
+40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',
+48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',
+56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',
+64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',
+72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',
+80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',
+88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',
+96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',
+104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',
+112=>'p',113=>'q',114=>'r',115=>'...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-11 22:25:06
|
Revision: 5065
http://web-erp.svn.sourceforge.net/web-erp/?rev=5065&view=rev
Author: vvs2012
Date: 2012-03-11 22:24:58 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/ExchangeRateTrend.php
trunk/FixedAssetTransfer.php
trunk/GLBudgets.php
trunk/GLJournal.php
trunk/GoodsReceived.php
trunk/PDFPrintLabel.php
trunk/PO_Header.php
trunk/Payments.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
trunk/SelectCreditItems.php
trunk/StockCategories.php
trunk/StockLocTransferReceive.php
trunk/Stocks.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/SupplierTenderCreate.php
trunk/WorkOrderEntry.php
trunk/reportwriter/install/ReportListForm.php
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DailyBankTransactions.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -12,7 +12,8 @@
</p>';
if (!isset($_POST['Show'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>';
+ 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">';
@@ -54,18 +55,19 @@
}
echo '<tr>
<td>' . _('Transactions Dated From') . ':</td>
- <td><input type="text" name="FromTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' .
+ <td><input type="text" name="FromTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' .
date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
<tr>
<td>' . _('Transactions Dated To') . ':</td>
- <td><input type="text" name="ToTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
+ <td><input type="text" name="ToTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
</table>
<br />
<div class="centre">
<input type="submit" name="Show" value="' . _('Show transactions'). '" />
</div>
+ </div>
</form>';
} else {
$SQL = "SELECT bankaccountname,
@@ -104,7 +106,7 @@
$BankDetailRow = DB_fetch_array($BankResult);
echo '<table class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</font></th>
+ <th colspan="8"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th>
</tr>
<tr>
<th>' . ('Date') . '</th>
@@ -139,9 +141,11 @@
echo '</table>';
} //end if no bank trans in the range to show
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>';
+ 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 '<br /><div class="centre"><input type="submit" name="Return" value="' . _('Select Another Date'). '" /></div>';
+ echo '</div>';
echo '</form>';
}
include('includes/footer.inc');
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DailySalesInquiry.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -11,6 +11,7 @@
<br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset($_POST['MonthToShow'])){
@@ -62,6 +63,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowResults" value="' . _('Show Daily Sales For The Selected Month') . '" />
</div>
+ </div>
</form>
<br />';
/*Now get and display the sales data returned */
Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DebtorsAtPeriodEnd.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -130,11 +130,12 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ <div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr>
- <td>' . _('From Customer Code') .':</font></td>
+ <td>' . _('From Customer Code') .':</td>
<td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1" /></td>
</tr>
<tr>
@@ -162,6 +163,7 @@
<div class="centre">
<input tabindex="5" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DeliveryDetails.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -255,8 +255,8 @@
if(isset($_POST['MakeRecurringOrder']) AND ! $InputErrors){
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
- prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $rootpath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">'. _('click here') .'</a> '. _('to continue'),'info');
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
+ prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $rootpath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">'. _('click here') .'</a> '. _('to continue'),'info');
include('includes/footer.inc');
exit;
}
@@ -276,7 +276,7 @@
if ($InputErrors ==0) {
$OK_to_PROCESS = 1;
}
- If ($_POST['FreightCost'] != $OldFreightCost && $_SESSION['DoFreightCalc']==True){
+ If ($_POST['FreightCost'] != $OldFreightCost AND $_SESSION['DoFreightCalc']==True){
$OK_to_PROCESS = 0;
prnMsg(_('The freight charge has been updated') . '. ' . _('Please reconfirm that the order and the freight charges are acceptable and then confirm the order again if OK') .' <br /> '. _('The new freight cost is') .' ' . $_POST['FreightCost'] . ' ' . _('and the previously calculated freight cost was') .' '. $OldFreightCost,'warn');
} else {
@@ -295,7 +295,7 @@
$myrow = DB_fetch_array($TermsResult);
- if ($myrow['daysbeforedue']==0 && $myrow['dayinfollowingmonth']==0){
+ if ($myrow['daysbeforedue']==0 AND $myrow['dayinfollowingmonth']==0){
/* THIS IS A CASH SALE NEED TO GO OFF TO 3RD PARTY SITE SENDING MERCHANT ACCOUNT DETAILS AND CHECK FOR APPROVAL FROM 3RD PARTY SITE BEFORE CONTINUING TO PROCESS THE ORDER
@@ -311,7 +311,7 @@
} #end if else freight charge not altered
} #end if process order
-if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]==0){
+if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]==0){
/* finally write the order header to the database and then the order line details */
@@ -572,16 +572,16 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td>
</tr>';
echo '</table>';
@@ -591,20 +591,20 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
- <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Landscape)') .'</a></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Landscape)') .'</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Portrait)') .'</a></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Portrait)') .'</a></td>
</tr>
</table>';
}
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="" /></td>
- <td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td>
+ <td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td>
</tr>
</table>';
} else {
@@ -617,7 +617,7 @@
include('includes/footer.inc');
exit;
-} elseif (isset($OK_to_PROCESS) and $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]!=0){
+} elseif (isset($OK_to_PROCESS) AND ($OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]!=0)){
/* update the order header then update the old order line details and insert the new lines */
@@ -787,15 +787,15 @@
<table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td>
+ <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
+ <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td>
- <td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td>
+ <td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="" /></td>
@@ -811,20 +811,21 @@
if (isset($_SESSION['Items'.$identifier]->SpecialInstructions) and mb_strlen($_SESSION['Items'.$identifier]->SpecialInstructions)>0) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'info');
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details');
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details') . '</p>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . '<br />';
echo '</b> ' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></p>';
echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Display the order with or without discount depending on access level*/
if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
- echo '<table cellpading="2" colspan="7">';
+ echo '<table>';
if ($_SESSION['Items'.$identifier]->Quotation==1){
echo '<tr><th colspan="7">'._('Quotation Summary').'</th></tr>';
@@ -1082,7 +1083,7 @@
echo '<option selected="selected" value="1">' . _('No') . '</option>';
echo '</select> '. _('Last printed') .': ' . ConvertSQLDate($_SESSION['DatePackingSlipPrinted']) . '</td></tr>';
} else {
- echo '<input type="hidden" name="ReprintPackingSlip" value="0" />';
+ echo '<tr><td><input type="hidden" name="ReprintPackingSlip" value="0" /></td></tr>';
}
echo '<tr>
@@ -1090,9 +1091,9 @@
<td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
if ($_SESSION['DoFreightCalc']==true){
- echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>
- </tr>';
+ echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>';
}
+echo '</tr>';
if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
@@ -1141,6 +1142,8 @@
echo '<br /><input type="submit" name="ProcessOrder" value="' . _('Commit Order Changes') . '" />';
}
-echo '</div></form>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/Departments.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -27,7 +27,7 @@
if (ContainsIllegalCharacters($_POST['DepartmentName'])) {
$InputError = 1;
- prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
+ prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
}
if (trim($_POST['DepartmentName']) == '') {
$InputError = 1;
@@ -111,6 +111,7 @@
$result = DB_query($sql,$db);
}
prnMsg($msg,'success');
+ echo '<br />';
}
unset ($SelectedDepartmentID);
unset ($_POST['SelectedDepartmentID']);
@@ -183,7 +184,7 @@
echo '<td>' . $myrow['description'] . '</td>
<td>' . $myrow['authoriser'] . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>
</tr>';
} //END WHILE LIST LOOP
@@ -200,6 +201,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($SelectedDepartmentID)) {
@@ -252,6 +254,7 @@
echo '<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/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DiscountCategories.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -65,7 +65,8 @@
}
if (isset($_POST['selectchoice'])) {
- echo '<form name="update" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form id="update" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT DISTINCT discountcategory FROM stockmaster WHERE discountcategory <>''";
@@ -73,7 +74,7 @@
if (DB_num_rows($result) > 0) {
echo '<table class="selection"><tr><td>'. _('Discount Category Code') .': </td>';
- echo '<td><select name="DiscCat" onChange="ReloadForm(update.select)">';
+ echo '<td><select name="DiscCat" onchange="ReloadForm(update.select)">';
while ($myrow = DB_fetch_array($result)){
if ($myrow['discountcategory']==$_POST['DiscCat']){
@@ -81,7 +82,6 @@
} else {
echo '<option value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
}
- echo '</option>';
}
echo '</select></td>';
@@ -90,8 +90,11 @@
</table>
<br />';
}
+ echo '</div>
+ </form>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="ChooseOption" value="'.$_POST['ChooseOption'].'" />';
echo '<input type="hidden" name="selectchoice" value="'.$_POST['selectchoice'].'" />';
@@ -171,7 +174,8 @@
echo '</select></td></tr></table>';
echo '<br /><div class="centre"><input type="submit" name="SubmitCategory" value="'. _('Update Items') .'" /></div>';
}
- echo '</form>';
+ echo '</div>
+ </form>';
if (! isset($_POST['DiscCat'])){ /*set DiscCat to something to show results for first cat defined */
@@ -212,11 +216,11 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
+ $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
printf('<td>%s</td>
<td>%s - %s</td>
- <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount category?') . '\');">'. _('Delete') .'</td>
+ <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount category?') . '\');">'. _('Delete') .'</a></td>
</tr>',
$myrow['discountcategory'],
$myrow['stockid'],
@@ -235,17 +239,20 @@
}
if (!isset($_POST['selectchoice'])) {
- echo '<form method="post" name="choose" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" id="choose" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<tr><td>'._('Update discount category for').'</td>';
- echo '<td><select name="ChooseOption" onChange="ReloadForm(choose.selectchoice)">';
+ echo '<td><select name="ChooseOption" onchange="ReloadForm(choose.selectchoice)">';
echo '<option value="1">'._('a single stock item').'</option>';
echo '<option value="2">'._('a complete stock category').'</option>';
echo '</select></td></tr>
</table>
<br />';
echo '<div class="centre"><input type="submit" name="selectchoice" value="'._('Select').'" /></div>';
+ echo '</div>
+ </form>';
}
include('includes/footer.inc');
Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DiscountMatrix.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -82,6 +82,7 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -105,7 +106,7 @@
}
}
-echo '</select>';
+echo '</select></td></tr>';
$sql = "SELECT DISTINCT discountcategory FROM stockmaster WHERE discountcategory <>''";
@@ -122,9 +123,9 @@
echo '<option value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
}
}
- echo '</select></td>';
+ echo '</select></td></tr>';
} else {
- echo '<input type="hidden" name="DiscountCategory" value="" />';
+ echo '<tr><td><input type="hidden" name="DiscountCategory" value="" /></td></tr>';
}
echo '<tr>
@@ -173,13 +174,13 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&DiscountCategory=' . $myrow['discountcategory'] . '&QuantityBreak=' . $myrow['quantitybreak'];
+ $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&DiscountCategory=' . $myrow['discountcategory'] . '&QuantityBreak=' . $myrow['quantitybreak'];
printf('<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount matrix record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount matrix record?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['sales_type'],
$myrow['discountcategory'],
@@ -190,7 +191,8 @@
}
echo '</table>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/ExchangeRateTrend.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -32,7 +32,7 @@
// CurrencyToShow Currency Picker
- echo '<tr><td><select name="CurrencyToShow" onChange="ReloadForm(update.submit)">';
+ echo '<tr><td><select name="CurrencyToShow" onchange="ReloadForm(update.submit)">';
DB_data_seek($result,0);
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/FixedAssetTransfer.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -129,7 +129,7 @@
<td class="number">'.locale_number_format($myrow['cost'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
<td class="number">'.locale_number_format($myrow['accumdepn'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
<td>'.$myrow['locationdescription'].'</td>';
- echo '<td><select name="Location'.$myrow['assetid'].'" onChange="ReloadForm(Move'.$myrow['assetid'].')">';
+ echo '<td><select name="Location'.$myrow['assetid'].'" onchange="ReloadForm(Move'.$myrow['assetid'].')">';
echo '<option></option>';
while ($LocationRow=DB_fetch_array($LocationResult)) {
if ($LocationRow['locationid']==$myrow['location']) {
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/GLBudgets.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -35,7 +35,7 @@
echo '<br />
<tr>
<td>'. _('Select GL Account'). ':</td>
- <td><select name="SelectedAccount" onChange="ReloadForm(selectaccount.Select)">';
+ <td><select name="SelectedAccount" onchange="ReloadForm(selectaccount.Select)">';
$SQL = "SELECT accountcode,
accountname
@@ -221,7 +221,7 @@
<td></td>
<td><input class="number" type="text" size="14" name="AnnualAmountTY" value="0.00" /></td>
<td></td>
- <td><input onChange="numberFormat(this,2)" class="number" type="text" size="14" name="AnnualAmount" value="0.00" /></td>
+ <td><input onchange="numberFormat(this,2)" class="number" type="text" size="14" name="AnnualAmount" value="0.00" /></td>
<td><input type="submit" name="Apportion" value="' . _('Apportion Budget') . '" /></td>
</tr>
</table>';
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/GLJournal.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -318,7 +318,7 @@
if (!isset($_POST['GLManualCode'])) {
$_POST['GLManualCode']='';
}
-echo '<td><input class="number" type="text" name="GLManualCode" maxlength="12" size="12" onChange="inArray(this.value, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'" /></td>';
+echo '<td><input class="number" type="text" name="GLManualCode" maxlength="12" size="12" onchange="inArray(this.value, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'" /></td>';
$sql="SELECT accountcode,
accountname
@@ -326,7 +326,7 @@
ORDER BY accountcode";
$result=DB_query($sql, $db);
-echo '<td><select name="GLCode" onChange="return assignComboToInput(this,'.'GLManualCode'.')">';
+echo '<td><select name="GLCode" onchange="return assignComboToInput(this,'.'GLManualCode'.')">';
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
@@ -350,11 +350,11 @@
echo '</tr>
<tr>
<th>' . _('Debit') . '</th>
- <td><input type="text" class="number" name = "Debit" onChange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="number" name = "Debit" onchange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
</tr>
<tr>
<th>' . _('Credit') . '</th>
- <td><input type="text" class="number" Name = "Credit" onChange="eitherOr(this, '.'Debit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Credit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="numbe...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-11 22:25:06
|
Revision: 5065
http://web-erp.svn.sourceforge.net/web-erp/?rev=5065&view=rev
Author: vvs2012
Date: 2012-03-11 22:24:58 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/ExchangeRateTrend.php
trunk/FixedAssetTransfer.php
trunk/GLBudgets.php
trunk/GLJournal.php
trunk/GoodsReceived.php
trunk/PDFPrintLabel.php
trunk/PO_Header.php
trunk/Payments.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
trunk/SelectCreditItems.php
trunk/StockCategories.php
trunk/StockLocTransferReceive.php
trunk/Stocks.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/SupplierTenderCreate.php
trunk/WorkOrderEntry.php
trunk/reportwriter/install/ReportListForm.php
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DailyBankTransactions.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -12,7 +12,8 @@
</p>';
if (!isset($_POST['Show'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>';
+ 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">';
@@ -54,18 +55,19 @@
}
echo '<tr>
<td>' . _('Transactions Dated From') . ':</td>
- <td><input type="text" name="FromTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' .
+ <td><input type="text" name="FromTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' .
date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
<tr>
<td>' . _('Transactions Dated To') . ':</td>
- <td><input type="text" name="ToTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
+ <td><input type="text" name="ToTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
</table>
<br />
<div class="centre">
<input type="submit" name="Show" value="' . _('Show transactions'). '" />
</div>
+ </div>
</form>';
} else {
$SQL = "SELECT bankaccountname,
@@ -104,7 +106,7 @@
$BankDetailRow = DB_fetch_array($BankResult);
echo '<table class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</font></th>
+ <th colspan="8"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th>
</tr>
<tr>
<th>' . ('Date') . '</th>
@@ -139,9 +141,11 @@
echo '</table>';
} //end if no bank trans in the range to show
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>';
+ 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 '<br /><div class="centre"><input type="submit" name="Return" value="' . _('Select Another Date'). '" /></div>';
+ echo '</div>';
echo '</form>';
}
include('includes/footer.inc');
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DailySalesInquiry.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -11,6 +11,7 @@
<br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset($_POST['MonthToShow'])){
@@ -62,6 +63,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowResults" value="' . _('Show Daily Sales For The Selected Month') . '" />
</div>
+ </div>
</form>
<br />';
/*Now get and display the sales data returned */
Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DebtorsAtPeriodEnd.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -130,11 +130,12 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ <div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr>
- <td>' . _('From Customer Code') .':</font></td>
+ <td>' . _('From Customer Code') .':</td>
<td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1" /></td>
</tr>
<tr>
@@ -162,6 +163,7 @@
<div class="centre">
<input tabindex="5" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DeliveryDetails.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -255,8 +255,8 @@
if(isset($_POST['MakeRecurringOrder']) AND ! $InputErrors){
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
- prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $rootpath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">'. _('click here') .'</a> '. _('to continue'),'info');
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
+ prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $rootpath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">'. _('click here') .'</a> '. _('to continue'),'info');
include('includes/footer.inc');
exit;
}
@@ -276,7 +276,7 @@
if ($InputErrors ==0) {
$OK_to_PROCESS = 1;
}
- If ($_POST['FreightCost'] != $OldFreightCost && $_SESSION['DoFreightCalc']==True){
+ If ($_POST['FreightCost'] != $OldFreightCost AND $_SESSION['DoFreightCalc']==True){
$OK_to_PROCESS = 0;
prnMsg(_('The freight charge has been updated') . '. ' . _('Please reconfirm that the order and the freight charges are acceptable and then confirm the order again if OK') .' <br /> '. _('The new freight cost is') .' ' . $_POST['FreightCost'] . ' ' . _('and the previously calculated freight cost was') .' '. $OldFreightCost,'warn');
} else {
@@ -295,7 +295,7 @@
$myrow = DB_fetch_array($TermsResult);
- if ($myrow['daysbeforedue']==0 && $myrow['dayinfollowingmonth']==0){
+ if ($myrow['daysbeforedue']==0 AND $myrow['dayinfollowingmonth']==0){
/* THIS IS A CASH SALE NEED TO GO OFF TO 3RD PARTY SITE SENDING MERCHANT ACCOUNT DETAILS AND CHECK FOR APPROVAL FROM 3RD PARTY SITE BEFORE CONTINUING TO PROCESS THE ORDER
@@ -311,7 +311,7 @@
} #end if else freight charge not altered
} #end if process order
-if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]==0){
+if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]==0){
/* finally write the order header to the database and then the order line details */
@@ -572,16 +572,16 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td>
</tr>';
echo '</table>';
@@ -591,20 +591,20 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
- <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Landscape)') .'</a></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Landscape)') .'</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Portrait)') .'</a></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Portrait)') .'</a></td>
</tr>
</table>';
}
echo '<br /><table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="" /></td>
- <td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td>
+ <td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td>
</tr>
</table>';
} else {
@@ -617,7 +617,7 @@
include('includes/footer.inc');
exit;
-} elseif (isset($OK_to_PROCESS) and $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]!=0){
+} elseif (isset($OK_to_PROCESS) AND ($OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]!=0)){
/* update the order header then update the old order line details and insert the new lines */
@@ -787,15 +787,15 @@
<table class="selection">
<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td>
+ <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
+ <td><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td>
- <td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td>
+ <td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td>
</tr>';
echo '<tr>
<td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="" /></td>
@@ -811,20 +811,21 @@
if (isset($_SESSION['Items'.$identifier]->SpecialInstructions) and mb_strlen($_SESSION['Items'.$identifier]->SpecialInstructions)>0) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'info');
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details');
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details') . '</p>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . '<br />';
echo '</b> ' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></p>';
echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Display the order with or without discount depending on access level*/
if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
- echo '<table cellpading="2" colspan="7">';
+ echo '<table>';
if ($_SESSION['Items'.$identifier]->Quotation==1){
echo '<tr><th colspan="7">'._('Quotation Summary').'</th></tr>';
@@ -1082,7 +1083,7 @@
echo '<option selected="selected" value="1">' . _('No') . '</option>';
echo '</select> '. _('Last printed') .': ' . ConvertSQLDate($_SESSION['DatePackingSlipPrinted']) . '</td></tr>';
} else {
- echo '<input type="hidden" name="ReprintPackingSlip" value="0" />';
+ echo '<tr><td><input type="hidden" name="ReprintPackingSlip" value="0" /></td></tr>';
}
echo '<tr>
@@ -1090,9 +1091,9 @@
<td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
if ($_SESSION['DoFreightCalc']==true){
- echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>
- </tr>';
+ echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>';
}
+echo '</tr>';
if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
@@ -1141,6 +1142,8 @@
echo '<br /><input type="submit" name="ProcessOrder" value="' . _('Commit Order Changes') . '" />';
}
-echo '</div></form>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/Departments.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -27,7 +27,7 @@
if (ContainsIllegalCharacters($_POST['DepartmentName'])) {
$InputError = 1;
- prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
+ prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
}
if (trim($_POST['DepartmentName']) == '') {
$InputError = 1;
@@ -111,6 +111,7 @@
$result = DB_query($sql,$db);
}
prnMsg($msg,'success');
+ echo '<br />';
}
unset ($SelectedDepartmentID);
unset ($_POST['SelectedDepartmentID']);
@@ -183,7 +184,7 @@
echo '<td>' . $myrow['description'] . '</td>
<td>' . $myrow['authoriser'] . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>
</tr>';
} //END WHILE LIST LOOP
@@ -200,6 +201,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($SelectedDepartmentID)) {
@@ -252,6 +254,7 @@
echo '<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/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DiscountCategories.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -65,7 +65,8 @@
}
if (isset($_POST['selectchoice'])) {
- echo '<form name="update" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form id="update" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT DISTINCT discountcategory FROM stockmaster WHERE discountcategory <>''";
@@ -73,7 +74,7 @@
if (DB_num_rows($result) > 0) {
echo '<table class="selection"><tr><td>'. _('Discount Category Code') .': </td>';
- echo '<td><select name="DiscCat" onChange="ReloadForm(update.select)">';
+ echo '<td><select name="DiscCat" onchange="ReloadForm(update.select)">';
while ($myrow = DB_fetch_array($result)){
if ($myrow['discountcategory']==$_POST['DiscCat']){
@@ -81,7 +82,6 @@
} else {
echo '<option value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
}
- echo '</option>';
}
echo '</select></td>';
@@ -90,8 +90,11 @@
</table>
<br />';
}
+ echo '</div>
+ </form>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="ChooseOption" value="'.$_POST['ChooseOption'].'" />';
echo '<input type="hidden" name="selectchoice" value="'.$_POST['selectchoice'].'" />';
@@ -171,7 +174,8 @@
echo '</select></td></tr></table>';
echo '<br /><div class="centre"><input type="submit" name="SubmitCategory" value="'. _('Update Items') .'" /></div>';
}
- echo '</form>';
+ echo '</div>
+ </form>';
if (! isset($_POST['DiscCat'])){ /*set DiscCat to something to show results for first cat defined */
@@ -212,11 +216,11 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
+ $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
printf('<td>%s</td>
<td>%s - %s</td>
- <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount category?') . '\');">'. _('Delete') .'</td>
+ <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount category?') . '\');">'. _('Delete') .'</a></td>
</tr>',
$myrow['discountcategory'],
$myrow['stockid'],
@@ -235,17 +239,20 @@
}
if (!isset($_POST['selectchoice'])) {
- echo '<form method="post" name="choose" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" id="choose" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<tr><td>'._('Update discount category for').'</td>';
- echo '<td><select name="ChooseOption" onChange="ReloadForm(choose.selectchoice)">';
+ echo '<td><select name="ChooseOption" onchange="ReloadForm(choose.selectchoice)">';
echo '<option value="1">'._('a single stock item').'</option>';
echo '<option value="2">'._('a complete stock category').'</option>';
echo '</select></td></tr>
</table>
<br />';
echo '<div class="centre"><input type="submit" name="selectchoice" value="'._('Select').'" /></div>';
+ echo '</div>
+ </form>';
}
include('includes/footer.inc');
Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/DiscountMatrix.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -82,6 +82,7 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -105,7 +106,7 @@
}
}
-echo '</select>';
+echo '</select></td></tr>';
$sql = "SELECT DISTINCT discountcategory FROM stockmaster WHERE discountcategory <>''";
@@ -122,9 +123,9 @@
echo '<option value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
}
}
- echo '</select></td>';
+ echo '</select></td></tr>';
} else {
- echo '<input type="hidden" name="DiscountCategory" value="" />';
+ echo '<tr><td><input type="hidden" name="DiscountCategory" value="" /></td></tr>';
}
echo '<tr>
@@ -173,13 +174,13 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&DiscountCategory=' . $myrow['discountcategory'] . '&QuantityBreak=' . $myrow['quantitybreak'];
+ $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&DiscountCategory=' . $myrow['discountcategory'] . '&QuantityBreak=' . $myrow['quantitybreak'];
printf('<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount matrix record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount matrix record?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['sales_type'],
$myrow['discountcategory'],
@@ -190,7 +191,8 @@
}
echo '</table>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/ExchangeRateTrend.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -32,7 +32,7 @@
// CurrencyToShow Currency Picker
- echo '<tr><td><select name="CurrencyToShow" onChange="ReloadForm(update.submit)">';
+ echo '<tr><td><select name="CurrencyToShow" onchange="ReloadForm(update.submit)">';
DB_data_seek($result,0);
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/FixedAssetTransfer.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -129,7 +129,7 @@
<td class="number">'.locale_number_format($myrow['cost'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
<td class="number">'.locale_number_format($myrow['accumdepn'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
<td>'.$myrow['locationdescription'].'</td>';
- echo '<td><select name="Location'.$myrow['assetid'].'" onChange="ReloadForm(Move'.$myrow['assetid'].')">';
+ echo '<td><select name="Location'.$myrow['assetid'].'" onchange="ReloadForm(Move'.$myrow['assetid'].')">';
echo '<option></option>';
while ($LocationRow=DB_fetch_array($LocationResult)) {
if ($LocationRow['locationid']==$myrow['location']) {
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/GLBudgets.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -35,7 +35,7 @@
echo '<br />
<tr>
<td>'. _('Select GL Account'). ':</td>
- <td><select name="SelectedAccount" onChange="ReloadForm(selectaccount.Select)">';
+ <td><select name="SelectedAccount" onchange="ReloadForm(selectaccount.Select)">';
$SQL = "SELECT accountcode,
accountname
@@ -221,7 +221,7 @@
<td></td>
<td><input class="number" type="text" size="14" name="AnnualAmountTY" value="0.00" /></td>
<td></td>
- <td><input onChange="numberFormat(this,2)" class="number" type="text" size="14" name="AnnualAmount" value="0.00" /></td>
+ <td><input onchange="numberFormat(this,2)" class="number" type="text" size="14" name="AnnualAmount" value="0.00" /></td>
<td><input type="submit" name="Apportion" value="' . _('Apportion Budget') . '" /></td>
</tr>
</table>';
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-03-11 21:29:58 UTC (rev 5064)
+++ trunk/GLJournal.php 2012-03-11 22:24:58 UTC (rev 5065)
@@ -318,7 +318,7 @@
if (!isset($_POST['GLManualCode'])) {
$_POST['GLManualCode']='';
}
-echo '<td><input class="number" type="text" name="GLManualCode" maxlength="12" size="12" onChange="inArray(this.value, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'" /></td>';
+echo '<td><input class="number" type="text" name="GLManualCode" maxlength="12" size="12" onchange="inArray(this.value, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'" /></td>';
$sql="SELECT accountcode,
accountname
@@ -326,7 +326,7 @@
ORDER BY accountcode";
$result=DB_query($sql, $db);
-echo '<td><select name="GLCode" onChange="return assignComboToInput(this,'.'GLManualCode'.')">';
+echo '<td><select name="GLCode" onchange="return assignComboToInput(this,'.'GLManualCode'.')">';
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
@@ -350,11 +350,11 @@
echo '</tr>
<tr>
<th>' . _('Debit') . '</th>
- <td><input type="text" class="number" name = "Debit" onChange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="number" name = "Debit" onchange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
</tr>
<tr>
<th>' . _('Credit') . '</th>
- <td><input type="text" class="number" Name = "Credit" onChange="eitherOr(this, '.'Debit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Credit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="numbe...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-16 22:34:11
|
Revision: 5105
http://web-erp.svn.sourceforge.net/web-erp/?rev=5105&view=rev
Author: vvs2012
Date: 2012-03-16 22:34:02 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/EDIMessageFormat.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/FTP_RadioBeacon.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLBudgets.php
trunk/POReport.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Items.php
trunk/Payments.php
trunk/RecurringSalesOrders.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SalesInquiry.php
trunk/SelectAsset.php
trunk/SelectOrderItems.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/StockAdjustments.php
trunk/StockCounts.php
trunk/StockLocStatus.php
trunk/StockLocTransferReceive.php
trunk/Z_ImportStocks.php
trunk/Z_UploadForm.php
Modified: trunk/EDIMessageFormat.php
===================================================================
--- trunk/EDIMessageFormat.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/EDIMessageFormat.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -98,11 +98,11 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p><table border="0" width="100%">
- <p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p>';
+echo '<br />
+ <p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
if (!isset($SelectedMessageLine)) {
@@ -124,7 +124,7 @@
$result = DB_query($sql,$db);
echo '<table class="selection">';
- echo '<tr><th colspan="5"><font size="3">' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</font></th></tr>';
+ echo '<tr><th colspan="5"><h3>' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</h3></th></tr>';
$TableHeader = '<tr>
<th>' . _('Section') . '</th>
<th>' . _('Sequence') . '</th>
@@ -147,8 +147,8 @@
printf('<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td>
- <td><a href="%s&delete=%s">' . _('Delete') . '</a></td>
+ <td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s&delete=%s">' . _('Delete') . '</a></td>
</tr>',
$myrow[1],
$myrow[2],
@@ -159,7 +159,7 @@
$myrow[0]);
} //END WHILE LIST LOOP
- echo '</table><p>';
+ echo '</table><br />';
if (DB_num_rows($result)==0){
echo '<div class="centre">
<input tabindex="1" type="submit" name="NewEDIInvMsg" value="' . _('Create New EDI Invoice Message From Default Template') . '" />
@@ -189,7 +189,7 @@
$_POST['SequenceNo'] = $myrow['sequenceno'];
$_POST['LineText'] = $myrow['linetext'];
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>';
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>';
echo '<input type="hidden" name="SelectedMessageLine" value="' . $SelectedMessageLine . '" />';
echo '<input type="hidden" name="MessageType" value="' . $myrow['messagetype'] . '" />';
@@ -247,7 +247,7 @@
} else {
echo '<div class="centre"><input tabindex="5" type="submit" name="submit" value="'. _('Enter Information'). '" /></div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/EmailCustTrans.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -35,7 +35,8 @@
include ('includes/header.inc');
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>';
+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="TransNo" value="' . $_GET['FromTransNo'] . '" />';
@@ -62,9 +63,12 @@
echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td>
<td><input type="text" name="EmailAddr" maxlength="60" size="60" value="' . $EmailAddress . '" /></td>
+ </tr>
</table>';
echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '" />';
-echo '</div></form>';
+echo '</div>
+ </div>
+ </form>';
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/ExchangeRateTrend.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -21,10 +21,11 @@
// SHOW OUR MAIN INPUT FORM
// ************************
- echo '<form method="post" name="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" id="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ 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/money_add.png" title="' .
- _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p>';
+ _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p></div>';
echo '<table>'; // First column
$SQL = "SELECT * FROM currencies";
@@ -48,7 +49,8 @@
echo '</table>'; /*close off the table in the third column */
- echo '<p><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /></div>';
+ echo '</div>';
echo '</form>';
// **************
@@ -59,9 +61,9 @@
$graph = $CurrencyToShow. '/' . $FunctionalCurrency . $graph;
$image = 'http://www.x-rates.com/d/' . $graph;
- echo '<p></div><table class="selection">';
- echo '<tr><th><div class="centre"><b><U>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></U></th></tr>';
- echo '<tr><td><img src=' . $image . ' alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
+ echo '<br /><table class="selection">';
+ echo '<tr><th><div class="centre"><b>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></div></th></tr>';
+ echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
echo '</table>';
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FTP_RadioBeacon.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -44,7 +44,7 @@
/*show a table of the orders returned by the SQL */
-echo '<table cellpadding="2" colspan="7" width="100%">';
+echo '<table cellpadding="2" width="100%">';
$TableHeader = '<tr>
<td class="tableheader">' . _('Modify') . '</td>
<td class="tableheader">' . _('Send to') . '<br />' . _('Radio Beacon') . '</td>
Modified: trunk/Factors.php
===================================================================
--- trunk/Factors.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/Factors.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -198,10 +198,11 @@
// its a new factor being added
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="FactorID" value="' . $FactorID .'" />
+ <input type="hidden" name="New" value="Yes" />
<table class="selection">
- <input type="hidden" name="New" value="Yes" />
<tr>
<td>' . _('Factor company Name') . ':</td>
<td><input tabindex="1" type="text" name="FactorName" size="42" maxlength="40" value="' .$_POST['FactorName'].'" /></td>
@@ -239,7 +240,7 @@
</tr>
<tr>
<td>' . _('Fax') . ':</td>
- <td><input tabindex="10" type="text" name="Fax" value="0" size="20" maxlength="25" value="' . $_POST['Fax'] .'" /></td>
+ <td><input tabindex="10" type="text" name="Fax" size="20" maxlength="25" value="' . $_POST['Fax'] .'" /></td>
</tr>
<tr>
<td>' . _('Email') . ':</td>
@@ -250,20 +251,23 @@
if (isset($_POST['Create'])) {
- echo '<p>
+ echo '<br />
<div class="centre">
<input tabindex="12" type="submit" name="Submit" value="' . _('Insert New Factor') . '" />
</div>
+ </div>
</form>';
} else if (isset($_POST['Amend'])) {
- echo '<p>
+ echo '<br />
<div class="centre">
<input tabindex="13" type="submit" name="Update" value="' . _('Update Factor') . '" />
- <p>';
+ <br />
+ <br />';
prnMsg ( _('There is no second warning if you hit the delete button below') . '. ' . _('However checks will be made to ensure there are no suppliers are using this factor before the deletion is processed'), 'warn');
- echo '<p>
+ echo '<br />
<input tabindex="14" type="submit" name="Delete" value="' . _('Delete Factor') . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this factoring company?') . '\');" />
</div>
+ </div>
</form>';
}
@@ -273,6 +277,7 @@
if (empty($FactorID) AND !isset($_POST['Create']) AND !isset($_POST['Amend'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="New" value="No" />';
@@ -330,11 +335,12 @@
</tr>';
} //end while loop
echo '</table>
- <p>
+ <br />
<div class="centre">
<br />
<input tabindex="3" type="submit" name="Create" value="' . _('Create New Factor') . '" />
</div>
+ </div>
</form>';
}
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetCategories.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -11,7 +11,8 @@
echo '<div class="centre">
<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Fixed Asset Categories') . '" alt="" />' . ' ' . $title . '
- </p>';
+ </p>
+ </div>';
if (isset($_GET['SelectedCategory'])){
$SelectedCategory = mb_strtoupper($_GET['SelectedCategory']);
@@ -162,7 +163,7 @@
<th>' . _('Cat Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Cost GL') . '</th>
- <th>' . _('P & L Depn GL') . '</th>
+ <th>' . _('P & L Depn GL') . '</th>
<th>' . _('Disposal GL') . '</th>
<th>' . _('Accum Depn GL') . '</th>
</tr>';
@@ -183,8 +184,8 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['categoryid'],
$myrow['categorydescription'],
@@ -198,7 +199,8 @@
$myrow['categoryid']);
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</table>
+ <br />';
}
//end of ifs and buts!
@@ -207,7 +209,8 @@
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' ._('Show All Fixed Asset Categories') . '</a></div>';
}
-echo '<form name="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<form id="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCategory) and !isset($_POST['submit'])) {
@@ -284,9 +287,9 @@
while ($myrow = DB_fetch_array($BSAccountsResult)){
if (isset($_POST['CostAct']) and $myrow['accountcode']==$_POST['CostAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
}
} //end while loop
echo '</select></td>
@@ -297,9 +300,9 @@
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['DepnAct']) and $myrow['accountcode']==$_POST['DepnAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
}
} //end while loop
echo '</select></td>
@@ -311,9 +314,9 @@
<td><select name="DisposalAct">';
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['DisposalAct']) and $myrow['accountcode']==$_POST['DisposalAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
echo '</select></td>
@@ -327,9 +330,9 @@
while ($myrow = DB_fetch_array($BSAccountsResult)) {
if (isset($_POST['AccumDepnAct']) and $myrow['accountcode']==$_POST['AccumDepnAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -343,6 +346,7 @@
echo '<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetDepreciation.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -80,7 +80,7 @@
$PeriodNo = GetPeriod($_POST['ProcessDate'],$db);
}
-echo '<p></p><table>';
+echo '<br /><table>';
$Heading = '<tr>
<th>' . _('Asset ID') . '</th>
<th>' . _('Description') . '</th>
@@ -257,7 +257,7 @@
echo '</table>
<hr />
- <p />';
+ <br />';
if (isset($_POST['CommitDepreciation']) AND $InputError==false){
$result = DB_Txn_Commit($db);
@@ -267,11 +267,11 @@
/*And post the journal too */
include ('includes/GLPostings.inc');
} else {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<p />
+ echo '<br />
<table class="selection" width="30%">
- <tr></tr>
<tr>';
if ($AllowUserEnteredProcessDate){
echo '<td>'._('Date to Process Depreciation'). ':</td>
@@ -284,6 +284,7 @@
</tr>
</table>
<br />
+ </div>
</form>';
}
include('includes/footer.inc');
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetItems.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -380,9 +380,10 @@
} /* end if delete asset */
$result = DB_Txn_Commit($db);
-echo '<form name="AssetForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
- <table class="selection">';
+echo '<form id="AssetForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ <div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<table class="selection">';
if (!isset($AssetID) OR $AssetID=='') {
@@ -390,7 +391,7 @@
/*If the page was called without $AssetID passed to page then assume a new asset is to be entered other wise the form showing the fields with the existing entries against the asset will show for editing with a hidden AssetID field. New is set to flag that the page may have called itself and still be entering a new asset, in which case the page needs to know not to go looking up details for an existing asset*/
$New = 1;
- echo '<input type="hidden" name="New" value="" /><br />';
+ echo '<tr><td><input type="hidden" name="New" value="" /></td></tr>';
$_POST['LongDescription'] = '';
$_POST['Description'] = '';
@@ -434,14 +435,14 @@
<td>' . _('Asset Code') . ':</td>
<td>' . $AssetID . '</td>
</tr>';
- echo '<input type="Hidden" name="AssetID" value="'.$AssetID.'"/>';
+ echo '<tr><td><input type="hidden" name="AssetID" value="'.$AssetID.'"/></td></tr>';
} else { // some changes were made to the data so don't re-set form variables to DB ie the code above
echo '<tr>
<td>' . _('Asset Code') . ':</td>
<td>' . $AssetID . '</td>
</tr>';
- echo '<input type="Hidden" name="AssetID" value="' . $AssetID . '"/>';
+ echo '<tr><td><input type="hidden" name="AssetID" value="' . $AssetID . '"/></td></tr>';
}
if (isset($_POST['Description'])) {
@@ -631,6 +632,7 @@
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetLocations.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -104,14 +104,15 @@
$ParentResult=DB_query($ParentSql, $db);
$ParentRow=DB_fetch_array($ParentResult);
echo '<td>' . $ParentRow['locationdescription'] . '</td>
- <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>';
+ <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</a></td></tr>';
}
echo '</table>
<br />';
-echo '<form name="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+echo '<form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<th style="text-align:left">'._('Location ID').'</th>';
if (isset($_GET['SelectedLocation'])) {
@@ -156,6 +157,7 @@
echo '<input type="submit" name="submit" value="' . _('Enter Information') . '" />';
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetRegister.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -73,8 +73,9 @@
} elseif (isset($_POST['csv'])) {
$csv_output = "'Asset ID','Description','Serial Number','Location','Date Acquired','Cost B/Fwd','Period Additions','Depn B/Fwd','Period Depreciation','Cost C/Fwd', 'Accum Depn C/Fwd','NBV','Disposal Value'\n";
} else {
- echo '<form name="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '"><table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">
+ <div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<div class="centre">' ._('From') . ':' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate'] . '</div>';
echo '<br />
<table width="80%" cellspacing="1" class="selection">
@@ -219,11 +220,6 @@
header('Location: ' .$_SESSION['reports_dir'] . '/FixedAssetRegister_' . Date('Y-m-d') .'.csv');
} else {
- echo '<input type="hidden" name="FromDate" value="' . $_POST['FromDate'] . '" />';
- echo '<input type="hidden" name="ToDate" value="' . $_POST['ToDate'] . '" />';
- echo '<input type="hidden" name="AssetCategory" value="' . $_POST['AssetCategory'] . '" />';
- echo '<input type="hidden" name="AssetID" value="' . $_POST['AssetID'] . '" />';
- echo '<input type="hidden" name="AssetLocation" value="' . $_POST['AssetLocation'] . '" />';
//Total Values
echo '<tr><th style="vertical-align:top" colspan="5">' . _('TOTAL') . '</th>';
echo '<th style="text-align:right">' . locale_number_format($TotalCostBfwd, $_SESSION['CompanyRecord']['decimalplaces']) . '</th>';
@@ -235,16 +231,28 @@
echo '<th style="text-align:right">' . locale_number_format($TotalNBV, $_SESSION['CompanyRecord']['decimalplaces']) . '</th>';
echo '<th style="text-align:right">' . locale_number_format($TotalDisposals, $_SESSION['CompanyRecord']['decimalplaces']) . '</th></tr>';
echo '</table>';
+
+ echo '<input type="hidden" name="FromDate" value="' . $_POST['FromDate'] . '" />';
+ echo '<input type="hidden" name="ToDate" value="' . $_POST['ToDate'] . '" />';
+ echo '<input type="hidden" name="AssetCategory" value="' . $_POST['AssetCategory'] . '" />';
+ echo '<input type="hidden" name="AssetID" value="' . $_POST['AssetID'] . '" />';
+ echo '<input type="hidden" name="AssetLocation" value="' . $_POST['AssetLocation'] . '" />';
+
echo '<br /><div class="centre"><input type="submit" name="pdf" value="' . _('Print as a pdf') . '" /> ';
- echo '<input type="submit" name="csv" value="' . _('Print as CSV') . '" /></div></form>';
+ echo '<input type="submit" name="csv" value="' . _('Print as CSV') . '" />
+ </div>
+ </div>
+ </form>';
}
} else {
include ('includes/header.inc');
- echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
$result = DB_query('SELECT categoryid,categorydescription FROM fixedassetcategories', $db);
- echo '<form name="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"><table class="selection">';
+ echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr>
<th>' . _('Asset Category') . '</th>
<td><select name="AssetCategory">
@@ -310,6 +318,7 @@
<input type="submit" name="pdf" value="' . _('Print as a pdf') . '" />
<input type="submit" name = "csv" value="' . _('Print as CSV') . '" />
</div>
+ </div>
</form>';
}
include ('includes/footer.inc');
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetTransfer.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -27,6 +27,7 @@
$sql="SELECT categoryid, categorydescription FROM fixedassetcategories";
$result=DB_query($sql, $db);
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/magnifier.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title . '</p>';
@@ -46,7 +47,7 @@
}
}
- echo '</select>';
+ echo '</select></td>';
echo '<td>'. _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>';
@@ -69,7 +70,10 @@
echo '</td></tr></table><br />';
- echo '<div class="centre"><input type="submit" name="Search" value="'. _('Search Now') . '" /></div></form><br />';
+ echo '<div class="centre"><input type="submit" name="Search" value="'. _('Search Now') . '" /></div>
+ </div>
+ </form>
+ <br />';
}
if (isset($_POST['Search'])) {
@@ -105,8 +109,9 @@
AND fixedassets.serialno " . LIKE . "'".$_POST['SerialNumber']."'";
$Result=DB_query($sql, $db);
echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ <div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr>
<th>'._('Asset ID') . '</th>
<th>' . _('Description') . '</th>
@@ -147,7 +152,9 @@
echo '<td><input type="submit" name="Move'.$myrow['assetid'].'" value="Move" /></td>';
echo '</tr>';
}
- echo '</table></form>';
+ echo '</table>
+ </div>
+ </form>';
}
include('includes/footer.inc');
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FormDesigner.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -128,6 +128,7 @@
if (empty($_POST['FormName'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form method="post" id="ChooseForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr>';
echo '<td>'. _('Select the form to edit') .'</td><td><select name="FormName">';
@@ -144,6 +145,7 @@
}
echo '</select></td></tr></table>';
echo '<br /><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Edit Form Layout') . '" /></div>';
+ echo '</div>';
echo '</form>';
include('includes/footer.inc');
exit;
@@ -153,16 +155,17 @@
if (empty($_POST['preview'])) {
$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$_POST['FormName']);
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . '';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . '</p>';
echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layo...
[truncated message content] |
|
From: <vv...@us...> - 2012-03-16 22:34:11
|
Revision: 5105
http://web-erp.svn.sourceforge.net/web-erp/?rev=5105&view=rev
Author: vvs2012
Date: 2012-03-16 22:34:02 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/EDIMessageFormat.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/FTP_RadioBeacon.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLBudgets.php
trunk/POReport.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Items.php
trunk/Payments.php
trunk/RecurringSalesOrders.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SalesInquiry.php
trunk/SelectAsset.php
trunk/SelectOrderItems.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/StockAdjustments.php
trunk/StockCounts.php
trunk/StockLocStatus.php
trunk/StockLocTransferReceive.php
trunk/Z_ImportStocks.php
trunk/Z_UploadForm.php
Modified: trunk/EDIMessageFormat.php
===================================================================
--- trunk/EDIMessageFormat.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/EDIMessageFormat.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -98,11 +98,11 @@
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p><table border="0" width="100%">
- <p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p>';
+echo '<br />
+ <p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
if (!isset($SelectedMessageLine)) {
@@ -124,7 +124,7 @@
$result = DB_query($sql,$db);
echo '<table class="selection">';
- echo '<tr><th colspan="5"><font size="3">' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</font></th></tr>';
+ echo '<tr><th colspan="5"><h3>' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</h3></th></tr>';
$TableHeader = '<tr>
<th>' . _('Section') . '</th>
<th>' . _('Sequence') . '</th>
@@ -147,8 +147,8 @@
printf('<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td>
- <td><a href="%s&delete=%s">' . _('Delete') . '</a></td>
+ <td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s&delete=%s">' . _('Delete') . '</a></td>
</tr>',
$myrow[1],
$myrow[2],
@@ -159,7 +159,7 @@
$myrow[0]);
} //END WHILE LIST LOOP
- echo '</table><p>';
+ echo '</table><br />';
if (DB_num_rows($result)==0){
echo '<div class="centre">
<input tabindex="1" type="submit" name="NewEDIInvMsg" value="' . _('Create New EDI Invoice Message From Default Template') . '" />
@@ -189,7 +189,7 @@
$_POST['SequenceNo'] = $myrow['sequenceno'];
$_POST['LineText'] = $myrow['linetext'];
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>';
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>';
echo '<input type="hidden" name="SelectedMessageLine" value="' . $SelectedMessageLine . '" />';
echo '<input type="hidden" name="MessageType" value="' . $myrow['messagetype'] . '" />';
@@ -247,7 +247,7 @@
} else {
echo '<div class="centre"><input tabindex="5" type="submit" name="submit" value="'. _('Enter Information'). '" /></div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/EmailCustTrans.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -35,7 +35,8 @@
include ('includes/header.inc');
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>';
+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="TransNo" value="' . $_GET['FromTransNo'] . '" />';
@@ -62,9 +63,12 @@
echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td>
<td><input type="text" name="EmailAddr" maxlength="60" size="60" value="' . $EmailAddress . '" /></td>
+ </tr>
</table>';
echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '" />';
-echo '</div></form>';
+echo '</div>
+ </div>
+ </form>';
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/ExchangeRateTrend.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -21,10 +21,11 @@
// SHOW OUR MAIN INPUT FORM
// ************************
- echo '<form method="post" name="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" id="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ 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/money_add.png" title="' .
- _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p>';
+ _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p></div>';
echo '<table>'; // First column
$SQL = "SELECT * FROM currencies";
@@ -48,7 +49,8 @@
echo '</table>'; /*close off the table in the third column */
- echo '<p><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /></div>';
+ echo '</div>';
echo '</form>';
// **************
@@ -59,9 +61,9 @@
$graph = $CurrencyToShow. '/' . $FunctionalCurrency . $graph;
$image = 'http://www.x-rates.com/d/' . $graph;
- echo '<p></div><table class="selection">';
- echo '<tr><th><div class="centre"><b><U>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></U></th></tr>';
- echo '<tr><td><img src=' . $image . ' alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
+ echo '<br /><table class="selection">';
+ echo '<tr><th><div class="centre"><b>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></div></th></tr>';
+ echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
echo '</table>';
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FTP_RadioBeacon.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -44,7 +44,7 @@
/*show a table of the orders returned by the SQL */
-echo '<table cellpadding="2" colspan="7" width="100%">';
+echo '<table cellpadding="2" width="100%">';
$TableHeader = '<tr>
<td class="tableheader">' . _('Modify') . '</td>
<td class="tableheader">' . _('Send to') . '<br />' . _('Radio Beacon') . '</td>
Modified: trunk/Factors.php
===================================================================
--- trunk/Factors.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/Factors.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -198,10 +198,11 @@
// its a new factor being added
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="FactorID" value="' . $FactorID .'" />
+ <input type="hidden" name="New" value="Yes" />
<table class="selection">
- <input type="hidden" name="New" value="Yes" />
<tr>
<td>' . _('Factor company Name') . ':</td>
<td><input tabindex="1" type="text" name="FactorName" size="42" maxlength="40" value="' .$_POST['FactorName'].'" /></td>
@@ -239,7 +240,7 @@
</tr>
<tr>
<td>' . _('Fax') . ':</td>
- <td><input tabindex="10" type="text" name="Fax" value="0" size="20" maxlength="25" value="' . $_POST['Fax'] .'" /></td>
+ <td><input tabindex="10" type="text" name="Fax" size="20" maxlength="25" value="' . $_POST['Fax'] .'" /></td>
</tr>
<tr>
<td>' . _('Email') . ':</td>
@@ -250,20 +251,23 @@
if (isset($_POST['Create'])) {
- echo '<p>
+ echo '<br />
<div class="centre">
<input tabindex="12" type="submit" name="Submit" value="' . _('Insert New Factor') . '" />
</div>
+ </div>
</form>';
} else if (isset($_POST['Amend'])) {
- echo '<p>
+ echo '<br />
<div class="centre">
<input tabindex="13" type="submit" name="Update" value="' . _('Update Factor') . '" />
- <p>';
+ <br />
+ <br />';
prnMsg ( _('There is no second warning if you hit the delete button below') . '. ' . _('However checks will be made to ensure there are no suppliers are using this factor before the deletion is processed'), 'warn');
- echo '<p>
+ echo '<br />
<input tabindex="14" type="submit" name="Delete" value="' . _('Delete Factor') . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this factoring company?') . '\');" />
</div>
+ </div>
</form>';
}
@@ -273,6 +277,7 @@
if (empty($FactorID) AND !isset($_POST['Create']) AND !isset($_POST['Amend'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="New" value="No" />';
@@ -330,11 +335,12 @@
</tr>';
} //end while loop
echo '</table>
- <p>
+ <br />
<div class="centre">
<br />
<input tabindex="3" type="submit" name="Create" value="' . _('Create New Factor') . '" />
</div>
+ </div>
</form>';
}
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetCategories.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -11,7 +11,8 @@
echo '<div class="centre">
<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Fixed Asset Categories') . '" alt="" />' . ' ' . $title . '
- </p>';
+ </p>
+ </div>';
if (isset($_GET['SelectedCategory'])){
$SelectedCategory = mb_strtoupper($_GET['SelectedCategory']);
@@ -162,7 +163,7 @@
<th>' . _('Cat Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Cost GL') . '</th>
- <th>' . _('P & L Depn GL') . '</th>
+ <th>' . _('P & L Depn GL') . '</th>
<th>' . _('Disposal GL') . '</th>
<th>' . _('Accum Depn GL') . '</th>
</tr>';
@@ -183,8 +184,8 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['categoryid'],
$myrow['categorydescription'],
@@ -198,7 +199,8 @@
$myrow['categoryid']);
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</table>
+ <br />';
}
//end of ifs and buts!
@@ -207,7 +209,8 @@
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' ._('Show All Fixed Asset Categories') . '</a></div>';
}
-echo '<form name="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<form id="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCategory) and !isset($_POST['submit'])) {
@@ -284,9 +287,9 @@
while ($myrow = DB_fetch_array($BSAccountsResult)){
if (isset($_POST['CostAct']) and $myrow['accountcode']==$_POST['CostAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
}
} //end while loop
echo '</select></td>
@@ -297,9 +300,9 @@
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['DepnAct']) and $myrow['accountcode']==$_POST['DepnAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>';
}
} //end while loop
echo '</select></td>
@@ -311,9 +314,9 @@
<td><select name="DisposalAct">';
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['DisposalAct']) and $myrow['accountcode']==$_POST['DisposalAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
echo '</select></td>
@@ -327,9 +330,9 @@
while ($myrow = DB_fetch_array($BSAccountsResult)) {
if (isset($_POST['AccumDepnAct']) and $myrow['accountcode']==$_POST['AccumDepnAct']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -343,6 +346,7 @@
echo '<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetDepreciation.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -80,7 +80,7 @@
$PeriodNo = GetPeriod($_POST['ProcessDate'],$db);
}
-echo '<p></p><table>';
+echo '<br /><table>';
$Heading = '<tr>
<th>' . _('Asset ID') . '</th>
<th>' . _('Description') . '</th>
@@ -257,7 +257,7 @@
echo '</table>
<hr />
- <p />';
+ <br />';
if (isset($_POST['CommitDepreciation']) AND $InputError==false){
$result = DB_Txn_Commit($db);
@@ -267,11 +267,11 @@
/*And post the journal too */
include ('includes/GLPostings.inc');
} else {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<p />
+ echo '<br />
<table class="selection" width="30%">
- <tr></tr>
<tr>';
if ($AllowUserEnteredProcessDate){
echo '<td>'._('Date to Process Depreciation'). ':</td>
@@ -284,6 +284,7 @@
</tr>
</table>
<br />
+ </div>
</form>';
}
include('includes/footer.inc');
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetItems.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -380,9 +380,10 @@
} /* end if delete asset */
$result = DB_Txn_Commit($db);
-echo '<form name="AssetForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
- <table class="selection">';
+echo '<form id="AssetForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ <div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<table class="selection">';
if (!isset($AssetID) OR $AssetID=='') {
@@ -390,7 +391,7 @@
/*If the page was called without $AssetID passed to page then assume a new asset is to be entered other wise the form showing the fields with the existing entries against the asset will show for editing with a hidden AssetID field. New is set to flag that the page may have called itself and still be entering a new asset, in which case the page needs to know not to go looking up details for an existing asset*/
$New = 1;
- echo '<input type="hidden" name="New" value="" /><br />';
+ echo '<tr><td><input type="hidden" name="New" value="" /></td></tr>';
$_POST['LongDescription'] = '';
$_POST['Description'] = '';
@@ -434,14 +435,14 @@
<td>' . _('Asset Code') . ':</td>
<td>' . $AssetID . '</td>
</tr>';
- echo '<input type="Hidden" name="AssetID" value="'.$AssetID.'"/>';
+ echo '<tr><td><input type="hidden" name="AssetID" value="'.$AssetID.'"/></td></tr>';
} else { // some changes were made to the data so don't re-set form variables to DB ie the code above
echo '<tr>
<td>' . _('Asset Code') . ':</td>
<td>' . $AssetID . '</td>
</tr>';
- echo '<input type="Hidden" name="AssetID" value="' . $AssetID . '"/>';
+ echo '<tr><td><input type="hidden" name="AssetID" value="' . $AssetID . '"/></td></tr>';
}
if (isset($_POST['Description'])) {
@@ -631,6 +632,7 @@
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetLocations.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -104,14 +104,15 @@
$ParentResult=DB_query($ParentSql, $db);
$ParentRow=DB_fetch_array($ParentResult);
echo '<td>' . $ParentRow['locationdescription'] . '</td>
- <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>';
+ <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</a></td></tr>';
}
echo '</table>
<br />';
-echo '<form name="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+echo '<form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<th style="text-align:left">'._('Location ID').'</th>';
if (isset($_GET['SelectedLocation'])) {
@@ -156,6 +157,7 @@
echo '<input type="submit" name="submit" value="' . _('Enter Information') . '" />';
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetRegister.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -73,8 +73,9 @@
} elseif (isset($_POST['csv'])) {
$csv_output = "'Asset ID','Description','Serial Number','Location','Date Acquired','Cost B/Fwd','Period Additions','Depn B/Fwd','Period Depreciation','Cost C/Fwd', 'Accum Depn C/Fwd','NBV','Disposal Value'\n";
} else {
- echo '<form name="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '"><table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">
+ <div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<div class="centre">' ._('From') . ':' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate'] . '</div>';
echo '<br />
<table width="80%" cellspacing="1" class="selection">
@@ -219,11 +220,6 @@
header('Location: ' .$_SESSION['reports_dir'] . '/FixedAssetRegister_' . Date('Y-m-d') .'.csv');
} else {
- echo '<input type="hidden" name="FromDate" value="' . $_POST['FromDate'] . '" />';
- echo '<input type="hidden" name="ToDate" value="' . $_POST['ToDate'] . '" />';
- echo '<input type="hidden" name="AssetCategory" value="' . $_POST['AssetCategory'] . '" />';
- echo '<input type="hidden" name="AssetID" value="' . $_POST['AssetID'] . '" />';
- echo '<input type="hidden" name="AssetLocation" value="' . $_POST['AssetLocation'] . '" />';
//Total Values
echo '<tr><th style="vertical-align:top" colspan="5">' . _('TOTAL') . '</th>';
echo '<th style="text-align:right">' . locale_number_format($TotalCostBfwd, $_SESSION['CompanyRecord']['decimalplaces']) . '</th>';
@@ -235,16 +231,28 @@
echo '<th style="text-align:right">' . locale_number_format($TotalNBV, $_SESSION['CompanyRecord']['decimalplaces']) . '</th>';
echo '<th style="text-align:right">' . locale_number_format($TotalDisposals, $_SESSION['CompanyRecord']['decimalplaces']) . '</th></tr>';
echo '</table>';
+
+ echo '<input type="hidden" name="FromDate" value="' . $_POST['FromDate'] . '" />';
+ echo '<input type="hidden" name="ToDate" value="' . $_POST['ToDate'] . '" />';
+ echo '<input type="hidden" name="AssetCategory" value="' . $_POST['AssetCategory'] . '" />';
+ echo '<input type="hidden" name="AssetID" value="' . $_POST['AssetID'] . '" />';
+ echo '<input type="hidden" name="AssetLocation" value="' . $_POST['AssetLocation'] . '" />';
+
echo '<br /><div class="centre"><input type="submit" name="pdf" value="' . _('Print as a pdf') . '" /> ';
- echo '<input type="submit" name="csv" value="' . _('Print as CSV') . '" /></div></form>';
+ echo '<input type="submit" name="csv" value="' . _('Print as CSV') . '" />
+ </div>
+ </div>
+ </form>';
}
} else {
include ('includes/header.inc');
- echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
$result = DB_query('SELECT categoryid,categorydescription FROM fixedassetcategories', $db);
- echo '<form name="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"><table class="selection">';
+ echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr>
<th>' . _('Asset Category') . '</th>
<td><select name="AssetCategory">
@@ -310,6 +318,7 @@
<input type="submit" name="pdf" value="' . _('Print as a pdf') . '" />
<input type="submit" name = "csv" value="' . _('Print as CSV') . '" />
</div>
+ </div>
</form>';
}
include ('includes/footer.inc');
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FixedAssetTransfer.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -27,6 +27,7 @@
$sql="SELECT categoryid, categorydescription FROM fixedassetcategories";
$result=DB_query($sql, $db);
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/magnifier.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title . '</p>';
@@ -46,7 +47,7 @@
}
}
- echo '</select>';
+ echo '</select></td>';
echo '<td>'. _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>';
@@ -69,7 +70,10 @@
echo '</td></tr></table><br />';
- echo '<div class="centre"><input type="submit" name="Search" value="'. _('Search Now') . '" /></div></form><br />';
+ echo '<div class="centre"><input type="submit" name="Search" value="'. _('Search Now') . '" /></div>
+ </div>
+ </form>
+ <br />';
}
if (isset($_POST['Search'])) {
@@ -105,8 +109,9 @@
AND fixedassets.serialno " . LIKE . "'".$_POST['SerialNumber']."'";
$Result=DB_query($sql, $db);
echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ <div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
echo '<tr>
<th>'._('Asset ID') . '</th>
<th>' . _('Description') . '</th>
@@ -147,7 +152,9 @@
echo '<td><input type="submit" name="Move'.$myrow['assetid'].'" value="Move" /></td>';
echo '</tr>';
}
- echo '</table></form>';
+ echo '</table>
+ </div>
+ </form>';
}
include('includes/footer.inc');
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2012-03-13 08:29:08 UTC (rev 5104)
+++ trunk/FormDesigner.php 2012-03-16 22:34:02 UTC (rev 5105)
@@ -128,6 +128,7 @@
if (empty($_POST['FormName'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form method="post" id="ChooseForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr>';
echo '<td>'. _('Select the form to edit') .'</td><td><select name="FormName">';
@@ -144,6 +145,7 @@
}
echo '</select></td></tr></table>';
echo '<br /><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Edit Form Layout') . '" /></div>';
+ echo '</div>';
echo '</form>';
include('includes/footer.inc');
exit;
@@ -153,16 +155,17 @@
if (empty($_POST['preview'])) {
$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$_POST['FormName']);
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . '';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . '</p>';
echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layo...
[truncated message content] |
|
From: <tim...@us...> - 2012-03-19 07:11:05
|
Revision: 5108
http://web-erp.svn.sourceforge.net/web-erp/?rev=5108&view=rev
Author: tim_schofield
Date: 2012-03-19 07:10:58 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Remove illegal copyright assignments to prevent any legal problems
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/footer.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-19 01:18:09 UTC (rev 5107)
+++ trunk/doc/Change.log 2012-03-19 07:10:58 UTC (rev 5108)
@@ -1,4 +1,5 @@
webERP Change Log
+19/3/2012 Tim: Remove illegal copyright notices to prevent any legal problems.</p>
13/3/2012 Exson: Fixed that same parent and component but added in different Work Centers and Locations will display twice in BOMs.php. And fixed that to delete one line of same parents and component will delete all lines with same parents and components. Add ArrayUnique function to get unique array for multi-dimensional array.
13/3/2012 Exson: Correct mailing sending messages display error in PrintCustTransPortrait.php Reported by Thomas_lie
12/3/2012 Exson: Fixed freight cost over 1000 cannot be calculated correctly in ConfirmDispatch_Invoice.php reported by Craig Craven.
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-03-19 01:18:09 UTC (rev 5107)
+++ trunk/includes/footer.inc 2012-03-19 07:10:58 UTC (rev 5108)
@@ -10,7 +10,6 @@
echo '<td class="footer" style="text-align: right;width:33%">'.(strftime('%A')).', '.(date($_SESSION['DefaultDateFormat']).' | '.(strftime(($DefaultClock==12) ? '%I:%M %p' : '%H:%M'))).'</td>';
echo '</tr>';
-echo '<tr><td colspan="3" class="footer">' ._('Copyright') . ' © weberp.org 2003 - ' . date('Y') . '</td></tr>';
echo '<tr><td colspan="3" class="footer">webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . '</td></tr>';
// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
@@ -22,4 +21,4 @@
echo '</div>';
echo '</body>';
echo '</html>';
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-03-19 07:11:09
|
Revision: 5108
http://web-erp.svn.sourceforge.net/web-erp/?rev=5108&view=rev
Author: tim_schofield
Date: 2012-03-19 07:10:58 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Remove illegal copyright assignments to prevent any legal problems
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/footer.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-19 01:18:09 UTC (rev 5107)
+++ trunk/doc/Change.log 2012-03-19 07:10:58 UTC (rev 5108)
@@ -1,4 +1,5 @@
webERP Change Log
+19/3/2012 Tim: Remove illegal copyright notices to prevent any legal problems.</p>
13/3/2012 Exson: Fixed that same parent and component but added in different Work Centers and Locations will display twice in BOMs.php. And fixed that to delete one line of same parents and component will delete all lines with same parents and components. Add ArrayUnique function to get unique array for multi-dimensional array.
13/3/2012 Exson: Correct mailing sending messages display error in PrintCustTransPortrait.php Reported by Thomas_lie
12/3/2012 Exson: Fixed freight cost over 1000 cannot be calculated correctly in ConfirmDispatch_Invoice.php reported by Craig Craven.
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-03-19 01:18:09 UTC (rev 5107)
+++ trunk/includes/footer.inc 2012-03-19 07:10:58 UTC (rev 5108)
@@ -10,7 +10,6 @@
echo '<td class="footer" style="text-align: right;width:33%">'.(strftime('%A')).', '.(date($_SESSION['DefaultDateFormat']).' | '.(strftime(($DefaultClock==12) ? '%I:%M %p' : '%H:%M'))).'</td>';
echo '</tr>';
-echo '<tr><td colspan="3" class="footer">' ._('Copyright') . ' © weberp.org 2003 - ' . date('Y') . '</td></tr>';
echo '<tr><td colspan="3" class="footer">webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . '</td></tr>';
// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
@@ -22,4 +21,4 @@
echo '</div>';
echo '</body>';
echo '</html>';
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-30 08:26:47
|
Revision: 5167
http://web-erp.svn.sourceforge.net/web-erp/?rev=5167&view=rev
Author: ExsonQu
Date: 2012-03-30 08:26:37 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
30/3/2012 Richard Andreu Modified security role to order by role name instead of by roleid to make it more user friendly in WWW_Access.php and WWW_Users.php
Modified Paths:
--------------
trunk/WWW_Access.php
trunk/WWW_Users.php
Modified: trunk/WWW_Access.php
===================================================================
--- trunk/WWW_Access.php 2012-03-29 10:34:06 UTC (rev 5166)
+++ trunk/WWW_Access.php 2012-03-30 08:26:37 UTC (rev 5167)
@@ -100,7 +100,7 @@
$sql = "SELECT secroleid,
secrolename
FROM securityroles
- ORDER BY secroleid";
+ ORDER BY secrolename";
$result = DB_query($sql,$db);
echo '<table class="selection">';
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-03-29 10:34:06 UTC (rev 5166)
+++ trunk/WWW_Users.php 2012-03-30 08:26:37 UTC (rev 5167)
@@ -37,7 +37,7 @@
$sql = "SELECT secroleid,
secrolename
FROM securityroles
- ORDER BY secroleid";
+ ORDER BY secrolename";
$Sec_Result = DB_query($sql, $db);
$SecurityRoles = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-30 08:26:48
|
Revision: 5167
http://web-erp.svn.sourceforge.net/web-erp/?rev=5167&view=rev
Author: ExsonQu
Date: 2012-03-30 08:26:37 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
30/3/2012 Richard Andreu Modified security role to order by role name instead of by roleid to make it more user friendly in WWW_Access.php and WWW_Users.php
Modified Paths:
--------------
trunk/WWW_Access.php
trunk/WWW_Users.php
Modified: trunk/WWW_Access.php
===================================================================
--- trunk/WWW_Access.php 2012-03-29 10:34:06 UTC (rev 5166)
+++ trunk/WWW_Access.php 2012-03-30 08:26:37 UTC (rev 5167)
@@ -100,7 +100,7 @@
$sql = "SELECT secroleid,
secrolename
FROM securityroles
- ORDER BY secroleid";
+ ORDER BY secrolename";
$result = DB_query($sql,$db);
echo '<table class="selection">';
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-03-29 10:34:06 UTC (rev 5166)
+++ trunk/WWW_Users.php 2012-03-30 08:26:37 UTC (rev 5167)
@@ -37,7 +37,7 @@
$sql = "SELECT secroleid,
secrolename
FROM securityroles
- ORDER BY secroleid";
+ ORDER BY secrolename";
$Sec_Result = DB_query($sql, $db);
$SecurityRoles = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-31 14:33:30
|
Revision: 5177
http://web-erp.svn.sourceforge.net/web-erp/?rev=5177&view=rev
Author: ExsonQu
Date: 2012-03-31 14:33:23 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
31/3/2012: PakRichard: Fixed problem that on PCAssignCashToTab.php it should be used the decimal places of the currency of the tab, not the decimal places of the functional currency.The same in PcClaimExpensesFromTab.php
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
trunk/PcClaimExpensesFromTab.php
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2012-03-31 09:24:30 UTC (rev 5176)
+++ trunk/PcAssignCashToTab.php 2012-03-31 14:33:23 UTC (rev 5177)
@@ -1,380 +1,391 @@
-<?php
-/* $Id$*/
-
-include('includes/session.inc');
-$title = _('Assignment of Cash to Petty Cash Tab');
-include('includes/header.inc');
-
-if (isset($_POST['SelectedTabs'])){
- $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
-} elseif (isset($_GET['SelectedTabs'])){
- $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
-}
-
-if (isset($_POST['SelectedIndex'])){
- $SelectedIndex = $_POST['SelectedIndex'];
-} elseif (isset($_GET['SelectedIndex'])){
- $SelectedIndex = $_GET['SelectedIndex'];
-}
-
-if (isset($_POST['Days'])){
- $Days = $_POST['Days'];
-} elseif (isset($_GET['Days'])){
- $Days = $_GET['Days'];
-}
-
-if (isset($_POST['Cancel'])) {
- unset($SelectedTabs);
- unset($SelectedIndex);
- unset($Days);
- unset($_POST['Amount']);
- unset($_POST['Notes']);
- unset($_POST['Receipt']);
-}
-
-if (isset($_POST['process'])) {
- if ($SelectedTabs=='') {
- prnMsg(_('You Must First Select a Petty Cash Tab To Assign Cash'),'error');
- unset($SelectedTabs);
- }
-}
-
-if (isset($_POST['Go'])) {
- $InputError = 0;
- if ($Days<=0) {
- $InputError = 1;
- prnMsg(_('The number of days must be a positive number'),'error');
- $Days=30;
- }
-}
-
-if (isset($_POST['submit'])) {
- //initialise no input errors assumed initially before we test
- $InputError = 0;
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title. '</p>';
-
- /* actions to take once the user has clicked the submit button
- ie the page has called itself with some user input */
-
- $i=1;
-
- if ($_POST['Amount']==0) {
- $InputError = 1;
- prnMsg('<br />' . _('The Amount must be input'),'error');
- }
-
- $sqlLimit = "SELECT tablimit
- FROM pctabs
- WHERE tabcode='" . $SelectedTabs . "'";
-
- $ResultLimit = DB_query($sqlLimit,$db);
- $Limit=DB_fetch_array($ResultLimit);
-
- if (($_POST['CurrentAmount']+$_POST['Amount'])>$Limit['tablimit']){
- prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab'),'warning');
- }
-
- if ($InputError !=1 AND isset($SelectedIndex) ) {
-
- $sql = "UPDATE pcashdetails
- SET date = '".FormatDateForSQL($_POST['Date'])."',
- amount = '" . filter_number_format($_POST['Amount']) . "',
- authorized = '0000-00-00',
- notes = '" . $_POST['Notes'] . "',
- receipt = '" . $_POST['Receipt'] . "'
- WHERE counterindex = '" . $SelectedIndex . "'";
- $msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated');
-
- } elseif ($InputError !=1 ) {
- // Add new record on submit
- $sql = "INSERT INTO pcashdetails
- (counterindex,
- tabcode,
- date,
- codeexpense,
- amount,
- authorized,
- posted,
- notes,
- receipt)
- VALUES ('',
- '" . $_POST['SelectedTabs'] . "',
- '".FormatDateForSQL($_POST['Date'])."',
- 'ASSIGNCASH',
- '" . filter_number_format($_POST['Amount']) . "',
- authorized = '0000-00-00',
- '0',
- '" . $_POST['Notes'] . "',
- '" . $_POST['Receipt'] . "'
- )";
- $msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
- }
-
- if ( $InputError !=1) {
- //run the SQL from either of the above possibilites
- $result = DB_query($sql,$db);
- prnMsg($msg,'success');
- unset($_POST['SelectedExpense']);
- unset($_POST['Amount']);
- unset($_POST['Notes']);
- unset($_POST['Receipt']);
- unset($_POST['SelectedTabs']);
- unset($_POST['Date']);
- }
-
-} elseif ( isset($_GET['delete']) ) {
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="">' . ' ' . $title. '</p>';
- $sql="DELETE FROM pcashdetails
- WHERE counterindex='" . $SelectedIndex . "'";
- $ErrMsg = _('The assignment of cash record could not be deleted because');
- $result = DB_query($sql,$db,$ErrMsg);
- prnMsg(_('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been deleted') ,'success');
- unset($_GET['delete']);
-}
-
-if (!isset($SelectedTabs)){
-
- /* It could still be the second time the page has been run and a record has been selected for modification - SelectedTabs will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
- then none of the above are true and the list of sales types will be displayed with
- links to delete or edit each. These will call the same page again and allow update/input
- or deletion of the records*/
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title. '</p>';
-
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<p><table class="selection">'; //Main table
-
- echo '<tr><td>' . _('Petty Cash Tab To Assign Cash') . ':</td>
- <td><select name="SelectedTabs">';
-
- DB_free_result($result);
- $SQL = "SELECT tabcode
- FROM pctabs
- WHERE assigner='" . $_SESSION['UserID'] . "'
- ORDER BY tabcode";
-
- $result = DB_query($SQL,$db);
-
- while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
- }
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
- }
-
- echo '</select></td></tr>';
- echo '</td></tr></table>'; // close main table
- echo '<p>
- <div class="centre">
- <input type="submit" name="process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
- </div>';
- echo '</form>';
-}
-
-//end of ifs and buts!
-if (isset($_POST['process']) OR isset($SelectedTabs)) {
-
- if (!isset($_POST['submit'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title. '</p>';
- }
- echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Details Of Petty Cash Tab ') . '' .$SelectedTabs. '<a/></div>';
-
- if (! isset($_GET['edit']) OR isset ($_POST['GO'])){
-
- if (isset($_POST['Cancel'])) {
- unset($_POST['Amount']);
- unset($_POST['Date']);
- unset($_POST['Notes']);
- unset($_POST['Receipt']);
- }
-
- if(!isset ($Days)){
- $Days=30;
- }
- $sql = "SELECT * FROM pcashdetails
- WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
- ORDER BY date, counterindex ASC";
-
-
- $result = DB_query($sql,$db);
-
- echo '<table class="selection">';
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><th colspan="8">' . _('Detail Of PC Tab Movements For Last') .': ';
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' . _('Days');
- echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
- echo '</th></tr></form>';
- echo '<tr>
- <th>' . _('Date') . '</th>
- <th>' . _('Expense Code') . '</th>
- <th>' . _('Amount') . '</th>
- <th>' . _('Authorised') . '</th>
- <th>' . _('Notes') . '</th>
- <th>' . _('Receipt') . '</th>
- </tr>';
-
- $k=0; //row colour counter
-
- while ($myrow = DB_fetch_array($result)) {
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k=1;
- }
-
- $sqldes="SELECT description
- FROM pcexpenses
- WHERE codeexpense='". $myrow['3'] . "'";
-
- $ResultDes = DB_query($sqldes,$db);
- $Description=DB_fetch_array($ResultDes);
-
- if (!isset($Description['0'])){
- $Description['0']='ASSIGNCASH';
- }
-
- if (($myrow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')){
- // only cash assignations NOT authorized can be modified or deleted
- echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
- <td>' . $Description['0'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
- <td>' . $myrow['notes'] . '</td>
- <td>' . $myrow['receipt'] . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
- $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
- $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick="return confirm("' .
- _('Are you sure you wish to delete this code and the expense it may have set up?') . '");">' .
- _('Delete') . '</td>
- </tr>';
- }else{
- echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
- <td>' . $Description['0'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
- <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
- <td>' . $myrow['notes'] . '</td>
- <td>' . $myrow['receipt'] . '</td>
- </tr>';
- }
- }
- //END WHILE LIST LOOP
-
- $sqlamount="SELECT sum(amount)
- FROM pcashdetails
- WHERE tabcode='".$SelectedTabs."'";
-
- $ResultAmount = DB_query($sqlamount,$db);
- $Amount=DB_fetch_array($ResultAmount);
-
- if (!isset($Amount['0'])) {
- $Amount['0']=0;
- }
-
- echo '<tr>
- <td colspan="2" style="text-align:right"><b>' . _('Current balance') . ':</b></td>
- <td>' . locale_number_format($Amount['0'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td></tr>';
-
- echo '</table>';
-
- }
-
- if (! isset($_GET['delete'])) {
-
- if (!isset($Amount['0'])) {
- $Amount['0']=0;
- }
-
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<p><table class="selection">'; //Main table
- if (isset($_GET['SelectedIndex'])) {
- echo '<tr><th colspan="2"><font color=blue size="3">'._('Update Cash Assignment').'</font></th></tr>';
- } else {
- echo '<tr><th colspan="2"><font color=blue size="3">'._('New Cash Assignment').'</font></th></tr>';
- }
- if ( isset($_GET['edit'])) {
-
- $sql = "SELECT * FROM pcashdetails
- WHERE counterindex='".$SelectedIndex."'";
-
- $result = DB_query($sql, $db);
- $myrow = DB_fetch_array($result);
-
- $_POST['Date'] = ConvertSQLDate($myrow['date']);
- $_POST['SelectedExpense'] = $myrow['codeexpense'];
- $_POST['Amount'] = $myrow['amount'];
- $_POST['Notes'] = $myrow['notes'];
- $_POST['Receipt'] = $myrow['receipt'];
-
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="hidden" name="SelectedIndex" value="' . $SelectedIndex. '" />';
- echo '<input type="hidden" name="CurrentAmount" value="' . $Amount[0]. '" />';
- echo '<input type="hidden" name="Days" value="' . $Days . '" />';
- }
-
-/* Ricard: needs revision of this date initialization */
- if (!isset($_POST['Date'])) {
- $_POST['Date']=Date('d/m/Y');
- }
-
- echo '<tr><td>' . _('Cash Assignation Date') . ':</td>';
-
- echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="Date" size="10" maxlength="10" value="' . $_POST['Date'] . '" /></td></tr>';
-
-
- if (!isset($_POST['Amount'])) {
- $_POST['Amount']=0;
- }
-
- echo '<tr>
- <td>' . _('Amount') . ':</td>
- <td><input type="text" class="number" name="Amount" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
- </tr>';
-
- if (!isset($_POST['Notes'])) {
- $_POST['Notes']='';
- }
-
- echo '<tr><td>' . _('Notes') . ':</td>
- <td><input type="text" name="Notes" size="50" maxlength="49" value="' . $_POST['Notes'] . '" /></td></tr>';
-
- if (!isset($_POST['Receipt'])) {
- $_POST['Receipt']='';
- }
-
- echo '<tr>
- <td>' . _('Receipt') . ':</td>
- <td><input type="text" name="Receipt" size="50" maxlength="49" value="' . $_POST['Receipt'] . '" /></td>
- </tr>';
-
- echo '<input type="hidden" name="CurrentAmount" value="' . $Amount['0']. '" />';
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="hidden" name="Days" value="' .$Days. '" />';
-
- echo '</td></tr></table>'; // close main table
-
- echo '<p><div class="centre">
- <input type="submit" name="submit" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
-
- echo '</form>';
-
- } // end if user wish to delete
-}
-include('includes/footer.inc');
+<?php
+/* $Id$*/
+
+include('includes/session.inc');
+$title = _('Assignment of Cash to Petty Cash Tab');
+include('includes/header.inc');
+
+if (isset($_POST['SelectedTabs'])){
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
+} elseif (isset($_GET['SelectedTabs'])){
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
+}
+
+if (isset($_POST['SelectedIndex'])){
+ $SelectedIndex = $_POST['SelectedIndex'];
+} elseif (isset($_GET['SelectedIndex'])){
+ $SelectedIndex = $_GET['SelectedIndex'];
+}
+
+if (isset($_POST['Days'])){
+ $Days = $_POST['Days'];
+} elseif (isset($_GET['Days'])){
+ $Days = $_GET['Days'];
+}
+
+if (isset($_POST['Cancel'])) {
+ unset($SelectedTabs);
+ unset($SelectedIndex);
+ unset($Days);
+ unset($_POST['Amount']);
+ unset($_POST['Notes']);
+ unset($_POST['Receipt']);
+}
+
+if (isset($_POST['process'])) {
+ if ($SelectedTabs=='') {
+ prnMsg(_('You Must First Select a Petty Cash Tab To Assign Cash'),'error');
+ unset($SelectedTabs);
+ }
+}
+
+if (isset($_POST['Go'])) {
+ $InputError = 0;
+ if ($Days<=0) {
+ $InputError = 1;
+ prnMsg(_('The number of days must be a positive number'),'error');
+ $Days=30;
+ }
+}
+
+if (isset($_POST['submit'])) {
+ //initialise no input errors assumed initially before we test
+ $InputError = 0;
+
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title. '</p>';
+
+ /* actions to take once the user has clicked the submit button
+ ie the page has called itself with some user input */
+
+ $i=1;
+
+ if ($_POST['Amount']==0) {
+ $InputError = 1;
+ prnMsg('<br />' . _('The Amount must be input'),'error');
+ }
+
+ $sqlLimit = "SELECT tablimit
+ FROM pctabs
+ WHERE tabcode='" . $SelectedTabs . "'";
+
+ $ResultLimit = DB_query($sqlLimit,$db);
+ $Limit=DB_fetch_array($ResultLimit);
+
+ if (($_POST['CurrentAmount']+$_POST['Amount'])>$Limit['tablimit']){
+ prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab'),'warning');
+ }
+
+ if ($InputError !=1 AND isset($SelectedIndex) ) {
+
+ $sql = "UPDATE pcashdetails
+ SET date = '".FormatDateForSQL($_POST['Date'])."',
+ amount = '" . filter_number_format($_POST['Amount']) . "',
+ authorized = '0000-00-00',
+ notes = '" . $_POST['Notes'] . "',
+ receipt = '" . $_POST['Receipt'] . "'
+ WHERE counterindex = '" . $SelectedIndex . "'";
+ $msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated');
+
+ } elseif ($InputError !=1 ) {
+ // Add new record on submit
+ $sql = "INSERT INTO pcashdetails
+ (counterindex,
+ tabcode,
+ date,
+ codeexpense,
+ amount,
+ authorized,
+ posted,
+ notes,
+ receipt)
+ VALUES ('',
+ '" . $_POST['SelectedTabs'] . "',
+ '".FormatDateForSQL($_POST['Date'])."',
+ 'ASSIGNCASH',
+ '" . filter_number_format($_POST['Amount']) . "',
+ authorized = '0000-00-00',
+ '0',
+ '" . $_POST['Notes'] . "',
+ '" . $_POST['Receipt'] . "'
+ )";
+ $msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
+ }
+
+ if ( $InputError !=1) {
+ //run the SQL from either of the above possibilites
+ $result = DB_query($sql,$db);
+ prnMsg($msg,'success');
+ unset($_POST['SelectedExpense']);
+ unset($_POST['Amount']);
+ unset($_POST['Notes']);
+ unset($_POST['Receipt']);
+ unset($_POST['SelectedTabs']);
+ unset($_POST['Date']);
+ }
+
+} elseif ( isset($_GET['delete']) ) {
+
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="">' . ' ' . $title. '</p>';
+ $sql="DELETE FROM pcashdetails
+ WHERE counterindex='" . $SelectedIndex . "'";
+ $ErrMsg = _('The assignment of cash record could not be deleted because');
+ $result = DB_query($sql,$db,$ErrMsg);
+ prnMsg(_('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been deleted') ,'success');
+ unset($_GET['delete']);
+}
+
+if (!isset($SelectedTabs)){
+
+ /* It could still be the second time the page has been run and a record has been selected for modification - SelectedTabs will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
+ then none of the above are true and the list of sales types will be displayed with
+ links to delete or edit each. These will call the same page again and allow update/input
+ or deletion of the records*/
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title. '</p>';
+
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p><table class="selection">'; //Main table
+
+ echo '<tr><td>' . _('Petty Cash Tab To Assign Cash') . ':</td>
+ <td><select name="SelectedTabs">';
+
+ DB_free_result($result);
+ $SQL = "SELECT tabcode
+ FROM pctabs
+ WHERE assigner='" . $_SESSION['UserID'] . "'
+ ORDER BY tabcode";
+
+ $result = DB_query($SQL,$db);
+
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ }
+
+ echo '</select></td></tr>';
+ echo '</td></tr></table>'; // close main table
+ echo '<p>
+ <div class="centre">
+ <input type="submit" name="process" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
+ </div>';
+ echo '</form>';
+}
+
+//end of ifs and buts!
+if (isset($_POST['process']) OR isset($SelectedTabs)) {
+
+ if (!isset($_POST['submit'])) {
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title. '</p>';
+ }
+ echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select another tab') . '<a/></div></p>';
+
+
+
+ if (! isset($_GET['edit']) OR isset ($_POST['GO'])){
+
+ if (isset($_POST['Cancel'])) {
+ unset($_POST['Amount']);
+ unset($_POST['Date']);
+ unset($_POST['Notes']);
+ unset($_POST['Receipt']);
+ }
+
+ if(!isset ($Days)){
+ $Days=30;
+ }
+
+ /* Retrieve decimal places to display */
+ $SqlDecimalPlaces="SELECT decimalplaces
+ FROM currencies,pctabs
+ WHERE currencies.currabrev = pctabs.currency
+ AND tabcode='" . $SelectedTabs . "'";
+ $result = DB_query($SqlDecimalPlaces,$db);
+ $myrow=DB_fetch_array($result);
+ $CurrDecimalPlaces = $myrow['decimalplaces'];
+
+ $sql = "SELECT * FROM pcashdetails
+ WHERE tabcode='" . $SelectedTabs . "'
+ AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
+ ORDER BY date, counterindex ASC";
+ $result = DB_query($sql,$db);
+
+ echo '<table class="selection">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<tr><th colspan="8">' . _('Detail Of PC Tab Movements For Last') .': ';
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' . _('Days');
+ echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
+ echo '</th></tr></form>';
+ echo '<tr>
+ <th>' . _('Date') . '</th>
+ <th>' . _('Expense Code') . '</th>
+ <th>' . _('Amount') . '</th>
+ <th>' . _('Authorised') . '</th>
+ <th>' . _('Notes') . '</th>
+ <th>' . _('Receipt') . '</th>
+ </tr>';
+
+ $k=0; //row colour counter
+
+ while ($myrow = DB_fetch_array($result)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ $sqldes="SELECT description
+ FROM pcexpenses
+ WHERE codeexpense='". $myrow['3'] . "'";
+
+ $ResultDes = DB_query($sqldes,$db);
+ $Description=DB_fetch_array($ResultDes);
+
+ if (!isset($Description['0'])){
+ $Description['0']='ASSIGNCASH';
+ }
+
+ if (($myrow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')){
+ // only cash assignations NOT authorized can be modified or deleted
+ echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
+ <td>' . $Description['0'] . '</td>
+ <td class="number">' . locale_number_format($myrow['amount'],$CurrDecimalPlaces) . '</td>
+ <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
+ <td>' . $myrow['notes'] . '</td>
+ <td>' . $myrow['receipt'] . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
+ $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
+ $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick="return confirm("' .
+ _('Are you sure you wish to delete this code and the expense it may have set up?') . '");">' .
+ _('Delete') . '</td>
+ </tr>';
+ }else{
+ echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
+ <td>' . $Description['0'] . '</td>
+ <td class="number">' . locale_number_format($myrow['amount'],$CurrDecimalPlaces).'</td>
+ <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
+ <td>' . $myrow['notes'] . '</td>
+ <td>' . $myrow['receipt'] . '</td>
+ </tr>';
+ }
+ }
+ //END WHILE LIST LOOP
+
+ $sqlamount="SELECT sum(amount)
+ FROM pcashdetails
+ WHERE tabcode='".$SelectedTabs."'";
+
+ $ResultAmount = DB_query($sqlamount,$db);
+ $Amount=DB_fetch_array($ResultAmount);
+
+ if (!isset($Amount['0'])) {
+ $Amount['0']=0;
+ }
+
+ echo '<tr>
+ <td colspan="2" style="text-align:right"><b>' . _('Current balance') . ':</b></td>
+ <td>' . locale_number_format($Amount['0'],$CurrDecimalPlaces) . '</td></tr>';
+
+ echo '</table>';
+
+ }
+
+ if (! isset($_GET['delete'])) {
+
+ if (!isset($Amount['0'])) {
+ $Amount['0']=0;
+ }
+
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p><table class="selection">'; //Main table
+ if (isset($_GET['SelectedIndex'])) {
+ echo '<tr><th colspan="2"><font color=blue size="3">'._('Update Cash Assignment').'</font></th></tr>';
+ } else {
+ echo '<tr><th colspan="2"><font color=blue size="3">'._('New Cash Assignment').'</font></th></tr>';
+ }
+ if ( isset($_GET['edit'])) {
+
+ $sql = "SELECT * FROM pcashdetails
+ WHERE counterindex='".$SelectedIndex."'";
+
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_array($result);
+
+ $_POST['Date'] = ConvertSQLDate($myrow['date']);
+ $_POST['SelectedExpense'] = $myrow['codeexpense'];
+ $_POST['Amount'] = $myrow['amount'];
+ $_POST['Notes'] = $myrow['notes'];
+ $_POST['Receipt'] = $myrow['receipt'];
+
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type="hidden" name="SelectedIndex" value="' . $SelectedIndex. '" />';
+ echo '<input type="hidden" name="CurrentAmount" value="' . $Amount[0]. '" />';
+ echo '<input type="hidden" name="Days" value="' . $Days . '" />';
+ }
+
+/* Ricard: needs revision of this date initialization */
+ if (!isset($_POST['Date'])) {
+ $_POST['Date']=Date('d/m/Y');
+ }
+
+ echo '<tr><td>' . _('Cash Assignation Date') . ':</td>';
+
+ echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="Date" size="10" maxlength="10" value="' . $_POST['Date'] . '" /></td></tr>';
+
+
+ if (!isset($_POST['Amount'])) {
+ $_POST['Amount']=0;
+ }
+
+ echo '<tr>
+ <td>' . _('Amount') . ':</td>
+ <td><input type="text" class="number" name="Amount" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$CurrDecimalPlaces) . '" /></td>
+ </tr>';
+
+ if (!isset($_POST['Notes'])) {
+ $_POST['Notes']='';
+ }
+
+ echo '<tr><td>' . _('Notes') . ':</td>
+ <td><input type="text" name="Notes" size="50" maxlength="49" value="' . $_POST['Notes'] . '" /></td></tr>';
+
+ if (!isset($_POST['Receipt'])) {
+ $_POST['Receipt']='';
+ }
+
+ echo '<tr>
+ <td>' . _('Receipt') . ':</td>
+ <td><input type="text" name="Receipt" size="50" maxlength="49" value="' . $_POST['Receipt'] . '" /></td>
+ </tr>';
+
+ echo '<input type="hidden" name="CurrentAmount" value="' . $Amount['0']. '" />';
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type="hidden" name="Days" value="' .$Days. '" />';
+
+ echo '</td></tr></table>'; // close main table
+
+ echo '<p><div class="centre">
+ <input type="submit" name="submit" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+
+ echo '</form>';
+
+ } // end if user wish to delete
+}
+
+include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-03-31 09:24:30 UTC (rev 5176)
+++ trunk/PcClaimExpensesFromTab.php 2012-03-31 14:33:23 UTC (rev 5177)
@@ -186,6 +186,16 @@
if(!isset ($Days)){
$Days=30;
}
+
+ /* Retrieve decimal places to display */
+ $SqlDecimalPlaces="SELECT decimalplaces
+ FROM currencies,pctabs
+ WHERE currencies.currabrev = pctabs.currency
+ AND tabcode='" . $SelectedTabs . "'";
+ $result = DB_query($SqlDecimalPlaces,$db);
+ $myrow=DB_fetch_array($result);
+ $CurrDecimalPlaces = $myrow['decimalplaces'];
+
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' ._('Days');
echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
@@ -254,7 +264,7 @@
</tr>',
ConvertSQLDate($myrow['2']),
$Description['0'],
- locale_number_format($myrow['4'],$_SESSION['CompanyRecord']['decimalplaces']),
+ locale_number_format($myrow['4'],$CurrDecimalPlaces),
$AuthorisedDate,
$myrow['7'],
$myrow['8'],
@@ -270,7 +280,7 @@
</tr>',
ConvertSQLDate($myrow['2']),
$Description['0'],
- locale_number_format($myrow['4'],$_SESSION['CompanyRecord']['decimalplaces']),
+ locale_number_format($myrow['4'],$CurrDecimalPlaces),
$AuthorisedDate,
$myrow['7'],
$myrow['8']);
@@ -292,7 +302,7 @@
}
echo '<tr><td colspan="2" style="text-align:right" >' . _('Current balance') . ':</td>
- <td class="number">'.locale_number_format($Amount['0'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td></tr>';
+ <td class="number">'.locale_number_format($Amount['0'],$CurrDecimalPlaces) . '</td></tr>';
echo '</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-31 14:33:30
|
Revision: 5177
http://web-erp.svn.sourceforge.net/web-erp/?rev=5177&view=rev
Author: ExsonQu
Date: 2012-03-31 14:33:23 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
31/3/2012: PakRichard: Fixed problem that on PCAssignCashToTab.php it should be used the decimal places of the currency of the tab, not the decimal places of the functional currency.The same in PcClaimExpensesFromTab.php
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
trunk/PcClaimExpensesFromTab.php
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2012-03-31 09:24:30 UTC (rev 5176)
+++ trunk/PcAssignCashToTab.php 2012-03-31 14:33:23 UTC (rev 5177)
@@ -1,380 +1,391 @@
-<?php
-/* $Id$*/
-
-include('includes/session.inc');
-$title = _('Assignment of Cash to Petty Cash Tab');
-include('includes/header.inc');
-
-if (isset($_POST['SelectedTabs'])){
- $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
-} elseif (isset($_GET['SelectedTabs'])){
- $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
-}
-
-if (isset($_POST['SelectedIndex'])){
- $SelectedIndex = $_POST['SelectedIndex'];
-} elseif (isset($_GET['SelectedIndex'])){
- $SelectedIndex = $_GET['SelectedIndex'];
-}
-
-if (isset($_POST['Days'])){
- $Days = $_POST['Days'];
-} elseif (isset($_GET['Days'])){
- $Days = $_GET['Days'];
-}
-
-if (isset($_POST['Cancel'])) {
- unset($SelectedTabs);
- unset($SelectedIndex);
- unset($Days);
- unset($_POST['Amount']);
- unset($_POST['Notes']);
- unset($_POST['Receipt']);
-}
-
-if (isset($_POST['process'])) {
- if ($SelectedTabs=='') {
- prnMsg(_('You Must First Select a Petty Cash Tab To Assign Cash'),'error');
- unset($SelectedTabs);
- }
-}
-
-if (isset($_POST['Go'])) {
- $InputError = 0;
- if ($Days<=0) {
- $InputError = 1;
- prnMsg(_('The number of days must be a positive number'),'error');
- $Days=30;
- }
-}
-
-if (isset($_POST['submit'])) {
- //initialise no input errors assumed initially before we test
- $InputError = 0;
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title. '</p>';
-
- /* actions to take once the user has clicked the submit button
- ie the page has called itself with some user input */
-
- $i=1;
-
- if ($_POST['Amount']==0) {
- $InputError = 1;
- prnMsg('<br />' . _('The Amount must be input'),'error');
- }
-
- $sqlLimit = "SELECT tablimit
- FROM pctabs
- WHERE tabcode='" . $SelectedTabs . "'";
-
- $ResultLimit = DB_query($sqlLimit,$db);
- $Limit=DB_fetch_array($ResultLimit);
-
- if (($_POST['CurrentAmount']+$_POST['Amount'])>$Limit['tablimit']){
- prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab'),'warning');
- }
-
- if ($InputError !=1 AND isset($SelectedIndex) ) {
-
- $sql = "UPDATE pcashdetails
- SET date = '".FormatDateForSQL($_POST['Date'])."',
- amount = '" . filter_number_format($_POST['Amount']) . "',
- authorized = '0000-00-00',
- notes = '" . $_POST['Notes'] . "',
- receipt = '" . $_POST['Receipt'] . "'
- WHERE counterindex = '" . $SelectedIndex . "'";
- $msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated');
-
- } elseif ($InputError !=1 ) {
- // Add new record on submit
- $sql = "INSERT INTO pcashdetails
- (counterindex,
- tabcode,
- date,
- codeexpense,
- amount,
- authorized,
- posted,
- notes,
- receipt)
- VALUES ('',
- '" . $_POST['SelectedTabs'] . "',
- '".FormatDateForSQL($_POST['Date'])."',
- 'ASSIGNCASH',
- '" . filter_number_format($_POST['Amount']) . "',
- authorized = '0000-00-00',
- '0',
- '" . $_POST['Notes'] . "',
- '" . $_POST['Receipt'] . "'
- )";
- $msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
- }
-
- if ( $InputError !=1) {
- //run the SQL from either of the above possibilites
- $result = DB_query($sql,$db);
- prnMsg($msg,'success');
- unset($_POST['SelectedExpense']);
- unset($_POST['Amount']);
- unset($_POST['Notes']);
- unset($_POST['Receipt']);
- unset($_POST['SelectedTabs']);
- unset($_POST['Date']);
- }
-
-} elseif ( isset($_GET['delete']) ) {
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="">' . ' ' . $title. '</p>';
- $sql="DELETE FROM pcashdetails
- WHERE counterindex='" . $SelectedIndex . "'";
- $ErrMsg = _('The assignment of cash record could not be deleted because');
- $result = DB_query($sql,$db,$ErrMsg);
- prnMsg(_('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been deleted') ,'success');
- unset($_GET['delete']);
-}
-
-if (!isset($SelectedTabs)){
-
- /* It could still be the second time the page has been run and a record has been selected for modification - SelectedTabs will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
- then none of the above are true and the list of sales types will be displayed with
- links to delete or edit each. These will call the same page again and allow update/input
- or deletion of the records*/
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title. '</p>';
-
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<p><table class="selection">'; //Main table
-
- echo '<tr><td>' . _('Petty Cash Tab To Assign Cash') . ':</td>
- <td><select name="SelectedTabs">';
-
- DB_free_result($result);
- $SQL = "SELECT tabcode
- FROM pctabs
- WHERE assigner='" . $_SESSION['UserID'] . "'
- ORDER BY tabcode";
-
- $result = DB_query($SQL,$db);
-
- while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
- }
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
- }
-
- echo '</select></td></tr>';
- echo '</td></tr></table>'; // close main table
- echo '<p>
- <div class="centre">
- <input type="submit" name="process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
- </div>';
- echo '</form>';
-}
-
-//end of ifs and buts!
-if (isset($_POST['process']) OR isset($SelectedTabs)) {
-
- if (!isset($_POST['submit'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title. '</p>';
- }
- echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Details Of Petty Cash Tab ') . '' .$SelectedTabs. '<a/></div>';
-
- if (! isset($_GET['edit']) OR isset ($_POST['GO'])){
-
- if (isset($_POST['Cancel'])) {
- unset($_POST['Amount']);
- unset($_POST['Date']);
- unset($_POST['Notes']);
- unset($_POST['Receipt']);
- }
-
- if(!isset ($Days)){
- $Days=30;
- }
- $sql = "SELECT * FROM pcashdetails
- WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
- ORDER BY date, counterindex ASC";
-
-
- $result = DB_query($sql,$db);
-
- echo '<table class="selection">';
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><th colspan="8">' . _('Detail Of PC Tab Movements For Last') .': ';
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' . _('Days');
- echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
- echo '</th></tr></form>';
- echo '<tr>
- <th>' . _('Date') . '</th>
- <th>' . _('Expense Code') . '</th>
- <th>' . _('Amount') . '</th>
- <th>' . _('Authorised') . '</th>
- <th>' . _('Notes') . '</th>
- <th>' . _('Receipt') . '</th>
- </tr>';
-
- $k=0; //row colour counter
-
- while ($myrow = DB_fetch_array($result)) {
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k=1;
- }
-
- $sqldes="SELECT description
- FROM pcexpenses
- WHERE codeexpense='". $myrow['3'] . "'";
-
- $ResultDes = DB_query($sqldes,$db);
- $Description=DB_fetch_array($ResultDes);
-
- if (!isset($Description['0'])){
- $Description['0']='ASSIGNCASH';
- }
-
- if (($myrow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')){
- // only cash assignations NOT authorized can be modified or deleted
- echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
- <td>' . $Description['0'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
- <td>' . $myrow['notes'] . '</td>
- <td>' . $myrow['receipt'] . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
- $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
- $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick="return confirm("' .
- _('Are you sure you wish to delete this code and the expense it may have set up?') . '");">' .
- _('Delete') . '</td>
- </tr>';
- }else{
- echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
- <td>' . $Description['0'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
- <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
- <td>' . $myrow['notes'] . '</td>
- <td>' . $myrow['receipt'] . '</td>
- </tr>';
- }
- }
- //END WHILE LIST LOOP
-
- $sqlamount="SELECT sum(amount)
- FROM pcashdetails
- WHERE tabcode='".$SelectedTabs."'";
-
- $ResultAmount = DB_query($sqlamount,$db);
- $Amount=DB_fetch_array($ResultAmount);
-
- if (!isset($Amount['0'])) {
- $Amount['0']=0;
- }
-
- echo '<tr>
- <td colspan="2" style="text-align:right"><b>' . _('Current balance') . ':</b></td>
- <td>' . locale_number_format($Amount['0'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td></tr>';
-
- echo '</table>';
-
- }
-
- if (! isset($_GET['delete'])) {
-
- if (!isset($Amount['0'])) {
- $Amount['0']=0;
- }
-
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<p><table class="selection">'; //Main table
- if (isset($_GET['SelectedIndex'])) {
- echo '<tr><th colspan="2"><font color=blue size="3">'._('Update Cash Assignment').'</font></th></tr>';
- } else {
- echo '<tr><th colspan="2"><font color=blue size="3">'._('New Cash Assignment').'</font></th></tr>';
- }
- if ( isset($_GET['edit'])) {
-
- $sql = "SELECT * FROM pcashdetails
- WHERE counterindex='".$SelectedIndex."'";
-
- $result = DB_query($sql, $db);
- $myrow = DB_fetch_array($result);
-
- $_POST['Date'] = ConvertSQLDate($myrow['date']);
- $_POST['SelectedExpense'] = $myrow['codeexpense'];
- $_POST['Amount'] = $myrow['amount'];
- $_POST['Notes'] = $myrow['notes'];
- $_POST['Receipt'] = $myrow['receipt'];
-
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="hidden" name="SelectedIndex" value="' . $SelectedIndex. '" />';
- echo '<input type="hidden" name="CurrentAmount" value="' . $Amount[0]. '" />';
- echo '<input type="hidden" name="Days" value="' . $Days . '" />';
- }
-
-/* Ricard: needs revision of this date initialization */
- if (!isset($_POST['Date'])) {
- $_POST['Date']=Date('d/m/Y');
- }
-
- echo '<tr><td>' . _('Cash Assignation Date') . ':</td>';
-
- echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="Date" size="10" maxlength="10" value="' . $_POST['Date'] . '" /></td></tr>';
-
-
- if (!isset($_POST['Amount'])) {
- $_POST['Amount']=0;
- }
-
- echo '<tr>
- <td>' . _('Amount') . ':</td>
- <td><input type="text" class="number" name="Amount" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
- </tr>';
-
- if (!isset($_POST['Notes'])) {
- $_POST['Notes']='';
- }
-
- echo '<tr><td>' . _('Notes') . ':</td>
- <td><input type="text" name="Notes" size="50" maxlength="49" value="' . $_POST['Notes'] . '" /></td></tr>';
-
- if (!isset($_POST['Receipt'])) {
- $_POST['Receipt']='';
- }
-
- echo '<tr>
- <td>' . _('Receipt') . ':</td>
- <td><input type="text" name="Receipt" size="50" maxlength="49" value="' . $_POST['Receipt'] . '" /></td>
- </tr>';
-
- echo '<input type="hidden" name="CurrentAmount" value="' . $Amount['0']. '" />';
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="hidden" name="Days" value="' .$Days. '" />';
-
- echo '</td></tr></table>'; // close main table
-
- echo '<p><div class="centre">
- <input type="submit" name="submit" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
-
- echo '</form>';
-
- } // end if user wish to delete
-}
-include('includes/footer.inc');
+<?php
+/* $Id$*/
+
+include('includes/session.inc');
+$title = _('Assignment of Cash to Petty Cash Tab');
+include('includes/header.inc');
+
+if (isset($_POST['SelectedTabs'])){
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
+} elseif (isset($_GET['SelectedTabs'])){
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
+}
+
+if (isset($_POST['SelectedIndex'])){
+ $SelectedIndex = $_POST['SelectedIndex'];
+} elseif (isset($_GET['SelectedIndex'])){
+ $SelectedIndex = $_GET['SelectedIndex'];
+}
+
+if (isset($_POST['Days'])){
+ $Days = $_POST['Days'];
+} elseif (isset($_GET['Days'])){
+ $Days = $_GET['Days'];
+}
+
+if (isset($_POST['Cancel'])) {
+ unset($SelectedTabs);
+ unset($SelectedIndex);
+ unset($Days);
+ unset($_POST['Amount']);
+ unset($_POST['Notes']);
+ unset($_POST['Receipt']);
+}
+
+if (isset($_POST['process'])) {
+ if ($SelectedTabs=='') {
+ prnMsg(_('You Must First Select a Petty Cash Tab To Assign Cash'),'error');
+ unset($SelectedTabs);
+ }
+}
+
+if (isset($_POST['Go'])) {
+ $InputError = 0;
+ if ($Days<=0) {
+ $InputError = 1;
+ prnMsg(_('The number of days must be a positive number'),'error');
+ $Days=30;
+ }
+}
+
+if (isset($_POST['submit'])) {
+ //initialise no input errors assumed initially before we test
+ $InputError = 0;
+
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title. '</p>';
+
+ /* actions to take once the user has clicked the submit button
+ ie the page has called itself with some user input */
+
+ $i=1;
+
+ if ($_POST['Amount']==0) {
+ $InputError = 1;
+ prnMsg('<br />' . _('The Amount must be input'),'error');
+ }
+
+ $sqlLimit = "SELECT tablimit
+ FROM pctabs
+ WHERE tabcode='" . $SelectedTabs . "'";
+
+ $ResultLimit = DB_query($sqlLimit,$db);
+ $Limit=DB_fetch_array($ResultLimit);
+
+ if (($_POST['CurrentAmount']+$_POST['Amount'])>$Limit['tablimit']){
+ prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab'),'warning');
+ }
+
+ if ($InputError !=1 AND isset($SelectedIndex) ) {
+
+ $sql = "UPDATE pcashdetails
+ SET date = '".FormatDateForSQL($_POST['Date'])."',
+ amount = '" . filter_number_format($_POST['Amount']) . "',
+ authorized = '0000-00-00',
+ notes = '" . $_POST['Notes'] . "',
+ receipt = '" . $_POST['Receipt'] . "'
+ WHERE counterindex = '" . $SelectedIndex . "'";
+ $msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated');
+
+ } elseif ($InputError !=1 ) {
+ // Add new record on submit
+ $sql = "INSERT INTO pcashdetails
+ (counterindex,
+ tabcode,
+ date,
+ codeexpense,
+ amount,
+ authorized,
+ posted,
+ notes,
+ receipt)
+ VALUES ('',
+ '" . $_POST['SelectedTabs'] . "',
+ '".FormatDateForSQL($_POST['Date'])."',
+ 'ASSIGNCASH',
+ '" . filter_number_format($_POST['Amount']) . "',
+ authorized = '0000-00-00',
+ '0',
+ '" . $_POST['Notes'] . "',
+ '" . $_POST['Receipt'] . "'
+ )";
+ $msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
+ }
+
+ if ( $InputError !=1) {
+ //run the SQL from either of the above possibilites
+ $result = DB_query($sql,$db);
+ prnMsg($msg,'success');
+ unset($_POST['SelectedExpense']);
+ unset($_POST['Amount']);
+ unset($_POST['Notes']);
+ unset($_POST['Receipt']);
+ unset($_POST['SelectedTabs']);
+ unset($_POST['Date']);
+ }
+
+} elseif ( isset($_GET['delete']) ) {
+
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="">' . ' ' . $title. '</p>';
+ $sql="DELETE FROM pcashdetails
+ WHERE counterindex='" . $SelectedIndex . "'";
+ $ErrMsg = _('The assignment of cash record could not be deleted because');
+ $result = DB_query($sql,$db,$ErrMsg);
+ prnMsg(_('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been deleted') ,'success');
+ unset($_GET['delete']);
+}
+
+if (!isset($SelectedTabs)){
+
+ /* It could still be the second time the page has been run and a record has been selected for modification - SelectedTabs will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
+ then none of the above are true and the list of sales types will be displayed with
+ links to delete or edit each. These will call the same page again and allow update/input
+ or deletion of the records*/
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title. '</p>';
+
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p><table class="selection">'; //Main table
+
+ echo '<tr><td>' . _('Petty Cash Tab To Assign Cash') . ':</td>
+ <td><select name="SelectedTabs">';
+
+ DB_free_result($result);
+ $SQL = "SELECT tabcode
+ FROM pctabs
+ WHERE assigner='" . $_SESSION['UserID'] . "'
+ ORDER BY tabcode";
+
+ $result = DB_query($SQL,$db);
+
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ }
+
+ echo '</select></td></tr>';
+ echo '</td></tr></table>'; // close main table
+ echo '<p>
+ <div class="centre">
+ <input type="submit" name="process" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
+ </div>';
+ echo '</form>';
+}
+
+//end of ifs and buts!
+if (isset($_POST['process']) OR isset($SelectedTabs)) {
+
+ if (!isset($_POST['submit'])) {
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title. '</p>';
+ }
+ echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select another tab') . '<a/></div></p>';
+
+
+
+ if (! isset($_GET['edit']) OR isset ($_POST['GO'])){
+
+ if (isset($_POST['Cancel'])) {
+ unset($_POST['Amount']);
+ unset($_POST['Date']);
+ unset($_POST['Notes']);
+ unset($_POST['Receipt']);
+ }
+
+ if(!isset ($Days)){
+ $Days=30;
+ }
+
+ /* Retrieve decimal places to display */
+ $SqlDecimalPlaces="SELECT decimalplaces
+ FROM currencies,pctabs
+ WHERE currencies.currabrev = pctabs.currency
+ AND tabcode='" . $SelectedTabs . "'";
+ $result = DB_query($SqlDecimalPlaces,$db);
+ $myrow=DB_fetch_array($result);
+ $CurrDecimalPlaces = $myrow['decimalplaces'];
+
+ $sql = "SELECT * FROM pcashdetails
+ WHERE tabcode='" . $SelectedTabs . "'
+ AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
+ ORDER BY date, counterindex ASC";
+ $result = DB_query($sql,$db);
+
+ echo '<table class="selection">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<tr><th colspan="8">' . _('Detail Of PC Tab Movements For Last') .': ';
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' . _('Days');
+ echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
+ echo '</th></tr></form>';
+ echo '<tr>
+ <th>' . _('Date') . '</th>
+ <th>' . _('Expense Code') . '</th>
+ <th>' . _('Amount') . '</th>
+ <th>' . _('Authorised') . '</th>
+ <th>' . _('Notes') . '</th>
+ <th>' . _('Receipt') . '</th>
+ </tr>';
+
+ $k=0; //row colour counter
+
+ while ($myrow = DB_fetch_array($result)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ $sqldes="SELECT description
+ FROM pcexpenses
+ WHERE codeexpense='". $myrow['3'] . "'";
+
+ $ResultDes = DB_query($sqldes,$db);
+ $Description=DB_fetch_array($ResultDes);
+
+ if (!isset($Description['0'])){
+ $Description['0']='ASSIGNCASH';
+ }
+
+ if (($myrow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')){
+ // only cash assignations NOT authorized can be modified or deleted
+ echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
+ <td>' . $Description['0'] . '</td>
+ <td class="number">' . locale_number_format($myrow['amount'],$CurrDecimalPlaces) . '</td>
+ <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
+ <td>' . $myrow['notes'] . '</td>
+ <td>' . $myrow['receipt'] . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
+ $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedIndex=' . $myrow['counterindex'] . '&SelectedTabs=' .
+ $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick="return confirm("' .
+ _('Are you sure you wish to delete this code and the expense it may have set up?') . '");">' .
+ _('Delete') . '</td>
+ </tr>';
+ }else{
+ echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
+ <td>' . $Description['0'] . '</td>
+ <td class="number">' . locale_number_format($myrow['amount'],$CurrDecimalPlaces).'</td>
+ <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
+ <td>' . $myrow['notes'] . '</td>
+ <td>' . $myrow['receipt'] . '</td>
+ </tr>';
+ }
+ }
+ //END WHILE LIST LOOP
+
+ $sqlamount="SELECT sum(amount)
+ FROM pcashdetails
+ WHERE tabcode='".$SelectedTabs."'";
+
+ $ResultAmount = DB_query($sqlamount,$db);
+ $Amount=DB_fetch_array($ResultAmount);
+
+ if (!isset($Amount['0'])) {
+ $Amount['0']=0;
+ }
+
+ echo '<tr>
+ <td colspan="2" style="text-align:right"><b>' . _('Current balance') . ':</b></td>
+ <td>' . locale_number_format($Amount['0'],$CurrDecimalPlaces) . '</td></tr>';
+
+ echo '</table>';
+
+ }
+
+ if (! isset($_GET['delete'])) {
+
+ if (!isset($Amount['0'])) {
+ $Amount['0']=0;
+ }
+
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p><table class="selection">'; //Main table
+ if (isset($_GET['SelectedIndex'])) {
+ echo '<tr><th colspan="2"><font color=blue size="3">'._('Update Cash Assignment').'</font></th></tr>';
+ } else {
+ echo '<tr><th colspan="2"><font color=blue size="3">'._('New Cash Assignment').'</font></th></tr>';
+ }
+ if ( isset($_GET['edit'])) {
+
+ $sql = "SELECT * FROM pcashdetails
+ WHERE counterindex='".$SelectedIndex."'";
+
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_array($result);
+
+ $_POST['Date'] = ConvertSQLDate($myrow['date']);
+ $_POST['SelectedExpense'] = $myrow['codeexpense'];
+ $_POST['Amount'] = $myrow['amount'];
+ $_POST['Notes'] = $myrow['notes'];
+ $_POST['Receipt'] = $myrow['receipt'];
+
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type="hidden" name="SelectedIndex" value="' . $SelectedIndex. '" />';
+ echo '<input type="hidden" name="CurrentAmount" value="' . $Amount[0]. '" />';
+ echo '<input type="hidden" name="Days" value="' . $Days . '" />';
+ }
+
+/* Ricard: needs revision of this date initialization */
+ if (!isset($_POST['Date'])) {
+ $_POST['Date']=Date('d/m/Y');
+ }
+
+ echo '<tr><td>' . _('Cash Assignation Date') . ':</td>';
+
+ echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="Date" size="10" maxlength="10" value="' . $_POST['Date'] . '" /></td></tr>';
+
+
+ if (!isset($_POST['Amount'])) {
+ $_POST['Amount']=0;
+ }
+
+ echo '<tr>
+ <td>' . _('Amount') . ':</td>
+ <td><input type="text" class="number" name="Amount" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$CurrDecimalPlaces) . '" /></td>
+ </tr>';
+
+ if (!isset($_POST['Notes'])) {
+ $_POST['Notes']='';
+ }
+
+ echo '<tr><td>' . _('Notes') . ':</td>
+ <td><input type="text" name="Notes" size="50" maxlength="49" value="' . $_POST['Notes'] . '" /></td></tr>';
+
+ if (!isset($_POST['Receipt'])) {
+ $_POST['Receipt']='';
+ }
+
+ echo '<tr>
+ <td>' . _('Receipt') . ':</td>
+ <td><input type="text" name="Receipt" size="50" maxlength="49" value="' . $_POST['Receipt'] . '" /></td>
+ </tr>';
+
+ echo '<input type="hidden" name="CurrentAmount" value="' . $Amount['0']. '" />';
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type="hidden" name="Days" value="' .$Days. '" />';
+
+ echo '</td></tr></table>'; // close main table
+
+ echo '<p><div class="centre">
+ <input type="submit" name="submit" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+
+ echo '</form>';
+
+ } // end if user wish to delete
+}
+
+include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-03-31 09:24:30 UTC (rev 5176)
+++ trunk/PcClaimExpensesFromTab.php 2012-03-31 14:33:23 UTC (rev 5177)
@@ -186,6 +186,16 @@
if(!isset ($Days)){
$Days=30;
}
+
+ /* Retrieve decimal places to display */
+ $SqlDecimalPlaces="SELECT decimalplaces
+ FROM currencies,pctabs
+ WHERE currencies.currabrev = pctabs.currency
+ AND tabcode='" . $SelectedTabs . "'";
+ $result = DB_query($SqlDecimalPlaces,$db);
+ $myrow=DB_fetch_array($result);
+ $CurrDecimalPlaces = $myrow['decimalplaces'];
+
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' ._('Days');
echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
@@ -254,7 +264,7 @@
</tr>',
ConvertSQLDate($myrow['2']),
$Description['0'],
- locale_number_format($myrow['4'],$_SESSION['CompanyRecord']['decimalplaces']),
+ locale_number_format($myrow['4'],$CurrDecimalPlaces),
$AuthorisedDate,
$myrow['7'],
$myrow['8'],
@@ -270,7 +280,7 @@
</tr>',
ConvertSQLDate($myrow['2']),
$Description['0'],
- locale_number_format($myrow['4'],$_SESSION['CompanyRecord']['decimalplaces']),
+ locale_number_format($myrow['4'],$CurrDecimalPlaces),
$AuthorisedDate,
$myrow['7'],
$myrow['8']);
@@ -292,7 +302,7 @@
}
echo '<tr><td colspan="2" style="text-align:right" >' . _('Current balance') . ':</td>
- <td class="number">'.locale_number_format($Amount['0'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td></tr>';
+ <td class="number">'.locale_number_format($Amount['0'],$CurrDecimalPlaces) . '</td></tr>';
echo '</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-01 02:42:55
|
Revision: 5185
http://web-erp.svn.sourceforge.net/web-erp/?rev=5185&view=rev
Author: vvs2012
Date: 2012-04-01 02:42:45 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GeocodeSetup.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/Labels.php
trunk/MRP.php
trunk/PDFCustomerList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PO_SelectOSPurchOrder.php
trunk/PcAuthorizeExpenses.php
trunk/PcReportTab.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/PrintCustStatements.php
trunk/SalesGraph.php
trunk/SecurityTokens.php
trunk/SelectCustomer.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/StockSerialItemResearch.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/doc/Manual/ManualContents.php
trunk/includes/InputSerialItemsExisting.php
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccountCSV.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -18,7 +18,8 @@
echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br />';
-echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Dates in SQL format for the last day of last month*/
@@ -28,22 +29,22 @@
echo '<table>
<tr>
<td>'._('Selected Accounts') . ':</td>
- <td><select name="Account[]" multiple>';
+ <td><select name="Account[]" size="12" multiple="multiple">';
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$AccountsResult = DB_query($sql,$db);
$i=0;
while ($myrow=DB_fetch_array($AccountsResult,$db)){
if(isset($_POST['Account'][$i]) AND $myrow['accountcode'] == $_POST['Account'][$i]){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
$i++;
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
}
echo '</select></td>';
echo '<td>'._('For Period range').':</td>
- <td><select name="Period[]" multiple>';
+ <td><select name="Period[]" size="12" multiple="multiple">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
@@ -67,7 +68,7 @@
ORDER BY tagref";
$result=DB_query($SQL,$db);
-echo '<option value="0">0 - '._('All tags');
+echo '<option value="0">0 - ' . _('All tags') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
@@ -78,8 +79,9 @@
echo '</select></td></tr>';
// End select tag
-echo '</table><p>
+echo '</table><br />
<div class="centre"><input type="submit" name="MakeCSV" value="'._('Make CSV File').'" /></div>
+ </div>
</form>';
/* End of the Form rest of script is what happens if the show button is hit*/
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccountInquiry.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -23,7 +23,8 @@
echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br />';
-echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Dates in SQL format for the last day of last month*/
@@ -35,9 +36,9 @@
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
if($myrow['accountcode'] == $SelectedAccount){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'];
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'];
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
}
echo '</select></td></tr>';
@@ -51,30 +52,32 @@
ORDER BY tagref";
$result=DB_query($SQL,$db);
-echo '<option value="0">0 - '._('All tags');
+echo '<option value="0">0 - '._('All tags') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
- echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
echo '</select></td></tr>';
// End select tag
-echo '<tr> <td>'._('For Period range').':</td><td><select name=Period[] multiple>';
+echo '<tr> <td>'._('For Period range').':</td><td><select name="Period[]" size="12" multiple="multiple">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
while ($myrow=DB_fetch_array($Periods,$db)){
if(isset($SelectedPeriod[$id]) and $myrow['periodno'] == $SelectedPeriod[$id]){
- echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period']));
+ echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
$id++;
} else {
- echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period']));
+ echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
}
}
-echo '</select></td></tr><table>';
-echo '<p><div class="centre"><input type="submit" name="Show" value="'._('Show Account Transactions').'" /></div></form>';
+echo '</select></td></tr></table>';
+echo '<br /><div class="centre"><input type="submit" name="Show" value="'._('Show Account Transactions').'" /></div>
+ </div>
+ </form>';
/* End of the Form rest of script is what happens if the show button is hit*/
Modified: trunk/GLAccountReport.php
===================================================================
--- trunk/GLAccountReport.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccountReport.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -221,7 +221,7 @@
echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br />';
- echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Dates in SQL format for the last day of last month*/
@@ -231,7 +231,7 @@
echo '<table>
<tr>
<td>'._('Selected Accounts') . ':</td>
- <td><select name="Account[]" multiple>';
+ <td><select name="Account[]" multiple="multiple">';
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$AccountsResult = DB_query($sql,$db);
$i=0;
@@ -246,7 +246,7 @@
echo '</select></td>';
echo '<td>'._('For Period range').':</td>
- <td><select Name=Period[] multiple>';
+ <td><select Name=Period[] multiple="multiple">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccounts.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -207,7 +207,8 @@
if (!isset($_GET['delete'])) {
- echo '<form method="post" name="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" id="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedAccount)) {
@@ -240,7 +241,7 @@
$sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb';
$result = DB_query($sql, $db);
- echo '<tr><td>' . _('Account Group') . ':</td><td><select name=Group>';
+ echo '<tr><td>' . _('Account Group') . ':</td><td><select name="Group">';
while ($myrow = DB_fetch_array($result)){
if (isset($_POST['Group']) and $myrow[0]==$_POST['Group']){
@@ -250,17 +251,16 @@
}
echo $myrow[0] . '">' . $myrow[0] . '</option>';
}
+ echo '</select></td></tr></table>';
if (!isset($_GET['SelectedAccount']) or $_GET['SelectedAccount']=='') {
- echo '<script>defaultControl(document.GLAccounts.AccountCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.GLAccounts.AccountCode);</script>';
} else {
- echo '<script>defaultControl(document.GLAccounts.AccountName);</script>';
+ echo '<script type="text/javascript">defaultControl(document.GLAccounts.AccountName);</script>';
}
- echo '</select></td></tr></table>';
-
echo '<br /><div class="centre"><input type="submit" name="submit" value="'. _('Enter Information') . '" /></div>';
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
@@ -309,11 +309,11 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=\"%s&SelectedAccount=%s\">" . _('Edit') . "</td>
- <td><a href=\"%s&SelectedAccount=%s&delete=1\" onclick=\"return confirm('" . _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</td>
+ <td><a href=\"%s&SelectedAccount=%s\">" . _('Edit') . "</a></td>
+ <td><a href=\"%s&SelectedAccount=%s&delete=1\" onclick=\"return confirm('" . _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</a></td>
</tr>",
$myrow[0],
- $myrow[1],
+ htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8'),
$myrow[2],
$myrow[3],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
@@ -328,13 +328,11 @@
//end of ifs and buts!
-echo '<p>';
+echo '<br />';
if (isset($SelectedAccount)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Accounts') . '</a></div>';
}
-echo '<p />';
-
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLBalanceSheet.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -367,16 +367,16 @@
<table class="selection">
<tr>
<th colspan="6">
- <div class="centre"><font size="4" color="blue"><b>' .
- _('Balance Sheet as at') . ' ' . $BalanceDate .'</b></font>
+ <div class="centre"><h1>' .
+ _('Balance Sheet as at') . ' ' . $BalanceDate .'</h1>
</div>
</th>
</tr>';
if ($_POST['Detail']=='Detailed'){
$TableHeader = '<tr>
- <th>'._('Account').'</td>
- <th>'._('Account Name').'</td>
+ <th>'._('Account').'</th>
+ <th>'._('Account Name').'</th>
<th colspan="2">' . $BalanceDate . '</th>
<th colspan="2">'._('Last Year').'</th>
</tr>';
@@ -428,10 +428,11 @@
<td></td>
</tr>';
}
- printf('<td colspan="2"><I>%s</I></td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
+ printf('<tr>
+ <td colspan="2"><I>%s</I></td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -453,10 +454,11 @@
</tr>';
}
- printf('<td colspan="2">%s</td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
+ printf('<tr>
+ <td colspan="2">%s</td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -489,7 +491,7 @@
}
printf('<tr>
- <td colspan="3"><font size="4">%s</font></td>
+ <td colspan="3"><h2>%s</h2></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -506,7 +508,7 @@
if ($_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="4" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h1>%s</h1></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -521,7 +523,7 @@
if ($_POST['Detail']=='Detailed'){
$ActGrp = $myrow['groupname'];
printf('<tr>
- <td colspan="6"><font size="2" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h3>%s</h3></td>
</tr>',
$myrow['groupname']);
echo $TableHeader;
@@ -546,14 +548,14 @@
if ($_POST['Detail']=='Detailed'){
if ($k==1){
- echo '<tr class="EvenTableRows">';
+ echo '<tr class="OddTableRows">';
$k=0;
} else {
echo '<tr class="EvenTableRows">';
$k++;
}
- $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>';
+ $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>';
printf('<td>%s</td>
<td>%s</td>
@@ -563,7 +565,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'),
locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']));
$j++;
@@ -581,10 +583,11 @@
<td></td>
</tr>';
}
- printf('<td colspan="2"><I>%s</I></td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
+ printf('<tr>
+ <td colspan="2"><I>%s</I></td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -602,11 +605,12 @@
</tr>';
}
- printf('<td colspan="2">%s</td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
- </tr>',
+ printf('<tr>
+ <td colspan="2">%s</td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
+ </tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces'])
@@ -630,7 +634,7 @@
}
printf('<tr>
- <td colspan="3">%s</td>
+ <td colspan="3"><h2>%s</h2></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -643,7 +647,7 @@
if (isset($myrow['sectioninaccounts']) and $_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="4" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h1>%s</h1></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -656,7 +660,7 @@
</tr>';
printf('<tr>
- <td colspan="3">'._('Check Total').'</font></td>
+ <td colspan="3"><h2>'._('Check Total').'</h2></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -672,6 +676,7 @@
</tr>';
echo '</table>';
+ echo '</div>';
echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>';
echo '</div></form>';
}
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLBudgets.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -28,11 +28,11 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'
</p>';
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="selectaccount">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="selectaccount">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table>';
-
-echo '<br />
+echo '<br />';
+echo '<table>
<tr>
<td>'. _('Select GL Account'). ':</td>
<td><select name="SelectedAccount" onchange="ReloadForm(selectaccount.Select)">';
@@ -49,7 +49,7 @@
prnMsg(_('No General ledger accounts have been set up yet') . ' - ' . _('budgets cannot be allocated until the GL accounts are set up'),'warn');
} else {
while ($myrow=DB_fetch_array($result)){
- $Account = $myrow['accountcode'] . ' - ' . $myrow['accountname'];
+ $Account = $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8');
if (isset($SelectedAccount) AND isset($LastCode) AND $SelectedAccount==$myrow['accountcode']){
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $Account . '</option>';
$PrevCode=$LastCode;
@@ -68,9 +68,10 @@
if (!isset($PrevCode)) {$PrevCode='';}
if (!isset($NextCode)) {$NextCode='';}
+echo '</table>';
echo '<input type="hidden" name="PrevAccount" value="'.$PrevCode.'" />';
echo '<input type="hidden" name="NextAccount" value="'.$NextCode.'" />';
-echo '</table>';
+
echo '<br />
<table>
<tr>
@@ -80,6 +81,7 @@
</tr>
</table>
<br />
+ </div>
</form>';
// End of account selection
@@ -157,7 +159,8 @@
// Table Headers
- echo '<form name="form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<form id="form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
<table class="selection">
@@ -217,8 +220,8 @@
<tr>
<td colspan="2">'._('Annual Budget').'</td>
<td><input class="number" type="text" size="14" name="AnnualAmountLY" value="0.00" /></td>
- </td><td>
<td></td>
+ <td></td>
<td><input class="number" type="text" size="14" name="AnnualAmountTY" value="0.00" /></td>
<td></td>
<td><input onchange="numberFormat(this,2)" class="number" type="text" size="14" name="AnnualAmount" value="0.00" /></td>
@@ -228,12 +231,12 @@
echo '<input type="hidden" name="SelectedAccount" value="'.$SelectedAccount.'" />';
- echo '<script>defaultControl(document.form.1next);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.1next);</script>';
echo '<br />
<div class="centre">
- <input type="submit" name=update value="' . _('Update') . '" />
+ <input type="submit" name="update" value="' . _('Update') . '" />
</div>
-
+ </div>
</form>';
$SQL="SELECT MIN(periodno) FROM periods";
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLCodesInquiry.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -20,11 +20,11 @@
/*show a table of the orders returned by the SQL */
-echo '<table cellpadding="2" colspan="2">
+echo '<table cellpadding="2">
<tr>
- <th>' . _('Group') . '</font></th>
- <th>' . _('Code') . '</font></th>
- <th>' . _('Account Name') . '</font></th>
+ <th><h3>' . _('Group') . '</h3></th>
+ <th><h3>' . _('Code') . '</h3></th>
+ <th><h3>' . _('Account Name') . '</h3></th>
</tr>';
$j = 1;
@@ -42,20 +42,20 @@
if ($myrow['group_']== $ActGrp){
printf('<td></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- </tr>',
- $myrow['accountcode'],
- $myrow['accountname']);
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['accountcode'],
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
} else {
$ActGrp = $myrow['group_'];
- printf('<td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- </tr>',
- $myrow['group_'],
- $myrow['accountcode'],
- $myrow['accountname']);
+ printf('<td><b>%s</b></td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['group_'],
+ $myrow['accountcode'],
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
}
}
//end of while loop
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLJournal.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -239,7 +239,8 @@
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
@@ -254,8 +255,8 @@
}
echo '<table>
- <tr>
- <td colspan="5"><table class="selection">
+ <tr>
+ <td colspan="5"><table class="selection">
<tr>
<td>'._('Date to Process Journal') . ':</td>
<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>
@@ -281,7 +282,7 @@
echo '<tr>
<th colspan="3">
- <div class="centre"><font size="3" color="blue"><b>' . _('Journal Line Entry') . '</b></font></div>
+ <div class="centre"><h2>' . _('Journal Line Entry') . '</h2></div>
</th>
</tr>';
@@ -350,11 +351,11 @@
echo '</tr>
<tr>
<th>' . _('Debit') . '</th>
- <td><input type="text" class="number" name = "Debit" onchange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="number" name="Debit" onchange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
</tr>
<tr>
<th>' . _('Credit') . '</th>
- <td><input type="text" class="number" Name = "Credit" onchange="eitherOr(this, '.'Debit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Credit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="number" name="Credit" onchange="eitherOr(this, '.'Debit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Credit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
</tr>
<tr>
<td></td>
@@ -376,7 +377,7 @@
echo '<table class="selection" width="85%">
<tr>
- <th colspan="6"><div class="centre"><font size="3" color="blue"><b>' . _('Journal Summary') . '</b></font></div></th>
+ <th colspan="6"><div class="centre"><h2>' . _('Journal Summary') . '</h2></div></th>
</tr>
<tr>
<th>'._('GL Tag').'</th>
@@ -432,7 +433,7 @@
<td class="number"><b>' . locale_number_format($CreditTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
</tr>';
if ($DebitTotal!=$CreditTotal) {
- echo '<td align="center" style="background-color: #fddbdb"><b>' . _('Required to balance') .' - </b>' .
+ echo '<tr><td align="center" style="background-color: #fddbdb"><b>' . _('Required to balance') .' - </b>' .
locale_number_format(abs($DebitTotal-$CreditTotal),$_SESSION['CompanyRecord']['decimalplaces']);
}
if ($DebitTotal>$CreditTotal) {
@@ -440,7 +441,10 @@
} else if ($DebitTotal<$CreditTotal) {
echo ' ' . _('Debit') . '</td></tr>';
}
-echo '</table>';
+echo '</table>
+ </td>
+ </tr>
+ </table>';
if (abs($_SESSION['JournalDetail']->JournalTotal)<0.001 AND $_SESSION['JournalDetail']->GLItemCounter > 0){
echo '<br />
@@ -455,11 +459,11 @@
}
if (!isset($_GET['NewJournal']) or $_GET['NewJournal']=='') {
- echo '<script>defaultControl(document.form.GLManualCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.GLManualCode);</script>';
} else {
- echo '<script>defaultControl(document.form.JournalProcessDate);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.JournalProcessDate);</script>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLProfit_Loss.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -21,13 +21,14 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . '
</p>';
- echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
+ echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
'<br />'
. _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />'
- . _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
+ . _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
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 (Date('m') > $_SESSION['YearEnd']){
@@ -41,7 +42,7 @@
$period=GetPeriod($FromDate, $db);
/*Show a form to allow input of criteria for profit and loss to show */
- echo '<p><table class="selection">
+ echo '<br /><table class="selection">
<tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
@@ -92,7 +93,7 @@
if($myrow['periodno']==$DefaultToPeriod){
echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
} else {
- echo '<option value =' . $myrow['periodno'] . '>' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</opt...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X