Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5296] trunk
|
From: <vv...@us...> - 2012-04-29 15:28:27
|
Revision: 5296
http://web-erp.svn.sourceforge.net/web-erp/?rev=5296&view=rev
Author: vvs2012
Date: 2012-04-29 15:28:19 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeStockCategory.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_ReApplyCostToSA.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_index.php
trunk/install/index.php
trunk/install/timezone.php
Modified: trunk/Z_BottomUpCosts.php
===================================================================
--- trunk/Z_BottomUpCosts.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_BottomUpCosts.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -50,7 +50,8 @@
<br />';
prnMsg(_('This script will not update the General Ledger stock balances for the changed costs. If you use integrated stock then do not use this utility'),'warn');
- 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">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Update costs for all items listed in a bill of materials').'<br />
@@ -58,6 +59,7 @@
<div class="centre">
<input type="submit" name="Run" value="' . _('Run') . '" />
</div>
+ </div>
</form>';
}
Modified: trunk/Z_ChangeBranchCode.php
===================================================================
--- trunk/Z_ChangeBranchCode.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ChangeBranchCode.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -193,9 +193,10 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p />
+echo '<br />
<table>
<tr>
<td>' . _('Customer Code') . ':</td>
@@ -213,7 +214,8 @@
echo '<input type="submit" name="ProcessCustomerChange" value="' . _('Process') . '" />';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/Z_ChangeCustomerCode.php
===================================================================
--- trunk/Z_ChangeCustomerCode.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ChangeCustomerCode.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -224,6 +224,7 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
@@ -239,7 +240,7 @@
</table>
<input type="submit" name="ProcessCustomerChange" value="' . _('Process') . '" />
-
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/Z_ChangeStockCategory.php
===================================================================
--- trunk/Z_ChangeStockCategory.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ChangeStockCategory.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -91,6 +91,7 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
<table>
@@ -104,10 +105,8 @@
</tr>
</table>
- <div class="centre">
<input type="submit" name="ProcessStockChange" value="' . _('Process') . '" />
</div>
-
</form>';
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ChangeStockCode.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -322,9 +322,11 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p><table>
+echo '<br />
+ <table>
<tr>
<td>' . _('Existing Inventory Code') . ':</td>
<td><input type="text" name="OldStockID" size="20" maxlength="20" /></td>
@@ -334,10 +336,9 @@
<td><input type="text" name="NewStockID" size="20" maxlength="20" /></td>
</tr>
</table>
- <div class="centre">
+
<input type="submit" name="ProcessStockChange" value="' . _('Process') . '" />
</div>
-
</form>';
include('includes/footer.inc');
Modified: trunk/Z_CheckAllocs.php
===================================================================
--- trunk/Z_CheckAllocs.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_CheckAllocs.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -113,11 +113,9 @@
//end of while loop
echo '<tr><td colspan="6" class="number">' . locale_number_format($AllocsTotal,$CurrDecimalPlaces) . '</td></tr>';
echo '</table>
- <hr />';
+ <br />';
}
-echo '</form>';
-
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_CheckDebtorsControl.php
===================================================================
--- trunk/Z_CheckDebtorsControl.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_CheckDebtorsControl.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -10,20 +10,17 @@
//========[ SHOW OUR FORM ]===========
//
+ // Context Navigation and Title
+ echo '<a href="'. $rootpath . '/index.php?&Application=AR">' . _('Back to Customers') . '</a>';
+ echo '<div class="centre"><h3>' . $title . '</h3></div>';
+
// Page Border
- echo '<table border="1" width="100%"><tr><td style="background-color:#FFFFFF">';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- // Context Navigation and Title
- echo '<table width="100%">
- <td width="37%" align=left><a href="'. $rootpath . '/index.php?&Application=AR">' . _('Back to Customers') . '</a></td>
- <td align=left><font size="4" color=blue><u><b>' . _('Debtors Control Integrity') . '</b></u></font></td>
- </table><p>';
+ echo '<table class="selection">';
- echo '<table border="1">'; //Main table
- echo '<td><table>'; // First column
-
$DefaultFromPeriod = ( !isset($_POST['FromPeriod']) OR $_POST['FromPeriod']=='' ) ? 1 : $_POST['FromPeriod'];
if ( !isset($_POST['ToPeriod']) OR $_POST['ToPeriod']=='' )
@@ -48,32 +45,28 @@
$perResult = DB_query($SQL,$db);
while ( $perRow=DB_fetch_array($perResult) ) {
- $FromSelected = ( $perRow['periodno'] == $DefaultFromPeriod ) ? 'selected' : '';
+ $FromSelected = ( $perRow['periodno'] == $DefaultFromPeriod ) ? 'selected="selected"' : '';
echo '<option ' . $FromSelected . ' value="' . $perRow['periodno'] . '">' .MonthAndYearFromSQLDate($perRow['lastdate_in_period']) .'</option>';
- $ToSelected = ( $perRow['periodno'] == $DefaultToPeriod ) ? 'selected' : '';
+ $ToSelected = ( $perRow['periodno'] == $DefaultToPeriod ) ? 'selected="selected"' : '';
$ToSelect .= '<option ' . $ToSelected . ' value="' . $perRow['periodno'] . '">' . MonthAndYearFromSQLDate($perRow['lastdate_in_period']) .'</option>';
}
DB_free_result($perResult);
echo '</select></td></tr>';
- echo '</table></td>'; // End First column
- echo '<td><table>'; // Start Second column
-
echo $ToSelect . '</select></td></tr>';
- echo '</table></td>'; // End Second column
- echo '</table>'; //End the main table
+ echo '</table>';
- echo '<p><input type="submit" name="Show" value="'._('Accept').'" />';
- echo '<input type="submit" action="reset" value="' . _('Cancel') .'" />';
+ echo '<br /><input type="submit" name="Show" value="'._('Accept').'" />';
+ echo '<input type="submit" value="' . _('Cancel') .'" />';
if ( isset($_POST['Show']) ) {
//
//========[ SHOW SYNOPSYS ]===========
//
- echo '<p><table border="1">';
+ echo '<br /><table border="1">';
echo '<tr>
<th>' . _('Period') . '</th>
<th>' . _('Bal B/F in GL') . '</th>
@@ -145,24 +138,26 @@
echo '<td class="number">' . locale_number_format($glMovement,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format(($CalcMovement),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td class="number" style="background-color:white"><font color="' . $color . '">' . locale_number_format($diff,$_SESSION['CompanyRecord']['decimalplaces']) . '</font></td>
+ <td class="number" style="background-color:white;color:' . $color . '">' . locale_number_format($diff,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
$CurPeriod++;
}
$difColor = ( $DiffTotal == 0 ) ? 'green' : 'red';
- echo '<tr bgcolor=white>
+ echo '<tr style="bgcolor:white">
<td>' . _('Total') . '</td>
<td class="number">' . locale_number_format($GLOpening,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($invTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($RecTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($GLClosing,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($CalcTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td class="number"><font color="' . $difColor . '">' . locale_number_format($DiffTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</font></td>
+ <td class="number" style="color=' . $difColor . '">' . locale_number_format($DiffTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
- echo '</table></form>';
+ echo '</table>';
}
+ echo '</div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/Z_CreateCompanyTemplateFile.php
===================================================================
--- trunk/Z_CreateCompanyTemplateFile.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_CreateCompanyTemplateFile.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -215,6 +215,7 @@
} /*end submit button hit */
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
prnMsg(_('Running the create a new company template script will export all account groups, account codes and tax set up tables including tax groups, tax authorities, tax rates etc. However, no transactions or private data will be exported. There is opportunity to prevent specific general ledger accounts from being exported where these are considered private - again no transactional or balance data is exported and you can inspect the contents of the sql file. The template file will be emailed automatically to the webERP project'),'info');
@@ -232,7 +233,7 @@
$i = 0;
while ($ChartRow = DB_fetch_array($ChartResult)){
echo '<tr><td>' . $ChartRow['accountcode'] . '</td>
- <td>' . $ChartRow['accountname'] . '</td>
+ <td>' . htmlspecialchars($ChartRow['accountname'],ENT_QUOTES,'UTF-8',false) . '</td>
<td><input type="checkbox" name="IncludeAccount_' . $i . '" checked="checked" /></td>
</tr>';
$i++;
@@ -240,8 +241,9 @@
echo '</table>';
echo '<hr />';
-echo '<center><input type="submit" name="CreateTemplate" value="' . _('Create Template and Email') . '" /></center>';
+echo '<div class="centre"><input type="submit" name="CreateTemplate" value="' . _('Create Template and Email') . '" /></div>';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_CurrencyDebtorsBalances.php
===================================================================
--- trunk/Z_CurrencyDebtorsBalances.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_CurrencyDebtorsBalances.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -5,7 +5,7 @@
$title=_('Currency Debtor Balances');
include('includes/header.inc');
-echo '<font size="4"><b>' . _('Debtors Balances By Currency Totals') . '</b></font>';
+echo '<div class="centre"><h3>' . _('Debtors Balances By Currency Totals') . '</h3></div>';
$sql = "SELECT SUM(ovamount+ovgst+ovdiscount+ovfreight-alloc) AS currencybalance,
currcode,
Modified: trunk/Z_CurrencySuppliersBalances.php
===================================================================
--- trunk/Z_CurrencySuppliersBalances.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_CurrencySuppliersBalances.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -5,7 +5,7 @@
$title=_('Currency Debtor Balances');
include('includes/header.inc');
-echo '<b>' . _('Suppliers Balances By Currency Totals') . '</b>';
+echo '<div class="centre"><h3>' . _('Suppliers Balances By Currency Totals') . '</h3></div>';
$sql = "SELECT SUM(ovamount+ovgst-alloc) AS currencybalance,
currcode,
Modified: trunk/Z_DataExport.php
===================================================================
--- trunk/Z_DataExport.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_DataExport.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -533,6 +533,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'] . '" />';
echo '<table>';
echo '<tr><th colspan="2">' . _('Price List Export') . '</th></tr>';
@@ -541,7 +542,7 @@
echo '<tr><td>' . _('For Sales Type/Price List') . ':</td>';
echo '<td><select name="SalesType">';
while ($myrow=DB_fetch_array($SalesTypesResult)){
- echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'];
+ echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
}
echo '</select></td></tr>';
@@ -550,12 +551,13 @@
echo '<tr><td>' . _('For Location') . ':</td>';
echo '<td><select name="Location">';
while ($myrow=DB_fetch_array($SalesTypesResult)){
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
echo '</select></td></tr>';
echo '</table>';
- echo "<div class='centre'><input type='Submit' name='pricelist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='pricelist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT FOR CUSTOMER LIST
@@ -563,6 +565,7 @@
echo "<br />";
// Export Stock For Location
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>';
echo '<tr><th colspan="2">' . _('Customer List Export') . '</th></tr>';
@@ -572,69 +575,82 @@
echo '<tr><td>' . _('For Location') . ':</td>';
echo '<td><select name="Location">';
while ($myrow=DB_fetch_array($SalesTypesResult)){
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
echo '</select></td></tr>';
echo '</table>';
- echo "<div class='centre'><input type='Submit' name='custlist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='custlist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT FOR SALES MAN
echo "<br />";
// Export Stock For Location
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>';
echo '<tr><th colspan="2">' . _('Salesman List Export') . '</th></tr>';
echo '</table>';
- echo "<div class='centre'><div class='centre'><input type='Submit' name='salesmanlist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='salesmanlist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT FOR IMAGES
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>';
echo '<tr><th colspan="2">' . _('Image List Export') . '</th></tr>';
echo '</table>';
- echo "<div class='centre'><input type='Submit' name='imagelist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='imagelist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT SECURITY TOKENS
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>';
echo '<tr><th colspan="2">' . _('Security Token List Export') . '</th></tr>';
echo '</table>';
- echo "<div class='centre'><input type='Submit' name='sectokenlist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='sectokenlist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT SECURITY ROLES
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>';
echo '<tr><th colspan="2">' . _('Security Role List Export') . '</th></tr>';
echo '</table>';
- echo "<div class='centre'><input type='Submit' name='secrolelist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='secrolelist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT SECURITY GROUPS
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>';
echo '<tr><th colspan="2">' . _('Security Group List Export') . '</th></tr>';
echo '</table>';
- echo "<div class='centre'><input type='Submit' name='secgrouplist' value='" . _('Export') . "' /></div>";
- echo '</form><br />';
+ echo "<div class='centre'><input type='submit' name='secgrouplist' value='" . _('Export') . "' /></div>";
+ echo '</div>
+ </form><br />';
// SELECT EXPORT SECURITY USERS
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>';
echo '<tr><th colspan="2">' . _('Security User List Export') . '</th></tr>';
echo '</table>';
echo '<div class="centre"><input type="submit" name="secuserlist" value="' . _('Export') . '" /></div>';
- echo '</form><br />';
+ echo '</div>
+ </form><br />';
include('includes/footer.inc');
Modified: trunk/Z_DeleteSalesTransActions.php
===================================================================
--- trunk/Z_DeleteSalesTransActions.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_DeleteSalesTransActions.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -133,9 +133,10 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p><table>
+echo '<br /><table>
<tr>
<td>' . _('Delete All Sales Analysis') . '</td>
<td><input type="checkbox" name="SalesAnalysis" /></td>
@@ -177,7 +178,8 @@
echo '<input type="submit" name="ProcessDeletions" value="' . _('Process') . '" onclick="return confirm(\'' . _('Are You Really REALLY Sure?') . '\');" />';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_ImportChartOfAccounts.php
===================================================================
--- trunk/Z_ImportChartOfAccounts.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ImportChartOfAccounts.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -73,12 +73,14 @@
prnMsg( _('Select a csv file containing the details of the account codes that you wish to import into webERP. '). '<br />' .
_('The first line must contain the field names that you wish to import. ').
'<a href ="Z_DescribeTable.php?table=chartmaster">' . _('The field names can be found here'). '</a>', 'info');
- echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr><td>'._('File to import').'</td>'.
'<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>';
echo '<div class="centre"><input type="submit" name="update" value="Process" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
}
include('includes/footer.inc');
Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ImportFixedAssets.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -289,6 +289,7 @@
<br />
';
echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method="post">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />';
@@ -300,8 +301,9 @@
echo '<option value="' . $PeriodRow[0] . '">' . ConvertSQLDate($PeriodRow[0]) . '</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Fixed Assets Upload file:') . '</td><td><input name="SelectedAssetFile" type="file" /></tr></table>
+ echo '<tr><td>' . _('Fixed Assets Upload file:') . '</td><td><input name="SelectedAssetFile" type="file" /></td></tr></table>
<input type="submit" value="' . _('Send File') . '" />
+ </div>
</form>';
}
Modified: trunk/Z_ImportGLAccountGroups.php
===================================================================
--- trunk/Z_ImportGLAccountGroups.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ImportGLAccountGroups.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -66,12 +66,14 @@
prnMsg( _('Select a csv file containing the details of the account sections that you wish to import into webERP. '). '<br />' .
_('The first line must contain the field names that you wish to import. ').
'<a href ="Z_DescribeTable.php?table=accountsection">' . _('The field names can be found here'). '</a>', 'info');
- echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr><td>'._('File to import').'</td>'.
'<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>';
echo '<div class="centre"><input type="submit" name="update" value="Process" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
}
include('includes/footer.inc');
Modified: trunk/Z_ImportGLAccountSections.php
===================================================================
--- trunk/Z_ImportGLAccountSections.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ImportGLAccountSections.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -70,12 +70,14 @@
prnMsg( _('Select a csv file containing the details of the account sections that you wish to import into webERP. '). '<br />' .
_('The first line must contain the field names that you wish to import. ').
'<a href ="Z_DescribeTable.php?table=accountsection">' . _('The field names can be found here'). '</a>', 'info');
- echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr><td>'._('File to import').'</td>'.
'<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>';
echo '<div class= "centre"><input type="submit" name="update" value="Process" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
}
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_ImportPartCodes.php
===================================================================
--- trunk/Z_ImportPartCodes.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ImportPartCodes.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -77,12 +77,14 @@
prnMsg( _('Select a csv file containing the details of the parts that you wish to import into webERP. '). '<br />' .
_('The first line must contain the field names that you wish to import. ').
'<a href ="Z_DescribeTable.php?table=stockmaster">' . _('The field names can be found here'). '</a>', 'info');
- echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr><td>'._('File to import').'</td>'.
'<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>';
echo '<div class="centre"><input type="submit" name="update" value="Process" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
}
}
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ImportStocks.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -289,12 +289,14 @@
<a href="Z_ImportStocks.php?gettemplate=1">Get Import Template</a>
<br />
<br />';
- echo '<form ENCtype="multipart/form-data" action="Z_ImportStocks.php" method="post">';
+ echo '<form action="Z_ImportStocks.php" method="post">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />' .
_('Upload file') . ': <input name="userfile" type="file" />
<input type="submit" value="' . _('Send File') . '" />
+ </div>
</form>';
}
Modified: trunk/Z_MakeNewCompany.php
===================================================================
--- trunk/Z_MakeNewCompany.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_MakeNewCompany.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -34,8 +34,8 @@
} else {
$_POST['NewCompany'] = strtolower($_POST['NewCompany']);
- echo '<div class="centre">';
- echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/* check for directory existence */
if (!file_exists('./companies/' . $_POST['NewCompany'])
@@ -161,8 +161,8 @@
prnMsg('_FILES[LogoFile][name] ' ._('is blank'),'info');
}
+ echo '</div>';
echo '</form>';
- echo '</div>';
include('includes/footer.inc');
exit;
}
@@ -195,8 +195,8 @@
echo '<p><a href="' . $rootpath . '/SystemParameters.php">' . _('Set Up Configuration Details') . '</a>';
echo '<p><a href="' . $rootpath . '/WWW_Users.php">' . _('Set Up User Accounts') . '</a>';
+ echo '</div>';
echo '</form>';
- echo '</div>';
include('includes/footer.inc');
exit;
}
@@ -208,8 +208,9 @@
echo '<br />';
prnMsg (_('This utility will create a new company') . '<br /><br />' .
_('If the company name already exists then you cannot recreate it'), 'info', _('PLEASE NOTE'));
-echo '<br />';
-echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . ' enctype="multipart/form-data">';
+echo '<br /></div>';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '" enctype="multipart/form-data">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr>';
@@ -217,17 +218,17 @@
<td><input type="text" size="33" maxlength="32" name="NewCompany" /></td>
</tr>
<tr>
- <td>'. _('Logo Image File (.jpg)') . ':</td><td><input type="FILE" ID="LogoFile" name="LogoFile" /></td>
+ <td>'. _('Logo Image File (.jpg)') . ':</td><td><input type="file" id="LogoFile" name="LogoFile" /></td>
</tr>
<tr>
<td>' . _('Create Database?') . '</td>
- <td><input type="CHECKBOX" name="CreateDB" /></td>
+ <td><input type="checkbox" name="CreateDB" /></td>
</tr>
</table>';
echo '<br /><input type="submit" name="submit" value="' . _('Proceed') . '" />';
+echo '</div>';
echo '</form>';
-echo '</div>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_ReApplyCostToSA.php
===================================================================
--- trunk/Z_ReApplyCostToSA.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ReApplyCostToSA.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -8,14 +8,15 @@
$Period = 42;
-echo "<form method='POST' action='" . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . "'>";
+echo "<form method='post' action='" . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . "'>";
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$SQL = "SELECT MonthName(lastdate_in_period) AS mnth,
YEAR(lastdate_in_period) AS yr,
periodno
FROM periods";
-echo '<p><div class="centre">' . _('Select the Period to update the costs for') . ':<select name="PeriodNo">';
+echo '<br /><div class="centre">' . _('Select the Period to update the costs for') . ':<select name="PeriodNo">';
$result = DB_query($SQL,$db);
echo '<option selected="selected" value="0">' . _('No Period Selected') . '</option>';
@@ -28,8 +29,8 @@
echo '</select>';
-echo '<p><input type="submit" name="UpdateSalesAnalysis" value="' . _('Update Sales Analysis Costs') .'" /></div>';
-echo '</form>';
+echo '<br /><input type="submit" name="UpdateSalesAnalysis" value="' . _('Update Sales Analysis Costs') .'" /></div>';
+echo '</div></form>';
if (isset($_POST['UpdateSalesAnalysis']) AND $_POST['PeriodNo']!=0){
$sql = "SELECT stockmaster.stockid,
Modified: trunk/Z_RePostGLFromPeriod.php
===================================================================
--- trunk/Z_RePostGLFromPeriod.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_RePostGLFromPeriod.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -7,6 +7,7 @@
include('includes/header.inc');
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($_POST['FromPeriod'])){
@@ -15,7 +16,7 @@
echo '<table>
<tr>
<td>' . _('Select Period From') . ':</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
$sql = "SELECT periodno,
lastdate_in_period
@@ -30,7 +31,9 @@
</tr>
</table>';
- echo '<div class="centre"><input type="submit" Name="recalc" value="' . _('Do the Recalculation') . '" onclick="return confirm(\'' . _('Are you sure you wish to re-post all general ledger transactions since the selected period this can take some time?') . '\');"></div></form>';
+ echo '<div class="centre"><input type="submit" name="recalc" value="' . _('Do the Recalculation') . '" onclick="return confirm(\'' . _('Are you sure you wish to re-post all general ledger transactions since the selected period this can take some time?') . '\');" /></div>
+ </div>
+ </form>';
} else { /*OK do the updates */
Modified: trunk/Z_ReverseSuppPaymentRun.php
===================================================================
--- trunk/Z_ReverseSuppPaymentRun.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_ReverseSuppPaymentRun.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -84,10 +84,12 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />' . _('Enter the date of the payment run') . ': <input type="text" name="PaytDate" maxlength="11" size="11" value="' . $_POST['PaytDate'] . '" />';
echo '<input type="submit" name="RevPayts" value="' . _('Reverse Supplier Payments on the Date Entered') . '" />';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Z_SalesIntegrityCheck.php
===================================================================
--- trunk/Z_SalesIntegrityCheck.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_SalesIntegrityCheck.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -11,7 +11,7 @@
include('includes/header.inc');
-echo '<div class="centre"><font size="4" color=blue><U><b>' . _('Sales Integrity Check') . '</b></U></font></div>';
+echo '<div class="centre"><h3>' . _('Sales Integrity Check') . '</h3></div>';
echo '<br /><br />'._('Check every Invoice has a Sales Order').'<br />';
echo '<br /><br />'._('Check every Invoice has a Tax Entry').'<br />';
@@ -25,7 +25,7 @@
if ( DB_num_rows($Result2) == 0) {
echo '<br />'._('Invoice '). ' '. $myrow['transno'] . ' : ';
- echo '<font color=RED>' . _('No Sales Order') . '</font>';
+ echo '<div style="color:red">' . _('No Sales Order') . '</div>';
}
$SQL3 = "SELECT debtortransid FROM debtortranstaxes WHERE debtortransid = '" . $myrow['id'] . "'";
@@ -33,7 +33,7 @@
if ( DB_num_rows($Result3) == 0) {
echo '<br />'. _('Invoice '). ' ' . $myrow['transno'] . ' : ';
- echo '<font color=RED>' . _('Has no Tax Entry') . '</font>';
+ echo '<div style="color:red">' . _('Has no Tax Entry') . '</div>';
}
$SQL4 = "SELECT typeno
@@ -44,7 +44,7 @@
if ( DB_num_rows($Result4) == 0) {
echo '<br />' . _('Invoice') . ' ' . $myrow['transno'] . ' : ';
- echo '<font color=RED>' . _('has no GL Entry') . '</font>';
+ echo '<div style="color:red">' . _('has no GL Entry') . '</div>';
}
}
@@ -64,7 +64,7 @@
if ( DB_num_rows($Result2) == 0) {
echo "<br />"._('GL Entry ') . $myrow['counterindex'] . " : ";
- echo ', <font color=RED>'._('Invoice ') . $myrow['typeno'] . _(' could not be found').'</font>';
+ echo ', <div style="color:red">'._('Invoice ') . $myrow['typeno'] . _(' could not be found').'</div>';
}
}
@@ -88,7 +88,7 @@
if ( $myrow2[0] + $myrow['amount'] == 0 ) {
echo '<br />'._('Receipt') . ' ' . $myrow['typeno'] . " : ";
- echo '<font color=RED>' . $myrow['amount']. ' ' . _('in GL but found'). ' ' . $myrow2[0] . ' ' . _('in debtorstrans').'</font>';
+ echo '<div style="color:red">' . $myrow['amount']. ' ' . _('in GL but found'). ' ' . $myrow2[0] . ' ' . _('in debtorstrans').'</div>';
}
}
@@ -103,7 +103,7 @@
if ( !$myrow2[0] ) {
echo '<br />'._('Receipt') . ' ' . $myrow['transno'] . " : ";
- echo '<font color=RED>' . $myrow['transno'] . ' ' ._('not found in GL')."</font>";
+ echo '<div style="color:red">' . $myrow['transno'] . ' ' ._('not found in GL')."</div>";
}
}
@@ -124,7 +124,7 @@
if ( DB_num_rows($Result2) == 0) {
echo '<br />'._('Sales Order') . ' ' . $myrow['orderno'] . ' : ';
- echo '<font color=RED>'._('Has no Invoice').'</font>';
+ echo '<div style="color:red">'._('Has no Invoice').'</div>';
}
}
@@ -139,7 +139,7 @@
if ( DB_num_rows($Result2) == 0) {
echo '<br />'._('Order Item') . ' ' . $myrow['orderno'] . ' : ';
- echo ', <font color=RED>'._('Has no Sales Order').'</font>';
+ echo ', <div style="color:red">'._('Has no Sales Order').'</div>';
}
$sumsql = "SELECT SUM( qtyinvoiced * unitprice ) AS InvoiceTotal
@@ -163,7 +163,7 @@
if ( $invrow['type'] != 11 ) {
// Do an integrity check on sales order items
if ( $sumrow['InvoiceTotal'] != $invrow['ovamount'] ) {
- echo '<br /><font color=red>' . _('Debtors trans') . ' ' . $invrow['ovamount'] . ' ' . _('differ from salesorderdetails') . ' ' . $sumrow['InvoiceTotal'] . '</font>';
+ echo '<br /><div style="color:red">' . _('Debtors trans') . ' ' . $invrow['ovamount'] . ' ' . _('differ from salesorderdetails') . ' ' . $sumrow['InvoiceTotal'] . '</div>';
}
}
}
@@ -187,7 +187,7 @@
if ( DB_num_rows($Result2) == 0) {
echo '<br />'._('Stock Move') . ' ' . $myrow['stkmoveno'] . ' : ';
- echo ', <font color=RED>'._('Has no Invoice').'</font>';
+ echo ', <div style="color:red">'._('Has no Invoice').'</div>';
}
}
@@ -202,7 +202,7 @@
if ( DB_num_rows($Result2) == 0) {
echo '<br />'._('Tax Entry') . ' ' . $myrow['debtortransid'] . ' : ';
- echo ', <font color=RED>'._('Has no Invoice').'</font>';
+ echo ', <div style="color:red">'._('Has no Invoice').'</div>';
}
}
Modified: trunk/Z_UpdateChartDetailsBFwd.php
===================================================================
--- trunk/Z_UpdateChartDetailsBFwd.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_UpdateChartDetailsBFwd.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -7,6 +7,7 @@
include('includes/header.inc');
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 ($_POST['FromPeriod'] > $_POST['ToPeriod']){
@@ -47,12 +48,14 @@
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']) . '</option>';
+ echo '<option value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
}
}
echo '</select></td></tr></table>';
- echo '<div class="centre"><input type="submit" name="recalc" value="' . _('Do the Recalculation') . '" /></div></form>';
+ echo '<div class="centre"><input type="submit" name="recalc" value="' . _('Do the Recalculation') . '" /></div>
+ </div>
+ </form>';
} else { /*OK do the updates */
Modified: trunk/Z_index.php
===================================================================
--- trunk/Z_index.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/Z_index.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -5,38 +5,38 @@
$title = _('Special Fixes and Utilities') . ' - ' . _('Only System Administrator');
include('includes/header.inc');
- echo '<p>' . _('BE VERY CAREFUL DO NOT RUN THESE LINKS BELOW WITHOUT UNDERSTANDING EXACTLY WHAT THEY DO AND THE IMPLICATIONS');
+ echo '<p>' . _('BE VERY CAREFUL DO NOT RUN THESE LINKS BELOW WITHOUT UNDERSTANDING EXACTLY WHAT THEY DO AND THE IMPLICATIONS') . '</p>';
- echo '<p><a href="' .$rootpath . '/Z_ReApplyCostToSA.php">'. _('Re-apply costs to Sales Analysis') . '</a>';
- echo '<p><a href="' .$rootpath . '/EDISendInvoices.php">' . _('Send All Unsent EDI Invoices and Credits') .'</a>';
- echo '<p><a href="' .$rootpath . '/Z_ChangeCustomerCode.php">'. _('Change A Customer Code') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_ChangeBranchCode.php">' . _('Change A Customer Branch Code') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_ChangeStockCode.php">' . _('Change An Inventory Item Code') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_ChangeSupplierCode.php">' . _('Change A Supplier Code') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_BottomUpCosts.php">' . _('Update costs for all BOM items, from the bottom up') . '</a>';
+ echo '<p><a href="' .$rootpath . '/Z_ReApplyCostToSA.php">'. _('Re-apply costs to Sales Analysis') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/EDISendInvoices.php">' . _('Send All Unsent EDI Invoices and Credits') .'</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ChangeCustomerCode.php">'. _('Change A Customer Code') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ChangeBranchCode.php">' . _('Change A Customer Branch Code') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ChangeStockCode.php">' . _('Change An Inventory Item Code') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ChangeSupplierCode.php">' . _('Change A Supplier Code') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_BottomUpCosts.php">' . _('Update costs for all BOM items, from the bottom up') . '</a></p>';
- echo '<p><a href="' .$rootpath . '/Z_CurrencyDebtorsBalances.php">' . _('Show Local Currency Total Debtor Balances') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_CurrencySuppliersBalances.php">' . _('Show Local Currency Total Suppliers Balances') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_CheckGLTransBalance.php">' . _('Show General Transactions That Do Not Balance') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_poAdmin.php">' . _('Maintain Language Files') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_MakeNewCompany.php">' . _('Make New Company') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_DataExport.php">' . _('Data Export Options') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_GetStockImage.php">' . _('Image Manipulation Utility') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_ImportStocks.php">' . _('Import Stock Items from .csv') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_ImportFixedAssets.php">' . _('Import Fixed Assets from .csv file') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_CreateCompanyTemplateFile.php">' . _('Create new company template SQL file and submit to webERP') . '</a>';
+ echo '<p><a href="' .$rootpath . '/Z_CurrencyDebtorsBalances.php">' . _('Show Local Currency Total Debtor Balances') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_CurrencySuppliersBalances.php">' . _('Show Local Currency Total Suppliers Balances') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_CheckGLTransBalance.php">' . _('Show General Transactions That Do Not Balance') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_poAdmin.php">' . _('Maintain Language Files') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_MakeNewCompany.php">' . _('Make New Company') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_DataExport.php">' . _('Data Export Options') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_GetStockImage.php">' . _('Image Manipulation Utility') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ImportStocks.php">' . _('Import Stock Items from .csv') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ImportFixedAssets.php">' . _('Import Fixed Assets from .csv file') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_CreateCompanyTemplateFile.php">' . _('Create new company template SQL file and submit to webERP') . '</a></p>';
echo '<br /><br /><hr /><br />' . _('The stuff below is really quite dangerous!');
- echo '<p>' . _('To delete a credit note call') . ' ' . $rootpath . '/Z_DeleteCreditNote.php?' . ' ' ._('and the credit note number to delete');
- echo '<p>' . _('To delete an invoice call') . ' ' . $rootpath . '/Z_DeleteInvoice.php?' . _('and the invoice number to delete');
- echo '<p><a href="' .$rootpath . '/Z_UploadForm.php">' . _('Upload a file to the server') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_DeleteSalesTransActions.php">' . _('Delete sales transactions') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_ReverseSuppPaymentRun.php">' . _('Reverse all supplier payments on a specified date') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_UpdateChartDetailsBFwd.php">' . _('Re-calculate brought forward amounts in GL') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_RePostGLFromPeriod.php">' . _('Re-Post all GL transactions from a specified period') . '</a>';
- echo '<p><a href="' .$rootpath . '/Z_CheckDebtorsControl.php">' . _('Show Debtors Control (Need to edit Z_CheckDebtorsControl.php for the period to show control totals for') . '</a>';
+ echo '<p>' . _('To delete a credit note call') . ' ' . $rootpath . '/Z_DeleteCreditNote.php?' . ' ' ._('and the credit note number to delete') . '</p>';
+ echo '<p>' . _('To delete an invoice call') . ' ' . $rootpath . '/Z_DeleteInvoice.php?' . _('and the invoice number to delete') . '</p>';
+ echo '<p><a href="' .$rootpath . '/Z_UploadForm.php">' . _('Upload a file to the server') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_DeleteSalesTransActions.php">' . _('Delete sales transactions') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_ReverseSuppPaymentRun.php">' . _('Reverse all supplier payments on a specified date') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_UpdateChartDetailsBFwd.php">' . _('Re-calculate brought forward amounts in GL') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_RePostGLFromPeriod.php">' . _('Re-Post all GL transactions from a specified period') . '</a></p>';
+ echo '<p><a href="' .$rootpath . '/Z_CheckDebtorsControl.php">' . _('Show Debtors Control (Need to edit Z_CheckDebtorsControl.php for the period to show control totals for') . '</a></p>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2012-04-29 04:21:07 UTC (rev 5295)
+++ trunk/install/index.php 2012-04-29 15:28:19 UTC (rev 5296)
@@ -37,12 +37,14 @@
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>WebERP Installation Wizard</title>
<link href="../css/jelly/default.css" rel="stylesheet" type="text/css" />
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
function change_os(type) {
if(type == 'linux') {
@@ -71,29 +73,21 @@
</head>
<body>
-<table cellpadding="0" cellspacing="0" border="0" width="750" align="center">
-<tr>
- <td width="100%" align="center" style="font-size: 20px;">
- <p style="color: #FFFFFF;">WebERP</p>
- <p style="color: #DDDDDD;">Installation Wizard</p>
- </td>
-</tr>
-</table>
-
-<form name="weberp_installation_wizard" action="save.php" method="post" enctype="multipart/form-data">
+<form id="weberp_installation_wizard" action="save.php" method="post" enctype="multipart/form-data">
+<div>
<input type="hidden" name="FormID" value="<?php echo $_SESSION['FormID']; ?>" />
<input type="hidden" name="url" value="" />
<input type="hidden" name="password_fieldname" value="admin_password" />
<input type="hidden" name="remember" id="remember" value="true" />
<input type="hidden" name="path_to_root" value="<?php echo $PathToRoot; ?>" />
-<table cellpadding="0" cellspacing="0" border="0" width="750" align="center" style="margin-top: 10px;">
+<table cellpadding="0" cellspacing="0" border="0" width="750" style="margin-top: 10px;">
<tr>
<td class="content">
+ <div class="centre">
<h2>Welcome to the WebERP Installation Wizard.</h2>
- <center>
<img src="<?php echo "../companies/weberpdemo/logo.jpg"; ?>" width="250" height="50" alt="Logo" />
- </center>
+ </div>
<?php
@@ -101,9 +95,9 @@
?><div style="width: 700px; padding: 10px; margin-bottom: 5px; border: 1px solid #FF0000; background-color: #FFDBDB;"><b>Error:</b> <?php echo $_SESSION['message']; ?></div><?php
}
?>
- <table cellpadding="3" cellspacing="0" width="100%" align="center">
+ <table cellpadding="3" cellspacing="0" width="100%">
<tr>
- <td colspan="8"><h1>Step 1</h1>Please check the following requirements are met before continuing...</td>
+ <td colspan="8"><h3>Step 1</h3>Please check the following requirements are met before continuing...</td>
</tr>
<?php if($session_support != '<p class="good">Enabled</p>') { ?>
<tr>
@@ -111,8 +105,8 @@
</tr>
<?php } ?>
<tr>
- <td width="140" style="color: #666666;">PHP Version > 5.1.0</td>
- <td width="35">
+ <td style="color: #666666;">PHP Version > 5.1.0</td>
+ <td>
<?php
$phpversion = mb_substr(PHP_VERSION, 0, 6);
if($phpversion > 5.1) {
@@ -122,9 +116,9 @@
}
?>
</td>
- <td width="140" style="color: #666666;">PHP Session Support</td>
- <td width="115"><?php echo $session_support; ?></td>
- <td width="105" style="color: #666666;">PHP Safe Mode</td>
+ <td style="color: #666666;">PHP Session Support</td>
+ <td><?php echo $session_support; ?></td>
+ <td style="color: #666666;">PHP Safe Mode</td>
<td>
<?php
if(ini_get('safe_mode')) {
@@ -136,9 +130,9 @@
</td>
</tr>
</table>
- <table cellpadding="3" cellspacing="0" width="100%" align="center">
+ <table cellpadding="3" cellspacing="0" width="100%">
<tr>
- <td colspan="8"><h1>Step 2</h1>Please check the following files/folders are writeable before continuing...</td>
+ <td colspan="8"><h3>Step 2</h3>Please check the following files/folders are writeable before continuing...</td>
</tr>
<tr>
<td style="color: #666666;">Configuration file</td>
@@ -159,91 +153,92 @@
</td>
</tr>
</table>
- <table cellpadding="3" cellspacing="0" width="100%" align="center">
+ <table cellpadding="3" cellspacing="0" width="100%">
<tr>
- <td colspan="2"><h1>Step 3</h1>Please check your path settings...</td>
+ <td colspan="2"><h3>Step 3</h3>Please check your path settings...</td>
</tr>
<tr>
- <td width="125" style="color: #666666;">
+ <td style="color: #666666;width:20%">
Absolute URL:
</td>
<td>
<?php
- // Try to guess installation URL
- $GuessedURL = 'http://'.$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"];
- $GuessedURL = trim(rtrim(dirname($GuessedURL), 'install'));
+ if (isset($_SESSION['ba_url'])) {
+ $IntstallUrl = $_SESSION['ba_url'];
+ } else {
+ // Try to guess installation URL
+ $GuessedURL = 'http://'.$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"];
+ $GuessedURL = trim(rtrim(dirname($GuessedURL), 'install'));
+ $IntstallUrl = $GuessedURL;
+ }
?>
- <input type="text" tabindex="30" name="ba_url" style="width: 99%;" value="<?php
- if(isset($_SESSION['ba_url'])) {
- echo $_SESSION['ba_url'];
- } else {
- echo $GuessedURL;
- }
- ?>" />
+ <input type="text" tabindex="30" name="ba_url" style="width: 99%;" value="<?php echo $IntstallUrl;?>" />
</td>
</tr>
</table>
- <table cellpadding="5" cellspacing="0" width="100%" align="center">
+ <table cellpadding="5" cellspacing="0" width="100%">
<tr>
- <td colspan="3"><h1>Step 4</h1>Please specify your operating system information below...</td>
+ <td colspan="3"><h3>Step 4</h3>Please specify your operating system information below...</td>
</tr>
- <tr height="50">
- <td width="170">
+ <tr>
+ <td >
Server Operating System:
</td>
- <td width="180">
- <input type="radio" tabindex="40" name="operating_system" id="operating_system_linux" onclick="document.getElementById('file_perms_box').style.display = 'block';" value="linux"
+ <td>
+ <p style="cursor: pointer;" onclick="javascript: change_os('linux');">
+ <input type="radio" tabindex="40" name="operating_system" id="operating_system_linux" onclick="document.getElementById('file_perms_box').style.display = 'block';" value="linux"
<?php
if(!isset($_SESSION['operating_system']) OR $_SESSION['operating_system'] == 'linux') {
- echo ' checked';
+ echo ' checked="checked"';
} ?>
- />
- <p style="cursor: pointer;" onclick="javascript: change_os('linux');">Linux/Unix based</p>
+ />Linux/Unix based</p>
<br />
+ <p style="cursor: pointer;" onclick="javascript: change_os('windows');">
<input type="radio" tabindex="41" name="operating_system" id="operating_system_windows" onclick="document.getElementById('file_perms_box').style.display = 'none';" value="windows"
<?php
if(isset($_SESSION['operating_system']) AND $_SESSION['operating_system'] == 'windows') {
- echo ' checked'; }
+ echo ' checked="checked"'; }
?>
- />
- <p style="cursor: pointer;" onclick="javascript: change_os('windows');">Windows</p>
+ />Windows</p>
</td>
<td>
-
- <?php
+ <?php
if(isset($_SESSION['operating_system']) AND $_SESSION['operating_system'] == 'windows') {
echo '<div id="file_perms_box" style="margin:0; padding:0; display:none">';
} else {
echo '<div id="file_perms_box" style="margin:0; padding:0; display:block">';
}
?>
- <input type="checkbox" tabindex="42" name="world_writeable" id="world_writeable" value="true"<?php if(isset($_SESSION['world_writeable']) AND $_SESSION['world_writeable'] == true) { echo 'checked'; } ?> />
+
+ <input type="checkbox" tabindex="42" name="world_writeable" id="world_writeable" value="true"<?php if(isset($_SESSION['world_writeable']) AND $_SESSION['world_writeable'] == true) { echo 'checked="checked"'; } ?> />
<label for="world_writeable">
World-writeable file permissions (777)
</label>
<br />
<p>(Please note: this is only recommended for testing environments)</p>
- </div>
+ <?php echo '</div>';?>
</td>
</tr>
</table>
- <table cellpadding="5" cellspacing="0" width="100%" align="center">
+ <table cellpadding="5" cellspacing="0" width="100%">
<tr>
<td colspan="5">Please enter your MySQL database server details below...</td>
</tr>
<tr>
- <td width="120" style="color: #666666;">Host Name:</td>
- <td width="230">
+ <td style="color: #666666;">Host Name:</td>
+ <td>
<input type="text" tabindex="43" name="database_host" style="width: 98%;" value="<?php if(isset($_SESSION['database_host'])) {
echo $_SESSION['database_host'];
} else {
echo 'localhost';
} ?>" />
</td>
- <td width="7"> </td>
- <td width="70" style="color: #666666;">Username:</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td style="color: #666666;">Username:</td>
<td>
- <input type="text" tabindex="44" name="database_username" style="width: 98%;" value="<?php
+ <input type="text" tabindex="44" name="database_username" size="20" value="<?php
if(isset($_SESSION['database_username'])) {
echo $_SESSION['database_username'];
} else {
@@ -253,24 +248,21 @@
</td>
</tr>
<tr>
- <td style="color: #666666;"></td>
- <td>
- </td>
- <td> </td>
<td style="color: #666666;">Password:</td>
<td>
- <input type="password" tabindex="45" name="database_password" style="width: 98%;"<?php if(isset($_SESSION['database_password'])) {
+ <input type="password" tabindex="45" name="database_password" size="20"<?php if(isset($_SESSION['database_password'])) {
echo ' value = "'.$_SESSION['database_password'].'"';
} ?> />
</td>
+ <td> </td>
</tr>
<tr>
<td colspan="2">
<input type="checkbox" tabindex="46" name="install_tables" id="install_tables" value="true"<?php if(!isset($_SESSION['install_tables'])) {
- echo ' checked';
+ echo ' checked="checked"';
} elseif($_SESSION['install_tables'] == 'true') {
- echo ' checked';
+ echo ' checked="checked"';
} ?> />
<label for="install_tables" style="color: #666666;">Install Tables</label>
<br />
@@ -278,7 +270,7 @@
</td>
</tr>
<tr>
- <td colspan="5"><h1>Step 5</h1>Please enter the company name below...</td>
+ <td colspan="5"><h3>Step 5</h3>Please enter the company name below...</td>
</tr>
<tr>
<td style="color: #666666;" colspan="1">Company Name:</td>
@@ -287,21 +279,22 @@
</td>
</tr>
<tr>
- <td width="170">
+ <td>
Install the test company :
</td>
- <td width="180">
- <input type="checkbox" tabindex="51" name="DemoData" id="db_file_demo" value="demo"<?php if(!isset($_SESSION['db_file']) OR $_SESSION['db_file'] == 'demo') { echo ' checked'; } ?> />
- <p style="cursor: pointer;" onclick="javascript: change_data('demo');">weberpdemo company</p>
+ <td>
+ <p style="cursor: pointer;" onclick="javascript: change_data('demo');">
+ <input type="checkbox" tabindex="51" name="DemoData" id="db_file_demo" value="demo"<?php if(!isset($_SESSION['db_file']) OR $_SESSION['db_file'] == 'demo') { echo ' checked="checked"'; } ?> />
+ weberpdemo company</p>
</td>
</tr>
<tr>
- <td width="170">
+ <td>
Time Zone
</td>
- <td width="180">
+ <td>
<select name='timezone' tabindex="52">
<?php
include('timezone.php');
@@ -311,17 +304,17 @@
</td>
</tr>
<tr>
- <td width="170">
+ <td>
Logo Image File (.jpg)
</td>
- <td width="180">
+ <td>
<input type="hidden" name="MAX_FILE_SIZE" <?php echo "value=\"" . $_SESSION['MaxLogoSize'] . "\"" ?> />
<input type="file" size="50" id="LogoFile" name="LogoFile" tabindex="53" />
</td>
</tr>
<tr>
- <td colspan="5"><h1>Step 6</h1>Please enter your Administrator accou...
[truncated message content] |
