Menu
▾
▴
web-erp-svn
|
From: <vv...@us...> - 2012-02-27 22:30:00
|
Revision: 4983
http://web-erp.svn.sourceforge.net/web-erp/?rev=4983&view=rev
Author: vvs2012
Date: 2012-02-27 22:29:51 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
xhtml cleanup
Modified Paths:
--------------
trunk/CompanyPreferences.php
trunk/Credit_Invoice.php
trunk/CustomerTransInquiry.php
trunk/InventoryValuation.php
trunk/PDFPriceList.php
trunk/PDFRemittanceAdvice.php
trunk/Payments.php
trunk/PcReportTab.php
trunk/ReorderLevel.php
trunk/SalesAnalRepts.php
trunk/SalesGraph.php
trunk/SelectWorkOrder.php
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocTransfer.php
trunk/StockTransfers.php
trunk/SuppLoginSetup.php
trunk/SuppPriceList.php
trunk/SystemParameters.php
trunk/Z_DataExport.php
trunk/install/timezone.php
trunk/reportwriter/admin/RCFunctions.inc
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/CompanyPreferences.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -151,9 +151,10 @@
} /* end of if submit */
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p><br />';
+ '" 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'] . '" />';
echo '<table class="selection">';
@@ -313,9 +314,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['DebtorsAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -330,9 +331,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['CreditorsAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="' . $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="' . $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -347,9 +348,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PayrollAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -364,9 +365,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['GRNAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -380,9 +381,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['RetainedEarnings']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -405,9 +406,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['FreightAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -422,9 +423,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['ExchangeDiffAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -439,9 +440,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PurchasesExchangeDiffAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -456,9 +457,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PytDiscountAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -518,6 +519,7 @@
<div class="centre">
<input tabindex="26" type="submit" name="submit" value="' . _('Update') . '" />
</div>';
+echo '</div></form>';
include('includes/footer.inc');
?>
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/Credit_Invoice.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -1511,7 +1511,7 @@
echo '<tr><td>' . _('Credit note text') . '</td><td><textarea tabindex="' . $j . '" name="CreditText" cols="31" rows="5">' . $_POST['CreditText'] . '</textarea></td></tr>';
echo '</table><br /><div class="centre"><input tabindex="' . $j . '" type="submit" name="Update" value="' . _('Update') . '" /><br />';
$j++;
- echo '<input type="submit" tabindex="'.$j++.'" name="ProcessCredit" Value="' . _('Process Credit') .'" /></div>';
+ echo '<input type="submit" tabindex="'.$j++.'" name="ProcessCredit" value="' . _('Process Credit') .'" /></div>';
}
echo '</form>';
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/CustomerTransInquiry.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -37,7 +37,7 @@
echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
}
} else {
- echo '<option Value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
+ echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
}
}
echo '</select></td>';
Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/InventoryValuation.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -259,7 +259,7 @@
<td>' . _('Summary or Detailed Report') . ':</td>
<td><select name="DetailedReport">
<option selected="selected" value="No">' . _('Summary Report') . '</option>
- <option Value="Yes">' . _('Detailed Report') . '</option>
+ <option value="Yes">' . _('Detailed Report') . '</option>
</select></td>
</tr>
</table>
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/PDFPriceList.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -286,27 +286,27 @@
$SalesTypesResult=DB_query($sql,$db);
while ($myrow=DB_fetch_array($SalesTypesResult)){
- echo '<option Value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
+ echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td>' . _('Show Gross Profit %') . ':</td>
<td><select name="ShowGPPercentages">';
- echo '<option selected="selected" Value="No">'. _('Prices Only') . '</option>';
- echo '<option Value="Yes">'. _('Show GP % too') . '</option>';
+ echo '<option selected="selected" value="No">'. _('Prices Only') . '</option>';
+ echo '<option value="Yes">'. _('Show GP % too') . '</option>';
echo '</select></td></tr>';
echo '<tr><td>' . _('Price Listing Type'). ':</td><td><select name="CustomerSpecials">';
echo '<option selected="selected" value="Sales Type Prices">'. _('Default Sales Type Prices');
- echo '<option Value="Customer Special Prices Only">'. _('Customer Special Prices Only') . '</option>';
- echo '<option Value="Full Description">'. _('Full Description') . '</option>';
+ echo '<option value="Customer Special Prices Only">'. _('Customer Special Prices Only') . '</option>';
+ echo '<option value="Full Description">'. _('Full Description') . '</option>';
echo '</select></td></tr>';
echo '<tr><td>' . _('Effective As At') . ':</td>';
echo '<td><input type="text" size="11" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '" />';
echo '</td></tr>';
- echo '</table><br /><div class="centre"><input type="submit" Name="PrintPDF" Value="'. _('Print PDF'). '" /></div>';
+ echo '</table><br /><div class="centre"><input type="submit" Name="PrintPDF" value="'. _('Print PDF'). '" /></div>';
}
include('includes/footer.inc');
Modified: trunk/PDFRemittanceAdvice.php
===================================================================
--- trunk/PDFRemittanceAdvice.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/PDFRemittanceAdvice.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -167,7 +167,7 @@
echo '</table>
<div class="centre">
- <input type="submit" Name="PrintPDF" Value="' . _('Print PDF') . '" />
+ <input type="submit" Name="PrintPDF" value="' . _('Print PDF') . '" />
</div>';
include ('includes/footer.inc');
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/Payments.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -1103,7 +1103,7 @@
</tr>';
echo '<input type="hidden" name="SuppName" value="' . $_SESSION['PaymentDetail' . $identifier]->SuppName . '" />';
} else {
- echo '<input type="hidden" name="Discount" Value="0" />';
+ echo '<input type="hidden" name="Discount" value="0" />';
}
echo '</table><br />';
echo '<input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" />';
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/PcReportTab.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -67,7 +67,7 @@
echo '<tr><td>' . _('To Date:') .'</td><td>';
echo '<input tabindex="3" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" />';
echo '</td></tr></table><br />';
- echo '<div class="centre"><input type="submit" Name="ShowTB" Value="' . _('Show HTML') .'" />';
+ echo '<div class="centre"><input type="submit" Name="ShowTB" value="' . _('Show HTML') .'" />';
echo '<input type="submit" name="PrintPDF" value="' . _('PrintPDF') . '" /></div>';
} else if (isset($_POST['PrintPDF'])) {
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/ReorderLevel.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -184,9 +184,9 @@
}
while ($myrow=DB_fetch_array($resultStkLocs)){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
echo '</select></td></tr>';
Modified: trunk/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/SalesAnalRepts.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -31,22 +31,22 @@
if ($GroupByDataX == 'Sales Type') {
echo '<option selected="selected" value="Sales Type">' . _('Sales Type') . '</option>';
} else {
- echo '<option Value="Sales Type">' . _('Sales Type') . '</option>';
+ echo '<option value="Sales Type">' . _('Sales Type') . '</option>';
}
if ($GroupByDataX == 'Product Type') {
echo '<option selected="selected" value="Product Type">' . _('Product Type') . '</option>';
} else {
- echo '<option Value="Product Type">' . _('Product Type') . '</option>';
+ echo '<option value="Product Type">' . _('Product Type') . '</option>';
}
if ($GroupByDataX == 'Customer Branch') {
echo '<option selected="selected" value="Customer Branch">' . _('Customer Branch') . '</option>';
} else {
- echo '<option Value="Customer Branch">' . _('Customer Branch') . '</option>';
+ echo '<option value="Customer Branch">' . _('Customer Branch') . '</option>';
}
if ($GroupByDataX == 'Sales Person') {
echo '<option selected="selected" value="Sales Person">' . _('Sales Person') . '</option>';
} else {
- echo '<option Value="Sales Person">' . _('Sales Person') . '</option>';
+ echo '<option value="Sales Person">' . _('Sales Person') . '</option>';
}
if ($GroupByDataX=='Not Used' OR $GroupByDataX == '' OR ! isset($GroupByDataX) OR is_null($GroupByDataX)){
echo '<option selected="selected" value="Not Used">' . _('Not Used') . '</option>';
@@ -470,7 +470,7 @@
echo '<option selected="selected" value="0">' . _('No') . '</option>';
echo '<option value="1">' . _('Yes') . '</option>';
} else {
- echo 'OPTION value="0">' . _('No') . '</option>';
+ echo '<option value="0">' . _('No') . '</option>';
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
}
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/SalesGraph.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -189,7 +189,7 @@
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" Name="ShowGraph" Value="' . _('Show Sales Graph') .'" /></div>';
+ echo '<br /><div class="centre"><input type="submit" Name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
include('includes/footer.inc');
} else {
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/SelectWorkOrder.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -128,7 +128,7 @@
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/StockCounts.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -126,7 +126,7 @@
//START OF action=VIEW
$SQL = "select * from stockcounts";
$result = DB_query($SQL, $db);
- echo '<input type="hidden" name=Action Value="View" />';
+ echo '<input type="hidden" name=Action value="View" />';
echo '<table cellpadding="2" class="selection">';
echo "<tr>
<th>" . _('Stock Code') . "</th>
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/StockDispatch.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -249,9 +249,9 @@
<td><select name="FromLocation"> ';
while ($myrow=DB_fetch_array($resultStkLocs)){
if ($myrow['loccode'] == $_POST['FromLocation']){
- echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
echo '</select></td>
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/StockLocTransfer.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -237,7 +237,7 @@
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
- echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
$_POST['FromStockLocation']=$myrow['loccode'];
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/StockTransfers.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -522,12 +522,12 @@
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_SESSION['Transfer']) AND isset($_SESSION['Transfer']->StockLocationTo)){
if ($myrow['loccode'] == $_SESSION['Transfer']->StockLocationTo){
- echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation'] AND isset($_SESSION['Transfer'])){
- echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
$_SESSION['Transfer']->StockLocationTo=$myrow['loccode'] . '</option>';
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
Modified: trunk/SuppLoginSetup.php
===================================================================
--- trunk/SuppLoginSetup.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/SuppLoginSetup.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -238,7 +238,7 @@
if(isset($_POST['PageSize']) and $_POST['PageSize']=='legal'){
echo '<option selected="selected" value="legal">' . _('Legal') . '</option>';
} else {
- echo '<option Value="legal">' . _('Legal') . '</option>';
+ echo '<option value="legal">' . _('Legal') . '</option>';
}
if(isset($_POST['PageSize']) and $_POST['PageSize']=='legal_landscape'){
echo '<option selected="selected" value="legal_landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/SuppPriceList.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -233,7 +233,7 @@
if (isset($_POST['categoryid']) and ($myrow['categoryid'] == $_POST['categoryid'])) {
echo '<option selected="selected" value="' . $myrow['categoryid'] . '">' . $myrow['categoryid']-$myrow['categorydescription'] . '</option>';
} else {
- echo '<option Value="' . $myrow['categoryid'] . '">' .$myrow['categoryid'].' - '. $myrow['categorydescription'] . '</option>';
+ echo '<option value="' . $myrow['categoryid'] . '">' .$myrow['categoryid'].' - '. $myrow['categorydescription'] . '</option>';
}
}
echo '</select></td>
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-02-27 19:19:27 UTC (rev 4982)
+++ trunk/SystemParameters.php 2012-02-27 22:29:51 UTC (rev 4983)
@@ -325,14 +325,16 @@
} /* end of if submit */
-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'] . '" />';
echo '<table cellpadding="2" class="selection" width="98%">';
$TableHeader = '<tr>
<th>' . _('System Variable Name') . '</th>
<th>' . _('Value') . '</th>
- <th>' . _('Notes') . '</th>';
+ <th>' . _('Notes') . '</th>
+ </tr>';
echo '<tr><th colspan="3">' . _('General Settings') . '</th></tr>';
echo $TableHeader;
@@ -340,10 +342,10 @@
// DefaultDateFormat
echo '<tr style="outline: 1px solid"><td>' . _('Default Date Format') . ':</td>
<td><select name="X_DefaultDateFormat">
- <option '.(($_SESSION['DefaultDateFormat']=='d/m/Y')?'selected ':'').'Value="d/m/Y">d/m/Y</option>
- <option '.(($_SESSION['DefaultDateFormat']=='d.m.Y')?'selected ':'').'Value="d.m.Y">d.m.Y</option>
- <option '.(($_SESSION['DefaultDateFormat']=='m/d/Y')?'selected ':'').'Value="m/d/Y">m/d/Y</option>
- <option '.(($_SESSION['DefaultDateFormat']=='Y/m/d')?'selected ':'').'Value="Y/m/d">Y/m/d</option>
+ <option '.(($_SESSION['DefaultDateFormat']=='d/m/Y')?'selected="selected" ':'').'value="d/m/Y">d/m/Y</option>
+ <option '.(($_SESSION['DefaultDateFormat']=='d.m.Y')?'selected="selected" ':'').'value="d.m.Y">d.m.Y</option>
+ <option '.(($_SESSION['DefaultDateFormat']=='m/d/Y')?'selected="selected" ':'').'value="m/d/Y">m/d/Y</option>
+ <option '.(($_SESSION['DefaultDateFormat']=='Y/m/d')?'selected="selected" ':'').'value="Y/m/d">Y/m/d</option>
</select></td>
<td>' . _('The default date format for entry of dates and display.') . '</td></tr>';
@@ -384,17 +386,17 @@
// Check Credit Limits
echo '<tr style="outline: 1px solid"><td>' . _('Check Credit Limits') . ':</td>
<td><select name="X_CheckCreditLimits">
- <option '.($_SESSION['CheckCreditLimits']==0?'selected ':'').'value="0">'._('Do not check').'</option>
- <option '.($_SESSION['CheckCreditLimits']==1?'selected ':'').'value="1">'._('Warn on breach').'</option>
- <option '.($_SESSION['CheckCreditLimits']==2?'selected ':'').'value="2">'._('Prohibit Sales').'</option>
+ <option '.($_SESSION['CheckCreditLimits']==0?'selected="selected" ':'').'value="0">'._('Do not check').'</option>
+ <option '.($_SESSION['CheckCreditLimits']==1?'selected="selected" ':'').'value="1">'._('Warn on breach').'</option>
+ <option '.($_SESSION['CheckCreditLimits']==2?'selected="selected" ':'').'value="2">'._('Prohibit Sales').'</option>
</select></td>
<td>' . _('Credit limits can be checked at order entry to warn only or to stop the order from being entered where it would take a customer account balance over their limit') . '</td></tr>';
// Show_Settled_LastMonth
echo '<tr style="outline: 1px solid"><td>' . _('Show Settled Last Month') . ':</td>
<td><select name="X_Show_Settled_LastMonth">
- <option '.($_SESSION['Show_Settled_LastMonth']?'selected ':'').'value="1">'._('Yes').'</option>
- <option '.(!$_SESSION['Show_Settled_LastMonth']?'selected ':'').'value="0">'._('No').'</option>
+ <option '.($_SESSION['Show_Settled_LastMonth']?'selected="selected" ':'').'value="1">'._('Yes').'</option>
+ <option '.(!$_SESSION['Show_Settled_LastMonth']?'selected="selected" ':'').'value="0">'._('No').'</option>
</select></td>
<td>' . _('This setting refers to the format of customer statements. If the invoices and credit notes that have been paid and settled during the course of the current month should be shown then select Yes. Selecting No will only show currently outstanding invoices, credits and payments that have not been allocated') . '</td></tr>';
@@ -416,15 +418,15 @@
// SO_AllowSameItemMultipleTimes
echo '<tr style="outline: 1px solid"><td>' . _('Sales Order Allows Same Item Multiple Times') . ':</td>
<td><select name="X_SO_AllowSameItemMultipleTimes">
- <option '.($_SESSION['SO_AllowSameItemMultipleTimes']?'selected ':'').'value="1">'._('Yes').'</option>
- <option '.(!$_SESSION['SO_AllowSameItemMultipleTimes']?'selected ':'').'value="0">'._('No').'</option>
+ <option '.($_SESSION['SO_AllowSameItemMultipleTimes']?'selected="selected" ':'').'value="1">'._('Yes').'</option>
+ <option '.(!$_SESSION['SO_AllowSameItemMultipleTimes']?'selected="selected" ':'').'value="0">'._('No').'</option>
</select></td><td> </td></tr>';
//'AllowOrderLineItemNarrative'
echo '<tr style="outline: 1px solid"><td>' . _('Order Entry allows Line Item Narrative') . ':</td>
<td><select name="X_AllowOrderLineItemNarrative">
- <option '.($_SESSION['AllowOrderLineItemNarrative']=='1'?'selected ':'').'value="1">'._('Allow Narrative Entry').'</option>
- <option '.($_SESSION['AllowOrderLineItemNarrative']=='0'?'selected ':'').'value="0">'._('No Narrative Line').'</option>
+ <option '.($_SESSION['AllowOrderLineItemNarrative']=='1'?'selected="selected" ':'').'value="1">'._('Allow Narrative Entry').'</option>
+ <option '.($_SESSION['AllowOrderLineItemNarrative']=='0'?'selected="selected" ':'').'value="0">'._('No Narrative Line').'</option>
</select></td>
<td>' . _('Select whether or not to allow entry of narrative on order line items. This narrative will appear on invoices and packing slips. Useful mainly for service businesses.') . '</td>
</tr>';
@@ -432,8 +434,8 @@
//'RequirePickingNote'
echo '<tr style="outline: 1px solid"><td>' . _('A picking note must be produced before an order can be delivered') . ':</td>
<td><select name="X_RequirePickingNote">
- <option '.($_SESSION['RequirePickingNote']=='1'?'selected ':'').'value="1">'._('Yes').'</option>
- <option '.($_SESSION['RequirePickingNote']=='0'?'selected ':'').'value="0">'._('No').'</option>
+ <option '.($_SESSION['RequirePickingNote']=='1'?'selected="selected" ':'').'value="1">'._('Yes').'</option>
+ <option '.($_SESSION['RequirePickingNote']=='0'?'selected="selected" ':'').'value="0">'._('No').'</option>
</select></td>
<td>' . _('Select whether or not a picking note must be produced before an order can be delivered to a customer.') . '</td>
</tr>';
@@ -441,8 +443,8 @@
//UpdateCurrencyRatesDaily
echo '<tr style="outline: 1px solid"><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
<td><select name="X_UpdateCurrencyRatesDaily">
- <option '.($_SESSION['UpdateCurrencyRatesDaily']!='1'?'selected ':'').'value="1">'._('Automatic').'</option>
- <option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected ':'').'value="0">'._('Manual').'</option>
+ <option '.($_SESSION['UpdateCurrencyRatesDaily']!='1'?'selected="selected" ':'').'value="1">'._('Automatic').'</option>
+ <option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected="selected" ':'').'value="0">'._('Manual').'</option>
</select></td>
<td>' . _('Automatic updates to exchange rates will retrieve the latest daily rates from the European Central Bank once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . '</td>
</tr>';
@@ -450,8 +452,8 @@
//Default Packing Note Format
echo '<tr style="outline: 1px solid"><td>' . _('Format of Packing Slips') . ':</td>
<td><select name="X_PackNoteFormat">
- <option '.($_SESSION['PackNoteFormat']=='1'?'selected ':'').'value="1">'._('Laser Printed').'</option>
- <option '.($_SESSION['PackNoteFormat']=='2'?'selected ':'').'value="2">'._('Special Stationery').'</option>
+ <option '.($_SESSION['PackNoteFor...
[truncated message content] |
|
From: <dai...@us...> - 2012-02-28 09:38:32
|
Revision: 4984
http://web-erp.svn.sourceforge.net/web-erp/?rev=4984&view=rev
Author: daintree
Date: 2012-02-28 09:38:19 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Departments.php
trunk/SelectOrderItems.php
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.07-4.08.sql
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/Departments.php 2012-02-28 09:38:19 UTC (rev 4984)
@@ -25,7 +25,7 @@
//first off validate inputs sensible
- if (strpos($_POST['DepartmentName'],'&')>0 OR strpos($_POST['DepartmentName'],"'")>0) {
+ if (ContainsIllegalCharacters($_POST['DepartmentName'])) {
$InputError = 1;
prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
}
@@ -34,7 +34,9 @@
prnMsg( _('The Name of the Department should not be empty'), 'error');
}
- if (isset($_POST['SelectedDepartmentID']) AND $_POST['SelectedDepartmentID']!='' AND $InputError !=1) {
+ if (isset($_POST['SelectedDepartmentID'])
+ AND $_POST['SelectedDepartmentID']!=''
+ AND $InputError !=1) {
/*SelectedDepartmentID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -48,21 +50,21 @@
$InputError = 1;
prnMsg( _('This department name already exists.'),'error');
} else {
- // Get the old name and check that the record still exist neet to be very carefull here
- // idealy this is one of those sets that should be in a stored procedure simce even the checks are
- // relavant
- $sql = "SELECT description FROM departments
- WHERE departmentid = '" . $SelectedDepartmentID . "'";
+ // Get the old name and check that the record still exist neet to be very careful here
+
+ $sql = "SELECT description
+ FROM departments
+ WHERE departmentid = '" . $SelectedDepartmentID . "'";
$result = DB_query($sql,$db);
if ( DB_num_rows($result) != 0 ) {
// This is probably the safest way there is
- $myrow = DB_fetch_row($result);
- $OldDepartmentName = $myrow[0];
+ $myrow = DB_fetch_array($result);
+ $OldDepartmentName = $myrow['description'];
$sql = array();
$sql[] = "UPDATE departments
- SET description='" . $_POST['DepartmentName'] . "',
- authoriser='" . $_POST['Authoriser'] . "'
- WHERE description ".LIKE." '".$OldDepartmentName."'";
+ SET description='" . $_POST['DepartmentName'] . "',
+ authoriser='" . $_POST['Authoriser'] . "'
+ WHERE description ". LIKE . " '" . $OldDepartmentName . "'";
} else {
$InputError = 1;
prnMsg( _('The Department does not exist.'),'error');
@@ -72,20 +74,17 @@
} elseif ($InputError !=1) {
/*SelectedDepartmentID is null cos no item selected on first time round so must be adding a record*/
$sql = "SELECT count(*) FROM departments
- WHERE description " .LIKE. " '".$_POST['DepartmentName'] ."'";
+ WHERE description " . LIKE . " '" . $_POST['DepartmentName'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ( $myrow[0] > 0 ) {
$InputError = 1;
prnMsg( _('There is already a Department with the specified name.'),'error');
} else {
- $sql = "INSERT INTO departments (
- description,
- authoriser )
- VALUES (
- '" . $_POST['DepartmentName'] ."',
- '" . $_POST['Authoriser'] ."'
- )";
+ $sql = "INSERT INTO departments (description,
+ authoriser )
+ VALUES ('" . $_POST['DepartmentName'] . "',
+ '" . $_POST['Authoriser'] . "')";
}
$msg = _('The new department has been created');
}
@@ -94,10 +93,10 @@
//run the SQL from either of the above possibilites
if (is_array($sql)) {
$result = DB_Txn_Begin($db);
- $tmpErr = _('The department could not be inserted');
- $tmpDbg = _('The sql that failed was') . ':';
+ $ErrMsg = _('The department could not be inserted');
+ $DbgMsg = _('The sql that failed was') . ':';
foreach ($sql as $stmt ) {
- $result = DB_query($stmt,$db, $tmpErr,$tmpDbg,true);
+ $result = DB_query($stmt,$db, $ErrMsg,$DbgMsg,true);
if(!$result) {
$InputError = 1;
break;
@@ -119,25 +118,28 @@
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
-// PREVENT DELETES IF DEPENDENT RECORDS IN 'stockmaster'
- // Get the original name of the unit of measure the ID is just a secure way to find the unit of measure
- $sql = "SELECT description FROM departments
- WHERE departmentid = '" . $SelectedDepartmentID . "'";
+
+
+ $sql = "SELECT description
+ FROM departments
+ WHERE departmentid = '" . $SelectedDepartmentID . "'";
$result = DB_query($sql,$db);
if ( DB_num_rows($result) == 0 ) {
- // This is probably the safest way there is
prnMsg( _('You cannot delete this Department'),'warn');
} else {
$myrow = DB_fetch_row($result);
$OldDepartmentName = $myrow[0];
- $sql= "SELECT COUNT(*) FROM dispatch,departments WHERE dispatch.departmentid=departments.departmentid and description ".LIKE." '" . $OldDepartmentName . "'";
+ $sql= "SELECT COUNT(*)
+ FROM dispatch INNER JOIN departments
+ ON dispatch.departmentid=departments.departmentid
+ WHERE description " . LIKE . " '" . $OldDepartmentName . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
prnMsg( _('You cannot delete this Department'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('There are items related to this department');
} else {
- $sql="DELETE FROM departments WHERE description ".LIKE."'" . $OldDepartmentName . "'";
+ $sql="DELETE FROM departments WHERE description " . LIKE . "'" . $OldDepartmentName . "'";
$result = DB_query($sql,$db);
prnMsg( $OldDepartmentName . ' ' . _('The department has been removed') . '!','success');
}
@@ -152,17 +154,9 @@
if (!isset($SelectedDepartmentID)) {
-/* An unit of measure could be posted when one has been edited and is being updated
- or GOT when selected for modification
- SelectedDepartmentID will exist because it was sent with the page in a GET .
- If its the first time the page has been displayed with no parameters
- then none of the above are true and the list of account groups 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*/
-
$sql = "SELECT departmentid,
- description,
- authoriser
+ description,
+ authoriser
FROM departments
ORDER BY departmentid";
@@ -186,11 +180,11 @@
$k++;
}
- echo '<td>' . $myrow['description'] . '</td>';
- echo '<td>' . $myrow['authoriser'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>';
- echo '</tr>';
+ 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>
+ </tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -212,7 +206,7 @@
//editing an existing section
$sql = "SELECT departmentid,
- description
+ description
FROM departments
WHERE departmentid='" . $SelectedDepartmentID . "'";
@@ -235,10 +229,12 @@
echo '<table class="selection">';
}
echo '<tr>
- <td>' . _('Department Name') . ':' . '</td>
- <td><input type="text" name="DepartmentName" size="50" maxlength="100" value="' . $_POST['DepartmentName'] . '" /></td>
+ <td>' . _('Department Name') . ':' . '</td>
+ <td><input type="text" name="DepartmentName" size="50" maxlength="100" value="' . $_POST['DepartmentName'] . '" /></td>
</tr>';
- echo '<tr><td>'._('Authoriser').'</td><td><select name="Authoriser">';
+ echo '<tr>
+ <td>'._('Authoriser').'</td>
+ <td><select name="Authoriser">';
$usersql="SELECT userid FROM www_users";
$userresult=DB_query($usersql,$db);
while ($myrow=DB_fetch_array($userresult)) {
@@ -248,13 +244,16 @@
echo '<option value="'.$myrow['userid'].'">'.$myrow['userid'].'</option>';
}
}
- echo '</select></td></tr>';
- echo '</table><br />';
+ echo '</select></td>
+ </tr>
+ </table>
+ <br />';
- echo '<div class="centre"><input type="submit" name="Submit" value="' . _('Enter Information') . '" /></div>';
+ echo '<div class="centre">
+ <input type="submit" name="Submit" value="' . _('Enter Information') . '" />
+ </div>
+ </form>';
- echo '</form>';
-
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/SelectOrderItems.php 2012-02-28 09:38:19 UTC (rev 4984)
@@ -1502,23 +1502,21 @@
$ImageSource = _('No Image');
// Find the quantity in stock at location
$QOHSQL = "SELECT sum(locstock.quantity) AS qoh
- FROM locstock INNER JOIN stockmaster
- ON locstock.stockid=stockmaster.stockid
- WHERE locstock.stockid='" .$myrow['stockid'] . "' AND
- loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
+ FROM locstock
+ WHERE stockid='" .$myrow['stockid'] . "'
+ AND loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSQL,$db);
$QOHRow = DB_fetch_array($QOHResult);
$QOH = $QOHRow['qoh'];
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
- AND salesorderdetails.completed=0
- AND salesorders.quotation=0
- AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
_('cannot be retrieved because');
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2012-02-28 09:38:19 UTC (rev 4984)
@@ -9,7 +9,7 @@
"Project-Id-Version: weberp 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-11 17:15+1300\n"
-"PO-Revision-Date: 2012-02-21 21:15+0100\n"
+"PO-Revision-Date: 2012-02-28 00:33+0100\n"
"Last-Translator: James Dupin <jam...@gm...>\n"
"Language-Team: French <none>\n"
"MIME-Version: 1.0\n"
@@ -92,11 +92,12 @@
msgid "The SQL that was used to update the account group was"
msgstr "Commande SQL de modification du groupe:"
+# JDN
#: AccountGroups.php:136
#: AccountSections.php:104
#: PaymentMethods.php:82
msgid "Record Updated"
-msgstr "Fiche mise à jour"
+msgstr "Enregistrement mis à jour"
#: AccountGroups.php:154
msgid "An error occurred in inserting the account group"
@@ -106,11 +107,12 @@
msgid "The SQL that was used to insert the account group was"
msgstr "Échec de la commande SQL d'ajoût du groupe:"
+# JDN
#: AccountGroups.php:156
#: AccountSections.php:116
#: PaymentMethods.php:103
msgid "Record inserted"
-msgstr "Fiche créée"
+msgstr "Enregistrement créé"
#: AccountGroups.php:173
msgid "An error occurred in retrieving the group information from chartmaster"
@@ -921,6 +923,7 @@
msgid "The contact email address is not a valid email address"
msgstr "L'adresse courriel est incorrecte"
+# JDN
#: AddCustomerContacts.php:61
#: AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49
@@ -943,7 +946,7 @@
#: Suppliers.php:513
#: SupplierTypes.php:67
msgid "has been updated"
-msgstr "a été mis à jour"
+msgstr "a été mis(e) à jour"
#: AddCustomerContacts.php:76
msgid "The contact record has been added"
@@ -978,7 +981,7 @@
#: WWW_Access.php:107
#: WWW_Access.php:169
msgid "Role"
-msgstr "Rôle"
+msgstr "Rôle de sécurité"
#: AddCustomerContacts.php:130
msgid "Phone no"
@@ -1035,7 +1038,7 @@
#: WOSerialNos.php:291
#: WOSerialNos.php:297
msgid "Notes"
-msgstr "Notes"
+msgstr "Commentaires"
#: AddCustomerContacts.php:150
#: SupplierContacts.php:164
@@ -1214,7 +1217,7 @@
#: AddCustomerTypeNotes.php:5
#: SelectCustomer.php:693
msgid "Customer Type (Group) Notes"
-msgstr "Type de client (en groupe) Notes"
+msgstr ""
#: AddCustomerTypeNotes.php:31
msgid "The Contact priority must be an integer."
@@ -1561,7 +1564,7 @@
#: AgedDebtors.php:468
#: AgedSuppliers.php:296
msgid "All balances or overdues only"
-msgstr "Tous les soldes ou les écheances uniquement"
+msgstr "Tous les soldes ou arrièrés uniquement"
#: AgedDebtors.php:470
msgid "All customers with balances"
@@ -1570,7 +1573,7 @@
#: AgedDebtors.php:471
#: AgedSuppliers.php:299
msgid "Overdue accounts only"
-msgstr "Seulement les comptes à écheance"
+msgstr "Arrièrés seulement"
#: AgedDebtors.php:472
msgid "Held accounts only"
@@ -1663,7 +1666,7 @@
#: AgedSuppliers.php:264
#: AgedSuppliers.php:274
msgid "Aged Supplier Analysis"
-msgstr "Analyse de fournisseur à écheance"
+msgstr ""
#: AgedSuppliers.php:288
#: OutstandingGRNs.php:168
@@ -1671,7 +1674,7 @@
#: SupplierBalsAtPeriodEnd.php:131
#: SuppPaymentRun.php:264
msgid "From Supplier Code"
-msgstr "À partir du code fournisseur"
+msgstr "À partir du code"
#: AgedSuppliers.php:292
#: OutstandingGRNs.php:172
@@ -1679,7 +1682,7 @@
#: SupplierBalsAtPeriodEnd.php:135
#: SuppPaymentRun.php:268
msgid "To Supplier Code"
-msgstr "Au code fournisseur"
+msgstr "Jusqu'au code"
#: AgedSuppliers.php:298
msgid "All suppliers with balances"
@@ -1687,16 +1690,18 @@
#: AgedSuppliers.php:303
msgid "For suppliers trading in"
-msgstr "Pour les fournisseurs \"trading in\""
+msgstr "Devise fournisseur"
+# JDN
#: AgedSuppliers.php:319
#: InventoryValuation.php:259
msgid "Summary or Detailed Report"
-msgstr "Sommaire ou Rapport détaillé"
+msgstr "Type de rapport"
+# JDN
#: Areas.php:7
msgid "Sales Area Maintenance"
-msgstr "Gestion de la zone d'achalandage"
+msgstr "Gestion des zones d'achalandage"
#: Areas.php:40
msgid "The area code must be three characters or less long"
@@ -1710,25 +1715,29 @@
msgid "The area description must be twenty five characters or less long"
msgstr "La description de la région doit être 25 caractères ou moins long"
+# JDN
#: Areas.php:55
msgid "The area code may not be empty"
-msgstr "L'indicatif régional ne doit pas être vide"
+msgstr "Un indicatif doit être saisi"
#: Areas.php:60
msgid "The area description may not be empty"
msgstr "La description de la région ne peut pas être vide"
+# JDN
#: Areas.php:73
msgid "Area code"
-msgstr "Indicatif régional"
+msgstr "Indicatif"
+# JDN
#: Areas.php:87
msgid "New area code"
-msgstr "Nouveau code zone"
+msgstr "la zone"
+# JDN
#: Areas.php:87
msgid "has been inserted"
-msgstr "a été ajouté"
+msgstr "a été ajouté(e)"
#: Areas.php:94
msgid "The area could not be added or updated because"
@@ -1778,46 +1787,51 @@
#: SupplierTypes.php:151
#: Z_DeleteInvoice.php:146
msgid "has been deleted"
-msgstr "a été supprimé"
+msgstr "a été supprimé(e)"
+# JDN
#: Areas.php:149
#: Areas.php:220
msgid "Area Name"
-msgstr "Nom zone"
+msgstr "Nom"
+# JDN
#: Areas.php:165
msgid "Are you sure you wish to delete this sales area?"
-msgstr "Voulez-vous supprimer ce département de ventes?"
+msgstr "Voulez-vous supprimer cette zone?"
#: Areas.php:166
msgid "View Customers from this Area"
msgstr "Afficher les clients de cette zone"
+# JDN
#: Areas.php:175
msgid "Review Areas Defined"
-msgstr "Afficher les Secteurs existants"
+msgstr "Afficher les zones d'achalandage"
#: AuditTrail.php:7
msgid "Audit Trail"
-msgstr "Audit Trail"
+msgstr "Journal des événements"
#: AuditTrail.php:21
msgid "Incorrect date format used, please re-enter"
msgstr "Format de date incorrect"
+# JDN
#: AuditTrail.php:41
#: BOMIndented.php:316
#: BOMIndentedReverse.php:296
#: MRPCalendar.php:263
msgid "From Date"
-msgstr "De Date"
+msgstr "Depuis le"
+# JDN
#: AuditTrail.php:43
#: BOMIndented.php:317
#: BOMIndentedReverse.php:297
#: MRPCalendar.php:265
msgid "To Date"
-msgstr "Pour Date"
+msgstr "Jusqu'au"
#: AuditTrail.php:47
#: PO_AuthorisationLevels.php:124
@@ -1825,7 +1839,7 @@
#: PO_AuthorisationLevels.php:175
#: UserSettings.php:112
msgid "User ID"
-msgstr "ID utilisateur"
+msgstr "Identifiant"
#: AuditTrail.php:49
#: AuditTrail.php:62
@@ -1892,7 +1906,7 @@
#: WorkOrderIssue.php:647
#: WorkOrderIssue.php:650
msgid "All"
-msgstr "Tous"
+msgstr "Tout(e)"
#: AuditTrail.php:60
msgid "Table "
@@ -1908,11 +1922,11 @@
#: SelectContract.php:193
#: SelectProduct.php:772
msgid "View"
-msgstr "Vue"
+msgstr "Afficher"
#: AuditTrail.php:163
msgid "Date/Time"
-msgstr "Date/Heure"
+msgstr "Date / Heure"
#: AuditTrail.php:164
#: PcReportTab.php:259
@@ -1957,14 +1971,14 @@
#: AuditTrail.php:166
msgid "Table"
-msgstr "Tableau"
+msgstr "Table"
#: AuditTrail.php:167
#: api/api_xml-rpc.php:314
#: api/api_xml-rpc.php:780
#: api/api_xml-rpc.php:2189
msgid "Field Name"
-msgstr "Nom du champ"
+msgstr "Champ"
#: AuditTrail.php:168
#: SystemParameters.php:334
@@ -2099,25 +2113,29 @@
msgid "GL Account Code"
msgstr "Code compte GL"
+# JDN
#: BankAccounts.php:192
#: BankAccounts.php:326
msgid "Bank Account Name"
-msgstr "Nom de compte bancaire"
+msgstr "Nom"
+# JDN
#: BankAccounts.php:193
#: BankAccounts.php:328
msgid "Bank Account Code"
-msgstr "Code de compte bancaire"
+msgstr "Code"
+# JDN
#: BankAccounts.php:194
#: BankAccounts.php:330
msgid "Bank Account Number"
-msgstr "Compte bancaire n°"
+msgstr "N°"
+# JDN
#: BankAccounts.php:195
#: BankAccounts.php:332
msgid "Bank Address"
-msgstr "Référence bancaire (adresse postale)"
+msgstr "Adresse postale"
#: BankAccounts.php:196
#: CustomerAllocations.php:333
@@ -2166,7 +2184,7 @@
#: BankAccounts.php:379
#: BankAccounts.php:383
msgid "Fall Back Default"
-msgstr "Solution de repli par défaut"
+msgstr ""
#: BankAccounts.php:214
#: BankAccounts.php:370
@@ -2183,7 +2201,7 @@
#: BankAccounts.php:248
msgid "Show All Bank Accounts Defined"
-msgstr "Afficher tous les comptes bancaires définis"
+msgstr "Afficher tous les comptes bancaires"
#: BankAccounts.php:282
#: BankAccounts.php:287
@@ -2505,7 +2523,7 @@
#: BankMatching.php:342
msgid "Update Matching"
-msgstr "Mise à jour des rapporchements"
+msgstr "Mise à jour des rapprochements"
#: BankReconciliation.php:7
msgid "Bank Reconciliation"
@@ -3367,7 +3385,7 @@
#: WorkOrderEntry.php:601
#: WorkOrderIssue.php:664
msgid "Enter text extracts in the"
-msgstr "Saisir un extrait de texte dans le/la"
+msgstr "Saisir une partie de "
#: BOMInquiry.php:28
#: BOMs.php:837
@@ -3378,7 +3396,7 @@
#: WorkOrderEntry.php:601
#: WorkOrderIssue.php:664
msgid "description"
-msgstr "Description"
+msgstr "description"
#: BOMInquiry.php:30
#: BOMs.php:839
@@ -3439,7 +3457,7 @@
#: WorkOrderEntry.php:605
#: WorkOrderIssue.php:667
msgid "Enter extract of the"
-msgstr "Saisir un extrait du"
+msgstr "Saisir une partie du "
#: BOMInquiry.php:31
#: BOMs.php:840
@@ -3477,7 +3495,7 @@
#: Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:319
msgid "Stock Code"
-msgstr "Code stock"
+msgstr "Code"
#: BOMInquiry.php:37
#: BOMs.php:844
@@ -3507,7 +3525,7 @@
#: WorkOrderEntry.php:609
#: WorkOrderIssue.php:672
msgid "Search Now"
-msgstr "Chercher maintenant"
+msgstr "Rechercher"
#: BOMInquiry.php:49
#: BOMs.php:775
@@ -3631,7 +3649,7 @@
#: includes/DefineLabelClass.php:21
#: includes/PDFInventoryValnPageHeader.inc:34
msgid "Units"
-msgstr "Unités"
+msgstr "Unité"
#: BOMInquiry.php:179
msgid "The bill of material could not be retrieved because"
@@ -3674,7 +3692,7 @@
#: SpecialOrder.php:725
#: StockAdjustments.php:380
msgid "Unit Cost"
-msgstr "Cot Unitaire"
+msgstr "Coût unitaire"
#: BOMInquiry.php:202
#: BOMInquiry.php:250
@@ -4290,13 +4308,13 @@
#: Suppliers.php:594
#: SystemParameters.php:323
msgid "Validation failed"
-msgstr "la validation a échoué"
+msgstr " "
#: CompanyPreferences.php:148
#: Suppliers.php:594
#: SystemParameters.php:323
msgid "no updates or deletes took place"
-msgstr "Il n'y a pas eu de mis à jour ou de suppression"
+msgstr " Rien n'a été modifié."
#: CompanyPreferences.php:189
msgid "The company preferences could not be retrieved because"
@@ -4312,7 +4330,7 @@
#: CompanyPreferences.php:233
msgid "Tax Authority Reference"
-msgstr "N° TVA Intracommunautaire"
+msgstr ""
#: CompanyPreferences.php:238
#: Factors.php:210
@@ -4352,7 +4370,7 @@
#: CompanyPreferences.php:268
msgid "Telephone Number"
-msgstr "n° tél"
+msgstr "N° tél"
#: CompanyPreferences.php:273
msgid "Facsimile Number"
@@ -4477,7 +4495,7 @@
#: ConfirmDispatchControlled_Invoice.php:39
#: ConfirmDispatch_Invoice.php:27
msgid "Select a sales order to invoice"
-msgstr "Sélectionner une commande à facturer"
+msgstr "Facturer une commande"
#: ConfirmDispatchControlled_Invoice.php:41
msgid "This page can only be opened if a sales order and line item has been selected Please do that first"
@@ -4611,6 +4629,7 @@
msgid "Customer"
msgstr "Client"
+# JDN
#: ConfirmDispatch_Invoice.php:260
#: CustEDISetup.php:93
#: Customers.php:440
@@ -4627,7 +4646,7 @@
#: includes/PDFTransPageHeader.inc:46
#: includes/PDFTransPageHeaderPortrait.inc:55
msgid "Customer Code"
-msgstr "Code Client"
+msgstr "Code client"
#: ConfirmDispatch_Invoice.php:261
#: CustEDISetup.php:96
@@ -4653,7 +4672,7 @@
#: SelectCustomer.php:415
#: SelectOrderItems.php:710
msgid "Customer Name"
-msgstr "Nom Client"
+msgstr "Société"
#: ConfirmDispatch_Invoice.php:264
msgid "Invoice amounts stated in"
@@ -5767,7 +5786,7 @@
#: Suppliers.php:965
#: includes/MiscFunctions.php:36
msgid "WARNING"
-msgstr "ATTENTION"
+msgstr "AVERTISSEMENT"
#: ConfirmDispatch_Invoice.php:939
#: CounterSales.php:1324
@@ -6466,7 +6485,7 @@
#: SelectCompletedOrder.php:524
#: SelectCreditItems.php:969
msgid "Enter text extracts in the description"
-msgstr "Saisir un extraitde texte dans la description"
+msgstr "Saisir une partie de la description"
#: ContractBOM.php:325
#: CounterSales.php:2177
@@ -6897,7 +6916,7 @@
#: Stocks.php:53
#: Z_MakeNewCompany.php:50
msgid "Only jpg files are supported - a file extension of .jpg is expected"
-msgstr "Seuls les fichiers jpg sont pris en charge -. Une extension de fichier jpg est prévu de"
+msgstr "Format d'image incorrect - Seuls les fichiers .jpg sont pris en charge"
#: Contracts.php:114
#: FixedAssetItems.php:37
@@ -7145,7 +7164,7 @@
#: Contracts.php:608
#: SelectOrderItems.php:303
msgid "At least one Customer Branch Name keyword OR an extract of a Customer Branch Code or Branch Phone Number must be entered for the search"
-msgstr "Au moins un mot-clé à la clientèle Direction Nom ou un extrait d'un code client ou de la Direction Direction numéro de téléphone doivent être inscrits pour la recherche"
+msgstr "Vous devez saisir un critère de recherche dans une des boîtes ci-dessous"
#: Contracts.php:663
#: CustomerReceipt.php:600
@@ -7157,24 +7176,28 @@
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "No Customer Branch records contain the search criteria"
-msgstr "Aucune fiche de succursale ne contient les critères de recherche"
+msgstr "Pas de succursale correspondante aux critères de recherche"
+# NE PAS CHANGER sans raison (plus que) valable.
+# La notice d'information contenant ce texte est bien trop longue avec ce texte inutile à la compréhension de l'action à mener sur la page SelectOrderItems.php?identifier=1329948142
+# should not be changed except for a pretty good reason.
+# It makes the information message way too long in SelectOrderItems.php?identifier=1329948142
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "please try again"
-msgstr "s'il vous plaît essayer à nouveau"
+msgstr " "
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "Note a Customer Branch Name may be different to the Customer Name"
-msgstr "Note: un nom de succursale peut être différent du nom du client"
+msgstr "Note: le nom de la succursale ne correspond pas forcément au nom du client"
#: Contracts.php:683
#: SelectCreditItems.php:134
#: SelectCustomer.php:189
#: SelectOrderItems.php:350
msgid "Unable to identify the selected customer"
-msgstr "Impossible d'identifier le client choisi"
+msgstr "Pas de succursale correspondant à la recherche"
#: Contracts.php:714
msgid "The customer record selected"
@@ -7267,12 +7290,12 @@
#: Contracts.php:757
#: SelectOrderItems.php:588
msgid "Part of the Customer Branch Code"
-msgstr "Partie du code de la succursale"
+msgstr "Partie du code succursale"
#: Contracts.php:760
#: SelectOrderItems.php:591
msgid "Part of the Branch Phone Number"
-msgstr "Partie du numéro de téléphone succursale"
+msgstr "Partie du n° de tél. de la succursale"
#: Contracts.php:765
#: Customers.php:611
@@ -7468,7 +7491,7 @@
#: SupplierInvoice.php:263
#: SuppPaymentRun.php:296
msgid "Exchange Rate"
-msgstr "Taux de Change"
+msgstr "Taux de change"
#: Contracts.php:919
msgid "Contract Status"
@@ -7498,7 +7521,7 @@
#: SelectContract.php:67
#: SelectContract.php:73
msgid "Completed"
-msgstr "Terminé"
+msgstr "Close"
#: Contracts.php:927
msgid "Contract Setup"
@@ -7707,7 +7730,7 @@
#: WorkOrderEntry.php:156
#: WorkOrderIssue.php:472
msgid "There are no products available meeting the criteria specified"
-msgstr "Il n'y a pas de produits répondant aux critères de recherche"
+msgstr "Il n'y a pas d'article répondant aux critères de recherche"
#: CounterSales.php:426
#: SelectOrderItems.php:903
@@ -7942,7 +7965,7 @@
#: DeliveryDetails.php:499
#: DeliveryDetails.php:685
msgid "an item on this sales order, the cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this"
-msgstr "un article sur cet ordre de vente, le coût de cet article accumulé de la somme des coûts des composants est nul. Ce pourrait être parce qu'il n'y a aucun projet de loi de matériel mis en place ... vous pouvez vérifier ce"
+msgstr "un article sur cet ordre de vente, le coût de cet article accumulé de la somme des coûts des composants est nul. Ce pourrait être parce qu'il n'y a aucun projet de loi de matériel mis en place ..."
#: CounterSales.php:1185
#: DeliveryDetails.php:513
@@ -8047,7 +8070,7 @@
#: DeliveryDetails.php:564
#: SpecialOrder.php:567
msgid "has been entered"
-msgstr "a été saisi"
+msgstr "a été saisie"
#: CounterSales.php:1833
msgid "The SQL that failed to insert the GL transaction for the bank account debit was"
@@ -8184,12 +8207,12 @@
#: CounterSales.php:2147
#: CounterSales.php:2148
msgid "Search for Items"
-msgstr "Chercher des articles"
+msgstr "Rechercher un article"
#: CounterSales.php:2148
#: SelectOrderItems.php:1607
msgid ", Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code"
-msgstr ", recherche dans la base de données des articles, affinez les résultats en sélectionnant une catégorie de stock ou entrez une description partielle de l'article ou une partie de son code"
+msgstr ": recherche d'un article dans la base de données. Affinez les résultats en sélectionnant une catégorie, une description partielle de l'article ou une partie d'un code"
#: CounterSales.php:2149
#: SelectOrderItems.php:1608
@@ -8201,15 +8224,16 @@
msgid "Enter partial Description"
msgstr "Saisir une description partielle"
+# NE PAS CHANGER sans raison (plus que) valable.
#: CounterSales.php:2182
#: SelectOrderItems.php:1647
msgid "Use Quick Entry"
-msgstr "Utiliser la Saisie rapide"
+msgstr "Vente directe"
#: CounterSales.php:2193
#: SelectOrderItems.php:1660
msgid "Select an item by entering the quantity required. Click Order when ready."
-msgstr "Sélectionner un article en entrant la quantité requise. Cliquer ensuite sur commander."
+msgstr "Saisir une quantité pour sélectionner un article puis cliquer sur \"Ajouter à la vente\". Utiliser les boutons \"Suivant\" ou \"Précédent\" pour faire défiler les articles."
#: CounterSales.php:2204
#: CounterSales.php:2327
@@ -8235,22 +8259,24 @@
#: CounterSales.php:2337
msgid "Use this form to add items quickly if the item codes are already known"
-msgstr "Utilisez ce formulaire pour ajouter des éléments rapidement si les codes de commande sont déjà connus"
+msgstr "Utilisez ce formulaire pour faire une vente directe. Entrez le code de l'article et la quantité vendue."
+# need to see if it can apply to all php where it is used.
+# Written vs CounterSales.php
#: CounterSales.php:2362
#: SelectCreditItems.php:981
#: SelectCreditItems.php:1032
#: SelectOrderItems.php:1796
#: SelectOrderItems.php:1822
msgid "Quick Entry"
-msgstr "Écriture rapide"
+msgstr "Appliquer...
[truncated message content] |
|
From: <dai...@us...> - 2012-02-28 09:38:33
|
Revision: 4984
http://web-erp.svn.sourceforge.net/web-erp/?rev=4984&view=rev
Author: daintree
Date: 2012-02-28 09:38:19 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Departments.php
trunk/SelectOrderItems.php
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.07-4.08.sql
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/Departments.php 2012-02-28 09:38:19 UTC (rev 4984)
@@ -25,7 +25,7 @@
//first off validate inputs sensible
- if (strpos($_POST['DepartmentName'],'&')>0 OR strpos($_POST['DepartmentName'],"'")>0) {
+ if (ContainsIllegalCharacters($_POST['DepartmentName'])) {
$InputError = 1;
prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
}
@@ -34,7 +34,9 @@
prnMsg( _('The Name of the Department should not be empty'), 'error');
}
- if (isset($_POST['SelectedDepartmentID']) AND $_POST['SelectedDepartmentID']!='' AND $InputError !=1) {
+ if (isset($_POST['SelectedDepartmentID'])
+ AND $_POST['SelectedDepartmentID']!=''
+ AND $InputError !=1) {
/*SelectedDepartmentID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -48,21 +50,21 @@
$InputError = 1;
prnMsg( _('This department name already exists.'),'error');
} else {
- // Get the old name and check that the record still exist neet to be very carefull here
- // idealy this is one of those sets that should be in a stored procedure simce even the checks are
- // relavant
- $sql = "SELECT description FROM departments
- WHERE departmentid = '" . $SelectedDepartmentID . "'";
+ // Get the old name and check that the record still exist neet to be very careful here
+
+ $sql = "SELECT description
+ FROM departments
+ WHERE departmentid = '" . $SelectedDepartmentID . "'";
$result = DB_query($sql,$db);
if ( DB_num_rows($result) != 0 ) {
// This is probably the safest way there is
- $myrow = DB_fetch_row($result);
- $OldDepartmentName = $myrow[0];
+ $myrow = DB_fetch_array($result);
+ $OldDepartmentName = $myrow['description'];
$sql = array();
$sql[] = "UPDATE departments
- SET description='" . $_POST['DepartmentName'] . "',
- authoriser='" . $_POST['Authoriser'] . "'
- WHERE description ".LIKE." '".$OldDepartmentName."'";
+ SET description='" . $_POST['DepartmentName'] . "',
+ authoriser='" . $_POST['Authoriser'] . "'
+ WHERE description ". LIKE . " '" . $OldDepartmentName . "'";
} else {
$InputError = 1;
prnMsg( _('The Department does not exist.'),'error');
@@ -72,20 +74,17 @@
} elseif ($InputError !=1) {
/*SelectedDepartmentID is null cos no item selected on first time round so must be adding a record*/
$sql = "SELECT count(*) FROM departments
- WHERE description " .LIKE. " '".$_POST['DepartmentName'] ."'";
+ WHERE description " . LIKE . " '" . $_POST['DepartmentName'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ( $myrow[0] > 0 ) {
$InputError = 1;
prnMsg( _('There is already a Department with the specified name.'),'error');
} else {
- $sql = "INSERT INTO departments (
- description,
- authoriser )
- VALUES (
- '" . $_POST['DepartmentName'] ."',
- '" . $_POST['Authoriser'] ."'
- )";
+ $sql = "INSERT INTO departments (description,
+ authoriser )
+ VALUES ('" . $_POST['DepartmentName'] . "',
+ '" . $_POST['Authoriser'] . "')";
}
$msg = _('The new department has been created');
}
@@ -94,10 +93,10 @@
//run the SQL from either of the above possibilites
if (is_array($sql)) {
$result = DB_Txn_Begin($db);
- $tmpErr = _('The department could not be inserted');
- $tmpDbg = _('The sql that failed was') . ':';
+ $ErrMsg = _('The department could not be inserted');
+ $DbgMsg = _('The sql that failed was') . ':';
foreach ($sql as $stmt ) {
- $result = DB_query($stmt,$db, $tmpErr,$tmpDbg,true);
+ $result = DB_query($stmt,$db, $ErrMsg,$DbgMsg,true);
if(!$result) {
$InputError = 1;
break;
@@ -119,25 +118,28 @@
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
-// PREVENT DELETES IF DEPENDENT RECORDS IN 'stockmaster'
- // Get the original name of the unit of measure the ID is just a secure way to find the unit of measure
- $sql = "SELECT description FROM departments
- WHERE departmentid = '" . $SelectedDepartmentID . "'";
+
+
+ $sql = "SELECT description
+ FROM departments
+ WHERE departmentid = '" . $SelectedDepartmentID . "'";
$result = DB_query($sql,$db);
if ( DB_num_rows($result) == 0 ) {
- // This is probably the safest way there is
prnMsg( _('You cannot delete this Department'),'warn');
} else {
$myrow = DB_fetch_row($result);
$OldDepartmentName = $myrow[0];
- $sql= "SELECT COUNT(*) FROM dispatch,departments WHERE dispatch.departmentid=departments.departmentid and description ".LIKE." '" . $OldDepartmentName . "'";
+ $sql= "SELECT COUNT(*)
+ FROM dispatch INNER JOIN departments
+ ON dispatch.departmentid=departments.departmentid
+ WHERE description " . LIKE . " '" . $OldDepartmentName . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
prnMsg( _('You cannot delete this Department'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('There are items related to this department');
} else {
- $sql="DELETE FROM departments WHERE description ".LIKE."'" . $OldDepartmentName . "'";
+ $sql="DELETE FROM departments WHERE description " . LIKE . "'" . $OldDepartmentName . "'";
$result = DB_query($sql,$db);
prnMsg( $OldDepartmentName . ' ' . _('The department has been removed') . '!','success');
}
@@ -152,17 +154,9 @@
if (!isset($SelectedDepartmentID)) {
-/* An unit of measure could be posted when one has been edited and is being updated
- or GOT when selected for modification
- SelectedDepartmentID will exist because it was sent with the page in a GET .
- If its the first time the page has been displayed with no parameters
- then none of the above are true and the list of account groups 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*/
-
$sql = "SELECT departmentid,
- description,
- authoriser
+ description,
+ authoriser
FROM departments
ORDER BY departmentid";
@@ -186,11 +180,11 @@
$k++;
}
- echo '<td>' . $myrow['description'] . '</td>';
- echo '<td>' . $myrow['authoriser'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>';
- echo '</tr>';
+ 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>
+ </tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -212,7 +206,7 @@
//editing an existing section
$sql = "SELECT departmentid,
- description
+ description
FROM departments
WHERE departmentid='" . $SelectedDepartmentID . "'";
@@ -235,10 +229,12 @@
echo '<table class="selection">';
}
echo '<tr>
- <td>' . _('Department Name') . ':' . '</td>
- <td><input type="text" name="DepartmentName" size="50" maxlength="100" value="' . $_POST['DepartmentName'] . '" /></td>
+ <td>' . _('Department Name') . ':' . '</td>
+ <td><input type="text" name="DepartmentName" size="50" maxlength="100" value="' . $_POST['DepartmentName'] . '" /></td>
</tr>';
- echo '<tr><td>'._('Authoriser').'</td><td><select name="Authoriser">';
+ echo '<tr>
+ <td>'._('Authoriser').'</td>
+ <td><select name="Authoriser">';
$usersql="SELECT userid FROM www_users";
$userresult=DB_query($usersql,$db);
while ($myrow=DB_fetch_array($userresult)) {
@@ -248,13 +244,16 @@
echo '<option value="'.$myrow['userid'].'">'.$myrow['userid'].'</option>';
}
}
- echo '</select></td></tr>';
- echo '</table><br />';
+ echo '</select></td>
+ </tr>
+ </table>
+ <br />';
- echo '<div class="centre"><input type="submit" name="Submit" value="' . _('Enter Information') . '" /></div>';
+ echo '<div class="centre">
+ <input type="submit" name="Submit" value="' . _('Enter Information') . '" />
+ </div>
+ </form>';
- echo '</form>';
-
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/SelectOrderItems.php 2012-02-28 09:38:19 UTC (rev 4984)
@@ -1502,23 +1502,21 @@
$ImageSource = _('No Image');
// Find the quantity in stock at location
$QOHSQL = "SELECT sum(locstock.quantity) AS qoh
- FROM locstock INNER JOIN stockmaster
- ON locstock.stockid=stockmaster.stockid
- WHERE locstock.stockid='" .$myrow['stockid'] . "' AND
- loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
+ FROM locstock
+ WHERE stockid='" .$myrow['stockid'] . "'
+ AND loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSQL,$db);
$QOHRow = DB_fetch_array($QOHResult);
$QOH = $QOHRow['qoh'];
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
- AND salesorderdetails.completed=0
- AND salesorders.quotation=0
- AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
_('cannot be retrieved because');
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2012-02-28 09:38:19 UTC (rev 4984)
@@ -9,7 +9,7 @@
"Project-Id-Version: weberp 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-11 17:15+1300\n"
-"PO-Revision-Date: 2012-02-21 21:15+0100\n"
+"PO-Revision-Date: 2012-02-28 00:33+0100\n"
"Last-Translator: James Dupin <jam...@gm...>\n"
"Language-Team: French <none>\n"
"MIME-Version: 1.0\n"
@@ -92,11 +92,12 @@
msgid "The SQL that was used to update the account group was"
msgstr "Commande SQL de modification du groupe:"
+# JDN
#: AccountGroups.php:136
#: AccountSections.php:104
#: PaymentMethods.php:82
msgid "Record Updated"
-msgstr "Fiche mise à jour"
+msgstr "Enregistrement mis à jour"
#: AccountGroups.php:154
msgid "An error occurred in inserting the account group"
@@ -106,11 +107,12 @@
msgid "The SQL that was used to insert the account group was"
msgstr "Échec de la commande SQL d'ajoût du groupe:"
+# JDN
#: AccountGroups.php:156
#: AccountSections.php:116
#: PaymentMethods.php:103
msgid "Record inserted"
-msgstr "Fiche créée"
+msgstr "Enregistrement créé"
#: AccountGroups.php:173
msgid "An error occurred in retrieving the group information from chartmaster"
@@ -921,6 +923,7 @@
msgid "The contact email address is not a valid email address"
msgstr "L'adresse courriel est incorrecte"
+# JDN
#: AddCustomerContacts.php:61
#: AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49
@@ -943,7 +946,7 @@
#: Suppliers.php:513
#: SupplierTypes.php:67
msgid "has been updated"
-msgstr "a été mis à jour"
+msgstr "a été mis(e) à jour"
#: AddCustomerContacts.php:76
msgid "The contact record has been added"
@@ -978,7 +981,7 @@
#: WWW_Access.php:107
#: WWW_Access.php:169
msgid "Role"
-msgstr "Rôle"
+msgstr "Rôle de sécurité"
#: AddCustomerContacts.php:130
msgid "Phone no"
@@ -1035,7 +1038,7 @@
#: WOSerialNos.php:291
#: WOSerialNos.php:297
msgid "Notes"
-msgstr "Notes"
+msgstr "Commentaires"
#: AddCustomerContacts.php:150
#: SupplierContacts.php:164
@@ -1214,7 +1217,7 @@
#: AddCustomerTypeNotes.php:5
#: SelectCustomer.php:693
msgid "Customer Type (Group) Notes"
-msgstr "Type de client (en groupe) Notes"
+msgstr ""
#: AddCustomerTypeNotes.php:31
msgid "The Contact priority must be an integer."
@@ -1561,7 +1564,7 @@
#: AgedDebtors.php:468
#: AgedSuppliers.php:296
msgid "All balances or overdues only"
-msgstr "Tous les soldes ou les écheances uniquement"
+msgstr "Tous les soldes ou arrièrés uniquement"
#: AgedDebtors.php:470
msgid "All customers with balances"
@@ -1570,7 +1573,7 @@
#: AgedDebtors.php:471
#: AgedSuppliers.php:299
msgid "Overdue accounts only"
-msgstr "Seulement les comptes à écheance"
+msgstr "Arrièrés seulement"
#: AgedDebtors.php:472
msgid "Held accounts only"
@@ -1663,7 +1666,7 @@
#: AgedSuppliers.php:264
#: AgedSuppliers.php:274
msgid "Aged Supplier Analysis"
-msgstr "Analyse de fournisseur à écheance"
+msgstr ""
#: AgedSuppliers.php:288
#: OutstandingGRNs.php:168
@@ -1671,7 +1674,7 @@
#: SupplierBalsAtPeriodEnd.php:131
#: SuppPaymentRun.php:264
msgid "From Supplier Code"
-msgstr "À partir du code fournisseur"
+msgstr "À partir du code"
#: AgedSuppliers.php:292
#: OutstandingGRNs.php:172
@@ -1679,7 +1682,7 @@
#: SupplierBalsAtPeriodEnd.php:135
#: SuppPaymentRun.php:268
msgid "To Supplier Code"
-msgstr "Au code fournisseur"
+msgstr "Jusqu'au code"
#: AgedSuppliers.php:298
msgid "All suppliers with balances"
@@ -1687,16 +1690,18 @@
#: AgedSuppliers.php:303
msgid "For suppliers trading in"
-msgstr "Pour les fournisseurs \"trading in\""
+msgstr "Devise fournisseur"
+# JDN
#: AgedSuppliers.php:319
#: InventoryValuation.php:259
msgid "Summary or Detailed Report"
-msgstr "Sommaire ou Rapport détaillé"
+msgstr "Type de rapport"
+# JDN
#: Areas.php:7
msgid "Sales Area Maintenance"
-msgstr "Gestion de la zone d'achalandage"
+msgstr "Gestion des zones d'achalandage"
#: Areas.php:40
msgid "The area code must be three characters or less long"
@@ -1710,25 +1715,29 @@
msgid "The area description must be twenty five characters or less long"
msgstr "La description de la région doit être 25 caractères ou moins long"
+# JDN
#: Areas.php:55
msgid "The area code may not be empty"
-msgstr "L'indicatif régional ne doit pas être vide"
+msgstr "Un indicatif doit être saisi"
#: Areas.php:60
msgid "The area description may not be empty"
msgstr "La description de la région ne peut pas être vide"
+# JDN
#: Areas.php:73
msgid "Area code"
-msgstr "Indicatif régional"
+msgstr "Indicatif"
+# JDN
#: Areas.php:87
msgid "New area code"
-msgstr "Nouveau code zone"
+msgstr "la zone"
+# JDN
#: Areas.php:87
msgid "has been inserted"
-msgstr "a été ajouté"
+msgstr "a été ajouté(e)"
#: Areas.php:94
msgid "The area could not be added or updated because"
@@ -1778,46 +1787,51 @@
#: SupplierTypes.php:151
#: Z_DeleteInvoice.php:146
msgid "has been deleted"
-msgstr "a été supprimé"
+msgstr "a été supprimé(e)"
+# JDN
#: Areas.php:149
#: Areas.php:220
msgid "Area Name"
-msgstr "Nom zone"
+msgstr "Nom"
+# JDN
#: Areas.php:165
msgid "Are you sure you wish to delete this sales area?"
-msgstr "Voulez-vous supprimer ce département de ventes?"
+msgstr "Voulez-vous supprimer cette zone?"
#: Areas.php:166
msgid "View Customers from this Area"
msgstr "Afficher les clients de cette zone"
+# JDN
#: Areas.php:175
msgid "Review Areas Defined"
-msgstr "Afficher les Secteurs existants"
+msgstr "Afficher les zones d'achalandage"
#: AuditTrail.php:7
msgid "Audit Trail"
-msgstr "Audit Trail"
+msgstr "Journal des événements"
#: AuditTrail.php:21
msgid "Incorrect date format used, please re-enter"
msgstr "Format de date incorrect"
+# JDN
#: AuditTrail.php:41
#: BOMIndented.php:316
#: BOMIndentedReverse.php:296
#: MRPCalendar.php:263
msgid "From Date"
-msgstr "De Date"
+msgstr "Depuis le"
+# JDN
#: AuditTrail.php:43
#: BOMIndented.php:317
#: BOMIndentedReverse.php:297
#: MRPCalendar.php:265
msgid "To Date"
-msgstr "Pour Date"
+msgstr "Jusqu'au"
#: AuditTrail.php:47
#: PO_AuthorisationLevels.php:124
@@ -1825,7 +1839,7 @@
#: PO_AuthorisationLevels.php:175
#: UserSettings.php:112
msgid "User ID"
-msgstr "ID utilisateur"
+msgstr "Identifiant"
#: AuditTrail.php:49
#: AuditTrail.php:62
@@ -1892,7 +1906,7 @@
#: WorkOrderIssue.php:647
#: WorkOrderIssue.php:650
msgid "All"
-msgstr "Tous"
+msgstr "Tout(e)"
#: AuditTrail.php:60
msgid "Table "
@@ -1908,11 +1922,11 @@
#: SelectContract.php:193
#: SelectProduct.php:772
msgid "View"
-msgstr "Vue"
+msgstr "Afficher"
#: AuditTrail.php:163
msgid "Date/Time"
-msgstr "Date/Heure"
+msgstr "Date / Heure"
#: AuditTrail.php:164
#: PcReportTab.php:259
@@ -1957,14 +1971,14 @@
#: AuditTrail.php:166
msgid "Table"
-msgstr "Tableau"
+msgstr "Table"
#: AuditTrail.php:167
#: api/api_xml-rpc.php:314
#: api/api_xml-rpc.php:780
#: api/api_xml-rpc.php:2189
msgid "Field Name"
-msgstr "Nom du champ"
+msgstr "Champ"
#: AuditTrail.php:168
#: SystemParameters.php:334
@@ -2099,25 +2113,29 @@
msgid "GL Account Code"
msgstr "Code compte GL"
+# JDN
#: BankAccounts.php:192
#: BankAccounts.php:326
msgid "Bank Account Name"
-msgstr "Nom de compte bancaire"
+msgstr "Nom"
+# JDN
#: BankAccounts.php:193
#: BankAccounts.php:328
msgid "Bank Account Code"
-msgstr "Code de compte bancaire"
+msgstr "Code"
+# JDN
#: BankAccounts.php:194
#: BankAccounts.php:330
msgid "Bank Account Number"
-msgstr "Compte bancaire n°"
+msgstr "N°"
+# JDN
#: BankAccounts.php:195
#: BankAccounts.php:332
msgid "Bank Address"
-msgstr "Référence bancaire (adresse postale)"
+msgstr "Adresse postale"
#: BankAccounts.php:196
#: CustomerAllocations.php:333
@@ -2166,7 +2184,7 @@
#: BankAccounts.php:379
#: BankAccounts.php:383
msgid "Fall Back Default"
-msgstr "Solution de repli par défaut"
+msgstr ""
#: BankAccounts.php:214
#: BankAccounts.php:370
@@ -2183,7 +2201,7 @@
#: BankAccounts.php:248
msgid "Show All Bank Accounts Defined"
-msgstr "Afficher tous les comptes bancaires définis"
+msgstr "Afficher tous les comptes bancaires"
#: BankAccounts.php:282
#: BankAccounts.php:287
@@ -2505,7 +2523,7 @@
#: BankMatching.php:342
msgid "Update Matching"
-msgstr "Mise à jour des rapporchements"
+msgstr "Mise à jour des rapprochements"
#: BankReconciliation.php:7
msgid "Bank Reconciliation"
@@ -3367,7 +3385,7 @@
#: WorkOrderEntry.php:601
#: WorkOrderIssue.php:664
msgid "Enter text extracts in the"
-msgstr "Saisir un extrait de texte dans le/la"
+msgstr "Saisir une partie de "
#: BOMInquiry.php:28
#: BOMs.php:837
@@ -3378,7 +3396,7 @@
#: WorkOrderEntry.php:601
#: WorkOrderIssue.php:664
msgid "description"
-msgstr "Description"
+msgstr "description"
#: BOMInquiry.php:30
#: BOMs.php:839
@@ -3439,7 +3457,7 @@
#: WorkOrderEntry.php:605
#: WorkOrderIssue.php:667
msgid "Enter extract of the"
-msgstr "Saisir un extrait du"
+msgstr "Saisir une partie du "
#: BOMInquiry.php:31
#: BOMs.php:840
@@ -3477,7 +3495,7 @@
#: Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:319
msgid "Stock Code"
-msgstr "Code stock"
+msgstr "Code"
#: BOMInquiry.php:37
#: BOMs.php:844
@@ -3507,7 +3525,7 @@
#: WorkOrderEntry.php:609
#: WorkOrderIssue.php:672
msgid "Search Now"
-msgstr "Chercher maintenant"
+msgstr "Rechercher"
#: BOMInquiry.php:49
#: BOMs.php:775
@@ -3631,7 +3649,7 @@
#: includes/DefineLabelClass.php:21
#: includes/PDFInventoryValnPageHeader.inc:34
msgid "Units"
-msgstr "Unités"
+msgstr "Unité"
#: BOMInquiry.php:179
msgid "The bill of material could not be retrieved because"
@@ -3674,7 +3692,7 @@
#: SpecialOrder.php:725
#: StockAdjustments.php:380
msgid "Unit Cost"
-msgstr "Cot Unitaire"
+msgstr "Coût unitaire"
#: BOMInquiry.php:202
#: BOMInquiry.php:250
@@ -4290,13 +4308,13 @@
#: Suppliers.php:594
#: SystemParameters.php:323
msgid "Validation failed"
-msgstr "la validation a échoué"
+msgstr " "
#: CompanyPreferences.php:148
#: Suppliers.php:594
#: SystemParameters.php:323
msgid "no updates or deletes took place"
-msgstr "Il n'y a pas eu de mis à jour ou de suppression"
+msgstr " Rien n'a été modifié."
#: CompanyPreferences.php:189
msgid "The company preferences could not be retrieved because"
@@ -4312,7 +4330,7 @@
#: CompanyPreferences.php:233
msgid "Tax Authority Reference"
-msgstr "N° TVA Intracommunautaire"
+msgstr ""
#: CompanyPreferences.php:238
#: Factors.php:210
@@ -4352,7 +4370,7 @@
#: CompanyPreferences.php:268
msgid "Telephone Number"
-msgstr "n° tél"
+msgstr "N° tél"
#: CompanyPreferences.php:273
msgid "Facsimile Number"
@@ -4477,7 +4495,7 @@
#: ConfirmDispatchControlled_Invoice.php:39
#: ConfirmDispatch_Invoice.php:27
msgid "Select a sales order to invoice"
-msgstr "Sélectionner une commande à facturer"
+msgstr "Facturer une commande"
#: ConfirmDispatchControlled_Invoice.php:41
msgid "This page can only be opened if a sales order and line item has been selected Please do that first"
@@ -4611,6 +4629,7 @@
msgid "Customer"
msgstr "Client"
+# JDN
#: ConfirmDispatch_Invoice.php:260
#: CustEDISetup.php:93
#: Customers.php:440
@@ -4627,7 +4646,7 @@
#: includes/PDFTransPageHeader.inc:46
#: includes/PDFTransPageHeaderPortrait.inc:55
msgid "Customer Code"
-msgstr "Code Client"
+msgstr "Code client"
#: ConfirmDispatch_Invoice.php:261
#: CustEDISetup.php:96
@@ -4653,7 +4672,7 @@
#: SelectCustomer.php:415
#: SelectOrderItems.php:710
msgid "Customer Name"
-msgstr "Nom Client"
+msgstr "Société"
#: ConfirmDispatch_Invoice.php:264
msgid "Invoice amounts stated in"
@@ -5767,7 +5786,7 @@
#: Suppliers.php:965
#: includes/MiscFunctions.php:36
msgid "WARNING"
-msgstr "ATTENTION"
+msgstr "AVERTISSEMENT"
#: ConfirmDispatch_Invoice.php:939
#: CounterSales.php:1324
@@ -6466,7 +6485,7 @@
#: SelectCompletedOrder.php:524
#: SelectCreditItems.php:969
msgid "Enter text extracts in the description"
-msgstr "Saisir un extraitde texte dans la description"
+msgstr "Saisir une partie de la description"
#: ContractBOM.php:325
#: CounterSales.php:2177
@@ -6897,7 +6916,7 @@
#: Stocks.php:53
#: Z_MakeNewCompany.php:50
msgid "Only jpg files are supported - a file extension of .jpg is expected"
-msgstr "Seuls les fichiers jpg sont pris en charge -. Une extension de fichier jpg est prévu de"
+msgstr "Format d'image incorrect - Seuls les fichiers .jpg sont pris en charge"
#: Contracts.php:114
#: FixedAssetItems.php:37
@@ -7145,7 +7164,7 @@
#: Contracts.php:608
#: SelectOrderItems.php:303
msgid "At least one Customer Branch Name keyword OR an extract of a Customer Branch Code or Branch Phone Number must be entered for the search"
-msgstr "Au moins un mot-clé à la clientèle Direction Nom ou un extrait d'un code client ou de la Direction Direction numéro de téléphone doivent être inscrits pour la recherche"
+msgstr "Vous devez saisir un critère de recherche dans une des boîtes ci-dessous"
#: Contracts.php:663
#: CustomerReceipt.php:600
@@ -7157,24 +7176,28 @@
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "No Customer Branch records contain the search criteria"
-msgstr "Aucune fiche de succursale ne contient les critères de recherche"
+msgstr "Pas de succursale correspondante aux critères de recherche"
+# NE PAS CHANGER sans raison (plus que) valable.
+# La notice d'information contenant ce texte est bien trop longue avec ce texte inutile à la compréhension de l'action à mener sur la page SelectOrderItems.php?identifier=1329948142
+# should not be changed except for a pretty good reason.
+# It makes the information message way too long in SelectOrderItems.php?identifier=1329948142
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "please try again"
-msgstr "s'il vous plaît essayer à nouveau"
+msgstr " "
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "Note a Customer Branch Name may be different to the Customer Name"
-msgstr "Note: un nom de succursale peut être différent du nom du client"
+msgstr "Note: le nom de la succursale ne correspond pas forcément au nom du client"
#: Contracts.php:683
#: SelectCreditItems.php:134
#: SelectCustomer.php:189
#: SelectOrderItems.php:350
msgid "Unable to identify the selected customer"
-msgstr "Impossible d'identifier le client choisi"
+msgstr "Pas de succursale correspondant à la recherche"
#: Contracts.php:714
msgid "The customer record selected"
@@ -7267,12 +7290,12 @@
#: Contracts.php:757
#: SelectOrderItems.php:588
msgid "Part of the Customer Branch Code"
-msgstr "Partie du code de la succursale"
+msgstr "Partie du code succursale"
#: Contracts.php:760
#: SelectOrderItems.php:591
msgid "Part of the Branch Phone Number"
-msgstr "Partie du numéro de téléphone succursale"
+msgstr "Partie du n° de tél. de la succursale"
#: Contracts.php:765
#: Customers.php:611
@@ -7468,7 +7491,7 @@
#: SupplierInvoice.php:263
#: SuppPaymentRun.php:296
msgid "Exchange Rate"
-msgstr "Taux de Change"
+msgstr "Taux de change"
#: Contracts.php:919
msgid "Contract Status"
@@ -7498,7 +7521,7 @@
#: SelectContract.php:67
#: SelectContract.php:73
msgid "Completed"
-msgstr "Terminé"
+msgstr "Close"
#: Contracts.php:927
msgid "Contract Setup"
@@ -7707,7 +7730,7 @@
#: WorkOrderEntry.php:156
#: WorkOrderIssue.php:472
msgid "There are no products available meeting the criteria specified"
-msgstr "Il n'y a pas de produits répondant aux critères de recherche"
+msgstr "Il n'y a pas d'article répondant aux critères de recherche"
#: CounterSales.php:426
#: SelectOrderItems.php:903
@@ -7942,7 +7965,7 @@
#: DeliveryDetails.php:499
#: DeliveryDetails.php:685
msgid "an item on this sales order, the cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this"
-msgstr "un article sur cet ordre de vente, le coût de cet article accumulé de la somme des coûts des composants est nul. Ce pourrait être parce qu'il n'y a aucun projet de loi de matériel mis en place ... vous pouvez vérifier ce"
+msgstr "un article sur cet ordre de vente, le coût de cet article accumulé de la somme des coûts des composants est nul. Ce pourrait être parce qu'il n'y a aucun projet de loi de matériel mis en place ..."
#: CounterSales.php:1185
#: DeliveryDetails.php:513
@@ -8047,7 +8070,7 @@
#: DeliveryDetails.php:564
#: SpecialOrder.php:567
msgid "has been entered"
-msgstr "a été saisi"
+msgstr "a été saisie"
#: CounterSales.php:1833
msgid "The SQL that failed to insert the GL transaction for the bank account debit was"
@@ -8184,12 +8207,12 @@
#: CounterSales.php:2147
#: CounterSales.php:2148
msgid "Search for Items"
-msgstr "Chercher des articles"
+msgstr "Rechercher un article"
#: CounterSales.php:2148
#: SelectOrderItems.php:1607
msgid ", Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code"
-msgstr ", recherche dans la base de données des articles, affinez les résultats en sélectionnant une catégorie de stock ou entrez une description partielle de l'article ou une partie de son code"
+msgstr ": recherche d'un article dans la base de données. Affinez les résultats en sélectionnant une catégorie, une description partielle de l'article ou une partie d'un code"
#: CounterSales.php:2149
#: SelectOrderItems.php:1608
@@ -8201,15 +8224,16 @@
msgid "Enter partial Description"
msgstr "Saisir une description partielle"
+# NE PAS CHANGER sans raison (plus que) valable.
#: CounterSales.php:2182
#: SelectOrderItems.php:1647
msgid "Use Quick Entry"
-msgstr "Utiliser la Saisie rapide"
+msgstr "Vente directe"
#: CounterSales.php:2193
#: SelectOrderItems.php:1660
msgid "Select an item by entering the quantity required. Click Order when ready."
-msgstr "Sélectionner un article en entrant la quantité requise. Cliquer ensuite sur commander."
+msgstr "Saisir une quantité pour sélectionner un article puis cliquer sur \"Ajouter à la vente\". Utiliser les boutons \"Suivant\" ou \"Précédent\" pour faire défiler les articles."
#: CounterSales.php:2204
#: CounterSales.php:2327
@@ -8235,22 +8259,24 @@
#: CounterSales.php:2337
msgid "Use this form to add items quickly if the item codes are already known"
-msgstr "Utilisez ce formulaire pour ajouter des éléments rapidement si les codes de commande sont déjà connus"
+msgstr "Utilisez ce formulaire pour faire une vente directe. Entrez le code de l'article et la quantité vendue."
+# need to see if it can apply to all php where it is used.
+# Written vs CounterSales.php
#: CounterSales.php:2362
#: SelectCreditItems.php:981
#: SelectCreditItems.php:1032
#: SelectOrderItems.php:1796
#: SelectOrderItems.php:1822
msgid "Quick Entry"
-msgstr "Écriture rapide"
+msgstr "Appliquer...
[truncated message content] |
|
From: <dai...@us...> - 2012-02-28 09:43:03
|
Revision: 4985
http://web-erp.svn.sourceforge.net/web-erp/?rev=4985&view=rev
Author: daintree
Date: 2012-02-28 09:42:54 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/GLAccountInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-02-28 09:38:19 UTC (rev 4984)
+++ trunk/GLAccountInquiry.php 2012-02-28 09:42:54 UTC (rev 4985)
@@ -30,7 +30,7 @@
$DefaultPeriodDate = Date ('Y-m-d', Mktime(0,0,0,Date('m'),0,Date('Y')));
/*Show a form to allow input of criteria for TB to show */
-echo '<table class="selection"><tr><td>'._('Account').':</td><td><select Name="Account">';
+echo '<table class="selection"><tr><td>'._('Account').':</td><td><select name="Account">';
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
@@ -61,7 +61,7 @@
}
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[] multiple>';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-02-28 09:38:19 UTC (rev 4984)
+++ trunk/GLProfit_Loss.php 2012-02-28 09:42:54 UTC (rev 4985)
@@ -83,7 +83,7 @@
echo '<tr>
<td>' . _('Select Period To') . ':</td>
- <td><select Name="ToPeriod">';
+ <td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2012-02-28 09:38:19 UTC (rev 4984)
+++ trunk/GLTagProfit_Loss.php 2012-02-28 09:42:54 UTC (rev 4985)
@@ -36,7 +36,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Select Period From') . ':</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
$sql = "SELECT periodno,
lastdate_in_period
@@ -76,7 +76,7 @@
echo '<tr>
<td>' . _('Select Period To') . ':</td>
- <td><select Name="ToPeriod">';
+ <td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
@@ -113,7 +113,7 @@
echo '<tr>
<td>'._('Detail Or Summary').':</td>
- <td><select Name="Detail">
+ <td><select name="Detail">
<option selected="selected" value="Summary">'._('Summary') . '</option>
<option selected="selected" value="Detailed">'._('All Accounts') . '</option>
</select>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-28 09:43:05
|
Revision: 4985
http://web-erp.svn.sourceforge.net/web-erp/?rev=4985&view=rev
Author: daintree
Date: 2012-02-28 09:42:54 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/GLAccountInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-02-28 09:38:19 UTC (rev 4984)
+++ trunk/GLAccountInquiry.php 2012-02-28 09:42:54 UTC (rev 4985)
@@ -30,7 +30,7 @@
$DefaultPeriodDate = Date ('Y-m-d', Mktime(0,0,0,Date('m'),0,Date('Y')));
/*Show a form to allow input of criteria for TB to show */
-echo '<table class="selection"><tr><td>'._('Account').':</td><td><select Name="Account">';
+echo '<table class="selection"><tr><td>'._('Account').':</td><td><select name="Account">';
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
@@ -61,7 +61,7 @@
}
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[] multiple>';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-02-28 09:38:19 UTC (rev 4984)
+++ trunk/GLProfit_Loss.php 2012-02-28 09:42:54 UTC (rev 4985)
@@ -83,7 +83,7 @@
echo '<tr>
<td>' . _('Select Period To') . ':</td>
- <td><select Name="ToPeriod">';
+ <td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2012-02-28 09:38:19 UTC (rev 4984)
+++ trunk/GLTagProfit_Loss.php 2012-02-28 09:42:54 UTC (rev 4985)
@@ -36,7 +36,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Select Period From') . ':</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
$sql = "SELECT periodno,
lastdate_in_period
@@ -76,7 +76,7 @@
echo '<tr>
<td>' . _('Select Period To') . ':</td>
- <td><select Name="ToPeriod">';
+ <td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
@@ -113,7 +113,7 @@
echo '<tr>
<td>'._('Detail Or Summary').':</td>
- <td><select Name="Detail">
+ <td><select name="Detail">
<option selected="selected" value="Summary">'._('Summary') . '</option>
<option selected="selected" value="Detailed">'._('All Accounts') . '</option>
</select>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-28 10:20:50
|
Revision: 4986
http://web-erp.svn.sourceforge.net/web-erp/?rev=4986&view=rev
Author: daintree
Date: 2012-02-28 10:20:39 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
sourceforge logo tracker on login page only
Modified Paths:
--------------
trunk/css/default/login.css
trunk/css/jelly/login.css
trunk/includes/Login.php
Modified: trunk/css/default/login.css
===================================================================
--- trunk/css/default/login.css 2012-02-28 09:42:54 UTC (rev 4985)
+++ trunk/css/default/login.css 2012-02-28 10:20:39 UTC (rev 4986)
@@ -69,3 +69,4 @@
margin-left:50px;
width:200px;
}
+
Modified: trunk/css/jelly/login.css
===================================================================
--- trunk/css/jelly/login.css 2012-02-28 09:42:54 UTC (rev 4985)
+++ trunk/css/jelly/login.css 2012-02-28 10:20:39 UTC (rev 4986)
@@ -71,4 +71,4 @@
#demo_text{
margin-left:50px;
width:200px;
-}
+}
\ No newline at end of file
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2012-02-28 09:42:54 UTC (rev 4985)
+++ trunk/includes/Login.php 2012-02-28 10:20:39 UTC (rev 4986)
@@ -65,9 +65,11 @@
<input type="password" name="Password" /><br />
<div id="demo_text"><?php echo $demo_text;?></div>
<input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" />
- </div>
+ </div>
</form>
</div>
+ <br />
+ <div style="text-align:center"><a href="http://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
</div>
<script type="text/javascript">
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-28 10:20:50
|
Revision: 4986
http://web-erp.svn.sourceforge.net/web-erp/?rev=4986&view=rev
Author: daintree
Date: 2012-02-28 10:20:39 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
sourceforge logo tracker on login page only
Modified Paths:
--------------
trunk/css/default/login.css
trunk/css/jelly/login.css
trunk/includes/Login.php
Modified: trunk/css/default/login.css
===================================================================
--- trunk/css/default/login.css 2012-02-28 09:42:54 UTC (rev 4985)
+++ trunk/css/default/login.css 2012-02-28 10:20:39 UTC (rev 4986)
@@ -69,3 +69,4 @@
margin-left:50px;
width:200px;
}
+
Modified: trunk/css/jelly/login.css
===================================================================
--- trunk/css/jelly/login.css 2012-02-28 09:42:54 UTC (rev 4985)
+++ trunk/css/jelly/login.css 2012-02-28 10:20:39 UTC (rev 4986)
@@ -71,4 +71,4 @@
#demo_text{
margin-left:50px;
width:200px;
-}
+}
\ No newline at end of file
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2012-02-28 09:42:54 UTC (rev 4985)
+++ trunk/includes/Login.php 2012-02-28 10:20:39 UTC (rev 4986)
@@ -65,9 +65,11 @@
<input type="password" name="Password" /><br />
<div id="demo_text"><?php echo $demo_text;?></div>
<input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" />
- </div>
+ </div>
</form>
</div>
+ <br />
+ <div style="text-align:center"><a href="http://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
</div>
<script type="text/javascript">
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-02-28 21:14:11
|
Revision: 4989
http://web-erp.svn.sourceforge.net/web-erp/?rev=4989&view=rev
Author: vvs2012
Date: 2012-02-28 21:14:04 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
Modified Paths:
--------------
trunk/WorkOrderReceive.php
trunk/doc/Change.log
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-02-28 10:59:54 UTC (rev 4988)
+++ trunk/WorkOrderReceive.php 2012-02-28 21:14:04 UTC (rev 4989)
@@ -234,7 +234,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['adjglact'] . "',
- '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
+ '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
'" . (-$ValueOfChange) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
@@ -253,7 +253,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
+ '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
'" . $ValueOfChange . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
@@ -374,7 +374,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP side of the work order issue GL posting could not be inserted because');
@@ -393,7 +393,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $AutoIssueCompRow['stockact'] . "',
- '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . -($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side of the work order issue GL posting could not be inserted because');
@@ -628,7 +628,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . ($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The receipt of work order finished stock GL posting could not be inserted because');
@@ -648,7 +648,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . -($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP credit on receipt of finished items from a work order GL posting could not be inserted because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-28 10:59:54 UTC (rev 4988)
+++ trunk/doc/Change.log 2012-02-28 21:14:04 UTC (rev 4989)
@@ -1,4 +1,5 @@
webERP Change Log
+28/02/2012 Vitaly: Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
26/02/2012 Fixed bug that when set frequently sold items, there are sql errors which claimed that no group set for sum() function. Fixed by Exson
26/02/2012 PO_Items.php Add $_SESSION and $_POST variables to fixed extra lines added while page refreshing or push F5. Reported by CQZ and Ke from webERP Chinese forum QQ group. Fixed by Exson
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-02-28 21:14:11
|
Revision: 4989
http://web-erp.svn.sourceforge.net/web-erp/?rev=4989&view=rev
Author: vvs2012
Date: 2012-02-28 21:14:04 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
Modified Paths:
--------------
trunk/WorkOrderReceive.php
trunk/doc/Change.log
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-02-28 10:59:54 UTC (rev 4988)
+++ trunk/WorkOrderReceive.php 2012-02-28 21:14:04 UTC (rev 4989)
@@ -234,7 +234,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['adjglact'] . "',
- '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
+ '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
'" . (-$ValueOfChange) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
@@ -253,7 +253,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
+ '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
'" . $ValueOfChange . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
@@ -374,7 +374,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP side of the work order issue GL posting could not be inserted because');
@@ -393,7 +393,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $AutoIssueCompRow['stockact'] . "',
- '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . -($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side of the work order issue GL posting could not be inserted because');
@@ -628,7 +628,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . ($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The receipt of work order finished stock GL posting could not be inserted because');
@@ -648,7 +648,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
'" . -($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP credit on receipt of finished items from a work order GL posting could not be inserted because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-28 10:59:54 UTC (rev 4988)
+++ trunk/doc/Change.log 2012-02-28 21:14:04 UTC (rev 4989)
@@ -1,4 +1,5 @@
webERP Change Log
+28/02/2012 Vitaly: Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
26/02/2012 Fixed bug that when set frequently sold items, there are sql errors which claimed that no group set for sum() function. Fixed by Exson
26/02/2012 PO_Items.php Add $_SESSION and $_POST variables to fixed extra lines added while page refreshing or push F5. Reported by CQZ and Ke from webERP Chinese forum QQ group. Fixed by Exson
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-29 08:59:20
|
Revision: 4991
http://web-erp.svn.sourceforge.net/web-erp/?rev=4991&view=rev
Author: daintree
Date: 2012-02-29 08:59:09 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
tidy up
Modified Paths:
--------------
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/doc/Change.log
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2012-02-28 23:15:08 UTC (rev 4990)
+++ trunk/InternalStockRequest.php 2012-02-29 08:59:09 UTC (rev 4991)
@@ -1,12 +1,11 @@
<?php
-/* $Id: StockTransfers.php 4576 2011-05-27 10:59:20Z daintree $*/
+/* $Id: InternalStockRequest.php 4576 2011-05-27 10:59:20Z daintree $*/
include('includes/DefineStockRequestClass.php');
include('includes/session.inc');
$title = _('Create an Internal Materials Request');
-
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -81,8 +80,7 @@
'" . $_SESSION['Request']->Location . "',
'" . $_SESSION['Request']->Department . "',
'" . FormatDateForSQL($_SESSION['Request']->DispatchDate) . "',
- '" . $_SESSION['Request']->Narrative . "'
- )";
+ '" . $_SESSION['Request']->Narrative . "')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The request header record could not be inserted because');
$DbgMsg = _('The following SQL to insert the request header record was used');
$Result = DB_query($HeaderSQL,$db,$ErrMsg,$DbgMsg,true);
@@ -100,12 +98,10 @@
'".$LineItems->StockID."',
'".$LineItems->Quantity."',
'".$LineItems->DecimalPlaces."',
- '".$LineItems->UOM."'
- )";
+ '".$LineItems->UOM."')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The request line record could not be inserted because');
$DbgMsg = _('The following SQL to insert the request header record was used');
$Result = DB_query($LineSQL,$db,$ErrMsg,$DbgMsg,true);
-
}
}
@@ -130,38 +126,42 @@
echo '<tr>
<td>' . _('Line number') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Stock Code') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->StockID . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Item Description') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->ItemDescription . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Unit of Measure') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->UOM . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Quantity Requested') . '</td>
<td><input type="text" class="number" name="Quantity" value="' . locale_number_format($_SESSION['Request']->LineItems[$_GET['Edit']]->Quantity, $_SESSION['Request']->LineItems[$_GET['Edit']]->DecimalPlaces) . '" /></td>
</tr>';
echo '<input type="hidden" name="LineNumber" value="' . $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber . '" />';
- echo '</table><br />';
- echo '<div class="centre"><input type="submit" name="Edit" value="' . _('Update Line') . '" /></div></form>';
+ echo '</table>
+ <br />';
+ echo '<div class="centre">
+ <input type="submit" name="Edit" value="' . _('Update Line') . '" />
+ </div>
+ </form>';
include('includes/footer.inc');
exit;
}
-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 '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<tr>
<th colspan="2"><font color="navy" size="2">' . _('Internal Stock Request Details') . '</font></th>
- </tr>';
-echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Department') . ':</td>';
$sql="SELECT departmentid,
@@ -170,18 +170,18 @@
ORDER BY description";
$result=DB_query($sql, $db);
-echo '<td><select name="Department">';
-echo '<option value="">' . _('Select your department') . '</option>';
+echo '<td><select name="Department">
+ <option value="">' . _('Select your department') . '</option>';
while ($myrow=DB_fetch_array($result)){
- if (isset($_SESSION['Request']->Department) and $_SESSION['Request']->Department==$myrow['departmentid']){
- echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8').'</option>';
+ if (isset($_SESSION['Request']->Department) AND $_SESSION['Request']->Department==$myrow['departmentid']){
+ echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
-echo '</select></td></tr>';
-
-echo '<tr>
+echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Location from which to request stock') . ':</td>';
$sql="SELECT loccode,
locationname
@@ -189,30 +189,33 @@
ORDER BY locationname";
$result=DB_query($sql, $db);
-echo '<td><select name="Location">';
-echo '<option value="">' . _('Select a Location') . '</option>';
+echo '<td><select name="Location">
+ <option value="">' . _('Select a Location') . '</option>';
while ($myrow=DB_fetch_array($result)){
- if (isset($_SESSION['Request']->Location) and $_SESSION['Request']->Location==$myrow['loccode']){
- echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8').'</option>';
+ if (isset($_SESSION['Request']->Location) AND $_SESSION['Request']->Location==$myrow['loccode']){
+ echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
-echo '</select></td></tr>';
-
-echo '<tr>
+echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Date when required') . ':</td>';
echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DispatchDate" maxlength="10" size="11" value="' . $_SESSION['Request']->DispatchDate . '" /></td>';
-echo '<tr><td>' . _('Narrative') . ':</td>';
-echo '<td><textarea name="Narrative" cols="30">'.$_SESSION['Request']->Narrative.'</textarea></td>';
+echo '<tr>
+ <td>' . _('Narrative') . ':</td>
+ <td><textarea name="Narrative" cols="30">'.$_SESSION['Request']->Narrative.'</textarea></td>
+ </tr>
+ </table>
+ <br />';
-echo '</table><br />';
+echo '<div class="centre">
+ <input type="submit" name="Update" value="' . _('Update') . '" />
+ </div>
+ </form>';
-echo '<div class="centre"><input type="submit" name="Update" value="' . _('Update') . '" /></div>';
-
-echo '</div></form>';
-
if (!isset($_SESSION['Request']->Location)) {
include('includes/footer.inc');
exit;
@@ -222,11 +225,12 @@
$i = 0; //Line Item Array pointer
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br /><table class="selection">';
-echo '<tr>
+echo '<br />
+ <table class="selection">
+ <tr>
<th colspan="7"><font size="2" color="navy">' . _('Details of Items Requested') . '</font></th>
- </tr>';
-echo '<tr>
+ </tr>
+ <tr>
<th>'. _('Line Number') . '</th>
<th>'. _('Item Code') . '</th>
<th>'. _('Item Description'). '</th>
@@ -253,11 +257,14 @@
<td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Edit='.$LineItems->LineNumber.'">' . _('Edit') . '</a></td>
<td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete='.$LineItems->LineNumber.'">' . _('Delete') . '</a></td>
</tr>';
-
}
-echo '</table><br />';
-echo '<div class="centre"><input type="submit" name="Submit" value="' . _('Submit') . '" /></div><br />';
+echo '</table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Submit" value="' . _('Submit') . '" />
+ </div>
+ <br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -270,14 +277,16 @@
$result1 = DB_query($SQL, $db);
if (DB_num_rows($result1) == 0) {
echo '<p><font size="4" color="red">' . _('Problem Report') . ':</font><br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>';
- echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ echo '<br />
+ <a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
exit;
}
-echo '<table class="selection"><tr>';
-echo '<td>' . _('In Stock Category') . ':';
-echo '<select name="StockCat">';
+echo '<table class="selection">
+ <tr>
+ <td>' . _('In Stock Category') . ':<select name="StockCat">';
+
if (!isset($_POST['StockCat'])) {
- $_POST['StockCat'] = "";
+ $_POST['StockCat'] = '';
}
if ($_POST['StockCat'] == 'All') {
echo '<option selected="True" value="All">' . _('All').'</option>';
@@ -291,8 +300,8 @@
echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
}
}
-echo '</select></td>';
-echo '<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td>';
+echo '</select></td>
+ <td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td>';
if (isset($_POST['Keywords'])) {
echo '<td><input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" /></td>';
} else {
@@ -300,16 +309,21 @@
}
echo '</tr>
<tr>
- <td></td>';
-echo '<td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
+ <td></td>
+ <td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
if (isset($_POST['StockCode'])) {
echo '<td><input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" /></td>';
} else {
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>';
}
-echo '</tr></table><br />';
-echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div><br />';
+echo '</tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Search" value="' . _('Search Now') . '" />
+ </div>
+ <br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
echo '</form>';
@@ -337,7 +351,7 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
- AND stockmaster.description " . LIKE . " '$SearchString'
+ AND stockmaster.description " . LIKE . " '" . $SearchString . "'
AND stockmaster.discontinued=0
ORDER BY stockmaster.stockid";
} else {
@@ -420,15 +434,15 @@
}
if (isset($_POST['Next'])) {
- $Offset = $_POST['nextlist'];
+ $Offset = $_POST['NextList'];
}
if (isset($_POST['Prev'])) {
- $Offset = $_POST['previous'];
+ $Offset = $_POST['Previous'];
}
if (!isset($Offset) or $Offset<0) {
$Offset=0;
}
- $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'].' OFFSET '.($_SESSION['DefaultDisplayRecordsMax']*$Offset);
+ $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'] . ' OFFSET ' . ($_SESSION['DefaultDisplayRecordsMax']*$Offset);
$ErrMsg = _('There is a problem selecting the part records to display because');
$DbgMsg = _('The SQL used to get the part selection was');
@@ -478,12 +492,12 @@
echo '</select>
<input type="submit" name="Go" value="' . _('Go') . '" />
<input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
- echo '<input type="hidden" name=Keywords value="'.$_POST['Keywords'].'" />';
- echo '<input type="hidden" name=StockCat value="'.$_POST['StockCat'].'" />';
- echo '<input type="hidden" name=StockCode value="'.$_POST['StockCode'].'" />';
-// echo '<input type="hidden" name=Search value="Search" />';
- echo '<br /></div>';
+ <input type="submit" name="Next" value="' . _('Next') . '" />
+ <input type="hidden" name=Keywords value="'.$_POST['Keywords'].'" />
+ <input type="hidden" name=StockCat value="'.$_POST['StockCat'].'" />
+ <input type="hidden" name=StockCode value="'.$_POST['StockCode'].'" />
+ <br />
+ </div>';
}
echo '<table cellpadding="2">';
echo '<tr>
@@ -542,13 +556,13 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="table1">';
echo '<tr><td>
- <input type="hidden" name="previous" value="'.($Offset-1).'" />
+ <input type="hidden" name="Previous" value="'.($Offset-1).'" />
<input tabindex="'.($j+8).'" type="submit" name="Prev" value="'._('Prev').'" /></td>';
echo '<td style="text-align:center" colspan="6">
<input type="hidden" name="order_items" value="1" />
<input tabindex="'.($j+9).'" type="submit" value="'._('Add to Requisition').'" /></td>';
echo '<td>
- <input type="hidden" name="nextlist" value="'.($Offset+1).'" />
+ <input type="hidden" name="NextList" value="'.($Offset+1).'" />
<input tabindex="'.($j+10).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
echo '<tr>
<th>' . _('Code') . '</th>
@@ -666,11 +680,11 @@
#end of page full new headings if
}
#end of while loop
- echo '<tr><td><input type="hidden" name="previous" value="'.($Offset-1).'" />
+ echo '<tr><td><input type="hidden" name="Previous" value="'.($Offset-1).'" />
<input tabindex="'.($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>';
echo '<td style="text-align:center" colspan="6"><input type="hidden" name="order_items" value="1" />
<input tabindex="'.($j+8).'" type="submit" value="'._('Add to Requisition').'" /></td>';
- echo '<td><input type="hidden" name="nextlist" value="'.($Offset+1).'" />
+ echo '<td><input type="hidden" name="NextList" value="'.($Offset+1).'" />
<input tabindex="'.($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td><tr/>';
echo '</table></form>';
echo $jsCall;
Modified: trunk/InternalStockRequestAuthorisation.php
===================================================================
--- trunk/InternalStockRequestAuthorisation.php 2012-02-28 23:15:08 UTC (rev 4990)
+++ trunk/InternalStockRequestAuthorisation.php 2012-02-29 08:59:09 UTC (rev 4991)
@@ -1,6 +1,6 @@
<?php
-/* $Id$*/
+/* $Id: InternalStockRequestAuthorisation.php 4576 2011-05-27 10:59:20Z daintree $*/
include('includes/session.inc');
@@ -10,17 +10,13 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' ' . $title . '</p>';
-$emailsql="SELECT email FROM www_users WHERE userid='".$_SESSION['UserID']."'";
-$emailresult=DB_query($emailsql, $db);
-$emailrow=DB_fetch_array($emailresult);
-
-if (isset($_POST['updateall'])) {
+if (isset($_POST['UpdateAll'])) {
foreach ($_POST as $key => $value) {
if (mb_substr($key,0,6)=='status') {
$RequestNo=mb_substr($key,6);
$sql="UPDATE stockrequest
- SET authorised='1'
- WHERE dispatchid='".$RequestNo."'";
+ SET authorised='1'
+ WHERE dispatchid='".$RequestNo."'";
$result=DB_query($sql, $db);
}
}
@@ -35,14 +31,13 @@
departments.description,
www_users.realname,
www_users.email
- FROM stockrequest
- LEFT JOIN departments
+ FROM stockrequest INNER JOIN departments
ON stockrequest.departmentid=departments.departmentid
- LEFT JOIN locations
+ INNER JOIN locations
ON stockrequest.loccode=locations.loccode
- LEFT JOIN www_users
+ INNER JOIN www_users
ON www_users.userid=departments.authoriser
- WHERE stockrequest.authorised=0
+ WHERE stockrequest.authorised=0
AND stockrequest.closed=0
AND www_users.userid='".$_SESSION['UserID']."'";
$result=DB_query($sql, $db);
@@ -53,22 +48,22 @@
/* Create the table for the purchase order header */
echo '<tr>
- <th>'._('Request Number').'</th>
- <th>'._('Department').'</th>
- <th>'._('Location Of Stock').'</th>
- <th>'._('Requested Date').'</th>
- <th>'._('Narrative').'</th>
- <th>'._('Authorise').'</th>
+ <th>' . _('Request Number') . '</th>
+ <th>' . _('Department') . '</th>
+ <th>' . _('Location Of Stock') . '</th>
+ <th>' . _('Requested Date') . '</th>
+ <th>' . _('Narrative') . '</th>
+ <th>' . _('Authorise') . '</th>
</tr>';
while ($myrow=DB_fetch_array($result)) {
echo '<tr>
- <td>'.$myrow['dispatchid'].'</td>
- <td>'.$myrow['description'].'</td>
- <td>'.$myrow['locationname'].'</td>
- <td>'.ConvertSQLDate($myrow['despatchdate']).'</td>
- <td>'.$myrow['narrative'].'</td>
+ <td>' . $myrow['dispatchid'] . '</td>
+ <td>' . $myrow['description'] . '</td>
+ <td>' . $myrow['locationname'] . '</td>
+ <td>' . ConvertSQLDate($myrow['despatchdate']) . '</td>
+ <td>' . $myrow['narrative'] . '</td>
<td><input type="checkbox" name="status'.$myrow['dispatchid'].'" /></td>
</tr>';
$linesql="SELECT stockrequestitems.dispatchitemsid,
@@ -78,7 +73,7 @@
stockmaster.description,
stockrequestitems.quantity
FROM stockrequestitems
- LEFT JOIN stockmaster
+ INNER JOIN stockmaster
ON stockmaster.stockid=stockrequestitems.stockid
WHERE dispatchid='".$myrow['dispatchid'] . "'";
$lineresult=DB_query($linesql, $db);
@@ -105,7 +100,7 @@
</tr>';
} //end while header loop
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="updateall" value="' . _('Update'). '" /></form>';
+echo '<br /><div class="centre"><input type="submit" name="UpdateAll" value="' . _('Update'). '" /></form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-28 23:15:08 UTC (rev 4990)
+++ trunk/doc/Change.log 2012-02-29 08:59:09 UTC (rev 4991)
@@ -1,4 +1,6 @@
webERP Change Log
+
+28/2/12 Tim: Added functionality that allows for the set up of internal departments, and for the request of stock to be issued - a new issue account is defined in stockcategories. Issue requests must be authorised by a department manager and then issues fulfilled creates a stock adjustment with posting in the gl to the item category issue account.
28/02/2012 Vitaly: Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
26/02/2012 Fixed bug that when set frequently sold items, there are sql errors which claimed that no group set for sum() function. Fixed by Exson
26/02/2012 PO_Items.php Add $_SESSION and $_POST variables to fixed extra lines added while page refreshing or push F5. Reported by CQZ and Ke from webERP Chinese forum QQ group. Fixed by Exson
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-29 08:59:20
|
Revision: 4991
http://web-erp.svn.sourceforge.net/web-erp/?rev=4991&view=rev
Author: daintree
Date: 2012-02-29 08:59:09 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
tidy up
Modified Paths:
--------------
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/doc/Change.log
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2012-02-28 23:15:08 UTC (rev 4990)
+++ trunk/InternalStockRequest.php 2012-02-29 08:59:09 UTC (rev 4991)
@@ -1,12 +1,11 @@
<?php
-/* $Id: StockTransfers.php 4576 2011-05-27 10:59:20Z daintree $*/
+/* $Id: InternalStockRequest.php 4576 2011-05-27 10:59:20Z daintree $*/
include('includes/DefineStockRequestClass.php');
include('includes/session.inc');
$title = _('Create an Internal Materials Request');
-
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -81,8 +80,7 @@
'" . $_SESSION['Request']->Location . "',
'" . $_SESSION['Request']->Department . "',
'" . FormatDateForSQL($_SESSION['Request']->DispatchDate) . "',
- '" . $_SESSION['Request']->Narrative . "'
- )";
+ '" . $_SESSION['Request']->Narrative . "')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The request header record could not be inserted because');
$DbgMsg = _('The following SQL to insert the request header record was used');
$Result = DB_query($HeaderSQL,$db,$ErrMsg,$DbgMsg,true);
@@ -100,12 +98,10 @@
'".$LineItems->StockID."',
'".$LineItems->Quantity."',
'".$LineItems->DecimalPlaces."',
- '".$LineItems->UOM."'
- )";
+ '".$LineItems->UOM."')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The request line record could not be inserted because');
$DbgMsg = _('The following SQL to insert the request header record was used');
$Result = DB_query($LineSQL,$db,$ErrMsg,$DbgMsg,true);
-
}
}
@@ -130,38 +126,42 @@
echo '<tr>
<td>' . _('Line number') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Stock Code') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->StockID . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Item Description') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->ItemDescription . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Unit of Measure') . '</td>
<td>' . $_SESSION['Request']->LineItems[$_GET['Edit']]->UOM . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Quantity Requested') . '</td>
<td><input type="text" class="number" name="Quantity" value="' . locale_number_format($_SESSION['Request']->LineItems[$_GET['Edit']]->Quantity, $_SESSION['Request']->LineItems[$_GET['Edit']]->DecimalPlaces) . '" /></td>
</tr>';
echo '<input type="hidden" name="LineNumber" value="' . $_SESSION['Request']->LineItems[$_GET['Edit']]->LineNumber . '" />';
- echo '</table><br />';
- echo '<div class="centre"><input type="submit" name="Edit" value="' . _('Update Line') . '" /></div></form>';
+ echo '</table>
+ <br />';
+ echo '<div class="centre">
+ <input type="submit" name="Edit" value="' . _('Update Line') . '" />
+ </div>
+ </form>';
include('includes/footer.inc');
exit;
}
-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 '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<tr>
<th colspan="2"><font color="navy" size="2">' . _('Internal Stock Request Details') . '</font></th>
- </tr>';
-echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Department') . ':</td>';
$sql="SELECT departmentid,
@@ -170,18 +170,18 @@
ORDER BY description";
$result=DB_query($sql, $db);
-echo '<td><select name="Department">';
-echo '<option value="">' . _('Select your department') . '</option>';
+echo '<td><select name="Department">
+ <option value="">' . _('Select your department') . '</option>';
while ($myrow=DB_fetch_array($result)){
- if (isset($_SESSION['Request']->Department) and $_SESSION['Request']->Department==$myrow['departmentid']){
- echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8').'</option>';
+ if (isset($_SESSION['Request']->Department) AND $_SESSION['Request']->Department==$myrow['departmentid']){
+ echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
-echo '</select></td></tr>';
-
-echo '<tr>
+echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Location from which to request stock') . ':</td>';
$sql="SELECT loccode,
locationname
@@ -189,30 +189,33 @@
ORDER BY locationname";
$result=DB_query($sql, $db);
-echo '<td><select name="Location">';
-echo '<option value="">' . _('Select a Location') . '</option>';
+echo '<td><select name="Location">
+ <option value="">' . _('Select a Location') . '</option>';
while ($myrow=DB_fetch_array($result)){
- if (isset($_SESSION['Request']->Location) and $_SESSION['Request']->Location==$myrow['loccode']){
- echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8').'</option>';
+ if (isset($_SESSION['Request']->Location) AND $_SESSION['Request']->Location==$myrow['loccode']){
+ echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
-echo '</select></td></tr>';
-
-echo '<tr>
+echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Date when required') . ':</td>';
echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DispatchDate" maxlength="10" size="11" value="' . $_SESSION['Request']->DispatchDate . '" /></td>';
-echo '<tr><td>' . _('Narrative') . ':</td>';
-echo '<td><textarea name="Narrative" cols="30">'.$_SESSION['Request']->Narrative.'</textarea></td>';
+echo '<tr>
+ <td>' . _('Narrative') . ':</td>
+ <td><textarea name="Narrative" cols="30">'.$_SESSION['Request']->Narrative.'</textarea></td>
+ </tr>
+ </table>
+ <br />';
-echo '</table><br />';
+echo '<div class="centre">
+ <input type="submit" name="Update" value="' . _('Update') . '" />
+ </div>
+ </form>';
-echo '<div class="centre"><input type="submit" name="Update" value="' . _('Update') . '" /></div>';
-
-echo '</div></form>';
-
if (!isset($_SESSION['Request']->Location)) {
include('includes/footer.inc');
exit;
@@ -222,11 +225,12 @@
$i = 0; //Line Item Array pointer
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br /><table class="selection">';
-echo '<tr>
+echo '<br />
+ <table class="selection">
+ <tr>
<th colspan="7"><font size="2" color="navy">' . _('Details of Items Requested') . '</font></th>
- </tr>';
-echo '<tr>
+ </tr>
+ <tr>
<th>'. _('Line Number') . '</th>
<th>'. _('Item Code') . '</th>
<th>'. _('Item Description'). '</th>
@@ -253,11 +257,14 @@
<td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Edit='.$LineItems->LineNumber.'">' . _('Edit') . '</a></td>
<td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete='.$LineItems->LineNumber.'">' . _('Delete') . '</a></td>
</tr>';
-
}
-echo '</table><br />';
-echo '<div class="centre"><input type="submit" name="Submit" value="' . _('Submit') . '" /></div><br />';
+echo '</table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Submit" value="' . _('Submit') . '" />
+ </div>
+ <br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -270,14 +277,16 @@
$result1 = DB_query($SQL, $db);
if (DB_num_rows($result1) == 0) {
echo '<p><font size="4" color="red">' . _('Problem Report') . ':</font><br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>';
- echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ echo '<br />
+ <a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
exit;
}
-echo '<table class="selection"><tr>';
-echo '<td>' . _('In Stock Category') . ':';
-echo '<select name="StockCat">';
+echo '<table class="selection">
+ <tr>
+ <td>' . _('In Stock Category') . ':<select name="StockCat">';
+
if (!isset($_POST['StockCat'])) {
- $_POST['StockCat'] = "";
+ $_POST['StockCat'] = '';
}
if ($_POST['StockCat'] == 'All') {
echo '<option selected="True" value="All">' . _('All').'</option>';
@@ -291,8 +300,8 @@
echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
}
}
-echo '</select></td>';
-echo '<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td>';
+echo '</select></td>
+ <td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td>';
if (isset($_POST['Keywords'])) {
echo '<td><input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" /></td>';
} else {
@@ -300,16 +309,21 @@
}
echo '</tr>
<tr>
- <td></td>';
-echo '<td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
+ <td></td>
+ <td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
if (isset($_POST['StockCode'])) {
echo '<td><input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" /></td>';
} else {
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>';
}
-echo '</tr></table><br />';
-echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div><br />';
+echo '</tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Search" value="' . _('Search Now') . '" />
+ </div>
+ <br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
echo '</form>';
@@ -337,7 +351,7 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
- AND stockmaster.description " . LIKE . " '$SearchString'
+ AND stockmaster.description " . LIKE . " '" . $SearchString . "'
AND stockmaster.discontinued=0
ORDER BY stockmaster.stockid";
} else {
@@ -420,15 +434,15 @@
}
if (isset($_POST['Next'])) {
- $Offset = $_POST['nextlist'];
+ $Offset = $_POST['NextList'];
}
if (isset($_POST['Prev'])) {
- $Offset = $_POST['previous'];
+ $Offset = $_POST['Previous'];
}
if (!isset($Offset) or $Offset<0) {
$Offset=0;
}
- $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'].' OFFSET '.($_SESSION['DefaultDisplayRecordsMax']*$Offset);
+ $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'] . ' OFFSET ' . ($_SESSION['DefaultDisplayRecordsMax']*$Offset);
$ErrMsg = _('There is a problem selecting the part records to display because');
$DbgMsg = _('The SQL used to get the part selection was');
@@ -478,12 +492,12 @@
echo '</select>
<input type="submit" name="Go" value="' . _('Go') . '" />
<input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
- echo '<input type="hidden" name=Keywords value="'.$_POST['Keywords'].'" />';
- echo '<input type="hidden" name=StockCat value="'.$_POST['StockCat'].'" />';
- echo '<input type="hidden" name=StockCode value="'.$_POST['StockCode'].'" />';
-// echo '<input type="hidden" name=Search value="Search" />';
- echo '<br /></div>';
+ <input type="submit" name="Next" value="' . _('Next') . '" />
+ <input type="hidden" name=Keywords value="'.$_POST['Keywords'].'" />
+ <input type="hidden" name=StockCat value="'.$_POST['StockCat'].'" />
+ <input type="hidden" name=StockCode value="'.$_POST['StockCode'].'" />
+ <br />
+ </div>';
}
echo '<table cellpadding="2">';
echo '<tr>
@@ -542,13 +556,13 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="table1">';
echo '<tr><td>
- <input type="hidden" name="previous" value="'.($Offset-1).'" />
+ <input type="hidden" name="Previous" value="'.($Offset-1).'" />
<input tabindex="'.($j+8).'" type="submit" name="Prev" value="'._('Prev').'" /></td>';
echo '<td style="text-align:center" colspan="6">
<input type="hidden" name="order_items" value="1" />
<input tabindex="'.($j+9).'" type="submit" value="'._('Add to Requisition').'" /></td>';
echo '<td>
- <input type="hidden" name="nextlist" value="'.($Offset+1).'" />
+ <input type="hidden" name="NextList" value="'.($Offset+1).'" />
<input tabindex="'.($j+10).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
echo '<tr>
<th>' . _('Code') . '</th>
@@ -666,11 +680,11 @@
#end of page full new headings if
}
#end of while loop
- echo '<tr><td><input type="hidden" name="previous" value="'.($Offset-1).'" />
+ echo '<tr><td><input type="hidden" name="Previous" value="'.($Offset-1).'" />
<input tabindex="'.($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>';
echo '<td style="text-align:center" colspan="6"><input type="hidden" name="order_items" value="1" />
<input tabindex="'.($j+8).'" type="submit" value="'._('Add to Requisition').'" /></td>';
- echo '<td><input type="hidden" name="nextlist" value="'.($Offset+1).'" />
+ echo '<td><input type="hidden" name="NextList" value="'.($Offset+1).'" />
<input tabindex="'.($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td><tr/>';
echo '</table></form>';
echo $jsCall;
Modified: trunk/InternalStockRequestAuthorisation.php
===================================================================
--- trunk/InternalStockRequestAuthorisation.php 2012-02-28 23:15:08 UTC (rev 4990)
+++ trunk/InternalStockRequestAuthorisation.php 2012-02-29 08:59:09 UTC (rev 4991)
@@ -1,6 +1,6 @@
<?php
-/* $Id$*/
+/* $Id: InternalStockRequestAuthorisation.php 4576 2011-05-27 10:59:20Z daintree $*/
include('includes/session.inc');
@@ -10,17 +10,13 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' ' . $title . '</p>';
-$emailsql="SELECT email FROM www_users WHERE userid='".$_SESSION['UserID']."'";
-$emailresult=DB_query($emailsql, $db);
-$emailrow=DB_fetch_array($emailresult);
-
-if (isset($_POST['updateall'])) {
+if (isset($_POST['UpdateAll'])) {
foreach ($_POST as $key => $value) {
if (mb_substr($key,0,6)=='status') {
$RequestNo=mb_substr($key,6);
$sql="UPDATE stockrequest
- SET authorised='1'
- WHERE dispatchid='".$RequestNo."'";
+ SET authorised='1'
+ WHERE dispatchid='".$RequestNo."'";
$result=DB_query($sql, $db);
}
}
@@ -35,14 +31,13 @@
departments.description,
www_users.realname,
www_users.email
- FROM stockrequest
- LEFT JOIN departments
+ FROM stockrequest INNER JOIN departments
ON stockrequest.departmentid=departments.departmentid
- LEFT JOIN locations
+ INNER JOIN locations
ON stockrequest.loccode=locations.loccode
- LEFT JOIN www_users
+ INNER JOIN www_users
ON www_users.userid=departments.authoriser
- WHERE stockrequest.authorised=0
+ WHERE stockrequest.authorised=0
AND stockrequest.closed=0
AND www_users.userid='".$_SESSION['UserID']."'";
$result=DB_query($sql, $db);
@@ -53,22 +48,22 @@
/* Create the table for the purchase order header */
echo '<tr>
- <th>'._('Request Number').'</th>
- <th>'._('Department').'</th>
- <th>'._('Location Of Stock').'</th>
- <th>'._('Requested Date').'</th>
- <th>'._('Narrative').'</th>
- <th>'._('Authorise').'</th>
+ <th>' . _('Request Number') . '</th>
+ <th>' . _('Department') . '</th>
+ <th>' . _('Location Of Stock') . '</th>
+ <th>' . _('Requested Date') . '</th>
+ <th>' . _('Narrative') . '</th>
+ <th>' . _('Authorise') . '</th>
</tr>';
while ($myrow=DB_fetch_array($result)) {
echo '<tr>
- <td>'.$myrow['dispatchid'].'</td>
- <td>'.$myrow['description'].'</td>
- <td>'.$myrow['locationname'].'</td>
- <td>'.ConvertSQLDate($myrow['despatchdate']).'</td>
- <td>'.$myrow['narrative'].'</td>
+ <td>' . $myrow['dispatchid'] . '</td>
+ <td>' . $myrow['description'] . '</td>
+ <td>' . $myrow['locationname'] . '</td>
+ <td>' . ConvertSQLDate($myrow['despatchdate']) . '</td>
+ <td>' . $myrow['narrative'] . '</td>
<td><input type="checkbox" name="status'.$myrow['dispatchid'].'" /></td>
</tr>';
$linesql="SELECT stockrequestitems.dispatchitemsid,
@@ -78,7 +73,7 @@
stockmaster.description,
stockrequestitems.quantity
FROM stockrequestitems
- LEFT JOIN stockmaster
+ INNER JOIN stockmaster
ON stockmaster.stockid=stockrequestitems.stockid
WHERE dispatchid='".$myrow['dispatchid'] . "'";
$lineresult=DB_query($linesql, $db);
@@ -105,7 +100,7 @@
</tr>';
} //end while header loop
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="updateall" value="' . _('Update'). '" /></form>';
+echo '<br /><div class="centre"><input type="submit" name="UpdateAll" value="' . _('Update'). '" /></form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-28 23:15:08 UTC (rev 4990)
+++ trunk/doc/Change.log 2012-02-29 08:59:09 UTC (rev 4991)
@@ -1,4 +1,6 @@
webERP Change Log
+
+28/2/12 Tim: Added functionality that allows for the set up of internal departments, and for the request of stock to be issued - a new issue account is defined in stockcategories. Issue requests must be authorised by a department manager and then issues fulfilled creates a stock adjustment with posting in the gl to the item category issue account.
28/02/2012 Vitaly: Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
26/02/2012 Fixed bug that when set frequently sold items, there are sql errors which claimed that no group set for sum() function. Fixed by Exson
26/02/2012 PO_Items.php Add $_SESSION and $_POST variables to fixed extra lines added while page refreshing or push F5. Reported by CQZ and Ke from webERP Chinese forum QQ group. Fixed by Exson
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-29 09:10:46
|
Revision: 4994
http://web-erp.svn.sourceforge.net/web-erp/?rev=4994&view=rev
Author: daintree
Date: 2012-02-29 09:10:35 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
htmlentities replaced with htmlspecialchars
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/CompanyPreferences.php
trunk/Contracts.php
trunk/GLJournal.php
trunk/InternalStockRequest.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SpecialOrder.php
trunk/Z_poEditLangHeader.php
trunk/doc/Change.log
trunk/includes/tcpdf/tcpdf.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/AccountGroups.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -256,13 +256,13 @@
break;
} //end of switch statement
- echo '<td>' . htmlentities($myrow['groupname'], ENT_QUOTES,'UTF-8') . '</td>
+ echo '<td>' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '</td>
<td>' . $myrow['sectionname'] . '</td>
<td>' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlentities($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlentities($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -360,9 +360,9 @@
while ( $grouprow = DB_fetch_array($groupresult) ) {
if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
- echo '<option selected="selected" value="'.htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option selected="selected" value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
} else {
- echo '<option value="'.htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
}
}
echo '</select>';
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/CompanyPreferences.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -314,9 +314,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['DebtorsAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -331,9 +331,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['CreditorsAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="' . $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="' . $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -348,9 +348,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PayrollAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -365,9 +365,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['GRNAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -381,9 +381,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['RetainedEarnings']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -406,9 +406,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['FreightAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -423,9 +423,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['ExchangeDiffAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -440,9 +440,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PurchasesExchangeDiffAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -457,9 +457,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PytDiscountAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/Contracts.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -790,13 +790,13 @@
$k=1;
}
if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlentities($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
+ echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8').'" /></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'].'" />
- <td>'.htmlentities($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
+ <td>'.htmlspecialchars($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
<td>'.$myrow['phoneno'].'</td>
<td>'.$myrow['faxno'].'</td>
</tr>';
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/GLJournal.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -330,9 +330,9 @@
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']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8') . '</option>';
+ 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'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8') .'</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8') .'</option>';
}
}
echo '</select></td>';
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/InternalStockRequest.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -174,9 +174,9 @@
<option value="">' . _('Select your department') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_SESSION['Request']->Department) AND $_SESSION['Request']->Department==$myrow['departmentid']){
- echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlspecialchars($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlspecialchars($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
echo '</select></td>
@@ -193,9 +193,9 @@
<option value="">' . _('Select a Location') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_SESSION['Request']->Location) AND $_SESSION['Request']->Location==$myrow['loccode']){
- echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlspecialchars($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlspecialchars($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
echo '</select></td>
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_AuthoriseMyOrders.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -94,7 +94,7 @@
<option value="Cancelled">'._('Cancelled').'</option>
</select></td>
</tr>';
- echo '<input type="hidden" name="comment" value="' . htmlentities($myrow['stat_comment'], ENT_QUOTES,'UTF-8') . '" />';
+ echo '<input type="hidden" name="comment" value="' . htmlspecialchars($myrow['stat_comment'], ENT_QUOTES,'UTF-8') . '" />';
$LineSQL="SELECT purchorderdetails.*,
stockmaster.description,
stockmaster.decimalplaces
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_Header.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -844,7 +844,7 @@
<td colspan="2">' . html_entity_decode($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'</td>
</tr>';
- echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlentities($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
+ echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlspecialchars($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'" /></td>';
} //end its not a new order
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_Items.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -184,7 +184,7 @@
'" . Date('Y-m-d') . "',
'" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
'" . $_SESSION['PO'.$identifier]->Status . "',
- '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "',
+ '" . htmlspecialchars($StatusComment,ENT_QUOTES,'UTF-8') . "',
'" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
'" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
'" . $_SESSION['PO'.$identifier]->AllowPrintPO . "' )";
@@ -277,7 +277,7 @@
paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
status = '" . $_SESSION['PO'.$identifier]->Status . "',
- stat_comment = '" . htmlentities($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "'
+ stat_comment = '" . htmlspecialchars($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "'
WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('The purchase order could not be updated because');
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_PDFPurchOrder.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -340,7 +340,7 @@
$sql = "UPDATE purchorders SET allowprint = 0,
dateprinted = '" . Date('Y-m-d') . "',
status = 'Printed',
- stat_comment = '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "'
+ stat_comment = '" . htmlspecialchars($StatusComment,ENT_QUOTES,'UTF-8') . "'
WHERE purchorders.orderno = '" . $OrderNo ."'";
$result = DB_query($sql,$db);
}
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SelectCreditItems.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -261,7 +261,7 @@
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></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'].'" />
<input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
<td>'.$myrow['contactname'].'</td>
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SelectCustomer.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -447,7 +447,7 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
+ echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
<input type="hidden" name="SelectedCustomer' . $i . '" value="'.$myrow['debtorno'].'" />
<input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" />
<td><font size="1">' . $myrow['name'] . '</font></td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SelectOrderItems.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -627,7 +627,7 @@
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td>
+ echo '<td><input tabindex="'.strval($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'].'" />
<input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
<td>'.$myrow['contactname'].'</td>
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SpecialOrder.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -380,7 +380,7 @@
'" . $StkLocAddress['deladd6'] . "',
'" . $StkLocAddress['contact'] . "',
'" . $_SESSION['SPL'.$identifier]->Status . "',
- '" . htmlentities($StatusComment, ENT_QUOTES,'UTF-8') . "',
+ '" . htmlspecialchars($StatusComment, ENT_QUOTES,'UTF-8') . "',
'" . $_SESSION['SPL'.$identifier]->AllowPrintPO . "',
'" . Date('Y-m-d') . "',
'" . Date('Y-m-d') . "')";
Modified: trunk/Z_poEditLangHeader.php
===================================================================
--- trunk/Z_poEditLangHeader.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/Z_poEditLangHeader.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -98,7 +98,7 @@
echo '<tr>';
echo '<td>' . _('Header Line') . ' # ' . $i . '</td>';
- echo '<td><input type="text" size="80" name="Header_' . $i . '" value="' . htmlentities($LanguageHeader[$i]) . '" /></td>';
+ echo '<td><input type="text" size="80" name="Header_' . $i . '" value="' . htmlspecialchars($LanguageHeader[$i]) . '" /></td>';
echo '</tr>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/doc/Change.log 2012-02-29 09:10:35 UTC (rev 4994)
@@ -38,7 +38,7 @@
28/1/12 Ahmed.Fawzy: StockCategories.php fixes for numericvalue not displaying and errored with "minimum value is not numeric"
28/1/12 Phil: ConfirmDispatch_Invoice.php corrected link to ConfirmDispatchControlled_Invoice.php to send $identifier to get the correct session variable containing the order to invoice
28/1/12 Tim: SpecialOrder.php added $identifier to session class variable to avoid overlapping sessions in multiple tabs.
-27/1/12 Phil: PO_AuthoriseMyOrders.php fixed html in hidden $_POST['StatusComments'] by using htmlentities($_POST['StatusComments'])
+27/1/12 Phil: PO_AuthoriseMyOrders.php fixed html in hidden $_POST['StatusComments'] by using htmlspecialchars($_POST['StatusComments'])
25/1/12 Vitaly: Added quotes and missing closing tags in multiple files
24/1/12 Vitaly: Added quotes to attributes in multiple files and changed option selected to selected="selected".
23/1/12 Vitaly: Added quotes to attributes in multiple files.
Modified: trunk/includes/tcpdf/tcpdf.php
===================================================================
--- trunk/includes/tcpdf/tcpdf.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/includes/tcpdf/tcpdf.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -6353,7 +6353,7 @@
case 'link': {
if(is_string($pl['txt'])) {
// external URI link
- $annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlentities($pl['txt'])).'>>';
+ $annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlspecialchars($pl['txt'])).'>>';
} else {
// internal link
$l = $this->links[$pl['txt']];
@@ -8312,7 +8312,7 @@
* @return string converted
* @access public
*/
- public function unhtmlentities($text_to_convert) {
+ public function unhtmlspecialchars($text_to_convert) {
return html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
}
@@ -13860,7 +13860,7 @@
// text
$dom[$key]['tag'] = false;
$dom[$key]['block'] = false;
- $dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
+ $dom[$key]['value'] = stripslashes($this->unhtmlspecialchars($element));
$dom[$key]['parent'] = end($level);
}
++$elkey;
@@ -17572,7 +17572,7 @@
*/
public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
global $unicode;
- $text = $this->unhtmlentities($text);
+ $text = $this->unhtmlspecialchars($text);
$word = array(); // last word
$txtarr = array(); // text to be returned
$intag = false; // true if we are inside an HTML tag
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-29 09:10:47
|
Revision: 4994
http://web-erp.svn.sourceforge.net/web-erp/?rev=4994&view=rev
Author: daintree
Date: 2012-02-29 09:10:35 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
htmlentities replaced with htmlspecialchars
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/CompanyPreferences.php
trunk/Contracts.php
trunk/GLJournal.php
trunk/InternalStockRequest.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SpecialOrder.php
trunk/Z_poEditLangHeader.php
trunk/doc/Change.log
trunk/includes/tcpdf/tcpdf.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/AccountGroups.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -256,13 +256,13 @@
break;
} //end of switch statement
- echo '<td>' . htmlentities($myrow['groupname'], ENT_QUOTES,'UTF-8') . '</td>
+ echo '<td>' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '</td>
<td>' . $myrow['sectionname'] . '</td>
<td>' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlentities($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlentities($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -360,9 +360,9 @@
while ( $grouprow = DB_fetch_array($groupresult) ) {
if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
- echo '<option selected="selected" value="'.htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option selected="selected" value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
} else {
- echo '<option value="'.htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
+ echo '<option value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
}
}
echo '</select>';
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/CompanyPreferences.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -314,9 +314,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['DebtorsAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -331,9 +331,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['CreditorsAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="' . $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="' . $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -348,9 +348,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PayrollAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -365,9 +365,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['GRNAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -381,9 +381,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['RetainedEarnings']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -406,9 +406,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['FreightAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -423,9 +423,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['ExchangeDiffAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -440,9 +440,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PurchasesExchangeDiffAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -457,9 +457,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PytDiscountAct']==$myrow[0]){
- echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
} else {
- echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
+ echo '<option value="'. $myrow[0] . '">' . htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>';
}
} //end while loop
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/Contracts.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -790,13 +790,13 @@
$k=1;
}
if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlentities($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
+ echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8').'" /></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'].'" />
- <td>'.htmlentities($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
+ <td>'.htmlspecialchars($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
<td>'.$myrow['phoneno'].'</td>
<td>'.$myrow['faxno'].'</td>
</tr>';
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/GLJournal.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -330,9 +330,9 @@
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']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8') . '</option>';
+ 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'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8') .'</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8') .'</option>';
}
}
echo '</select></td>';
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/InternalStockRequest.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -174,9 +174,9 @@
<option value="">' . _('Select your department') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_SESSION['Request']->Department) AND $_SESSION['Request']->Department==$myrow['departmentid']){
- echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="True" value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlspecialchars($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlentities($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['departmentid'].' - ' .htmlspecialchars($myrow['description'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
echo '</select></td>
@@ -193,9 +193,9 @@
<option value="">' . _('Select a Location') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_SESSION['Request']->Location) AND $_SESSION['Request']->Location==$myrow['loccode']){
- echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlspecialchars($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlentities($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['loccode'].' - ' .htmlspecialchars($myrow['locationname'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
echo '</select></td>
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_AuthoriseMyOrders.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -94,7 +94,7 @@
<option value="Cancelled">'._('Cancelled').'</option>
</select></td>
</tr>';
- echo '<input type="hidden" name="comment" value="' . htmlentities($myrow['stat_comment'], ENT_QUOTES,'UTF-8') . '" />';
+ echo '<input type="hidden" name="comment" value="' . htmlspecialchars($myrow['stat_comment'], ENT_QUOTES,'UTF-8') . '" />';
$LineSQL="SELECT purchorderdetails.*,
stockmaster.description,
stockmaster.decimalplaces
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_Header.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -844,7 +844,7 @@
<td colspan="2">' . html_entity_decode($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'</td>
</tr>';
- echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlentities($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
+ echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlspecialchars($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'" /></td>';
} //end its not a new order
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_Items.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -184,7 +184,7 @@
'" . Date('Y-m-d') . "',
'" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
'" . $_SESSION['PO'.$identifier]->Status . "',
- '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "',
+ '" . htmlspecialchars($StatusComment,ENT_QUOTES,'UTF-8') . "',
'" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
'" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
'" . $_SESSION['PO'.$identifier]->AllowPrintPO . "' )";
@@ -277,7 +277,7 @@
paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
status = '" . $_SESSION['PO'.$identifier]->Status . "',
- stat_comment = '" . htmlentities($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "'
+ stat_comment = '" . htmlspecialchars($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "'
WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('The purchase order could not be updated because');
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/PO_PDFPurchOrder.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -340,7 +340,7 @@
$sql = "UPDATE purchorders SET allowprint = 0,
dateprinted = '" . Date('Y-m-d') . "',
status = 'Printed',
- stat_comment = '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "'
+ stat_comment = '" . htmlspecialchars($StatusComment,ENT_QUOTES,'UTF-8') . "'
WHERE purchorders.orderno = '" . $OrderNo ."'";
$result = DB_query($sql,$db);
}
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SelectCreditItems.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -261,7 +261,7 @@
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></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'].'" />
<input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
<td>'.$myrow['contactname'].'</td>
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SelectCustomer.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -447,7 +447,7 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
+ echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
<input type="hidden" name="SelectedCustomer' . $i . '" value="'.$myrow['debtorno'].'" />
<input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" />
<td><font size="1">' . $myrow['name'] . '</font></td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SelectOrderItems.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -627,7 +627,7 @@
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td>
+ echo '<td><input tabindex="'.strval($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'].'" />
<input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
<td>'.$myrow['contactname'].'</td>
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/SpecialOrder.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -380,7 +380,7 @@
'" . $StkLocAddress['deladd6'] . "',
'" . $StkLocAddress['contact'] . "',
'" . $_SESSION['SPL'.$identifier]->Status . "',
- '" . htmlentities($StatusComment, ENT_QUOTES,'UTF-8') . "',
+ '" . htmlspecialchars($StatusComment, ENT_QUOTES,'UTF-8') . "',
'" . $_SESSION['SPL'.$identifier]->AllowPrintPO . "',
'" . Date('Y-m-d') . "',
'" . Date('Y-m-d') . "')";
Modified: trunk/Z_poEditLangHeader.php
===================================================================
--- trunk/Z_poEditLangHeader.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/Z_poEditLangHeader.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -98,7 +98,7 @@
echo '<tr>';
echo '<td>' . _('Header Line') . ' # ' . $i . '</td>';
- echo '<td><input type="text" size="80" name="Header_' . $i . '" value="' . htmlentities($LanguageHeader[$i]) . '" /></td>';
+ echo '<td><input type="text" size="80" name="Header_' . $i . '" value="' . htmlspecialchars($LanguageHeader[$i]) . '" /></td>';
echo '</tr>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/doc/Change.log 2012-02-29 09:10:35 UTC (rev 4994)
@@ -38,7 +38,7 @@
28/1/12 Ahmed.Fawzy: StockCategories.php fixes for numericvalue not displaying and errored with "minimum value is not numeric"
28/1/12 Phil: ConfirmDispatch_Invoice.php corrected link to ConfirmDispatchControlled_Invoice.php to send $identifier to get the correct session variable containing the order to invoice
28/1/12 Tim: SpecialOrder.php added $identifier to session class variable to avoid overlapping sessions in multiple tabs.
-27/1/12 Phil: PO_AuthoriseMyOrders.php fixed html in hidden $_POST['StatusComments'] by using htmlentities($_POST['StatusComments'])
+27/1/12 Phil: PO_AuthoriseMyOrders.php fixed html in hidden $_POST['StatusComments'] by using htmlspecialchars($_POST['StatusComments'])
25/1/12 Vitaly: Added quotes and missing closing tags in multiple files
24/1/12 Vitaly: Added quotes to attributes in multiple files and changed option selected to selected="selected".
23/1/12 Vitaly: Added quotes to attributes in multiple files.
Modified: trunk/includes/tcpdf/tcpdf.php
===================================================================
--- trunk/includes/tcpdf/tcpdf.php 2012-02-29 09:05:57 UTC (rev 4993)
+++ trunk/includes/tcpdf/tcpdf.php 2012-02-29 09:10:35 UTC (rev 4994)
@@ -6353,7 +6353,7 @@
case 'link': {
if(is_string($pl['txt'])) {
// external URI link
- $annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlentities($pl['txt'])).'>>';
+ $annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlspecialchars($pl['txt'])).'>>';
} else {
// internal link
$l = $this->links[$pl['txt']];
@@ -8312,7 +8312,7 @@
* @return string converted
* @access public
*/
- public function unhtmlentities($text_to_convert) {
+ public function unhtmlspecialchars($text_to_convert) {
return html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
}
@@ -13860,7 +13860,7 @@
// text
$dom[$key]['tag'] = false;
$dom[$key]['block'] = false;
- $dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
+ $dom[$key]['value'] = stripslashes($this->unhtmlspecialchars($element));
$dom[$key]['parent'] = end($level);
}
++$elkey;
@@ -17572,7 +17572,7 @@
*/
public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
global $unicode;
- $text = $this->unhtmlentities($text);
+ $text = $this->unhtmlspecialchars($text);
$word = array(); // last word
$txtarr = array(); // text to be returned
$intag = false; // true if we are inside an HTML tag
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-02-29 23:15:00
|
Revision: 4997
http://web-erp.svn.sourceforge.net/web-erp/?rev=4997&view=rev
Author: vvs2012
Date: 2012-02-29 23:14:53 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/WorkOrderReceive.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-02-29 09:19:58 UTC (rev 4996)
+++ trunk/AccountGroups.php 2012-02-29 23:14:53 UTC (rev 4997)
@@ -178,7 +178,7 @@
$myrow = DB_fetch_array($result);
if ($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group') . '</font>';
+ echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
@@ -188,7 +188,7 @@
$myrow = DB_fetch_array($result);
if ($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group') . '</font>';
+ echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
} else {
$sql="DELETE FROM accountgroups WHERE groupname='" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in deleting the account group');
@@ -222,7 +222,7 @@
$DbgMsg = _('The sql that was used to retrieve the account group information was ');
$ErrMsg = _('Could not get account groups because');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
echo '<table class="selection">
<tr>
@@ -261,8 +261,8 @@
<td>' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -270,12 +270,13 @@
if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
+ echo '<div class="centre"><br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
}
if (!isset($_GET['delete'])) {
- echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedAccountGroup'])) {
@@ -307,10 +308,12 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('Edit Account Group Details') . '</th>
+ <th colspan="2">' . _('Edit Account Group Details') . '</th>
</tr>';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
- echo '<input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" />';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
+ <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group') . ':' . '</td>
@@ -336,10 +339,12 @@
}
echo '<br /><table class="selection">';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" />';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('New Account Group Details') . '</th>
+ <th colspan="2">' . _('New Account Group Details') . '</th>
</tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
<td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
@@ -413,7 +418,7 @@
echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-02-29 09:19:58 UTC (rev 4996)
+++ trunk/WorkOrderReceive.php 2012-02-29 23:14:53 UTC (rev 4997)
@@ -6,15 +6,18 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+echo '<div>';
echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
<br />';
echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a>
<br />';
+echo '</div>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p>';
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($_REQUEST['WO']) OR !isset($_REQUEST['StockID'])) {
@@ -66,6 +69,8 @@
if (DB_num_rows($WOResult)==0){
prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -234,7 +239,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['adjglact'] . "',
- '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
+ '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
'" . (-$ValueOfChange) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
@@ -253,7 +258,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
+ '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
'" . $ValueOfChange . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
@@ -374,7 +379,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP side of the work order issue GL posting could not be inserted because');
@@ -393,7 +398,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $AutoIssueCompRow['stockact'] . "',
- '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side of the work order issue GL posting could not be inserted because');
@@ -628,7 +633,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . DB_escape_string($WORow['description']) . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The receipt of work order finished stock GL posting could not be inserted because');
@@ -648,7 +653,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . DB_escape_string($WORow['description']) . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP credit on receipt of finished items from a work order GL posting could not be inserted because');
@@ -686,6 +691,8 @@
unset($_POST['QualityText'.$i]);
unset($_POST['QtyReqd'.$i]);
}
+ echo '</div>';
+ echo '</form>';
/*end of process work order goods received entry */
include('includes/footer.inc');
exit;
@@ -722,6 +729,8 @@
if (DB_num_rows($WOResult)==0){
prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -729,6 +738,8 @@
if ($WORow['closed']==1){
prnMsg(_('The selected work order has been closed and variances calculated and posted. No more receipts of manufactured items can be received against this work order. You should make up a new work order to receive this item against.'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -842,8 +853,8 @@
if (!isset($i)){
$i=0;
}
+ echo '<td><input type="hidden" name="CountOfInputs" value="' . $i . '" /></td>';
echo '</tr>';
- echo '<input type="hidden" name="CountOfInputs" value="' . $i . '" />';
echo '<tr>
<td colspan="5"></td>
</tr>
@@ -893,7 +904,10 @@
<td><input type="textbox" class="number" name="Qty' . $i .'" /></td></tr>';
}
}
- echo '<input type="hidden" name="CountOfInputs" value="' . $i . '" /></table>';
+ echo '<tr>
+ <td><input type="hidden" name="CountOfInputs" value="' . $i . '" /></td>
+ </tr>
+ </table>';
echo '<br />
<div class="centre">
<input type="submit" name="Process" value="' . _('Process Manufactured Items Received') . '" />
@@ -901,8 +915,8 @@
} //end of lot/batch control
} else { //not controlled - an easy one!
- echo '<input type="hidden" name="CountOfInputs" value="1" />';
echo '<tr>
+ <td><input type="hidden" name="CountOfInputs" value="1" /></td>
<td>' . _('Quantity Received') . ':</td>
<td><input type="text" class="number" name="Qty" /></td>
</tr>
@@ -912,7 +926,7 @@
<input type="submit" name="Process" value="' . _('Process Manufactured Items Received') . '" />
</div>';
}
-
+echo '</div>';
echo '</form>';
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-02-29 23:14:59
|
Revision: 4997
http://web-erp.svn.sourceforge.net/web-erp/?rev=4997&view=rev
Author: vvs2012
Date: 2012-02-29 23:14:53 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/WorkOrderReceive.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-02-29 09:19:58 UTC (rev 4996)
+++ trunk/AccountGroups.php 2012-02-29 23:14:53 UTC (rev 4997)
@@ -178,7 +178,7 @@
$myrow = DB_fetch_array($result);
if ($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group') . '</font>';
+ echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
@@ -188,7 +188,7 @@
$myrow = DB_fetch_array($result);
if ($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group') . '</font>';
+ echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
} else {
$sql="DELETE FROM accountgroups WHERE groupname='" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in deleting the account group');
@@ -222,7 +222,7 @@
$DbgMsg = _('The sql that was used to retrieve the account group information was ');
$ErrMsg = _('Could not get account groups because');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
echo '<table class="selection">
<tr>
@@ -261,8 +261,8 @@
<td>' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -270,12 +270,13 @@
if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
+ echo '<div class="centre"><br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
}
if (!isset($_GET['delete'])) {
- echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedAccountGroup'])) {
@@ -307,10 +308,12 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('Edit Account Group Details') . '</th>
+ <th colspan="2">' . _('Edit Account Group Details') . '</th>
</tr>';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
- echo '<input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" />';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
+ <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group') . ':' . '</td>
@@ -336,10 +339,12 @@
}
echo '<br /><table class="selection">';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" />';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('New Account Group Details') . '</th>
+ <th colspan="2">' . _('New Account Group Details') . '</th>
</tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
<td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
@@ -413,7 +418,7 @@
echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-02-29 09:19:58 UTC (rev 4996)
+++ trunk/WorkOrderReceive.php 2012-02-29 23:14:53 UTC (rev 4997)
@@ -6,15 +6,18 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+echo '<div>';
echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
<br />';
echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a>
<br />';
+echo '</div>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p>';
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($_REQUEST['WO']) OR !isset($_REQUEST['StockID'])) {
@@ -66,6 +69,8 @@
if (DB_num_rows($WOResult)==0){
prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -234,7 +239,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['adjglact'] . "',
- '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
+ '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
'" . (-$ValueOfChange) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
@@ -253,7 +258,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
+ '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
'" . $ValueOfChange . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
@@ -374,7 +379,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP side of the work order issue GL posting could not be inserted because');
@@ -393,7 +398,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $AutoIssueCompRow['stockact'] . "',
- '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side of the work order issue GL posting could not be inserted because');
@@ -628,7 +633,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . DB_escape_string($WORow['description']) . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The receipt of work order finished stock GL posting could not be inserted because');
@@ -648,7 +653,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . DB_escape_string($WORow['description']) . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP credit on receipt of finished items from a work order GL posting could not be inserted because');
@@ -686,6 +691,8 @@
unset($_POST['QualityText'.$i]);
unset($_POST['QtyReqd'.$i]);
}
+ echo '</div>';
+ echo '</form>';
/*end of process work order goods received entry */
include('includes/footer.inc');
exit;
@@ -722,6 +729,8 @@
if (DB_num_rows($WOResult)==0){
prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -729,6 +738,8 @@
if ($WORow['closed']==1){
prnMsg(_('The selected work order has been closed and variances calculated and posted. No more receipts of manufactured items can be received against this work order. You should make up a new work order to receive this item against.'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -842,8 +853,8 @@
if (!isset($i)){
$i=0;
}
+ echo '<td><input type="hidden" name="CountOfInputs" value="' . $i . '" /></td>';
echo '</tr>';
- echo '<input type="hidden" name="CountOfInputs" value="' . $i . '" />';
echo '<tr>
<td colspan="5"></td>
</tr>
@@ -893,7 +904,10 @@
<td><input type="textbox" class="number" name="Qty' . $i .'" /></td></tr>';
}
}
- echo '<input type="hidden" name="CountOfInputs" value="' . $i . '" /></table>';
+ echo '<tr>
+ <td><input type="hidden" name="CountOfInputs" value="' . $i . '" /></td>
+ </tr>
+ </table>';
echo '<br />
<div class="centre">
<input type="submit" name="Process" value="' . _('Process Manufactured Items Received') . '" />
@@ -901,8 +915,8 @@
} //end of lot/batch control
} else { //not controlled - an easy one!
- echo '<input type="hidden" name="CountOfInputs" value="1" />';
echo '<tr>
+ <td><input type="hidden" name="CountOfInputs" value="1" /></td>
<td>' . _('Quantity Received') . ':</td>
<td><input type="text" class="number" name="Qty" /></td>
</tr>
@@ -912,7 +926,7 @@
<input type="submit" name="Process" value="' . _('Process Manufactured Items Received') . '" />
</div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-01 09:08:45
|
Revision: 4998
http://web-erp.svn.sourceforge.net/web-erp/?rev=4998&view=rev
Author: daintree
Date: 2012-03-01 09:08:34 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
made the ability to change prices at order entry a separate security token 13 - so order entry clerks with minimal access cant change prices/discounts
Modified Paths:
--------------
trunk/CounterSales.php
trunk/SelectOrderItems.php
trunk/SystemParameters.php
trunk/sql/mysql/upgrade4.07-4.08.sql
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/CounterSales.php 2012-03-01 09:08:34 UTC (rev 4998)
@@ -742,10 +742,12 @@
<th>' . _('Quantity') . '</th>
<th>' . _('QOH') . '</th>
<th>' . _('Unit') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('GP %') . '</th>
- <th>' . _('Net') . '</th>
+ <th>' . _('Price') . '</th>';
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<th>' . _('Discount') . '</th>
+ <th>' . _('GP %') . '</th>';
+ }
+ echo '<th>' . _('Net') . '</th>
<th>' . _('Tax') . '</th>
<th>' . _('Total') . '<br />' . _('Incl Tax') . '</th>
</tr>';
@@ -787,10 +789,15 @@
echo '</td>
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
-
- echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
<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>
+ <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) . '" />';
+ }
echo '<td class="number">' . locale_number_format($SubTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
$LineDueDate = $OrderLine->ItemDue;
if (!Is_Date($OrderLine->ItemDue)){
@@ -834,11 +841,16 @@
} /* end of loop around items */
- echo '<tr class="EvenTableRows"><td colspan="8" class="number"><b>' . _('Total') . '</b></td>
- <td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total+$TaxTotal),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
- </tr>
+ echo '<tr class="EvenTableRows">';
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<td colspan="8" class="number"><b>' . _('Total') . '</b></td>';
+ } else {
+ echo '<td colspan="6" class="number"><b>' . _('Total') . '</b></td>';
+ }
+ echo '<td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total+$TaxTotal),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
+ </tr>
</table>';
echo '<input type="hidden" name="TaxTotal" value="'.$TaxTotal.'" />';
echo '<table><tr><td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/SelectOrderItems.php 2012-03-01 09:08:34 UTC (rev 4998)
@@ -1336,7 +1336,7 @@
<th>' . _('Unit') . '</th>
<th>' . _('Price') . '</th>';
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
echo '<th>' . _('Discount') . '</th>
<th>' . _('GP %') . '</th>';
}
@@ -1384,7 +1384,7 @@
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
/*OK to display with discount if it is an internal user with appropriate permissions */
echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
<td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
@@ -1424,13 +1424,13 @@
} /* end of loop around items */
$DisplayTotal = locale_number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
$ColSpanNumber = 2;
} else {
$ColSpanNumber = 1;
}
echo '<tr class="EvenTableRows">
- <td class="number" colspan="7"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
+ <td class="number" colspan="6"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
<td colspan="' . $ColSpanNumber . '" class="number">' . $DisplayTotal . '</td>
</tr>
</table>';
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/SystemParameters.php 2012-03-01 09:08:34 UTC (rev 4998)
@@ -24,61 +24,61 @@
Note: the X_ in the POST variables, the reason for this is to overcome globals=on replacing
the actial system/overidden variables.
*/
- if (mb_strlen($_POST['X_PastDueDays1']) > 3 || !is_numeric($_POST['X_PastDueDays1']) ) {
+ if (mb_strlen($_POST['X_PastDueDays1']) > 3 OR !is_numeric($_POST['X_PastDueDays1']) ) {
$InputError = 1;
prnMsg(_('First overdue deadline days must be a number'),'error');
- } elseif (mb_strlen($_POST['X_PastDueDays2']) > 3 || !is_numeric($_POST['X_PastDueDays2']) ) {
+ } elseif (mb_strlen($_POST['X_PastDueDays2']) > 3 OR !is_numeric($_POST['X_PastDueDays2']) ) {
$InputError = 1;
prnMsg(_('Second overdue deadline days must be a number'),'error');
- } elseif (mb_strlen($_POST['X_DefaultCreditLimit']) > 12 || !is_numeric($_POST['X_DefaultCreditLimit']) ) {
+ } elseif (mb_strlen($_POST['X_DefaultCreditLimit']) > 12 OR !is_numeric($_POST['X_DefaultCreditLimit']) ) {
$InputError = 1;
prnMsg(_('Default Credit Limit must be a number'),'error');
- } elseif (mb_strstr($_POST['X_RomalpaClause'], "'") || mb_strlen($_POST['X_RomalpaClause']) > 5000) {
+ } elseif (mb_strstr($_POST['X_RomalpaClause'], "'") OR mb_strlen($_POST['X_RomalpaClause']) > 5000) {
$InputError = 1;
prnMsg(_('The Romalpa Clause may not contain single quotes and may not be longer than 5000 chars'),'error');
- } elseif (mb_strlen($_POST['X_QuickEntries']) > 2 || !is_numeric($_POST['X_QuickEntries']) ||
- $_POST['X_QuickEntries'] < 1 || $_POST['X_QuickEntries'] > 99 ) {
+ } elseif (mb_strlen($_POST['X_QuickEntries']) > 2 OR !is_numeric($_POST['X_QuickEntries']) OR
+ $_POST['X_QuickEntries'] < 1 OR $_POST['X_QuickEntries'] > 99 ) {
$InputError = 1;
prnMsg(_('No less than 1 and more than 99 Quick entries allowed'),'error');
- } elseif (mb_strlen($_POST['X_FreightChargeAppliesIfLessThan']) > 12 || !is_numeric($_POST['X_FreightChargeAppliesIfLessThan']) ) {
+ } elseif (mb_strlen($_POST['X_FreightChargeAppliesIfLessThan']) > 12 OR !is_numeric($_POST['X_FreightChargeAppliesIfLessThan']) ) {
$InputError = 1;
prnMsg(_('Freight Charge Applies If Less Than must be a number'),'error');
- } elseif ( !is_numeric($_POST['X_StandardCostDecimalPlaces']) ||
- $_POST['X_StandardCostDecimalPlaces'] < 0 || $_POST['X_StandardCostDecimalPlaces'] > 4 ) {
+ } elseif ( !is_numeric($_POST['X_StandardCostDecimalPlaces']) OR
+ $_POST['X_StandardCostDecimalPlaces'] < 0 OR $_POST['X_StandardCostDecimalPlaces'] > 4 ) {
$InputError = 1;
prnMsg(_('Standard Cost Decimal Places must be a number between 0 and 4'),'error');
- } elseif (mb_strlen($_POST['X_NumberOfPeriodsOfStockUsage']) > 2 || !is_numeric($_POST['X_NumberOfPeriodsOfStockUsage']) ||
- $_POST['X_NumberOfPeriodsOfStockUsage'] < 1 || $_POST['X_NumberOfPeriodsOfStockUsage'] > 12 ) {
+ } elseif (mb_strlen($_POST['X_NumberOfPeriodsOfStockUsage']) > 2 OR !is_numeric($_POST['X_NumberOfPeriodsOfStockUsage']) OR
+ $_POST['X_NumberOfPeriodsOfStockUsage'] < 1 OR $_POST['X_NumberOfPeriodsOfStockUsage'] > 12 ) {
$InputError = 1;
prnMsg(_('Financial period per year must be a number between 1 and 12'),'error');
} elseif (mb_strlen($_POST['X_TaxAuthorityReferenceName']) >25) {
$InputError = 1;
prnMsg(_('The Tax Authority Reference Name must be 25 characters or less long'),'error');
- } elseif (mb_strlen($_POST['X_OverChargeProportion']) > 3 || !is_numeric($_POST['X_OverChargeProportion']) ||
- $_POST['X_OverChargeProportion'] < 0 || $_POST['X_OverChargeProportion'] > 100 ) {
+ } elseif (mb_strlen($_POST['X_OverChargeProportion']) > 3 OR !is_numeric($_POST['X_OverChargeProportion']) OR
+ $_POST['X_OverChargeProportion'] < 0 OR $_POST['X_OverChargeProportion'] > 100 ) {
$InputError = 1;
prnMsg(_('Over Charge Proportion must be a percentage'),'error');
- } elseif (mb_strlen($_POST['X_OverReceiveProportion']) > 3 || !is_numeric($_POST['X_OverReceiveProportion']) ||
- $_POST['X_OverReceiveProportion'] < 0 || $_POST['X_OverReceiveProportion'] > 100 ) {
+ } elseif (mb_strlen($_POST['X_OverReceiveProportion']) > 3 OR !is_numeric($_POST['X_OverReceiveProportion']) OR
+ $_POST['X_OverReceiveProportion'] < 0 OR $_POST['X_OverReceiveProportion'] > 100 ) {
$InputError = 1;
prnMsg(_('Over Receive Proportion must be a percentage'),'error');
- } elseif (mb_strlen($_POST['X_PageLength']) > 3 || !is_numeric($_POST['X_PageLength']) ||
+ } elseif (mb_strlen($_POST['X_PageLength']) > 3 OR !is_numeric($_POST['X_PageLength']) OR
$_POST['X_PageLength'] < 1 ) {
$InputError = 1;
prnMsg(_('Lines per page must be greater than 1'),'error');
- } elseif (mb_strlen($_POST['X_MonthsAuditTrail']) > 2 || !is_numeric($_POST['X_MonthsAuditTrail']) ||
+ } elseif (mb_strlen($_POST['X_MonthsAuditTrail']) > 2 OR !is_numeric($_POST['X_MonthsAuditTrail']) OR
$_POST['X_MonthsAuditTrail'] < 0 ) {
$InputError = 1;
prnMsg(_('The number of months of audit trail to keep must be zero or a positive number less than 100 months'),'error');
- }elseif (mb_strlen($_POST['X_DefaultTaxCategory']) > 1 || !is_numeric($_POST['X_DefaultTaxCategory']) ||
+ }elseif (mb_strlen($_POST['X_DefaultTaxCategory']) > 1 OR !is_numeric($_POST['X_DefaultTaxCategory']) OR
$_POST['X_DefaultTaxCategory'] < 1 ) {
$InputError = 1;
prnMsg(_('DefaultTaxCategory must be between 1 and 9'),'error');
- } elseif (mb_strlen($_POST['X_DefaultDisplayRecordsMax']) > 3 || !is_numeric($_POST['X_DefaultDisplayRecordsMax']) ||
+ } elseif (mb_strlen($_POST['X_DefaultDisplayRecordsMax']) > 3 OR !is_numeric($_POST['X_DefaultDisplayRecordsMax']) OR
$_POST['X_DefaultDisplayRecordsMax'] < 1 ) {
$InputError = 1;
prnMsg(_('Default maximum number of records to display must be between 1 and 500'),'error');
- }elseif (mb_strlen($_POST['X_MaxImageSize']) > 3 || !is_numeric($_POST['X_MaxImageSize']) ||
+ }elseif (mb_strlen($_POST['X_MaxImageSize']) > 3 OR !is_numeric($_POST['X_MaxImageSize']) OR
$_POST['X_MaxImageSize'] < 1 ) {
$InputError = 1;
prnMsg(_('The maximum size of item image files must be between 50 and 500 (NB this figure refers to KB)'),'error');
@@ -91,7 +91,7 @@
}elseif (!IsEmailAddress($_POST['X_InventoryManagerEmail']) AND $_POST['X_InventoryManagerEmail']!=''){
$InputError = 1;
prnMsg(_('The Inventory Manager Email address does not appear to be valid'),'error');
- }elseif (mb_strlen($_POST['X_FrequentlyOrderedItems']) > 2 || !is_numeric($_POST['X_FrequentlyOrderedItems'])) {
+ }elseif (mb_strlen($_POST['X_FrequentlyOrderedItems']) > 2 OR !is_numeric($_POST['X_FrequentlyOrderedItems'])) {
$InputError = 1;
prnMsg(_('The number of frequently ordered items to display must be numeric'),'error');
}
Modified: trunk/sql/mysql/upgrade4.07-4.08.sql
===================================================================
--- trunk/sql/mysql/upgrade4.07-4.08.sql 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/sql/mysql/upgrade4.07-4.08.sql 2012-03-01 09:08:34 UTC (rev 4998)
@@ -4,7 +4,7 @@
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('reportwriter/admin/ReportCreator.php', '15', 'Report Writer');
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('RecurringSalesOrdersProcess.php', '1', 'Process Recurring Sales Orders');
-DELETE FROM `scripts` WHERE `script`='Z_CopyBOM.php';
+UPDATE `scripts` SET script='CopyBOM.php' WHERE `script`='Z_CopyBOM.php';
ALTER TABLE `stockcategory` ADD `issueglact` int(11) NOT NULL DEFAULT 0 AFTER `adjglact`;
@@ -43,6 +43,6 @@
UPDATE `stockcategory` SET `issueglact`=`adjglact`;
INSERT INTO `systypes` (`typeid`, `typename`, `typeno`) VALUES (38, 'Stock Requests', 0);
-UPDATE `www_users` SET `modulesallowed` = CONCAT(`modulesallowed`,'0,');
+UPDATE `www_users` SET `modulesallowed` = CONCAT(`modulesallowed`,'0,') WHERE modulesallowed LIKE '_,_,_,_,_,_,_,_,_,_,';
INSERT INTO `config` VALUES ('ShowStockidOnImages','0');
UPDATE config SET confvalue='4.08' WHERE confname='VersionNumber';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-01 09:08:45
|
Revision: 4998
http://web-erp.svn.sourceforge.net/web-erp/?rev=4998&view=rev
Author: daintree
Date: 2012-03-01 09:08:34 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
made the ability to change prices at order entry a separate security token 13 - so order entry clerks with minimal access cant change prices/discounts
Modified Paths:
--------------
trunk/CounterSales.php
trunk/SelectOrderItems.php
trunk/SystemParameters.php
trunk/sql/mysql/upgrade4.07-4.08.sql
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/CounterSales.php 2012-03-01 09:08:34 UTC (rev 4998)
@@ -742,10 +742,12 @@
<th>' . _('Quantity') . '</th>
<th>' . _('QOH') . '</th>
<th>' . _('Unit') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('GP %') . '</th>
- <th>' . _('Net') . '</th>
+ <th>' . _('Price') . '</th>';
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<th>' . _('Discount') . '</th>
+ <th>' . _('GP %') . '</th>';
+ }
+ echo '<th>' . _('Net') . '</th>
<th>' . _('Tax') . '</th>
<th>' . _('Total') . '<br />' . _('Incl Tax') . '</th>
</tr>';
@@ -787,10 +789,15 @@
echo '</td>
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
-
- echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
<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>
+ <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) . '" />';
+ }
echo '<td class="number">' . locale_number_format($SubTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
$LineDueDate = $OrderLine->ItemDue;
if (!Is_Date($OrderLine->ItemDue)){
@@ -834,11 +841,16 @@
} /* end of loop around items */
- echo '<tr class="EvenTableRows"><td colspan="8" class="number"><b>' . _('Total') . '</b></td>
- <td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total+$TaxTotal),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
- </tr>
+ echo '<tr class="EvenTableRows">';
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<td colspan="8" class="number"><b>' . _('Total') . '</b></td>';
+ } else {
+ echo '<td colspan="6" class="number"><b>' . _('Total') . '</b></td>';
+ }
+ echo '<td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total+$TaxTotal),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
+ </tr>
</table>';
echo '<input type="hidden" name="TaxTotal" value="'.$TaxTotal.'" />';
echo '<table><tr><td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/SelectOrderItems.php 2012-03-01 09:08:34 UTC (rev 4998)
@@ -1336,7 +1336,7 @@
<th>' . _('Unit') . '</th>
<th>' . _('Price') . '</th>';
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
echo '<th>' . _('Discount') . '</th>
<th>' . _('GP %') . '</th>';
}
@@ -1384,7 +1384,7 @@
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
/*OK to display with discount if it is an internal user with appropriate permissions */
echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
<td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
@@ -1424,13 +1424,13 @@
} /* end of loop around items */
$DisplayTotal = locale_number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
$ColSpanNumber = 2;
} else {
$ColSpanNumber = 1;
}
echo '<tr class="EvenTableRows">
- <td class="number" colspan="7"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
+ <td class="number" colspan="6"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
<td colspan="' . $ColSpanNumber . '" class="number">' . $DisplayTotal . '</td>
</tr>
</table>';
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/SystemParameters.php 2012-03-01 09:08:34 UTC (rev 4998)
@@ -24,61 +24,61 @@
Note: the X_ in the POST variables, the reason for this is to overcome globals=on replacing
the actial system/overidden variables.
*/
- if (mb_strlen($_POST['X_PastDueDays1']) > 3 || !is_numeric($_POST['X_PastDueDays1']) ) {
+ if (mb_strlen($_POST['X_PastDueDays1']) > 3 OR !is_numeric($_POST['X_PastDueDays1']) ) {
$InputError = 1;
prnMsg(_('First overdue deadline days must be a number'),'error');
- } elseif (mb_strlen($_POST['X_PastDueDays2']) > 3 || !is_numeric($_POST['X_PastDueDays2']) ) {
+ } elseif (mb_strlen($_POST['X_PastDueDays2']) > 3 OR !is_numeric($_POST['X_PastDueDays2']) ) {
$InputError = 1;
prnMsg(_('Second overdue deadline days must be a number'),'error');
- } elseif (mb_strlen($_POST['X_DefaultCreditLimit']) > 12 || !is_numeric($_POST['X_DefaultCreditLimit']) ) {
+ } elseif (mb_strlen($_POST['X_DefaultCreditLimit']) > 12 OR !is_numeric($_POST['X_DefaultCreditLimit']) ) {
$InputError = 1;
prnMsg(_('Default Credit Limit must be a number'),'error');
- } elseif (mb_strstr($_POST['X_RomalpaClause'], "'") || mb_strlen($_POST['X_RomalpaClause']) > 5000) {
+ } elseif (mb_strstr($_POST['X_RomalpaClause'], "'") OR mb_strlen($_POST['X_RomalpaClause']) > 5000) {
$InputError = 1;
prnMsg(_('The Romalpa Clause may not contain single quotes and may not be longer than 5000 chars'),'error');
- } elseif (mb_strlen($_POST['X_QuickEntries']) > 2 || !is_numeric($_POST['X_QuickEntries']) ||
- $_POST['X_QuickEntries'] < 1 || $_POST['X_QuickEntries'] > 99 ) {
+ } elseif (mb_strlen($_POST['X_QuickEntries']) > 2 OR !is_numeric($_POST['X_QuickEntries']) OR
+ $_POST['X_QuickEntries'] < 1 OR $_POST['X_QuickEntries'] > 99 ) {
$InputError = 1;
prnMsg(_('No less than 1 and more than 99 Quick entries allowed'),'error');
- } elseif (mb_strlen($_POST['X_FreightChargeAppliesIfLessThan']) > 12 || !is_numeric($_POST['X_FreightChargeAppliesIfLessThan']) ) {
+ } elseif (mb_strlen($_POST['X_FreightChargeAppliesIfLessThan']) > 12 OR !is_numeric($_POST['X_FreightChargeAppliesIfLessThan']) ) {
$InputError = 1;
prnMsg(_('Freight Charge Applies If Less Than must be a number'),'error');
- } elseif ( !is_numeric($_POST['X_StandardCostDecimalPlaces']) ||
- $_POST['X_StandardCostDecimalPlaces'] < 0 || $_POST['X_StandardCostDecimalPlaces'] > 4 ) {
+ } elseif ( !is_numeric($_POST['X_StandardCostDecimalPlaces']) OR
+ $_POST['X_StandardCostDecimalPlaces'] < 0 OR $_POST['X_StandardCostDecimalPlaces'] > 4 ) {
$InputError = 1;
prnMsg(_('Standard Cost Decimal Places must be a number between 0 and 4'),'error');
- } elseif (mb_strlen($_POST['X_NumberOfPeriodsOfStockUsage']) > 2 || !is_numeric($_POST['X_NumberOfPeriodsOfStockUsage']) ||
- $_POST['X_NumberOfPeriodsOfStockUsage'] < 1 || $_POST['X_NumberOfPeriodsOfStockUsage'] > 12 ) {
+ } elseif (mb_strlen($_POST['X_NumberOfPeriodsOfStockUsage']) > 2 OR !is_numeric($_POST['X_NumberOfPeriodsOfStockUsage']) OR
+ $_POST['X_NumberOfPeriodsOfStockUsage'] < 1 OR $_POST['X_NumberOfPeriodsOfStockUsage'] > 12 ) {
$InputError = 1;
prnMsg(_('Financial period per year must be a number between 1 and 12'),'error');
} elseif (mb_strlen($_POST['X_TaxAuthorityReferenceName']) >25) {
$InputError = 1;
prnMsg(_('The Tax Authority Reference Name must be 25 characters or less long'),'error');
- } elseif (mb_strlen($_POST['X_OverChargeProportion']) > 3 || !is_numeric($_POST['X_OverChargeProportion']) ||
- $_POST['X_OverChargeProportion'] < 0 || $_POST['X_OverChargeProportion'] > 100 ) {
+ } elseif (mb_strlen($_POST['X_OverChargeProportion']) > 3 OR !is_numeric($_POST['X_OverChargeProportion']) OR
+ $_POST['X_OverChargeProportion'] < 0 OR $_POST['X_OverChargeProportion'] > 100 ) {
$InputError = 1;
prnMsg(_('Over Charge Proportion must be a percentage'),'error');
- } elseif (mb_strlen($_POST['X_OverReceiveProportion']) > 3 || !is_numeric($_POST['X_OverReceiveProportion']) ||
- $_POST['X_OverReceiveProportion'] < 0 || $_POST['X_OverReceiveProportion'] > 100 ) {
+ } elseif (mb_strlen($_POST['X_OverReceiveProportion']) > 3 OR !is_numeric($_POST['X_OverReceiveProportion']) OR
+ $_POST['X_OverReceiveProportion'] < 0 OR $_POST['X_OverReceiveProportion'] > 100 ) {
$InputError = 1;
prnMsg(_('Over Receive Proportion must be a percentage'),'error');
- } elseif (mb_strlen($_POST['X_PageLength']) > 3 || !is_numeric($_POST['X_PageLength']) ||
+ } elseif (mb_strlen($_POST['X_PageLength']) > 3 OR !is_numeric($_POST['X_PageLength']) OR
$_POST['X_PageLength'] < 1 ) {
$InputError = 1;
prnMsg(_('Lines per page must be greater than 1'),'error');
- } elseif (mb_strlen($_POST['X_MonthsAuditTrail']) > 2 || !is_numeric($_POST['X_MonthsAuditTrail']) ||
+ } elseif (mb_strlen($_POST['X_MonthsAuditTrail']) > 2 OR !is_numeric($_POST['X_MonthsAuditTrail']) OR
$_POST['X_MonthsAuditTrail'] < 0 ) {
$InputError = 1;
prnMsg(_('The number of months of audit trail to keep must be zero or a positive number less than 100 months'),'error');
- }elseif (mb_strlen($_POST['X_DefaultTaxCategory']) > 1 || !is_numeric($_POST['X_DefaultTaxCategory']) ||
+ }elseif (mb_strlen($_POST['X_DefaultTaxCategory']) > 1 OR !is_numeric($_POST['X_DefaultTaxCategory']) OR
$_POST['X_DefaultTaxCategory'] < 1 ) {
$InputError = 1;
prnMsg(_('DefaultTaxCategory must be between 1 and 9'),'error');
- } elseif (mb_strlen($_POST['X_DefaultDisplayRecordsMax']) > 3 || !is_numeric($_POST['X_DefaultDisplayRecordsMax']) ||
+ } elseif (mb_strlen($_POST['X_DefaultDisplayRecordsMax']) > 3 OR !is_numeric($_POST['X_DefaultDisplayRecordsMax']) OR
$_POST['X_DefaultDisplayRecordsMax'] < 1 ) {
$InputError = 1;
prnMsg(_('Default maximum number of records to display must be between 1 and 500'),'error');
- }elseif (mb_strlen($_POST['X_MaxImageSize']) > 3 || !is_numeric($_POST['X_MaxImageSize']) ||
+ }elseif (mb_strlen($_POST['X_MaxImageSize']) > 3 OR !is_numeric($_POST['X_MaxImageSize']) OR
$_POST['X_MaxImageSize'] < 1 ) {
$InputError = 1;
prnMsg(_('The maximum size of item image files must be between 50 and 500 (NB this figure refers to KB)'),'error');
@@ -91,7 +91,7 @@
}elseif (!IsEmailAddress($_POST['X_InventoryManagerEmail']) AND $_POST['X_InventoryManagerEmail']!=''){
$InputError = 1;
prnMsg(_('The Inventory Manager Email address does not appear to be valid'),'error');
- }elseif (mb_strlen($_POST['X_FrequentlyOrderedItems']) > 2 || !is_numeric($_POST['X_FrequentlyOrderedItems'])) {
+ }elseif (mb_strlen($_POST['X_FrequentlyOrderedItems']) > 2 OR !is_numeric($_POST['X_FrequentlyOrderedItems'])) {
$InputError = 1;
prnMsg(_('The number of frequently ordered items to display must be numeric'),'error');
}
Modified: trunk/sql/mysql/upgrade4.07-4.08.sql
===================================================================
--- trunk/sql/mysql/upgrade4.07-4.08.sql 2012-02-29 23:14:53 UTC (rev 4997)
+++ trunk/sql/mysql/upgrade4.07-4.08.sql 2012-03-01 09:08:34 UTC (rev 4998)
@@ -4,7 +4,7 @@
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('reportwriter/admin/ReportCreator.php', '15', 'Report Writer');
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('RecurringSalesOrdersProcess.php', '1', 'Process Recurring Sales Orders');
-DELETE FROM `scripts` WHERE `script`='Z_CopyBOM.php';
+UPDATE `scripts` SET script='CopyBOM.php' WHERE `script`='Z_CopyBOM.php';
ALTER TABLE `stockcategory` ADD `issueglact` int(11) NOT NULL DEFAULT 0 AFTER `adjglact`;
@@ -43,6 +43,6 @@
UPDATE `stockcategory` SET `issueglact`=`adjglact`;
INSERT INTO `systypes` (`typeid`, `typename`, `typeno`) VALUES (38, 'Stock Requests', 0);
-UPDATE `www_users` SET `modulesallowed` = CONCAT(`modulesallowed`,'0,');
+UPDATE `www_users` SET `modulesallowed` = CONCAT(`modulesallowed`,'0,') WHERE modulesallowed LIKE '_,_,_,_,_,_,_,_,_,_,';
INSERT INTO `config` VALUES ('ShowStockidOnImages','0');
UPDATE config SET confvalue='4.08' WHERE confname='VersionNumber';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-03-02 22:27:57
|
Revision: 5002
http://web-erp.svn.sourceforge.net/web-erp/?rev=5002&view=rev
Author: vvs2012
Date: 2012-03-02 22:27:49 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/Customers.php
trunk/FixedAssetCategories.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/GLAccounts.php
trunk/Locations.php
trunk/SalesGLPostings.php
trunk/Shippers.php
trunk/SuppInvGRNs.php
trunk/Suppliers.php
trunk/WorkCentres.php
trunk/Z_DataExport.php
trunk/Z_poAddLanguage.php
trunk/Z_poEditLangHeader.php
trunk/Z_poRebuildDefault.php
trunk/includes/footer.inc
trunk/includes/header.inc
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AccountSections.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -126,7 +126,9 @@
$myrow = DB_fetch_array($result);
if (DB_num_rows($result)>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section') . '</font>';
+ echo '<div>';
+ echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
+ echo '</div>';
} else {
//Fetch section name
@@ -164,10 +166,9 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
- <br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
- echo '<table name="SectionList" class="selection">
+ echo '<table class="selection">
<tr>
<th>' . _('Section Number') . '</th>
<th>' . _('Section Description') . '</th>
@@ -185,15 +186,15 @@
}
echo '<td>' . $myrow['sectionid'] . '</td><td>' . $myrow['sectionname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSectionID=' . $myrow['sectionid'] . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . '</a></td>';
if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) {
echo '<td><b>'._('Restricted').'</b></td>';
} else {
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSectionID=' . $myrow['sectionid'] . '&delete=1">' . _('Delete') .'</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' . _('Delete') .'</a></td>';
}
echo '</tr>';
} //END WHILE LIST LOOP
- echo '</table><br />';
+ echo '</table>';
} //end of ifs and buts!
@@ -203,7 +204,8 @@
if (! isset($_GET['delete'])) {
- echo '<form method="post" name="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedSectionID'])) {
@@ -257,11 +259,11 @@
echo '</table><br />';
if (!isset($_GET['SelectedSectionID']) or $_GET['SelectedSectionID']=='') {
- echo '<script>defaultControl(document.AccountSections.SectionID);</script>';
+ echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionID);</script>';
} else {
- echo '<script>defaultControl(document.AccountSections.SectionName);</script>';
+ echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionName);</script>';
}
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AddCustomerContacts.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -22,9 +22,9 @@
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' .$row['name'].'</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
} else {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' .$row['name'].'</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
}
if ( isset($_POST['submit']) ) {
@@ -143,10 +143,10 @@
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=mailto:%s>%s</a></td>
+ <td><a href="mailto:%s">%s</a></td>
<td>%s</td>
- <td><a href="%sId=%s&DebtorNo=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">'. _('Delete'). '</td></tr>',
+ <td><a href="%sId=%s&DebtorNo=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">'. _('Delete'). '</a></td></tr>',
$myrow['contactname'],
$myrow['role'],
$myrow['phoneno'],
@@ -162,7 +162,7 @@
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</table><br />';
}
if (isset($Id)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo .'">' . _('Review all contacts for this Customer') . '</a></div>';
@@ -171,6 +171,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -248,10 +249,11 @@
echo '<tr>
<td>' . _('Notes') . '</td>';
if (isset($_POST['ContactNotes'])) {
- echo '<td><textarea name="ContactNotes">'. $_POST['ContactNotes'] . '</textarea>';
+ echo '<td><textarea name="ContactNotes" rows="3" cols="40">'. $_POST['ContactNotes'] . '</textarea></td>';
} else {
- echo '<td><textarea name="ContactNotes"></textarea>';
+ echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
}
+ echo '</tr>';
echo '<tr>
<td colspan="2">
<div class="centre">
@@ -260,6 +262,7 @@
</td>
</tr>
</table>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AddCustomerNotes.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -162,6 +162,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo=' . $DebtorNo . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -202,10 +203,10 @@
echo '<tr>
<td>' . _('Contact Note'). '</td>';
if (isset($_POST['Note'])) {
- echo '<td><textarea name="Note">' .$_POST['Note'] . '</textarea></td>
+ echo '<td><textarea name="Note" rows="3" cols="32">' .$_POST['Note'] . '</textarea></td>
</tr>';
} else {
- echo '<td><textarea name="Note"></textarea></td>
+ echo '<td><textarea name="Note" rows="3" cols="32"></textarea></td>
</tr>';
}
echo '<tr>
@@ -243,6 +244,7 @@
</td>
</tr>
</table>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AddCustomerTypeNotes.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -128,8 +128,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sId=%s&DebtorType=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete'). '</td></tr>',
+ <td><a href="%sId=%s&DebtorType=%s">'. _('Edit') . '</a></td>
+ <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete') . '</a></td></tr>',
$myrow['date'],
$myrow['note'],
$myrow['href'],
@@ -154,6 +154,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorType='.$DebtorType.'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -200,7 +201,7 @@
echo '<tr>
<td>'._('Contact Group Note').':</td>
- <td><textarea name="note">'. $_POST['note'].'</textarea></td>
+ <td><textarea name="note" rows="3" cols="32">'. $_POST['note'].'</textarea></td>
</tr>
<tr>
<td>'. _('Web site').':</td>
@@ -217,8 +218,9 @@
</table>
<br />
<div class="centre">
- <input type="Submit" name="submit" value="'. _('Enter Information').'" />
+ <input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AgedDebtors.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -448,10 +448,11 @@
/*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">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<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="0" /></td>
</tr>
<tr>
@@ -508,7 +509,9 @@
<br />
<div class="centre">
<input tabindex="7" type="submit" name="PrintPDF" value="' . _('Print PDF') , '" />
- </div>';
+ </div>
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AgedSuppliers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -279,11 +279,12 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo '<form sction="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
- <td>' . _('From Supplier Code') . ':</font></td>
+ <td>' . _('From Supplier Code') . ':</td>
<td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1" /></td>
</tr>
<tr>
@@ -324,7 +325,9 @@
<br />
<div class="centre">
<input tabindex="6" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Areas.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -161,7 +161,7 @@
echo '<td>' . $myrow['areacode'] . '</td>
<td>' . $myrow['areadescription'] . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedArea=' . $myrow['areacode'] . '">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedArea=' . $myrow['areacode'] . '&delete=yes">' . _('Delete') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedArea=' . $myrow['areacode'] . '&delete=yes">' . _('Delete') . '</a></td>
<td><a href="SelectCustomer.php?Area=' . $myrow['areacode'] . '">' . _('View Customers from this Area') . '</a></td>
</tr>';
}
@@ -178,7 +178,8 @@
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"><br />';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -229,6 +230,7 @@
</td>
</tr>
</table>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AuditTrail.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -35,6 +35,7 @@
$UserResult = DB_query("SELECT userid FROM www_users",$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 '<table class="selection">';
@@ -79,6 +80,7 @@
echo '</table><br />';
echo '<div class="centre"><input tabindex="5" type="submit" name="View" value="' . _('View') . '" /></div>';
+echo '</div>';
echo '</form>';
// View the audit trail
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Customers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -1088,7 +1088,7 @@
echo '<br />
<div class="centre">
<input type="submit" name="submit" value="' . _('Update Customer') . '" />
- <input type="Submit" name="delete" value="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
+ <input type="submit" name="delete" value="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
}
echo '</div>';
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/FixedAssetCategories.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -341,7 +341,7 @@
<br />';
echo '<div class="centre">
- <input type="Submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
</form>';
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/FixedAssetLocations.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -148,10 +148,10 @@
echo '<div class="centre">';
if (isset($_GET['SelectedLocation'])) {
- echo '<input type="Submit" name="update" value="' . _('Update Information') . '" />';
+ echo '<input type="submit" name="update" value="' . _('Update Information') . '" />';
echo '<br />
<br />
- <<input type="Submit" name="delete" value="' . _('Delete This Location') . '" />';
+ <<input type="submit" name="delete" value="' . _('Delete This Location') . '" />';
} else {
echo '<input type="submit" name="submit" value="' . _('Enter Information') . '" />';
}
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/FixedAssetRegister.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -235,7 +235,7 @@
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 '<br /><div class="centre"><input type="Submit" name="pdf" value="' . _('Print as a pdf') . '" /> ';
+ 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>';
}
} else {
@@ -308,7 +308,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Show Assets') . '" />
<input type="submit" name="pdf" value="' . _('Print as a pdf') . '" />
- <input type="Submit" name = "csv" value="' . _('Print as CSV') . '" />
+ <input type="submit" name = "csv" value="' . _('Print as CSV') . '" />
</div>
</form>';
}
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/GLAccounts.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -259,7 +259,7 @@
echo '</select></td></tr></table>';
- echo '<br /><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="'. _('Enter Information') . '" /></div>';
echo '</form>';
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Locations.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -603,7 +603,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="Submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
</form>';
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/SalesGLPostings.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -413,7 +413,7 @@
</tr>
</table>';
- echo '<br /><div class="centre"><input type="Submit" name="submit" value="' . _('Enter Information') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
echo '</form>';
Modified: trunk/Shippers.php
===================================================================
--- trunk/Shippers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Shippers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -199,7 +199,7 @@
<br />
<div class="centre">
- <input type="Submit" name="submit" value="'. _('Enter Information').'" />
+ <input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
</form>';
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/SuppInvGRNs.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -274,7 +274,7 @@
echo '<div class="centre">
<p>
- <input type="Submit" name="ModifyGRN" value="' . _('Modify Line') . '" />
+ <input type="submit" name="ModifyGRN" value="' . _('Modify Line') . '" />
</p>
</div>';
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Suppliers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -772,7 +772,7 @@
echo '</select></td></tr>
</table>
- <p><div class="centre"><input type="Submit" name="submit" value="' . _('Insert New Supplier') . '" />';
+ <p><div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" />';
echo '</div></form>';
} else {
Modified: trunk/WorkCentres.php
===================================================================
--- trunk/WorkCentres.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/WorkCentres.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -276,7 +276,7 @@
echo '<br />
<div class="centre">
- <input type="Submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>';
if (!isset($_GET['SelectedWC']) or $_GET['SelectedWC']=='') {
Modified: trunk/Z_DataExport.php
===================================================================
--- trunk/Z_DataExport.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_DataExport.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -633,7 +633,7 @@
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 '<div class="centre"><input type="submit" name="secuserlist" value="' . _('Export') . '" /></div>';
echo '</form><br />';
Modified: trunk/Z_poAddLanguage.php
===================================================================
--- trunk/Z_poAddLanguage.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_poAddLanguage.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -91,7 +91,7 @@
echo '<td><input type="text" size="5" name="NewLanguage" />';
echo '</td></tr></table>';
-echo '<br /><input type="Submit" name="submit" value="' . _('Proceed') . '" /> ';
+echo '<br /><input type="submit" name="submit" value="' . _('Proceed') . '" /> ';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/Z_poEditLangHeader.php
===================================================================
--- trunk/Z_poEditLangHeader.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_poEditLangHeader.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -103,7 +103,7 @@
}
echo '</table>';
- echo '<br /><div class="centre"><input type="Submit" name="submit" value="' . _('Modify') . '" /> ';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Modify') . '" /> ';
echo '<input type="hidden" name="language" value="' . $_POST['language'] . '" /></div>';
echo '</form>';
}
Modified: trunk/Z_poRebuildDefault.php
===================================================================
--- trunk/Z_poRebuildDefault.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_poRebuildDefault.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -51,7 +51,7 @@
echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<input type="Submit" name="submit" value="' . _('Proceed') . '" /> ';
+ echo '<input type="submit" name="submit" value="' . _('Proceed') . '" /> ';
echo '</form>';
echo '</div>';
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/includes/footer.inc 2012-03-02 22:27:49 UTC (rev 5002)
@@ -19,6 +19,7 @@
echo '</table>';
+echo '</div>';
echo '</body>';
echo '</html>';
?>
\ No newline at end of file
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/includes/header.inc 2012-03-02 22:27:49 UTC (rev 5002)
@@ -32,6 +32,7 @@
echo '</head>';
echo '<body>';
+ echo '<div id="canvas">';
echo '<table class="callout_main" cellpadding="0" cellspacing="0">';
echo '<tr>';
echo '<td colspan="2" rowspan="2">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-03-02 22:27:56
|
Revision: 5002
http://web-erp.svn.sourceforge.net/web-erp/?rev=5002&view=rev
Author: vvs2012
Date: 2012-03-02 22:27:49 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/Customers.php
trunk/FixedAssetCategories.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/GLAccounts.php
trunk/Locations.php
trunk/SalesGLPostings.php
trunk/Shippers.php
trunk/SuppInvGRNs.php
trunk/Suppliers.php
trunk/WorkCentres.php
trunk/Z_DataExport.php
trunk/Z_poAddLanguage.php
trunk/Z_poEditLangHeader.php
trunk/Z_poRebuildDefault.php
trunk/includes/footer.inc
trunk/includes/header.inc
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AccountSections.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -126,7 +126,9 @@
$myrow = DB_fetch_array($result);
if (DB_num_rows($result)>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section') . '</font>';
+ echo '<div>';
+ echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
+ echo '</div>';
} else {
//Fetch section name
@@ -164,10 +166,9 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
- <br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
- echo '<table name="SectionList" class="selection">
+ echo '<table class="selection">
<tr>
<th>' . _('Section Number') . '</th>
<th>' . _('Section Description') . '</th>
@@ -185,15 +186,15 @@
}
echo '<td>' . $myrow['sectionid'] . '</td><td>' . $myrow['sectionname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSectionID=' . $myrow['sectionid'] . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . '</a></td>';
if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) {
echo '<td><b>'._('Restricted').'</b></td>';
} else {
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSectionID=' . $myrow['sectionid'] . '&delete=1">' . _('Delete') .'</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' . _('Delete') .'</a></td>';
}
echo '</tr>';
} //END WHILE LIST LOOP
- echo '</table><br />';
+ echo '</table>';
} //end of ifs and buts!
@@ -203,7 +204,8 @@
if (! isset($_GET['delete'])) {
- echo '<form method="post" name="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedSectionID'])) {
@@ -257,11 +259,11 @@
echo '</table><br />';
if (!isset($_GET['SelectedSectionID']) or $_GET['SelectedSectionID']=='') {
- echo '<script>defaultControl(document.AccountSections.SectionID);</script>';
+ echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionID);</script>';
} else {
- echo '<script>defaultControl(document.AccountSections.SectionName);</script>';
+ echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionName);</script>';
}
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AddCustomerContacts.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -22,9 +22,9 @@
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' .$row['name'].'</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
} else {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' .$row['name'].'</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
}
if ( isset($_POST['submit']) ) {
@@ -143,10 +143,10 @@
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=mailto:%s>%s</a></td>
+ <td><a href="mailto:%s">%s</a></td>
<td>%s</td>
- <td><a href="%sId=%s&DebtorNo=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">'. _('Delete'). '</td></tr>',
+ <td><a href="%sId=%s&DebtorNo=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">'. _('Delete'). '</a></td></tr>',
$myrow['contactname'],
$myrow['role'],
$myrow['phoneno'],
@@ -162,7 +162,7 @@
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</table><br />';
}
if (isset($Id)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo .'">' . _('Review all contacts for this Customer') . '</a></div>';
@@ -171,6 +171,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -248,10 +249,11 @@
echo '<tr>
<td>' . _('Notes') . '</td>';
if (isset($_POST['ContactNotes'])) {
- echo '<td><textarea name="ContactNotes">'. $_POST['ContactNotes'] . '</textarea>';
+ echo '<td><textarea name="ContactNotes" rows="3" cols="40">'. $_POST['ContactNotes'] . '</textarea></td>';
} else {
- echo '<td><textarea name="ContactNotes"></textarea>';
+ echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
}
+ echo '</tr>';
echo '<tr>
<td colspan="2">
<div class="centre">
@@ -260,6 +262,7 @@
</td>
</tr>
</table>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AddCustomerNotes.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -162,6 +162,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo=' . $DebtorNo . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -202,10 +203,10 @@
echo '<tr>
<td>' . _('Contact Note'). '</td>';
if (isset($_POST['Note'])) {
- echo '<td><textarea name="Note">' .$_POST['Note'] . '</textarea></td>
+ echo '<td><textarea name="Note" rows="3" cols="32">' .$_POST['Note'] . '</textarea></td>
</tr>';
} else {
- echo '<td><textarea name="Note"></textarea></td>
+ echo '<td><textarea name="Note" rows="3" cols="32"></textarea></td>
</tr>';
}
echo '<tr>
@@ -243,6 +244,7 @@
</td>
</tr>
</table>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AddCustomerTypeNotes.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -128,8 +128,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sId=%s&DebtorType=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete'). '</td></tr>',
+ <td><a href="%sId=%s&DebtorType=%s">'. _('Edit') . '</a></td>
+ <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete') . '</a></td></tr>',
$myrow['date'],
$myrow['note'],
$myrow['href'],
@@ -154,6 +154,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorType='.$DebtorType.'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -200,7 +201,7 @@
echo '<tr>
<td>'._('Contact Group Note').':</td>
- <td><textarea name="note">'. $_POST['note'].'</textarea></td>
+ <td><textarea name="note" rows="3" cols="32">'. $_POST['note'].'</textarea></td>
</tr>
<tr>
<td>'. _('Web site').':</td>
@@ -217,8 +218,9 @@
</table>
<br />
<div class="centre">
- <input type="Submit" name="submit" value="'. _('Enter Information').'" />
+ <input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AgedDebtors.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -448,10 +448,11 @@
/*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">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<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="0" /></td>
</tr>
<tr>
@@ -508,7 +509,9 @@
<br />
<div class="centre">
<input tabindex="7" type="submit" name="PrintPDF" value="' . _('Print PDF') , '" />
- </div>';
+ </div>
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AgedSuppliers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -279,11 +279,12 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo '<form sction="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
- <td>' . _('From Supplier Code') . ':</font></td>
+ <td>' . _('From Supplier Code') . ':</td>
<td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1" /></td>
</tr>
<tr>
@@ -324,7 +325,9 @@
<br />
<div class="centre">
<input tabindex="6" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Areas.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -161,7 +161,7 @@
echo '<td>' . $myrow['areacode'] . '</td>
<td>' . $myrow['areadescription'] . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedArea=' . $myrow['areacode'] . '">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedArea=' . $myrow['areacode'] . '&delete=yes">' . _('Delete') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedArea=' . $myrow['areacode'] . '&delete=yes">' . _('Delete') . '</a></td>
<td><a href="SelectCustomer.php?Area=' . $myrow['areacode'] . '">' . _('View Customers from this Area') . '</a></td>
</tr>';
}
@@ -178,7 +178,8 @@
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"><br />';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -229,6 +230,7 @@
</td>
</tr>
</table>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/AuditTrail.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -35,6 +35,7 @@
$UserResult = DB_query("SELECT userid FROM www_users",$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 '<table class="selection">';
@@ -79,6 +80,7 @@
echo '</table><br />';
echo '<div class="centre"><input tabindex="5" type="submit" name="View" value="' . _('View') . '" /></div>';
+echo '</div>';
echo '</form>';
// View the audit trail
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Customers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -1088,7 +1088,7 @@
echo '<br />
<div class="centre">
<input type="submit" name="submit" value="' . _('Update Customer') . '" />
- <input type="Submit" name="delete" value="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
+ <input type="submit" name="delete" value="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
}
echo '</div>';
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/FixedAssetCategories.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -341,7 +341,7 @@
<br />';
echo '<div class="centre">
- <input type="Submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
</form>';
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/FixedAssetLocations.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -148,10 +148,10 @@
echo '<div class="centre">';
if (isset($_GET['SelectedLocation'])) {
- echo '<input type="Submit" name="update" value="' . _('Update Information') . '" />';
+ echo '<input type="submit" name="update" value="' . _('Update Information') . '" />';
echo '<br />
<br />
- <<input type="Submit" name="delete" value="' . _('Delete This Location') . '" />';
+ <<input type="submit" name="delete" value="' . _('Delete This Location') . '" />';
} else {
echo '<input type="submit" name="submit" value="' . _('Enter Information') . '" />';
}
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/FixedAssetRegister.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -235,7 +235,7 @@
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 '<br /><div class="centre"><input type="Submit" name="pdf" value="' . _('Print as a pdf') . '" /> ';
+ 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>';
}
} else {
@@ -308,7 +308,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Show Assets') . '" />
<input type="submit" name="pdf" value="' . _('Print as a pdf') . '" />
- <input type="Submit" name = "csv" value="' . _('Print as CSV') . '" />
+ <input type="submit" name = "csv" value="' . _('Print as CSV') . '" />
</div>
</form>';
}
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/GLAccounts.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -259,7 +259,7 @@
echo '</select></td></tr></table>';
- echo '<br /><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="'. _('Enter Information') . '" /></div>';
echo '</form>';
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Locations.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -603,7 +603,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="Submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
</form>';
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/SalesGLPostings.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -413,7 +413,7 @@
</tr>
</table>';
- echo '<br /><div class="centre"><input type="Submit" name="submit" value="' . _('Enter Information') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
echo '</form>';
Modified: trunk/Shippers.php
===================================================================
--- trunk/Shippers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Shippers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -199,7 +199,7 @@
<br />
<div class="centre">
- <input type="Submit" name="submit" value="'. _('Enter Information').'" />
+ <input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
</form>';
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/SuppInvGRNs.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -274,7 +274,7 @@
echo '<div class="centre">
<p>
- <input type="Submit" name="ModifyGRN" value="' . _('Modify Line') . '" />
+ <input type="submit" name="ModifyGRN" value="' . _('Modify Line') . '" />
</p>
</div>';
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Suppliers.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -772,7 +772,7 @@
echo '</select></td></tr>
</table>
- <p><div class="centre"><input type="Submit" name="submit" value="' . _('Insert New Supplier') . '" />';
+ <p><div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" />';
echo '</div></form>';
} else {
Modified: trunk/WorkCentres.php
===================================================================
--- trunk/WorkCentres.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/WorkCentres.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -276,7 +276,7 @@
echo '<br />
<div class="centre">
- <input type="Submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>';
if (!isset($_GET['SelectedWC']) or $_GET['SelectedWC']=='') {
Modified: trunk/Z_DataExport.php
===================================================================
--- trunk/Z_DataExport.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_DataExport.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -633,7 +633,7 @@
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 '<div class="centre"><input type="submit" name="secuserlist" value="' . _('Export') . '" /></div>';
echo '</form><br />';
Modified: trunk/Z_poAddLanguage.php
===================================================================
--- trunk/Z_poAddLanguage.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_poAddLanguage.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -91,7 +91,7 @@
echo '<td><input type="text" size="5" name="NewLanguage" />';
echo '</td></tr></table>';
-echo '<br /><input type="Submit" name="submit" value="' . _('Proceed') . '" /> ';
+echo '<br /><input type="submit" name="submit" value="' . _('Proceed') . '" /> ';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/Z_poEditLangHeader.php
===================================================================
--- trunk/Z_poEditLangHeader.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_poEditLangHeader.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -103,7 +103,7 @@
}
echo '</table>';
- echo '<br /><div class="centre"><input type="Submit" name="submit" value="' . _('Modify') . '" /> ';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Modify') . '" /> ';
echo '<input type="hidden" name="language" value="' . $_POST['language'] . '" /></div>';
echo '</form>';
}
Modified: trunk/Z_poRebuildDefault.php
===================================================================
--- trunk/Z_poRebuildDefault.php 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/Z_poRebuildDefault.php 2012-03-02 22:27:49 UTC (rev 5002)
@@ -51,7 +51,7 @@
echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<input type="Submit" name="submit" value="' . _('Proceed') . '" /> ';
+ echo '<input type="submit" name="submit" value="' . _('Proceed') . '" /> ';
echo '</form>';
echo '</div>';
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/includes/footer.inc 2012-03-02 22:27:49 UTC (rev 5002)
@@ -19,6 +19,7 @@
echo '</table>';
+echo '</div>';
echo '</body>';
echo '</html>';
?>
\ No newline at end of file
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2012-03-02 09:46:44 UTC (rev 5001)
+++ trunk/includes/header.inc 2012-03-02 22:27:49 UTC (rev 5002)
@@ -32,6 +32,7 @@
echo '</head>';
echo '<body>';
+ echo '<div id="canvas">';
echo '<table class="callout_main" cellpadding="0" cellspacing="0">';
echo '<tr>';
echo '<td colspan="2" rowspan="2">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-03 21:32:17
|
Revision: 5006
http://web-erp.svn.sourceforge.net/web-erp/?rev=5006&view=rev
Author: daintree
Date: 2012-03-03 21:32:10 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/ReorderLevel.php
trunk/SelectProduct.php
trunk/Stocks.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/footer.inc
trunk/index.php
Added Paths:
-----------
trunk/companies/weberpdemo/part_pics/BREAD.jpg
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/ReorderLevel.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -109,8 +109,8 @@
AND locstock.stockid = stockmaster.stockid
AND locstock.stockid ='" . $myrow['stockid'] .
"' AND locstock.loccode !='" . $myrow['loccode'] . "'";
- $otherresult = DB_query($sql2,$db,'','',false,true);
- while ($myrow2 = DB_fetch_array($otherresult,$db)){
+ $OtherResult = DB_query($sql2,$db,'','',false,true);
+ while ($myrow2 = DB_fetch_array($OtherResult,$db)){
$YPos -=$line_height;
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -146,8 +146,8 @@
include('includes/footer.inc');
exit;
} else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_ReOrderLevel_' . date('Y-m-d') . '.pdf');//UldisN
- $pdf->__destruct(); //UldisN
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_ReOrderLevel_' . date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
}
} else { /*The option to print PDF was not hit so display form */
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/SelectProduct.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -411,7 +411,9 @@
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 />';
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</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 />';
+ }
}
if ($Its_A_Dummy == False) {
echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/Stocks.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -90,7 +90,7 @@
$i=1;
- if (!isset($_POST['Description']) or mb_strlen($_POST['Description']) > 50 OR mb_strlen($_POST['Description'])==0) {
+ if (!isset($_POST['Description']) OR mb_strlen($_POST['Description']) > 50 OR mb_strlen($_POST['Description'])==0) {
$InputError = 1;
prnMsg (_('The stock item description must be entered and be fifty characters or less long') . '. ' . _('It cannot be a zero length string either') . ' - ' . _('a description is required'),'error');
$Errors[$i] = 'Description';
@@ -719,7 +719,7 @@
echo '<input type="hidden" name="New" value="'.$New.'" />';
-if (!isset($StockID) or $StockID=='' or isset($_POST['UpdateCategories'])) {
+if (!isset($StockID) OR $StockID=='' or isset($_POST['UpdateCategories'])) {
/*If the page was called without $StockID passed to page then assume a new stock item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden StockID field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/
if (!isset($StockID)) {
@@ -851,7 +851,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
while ($myrow=DB_fetch_array($result)){
- if (!isset($_POST['CategoryID']) or $myrow['categoryid']==$_POST['CategoryID']){
+ if (!isset($_POST['CategoryID']) OR $myrow['categoryid']==$_POST['CategoryID']){
echo '<option selected="selected" value="'. $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} else {
echo '<option value="'. $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
@@ -879,13 +879,13 @@
if (!isset($_POST['Controlled']) OR $_POST['Controlled']==''){
$_POST['Controlled']=0;
}
-if (!isset($_POST['Serialised']) or $_POST['Serialised']=='' || $_POST['Controlled']==0){
+if (!isset($_POST['Serialised']) OR $_POST['Serialised']=='' || $_POST['Controlled']==0){
$_POST['Serialised']=0;
}
-if (!isset($_POST['DecimalPlaces']) or $_POST['DecimalPlaces']==''){
+if (!isset($_POST['DecimalPlaces']) OR $_POST['DecimalPlaces']==''){
$_POST['DecimalPlaces']=0;
}
-if (!isset($_POST['Discontinued']) or $_POST['Discontinued']==''){
+if (!isset($_POST['Discontinued']) OR $_POST['Discontinued']==''){
$_POST['Discontinued']=0;
}
if (!isset($_POST['Pansize'])) {
@@ -941,22 +941,22 @@
} else {
echo '<option value="A">' . _('Assembly') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='K'){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='K'){
echo '<option selected="selected" value="K">' . _('Kit') . '</option>';
} else {
echo '<option value="K">' . _('Kit') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='M'){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='M'){
echo '<option selected="selected" value="M">' . _('Manufactured') . '</option>';
} else {
echo '<option value="M">' . _('Manufactured') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='G' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='G' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
echo '<option selected="selected" value="G">' . _('Phantom') . '</option>';
} else {
echo '<option value="G">' . _('Phantom') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='B' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='B' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
echo '<option selected="selected" value="B">' . _('Purchased') . '</option>';
} else {
echo '<option value="B">' . _('Purchased') . '</option>';
@@ -1031,7 +1031,7 @@
<td>' . _('Perishable') . ':</td>
<td><select name="Perishable">';
-if (!isset($_POST['Perishable']) or $_POST['Perishable']==0){
+if (!isset($_POST['Perishable']) OR $_POST['Perishable']==0){
echo '<option selected="selected" value="0">' . _('No'). '</option>';
} else {
echo '<option value="0">' . _('No'). '</option>';
Added: trunk/companies/weberpdemo/part_pics/BREAD.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/companies/weberpdemo/part_pics/BREAD.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/doc/Change.log 2012-03-03 21:32:10 UTC (rev 5006)
@@ -1,5 +1,6 @@
webERP Change Log
+3/3/12 Phil: SelectProduct.php checked for existence of part pic before displaying a link that could potnetially fail
29/2/12 Phil: Changed all htmlentities calls to htmlspecialchars calls
28/2/12 Tim: Added functionality that allows for the set up of internal departments, and for the request of stock to be issued - a new issue account is defined in stockcategories. Issue requests must be authorised by a department manager and then issues fulfilled creates a stock adjustment with posting in the gl to the item category issue account.
28/02/2012 Vitaly: Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/includes/MainMenuLinksArray.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -101,11 +101,16 @@
_('Customer Listing By Area/Salesperson'),
_('Sales Graphs'),
_('List Daily Transactions'),
- _('Customer Transaction Inquiries')
- );
+ _('Customer Transaction Inquiries') );
+if ($_SESSION['InvoicePortraitFormat']==0){
+ $PrintInvoicesOrCreditNotesScript = '/PrintCustTrans.php';
+} else {
+ $PrintInvoicesOrCreditNotesScript = '/PrintCustTransPortrait.php';
+}
+
$MenuItems['AR']['Reports']['URL'] = array ('/CustWhereAlloc.php',
- '/PrintCustTrans.php',
+ $PrintInvoicesOrCreditNotesScript,
'/PrintCustStatements.php',
'/SalesAnalRepts.php',
'/AgedDebtors.php',
@@ -114,8 +119,7 @@
'/PDFCustomerList.php',
'/SalesGraph.php',
'/PDFCustTransListing.php',
- '/CustomerTransInquiry.php'
- );
+ '/CustomerTransInquiry.php' );
$MenuItems['AR']['Maintenance']['Caption'] = array (_('Add Customer'),
_('Customers')
Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc 2012-03-03 21:32:10 UTC (rev 5006)
@@ -9,7 +9,7 @@
$YPos = $Page_Height - $Top_Margin;
-$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -115,$YPos-50,0,35);
+$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -118,$YPos-60,0,35);
$FontSize =15;
if ($InvOrCredit=='Invoice') {
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/includes/footer.inc 2012-03-03 21:32:10 UTC (rev 5006)
@@ -6,15 +6,15 @@
echo '<tr>';
echo '<td style="width:33%"></td><td class="footer">';
-echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © webrp.org - ' . date('Y') . '" /></td>';
+echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
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>';
-echo '<tr><td colspan="3" class="footer">webERP v' . $_SESSION['VersionNumber'] . '</td></tr>';
-
// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
-// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/weberp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
+// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
// }
echo '</table>';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/index.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -68,7 +68,7 @@
if ($_SESSION['ModulesEnabled'][$i]==1) {
// If this is the first time the application is loaded then it is possible that
// SESSION['Module'] is not set if so set it to the first module that is enabled for the user
- if (!isset($_SESSION['Module'])OR $_SESSION['Module']==''){
+ if (!isset($_SESSION['Module']) OR $_SESSION['Module']==''){
$_SESSION['Module']=$ModuleLink[$i];
}
if ($ModuleLink[$i] == $_SESSION['Module']){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-03 21:32:17
|
Revision: 5006
http://web-erp.svn.sourceforge.net/web-erp/?rev=5006&view=rev
Author: daintree
Date: 2012-03-03 21:32:10 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/ReorderLevel.php
trunk/SelectProduct.php
trunk/Stocks.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/footer.inc
trunk/index.php
Added Paths:
-----------
trunk/companies/weberpdemo/part_pics/BREAD.jpg
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/ReorderLevel.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -109,8 +109,8 @@
AND locstock.stockid = stockmaster.stockid
AND locstock.stockid ='" . $myrow['stockid'] .
"' AND locstock.loccode !='" . $myrow['loccode'] . "'";
- $otherresult = DB_query($sql2,$db,'','',false,true);
- while ($myrow2 = DB_fetch_array($otherresult,$db)){
+ $OtherResult = DB_query($sql2,$db,'','',false,true);
+ while ($myrow2 = DB_fetch_array($OtherResult,$db)){
$YPos -=$line_height;
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -146,8 +146,8 @@
include('includes/footer.inc');
exit;
} else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_ReOrderLevel_' . date('Y-m-d') . '.pdf');//UldisN
- $pdf->__destruct(); //UldisN
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_ReOrderLevel_' . date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
}
} else { /*The option to print PDF was not hit so display form */
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/SelectProduct.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -411,7 +411,9 @@
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 />';
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</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 />';
+ }
}
if ($Its_A_Dummy == False) {
echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/Stocks.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -90,7 +90,7 @@
$i=1;
- if (!isset($_POST['Description']) or mb_strlen($_POST['Description']) > 50 OR mb_strlen($_POST['Description'])==0) {
+ if (!isset($_POST['Description']) OR mb_strlen($_POST['Description']) > 50 OR mb_strlen($_POST['Description'])==0) {
$InputError = 1;
prnMsg (_('The stock item description must be entered and be fifty characters or less long') . '. ' . _('It cannot be a zero length string either') . ' - ' . _('a description is required'),'error');
$Errors[$i] = 'Description';
@@ -719,7 +719,7 @@
echo '<input type="hidden" name="New" value="'.$New.'" />';
-if (!isset($StockID) or $StockID=='' or isset($_POST['UpdateCategories'])) {
+if (!isset($StockID) OR $StockID=='' or isset($_POST['UpdateCategories'])) {
/*If the page was called without $StockID passed to page then assume a new stock item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden StockID field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/
if (!isset($StockID)) {
@@ -851,7 +851,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
while ($myrow=DB_fetch_array($result)){
- if (!isset($_POST['CategoryID']) or $myrow['categoryid']==$_POST['CategoryID']){
+ if (!isset($_POST['CategoryID']) OR $myrow['categoryid']==$_POST['CategoryID']){
echo '<option selected="selected" value="'. $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} else {
echo '<option value="'. $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
@@ -879,13 +879,13 @@
if (!isset($_POST['Controlled']) OR $_POST['Controlled']==''){
$_POST['Controlled']=0;
}
-if (!isset($_POST['Serialised']) or $_POST['Serialised']=='' || $_POST['Controlled']==0){
+if (!isset($_POST['Serialised']) OR $_POST['Serialised']=='' || $_POST['Controlled']==0){
$_POST['Serialised']=0;
}
-if (!isset($_POST['DecimalPlaces']) or $_POST['DecimalPlaces']==''){
+if (!isset($_POST['DecimalPlaces']) OR $_POST['DecimalPlaces']==''){
$_POST['DecimalPlaces']=0;
}
-if (!isset($_POST['Discontinued']) or $_POST['Discontinued']==''){
+if (!isset($_POST['Discontinued']) OR $_POST['Discontinued']==''){
$_POST['Discontinued']=0;
}
if (!isset($_POST['Pansize'])) {
@@ -941,22 +941,22 @@
} else {
echo '<option value="A">' . _('Assembly') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='K'){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='K'){
echo '<option selected="selected" value="K">' . _('Kit') . '</option>';
} else {
echo '<option value="K">' . _('Kit') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='M'){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='M'){
echo '<option selected="selected" value="M">' . _('Manufactured') . '</option>';
} else {
echo '<option value="M">' . _('Manufactured') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='G' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='G' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
echo '<option selected="selected" value="G">' . _('Phantom') . '</option>';
} else {
echo '<option value="G">' . _('Phantom') . '</option>';
}
-if (!isset($_POST['MBFlag']) or $_POST['MBFlag']=='B' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
+if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='B' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
echo '<option selected="selected" value="B">' . _('Purchased') . '</option>';
} else {
echo '<option value="B">' . _('Purchased') . '</option>';
@@ -1031,7 +1031,7 @@
<td>' . _('Perishable') . ':</td>
<td><select name="Perishable">';
-if (!isset($_POST['Perishable']) or $_POST['Perishable']==0){
+if (!isset($_POST['Perishable']) OR $_POST['Perishable']==0){
echo '<option selected="selected" value="0">' . _('No'). '</option>';
} else {
echo '<option value="0">' . _('No'). '</option>';
Added: trunk/companies/weberpdemo/part_pics/BREAD.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/companies/weberpdemo/part_pics/BREAD.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/doc/Change.log 2012-03-03 21:32:10 UTC (rev 5006)
@@ -1,5 +1,6 @@
webERP Change Log
+3/3/12 Phil: SelectProduct.php checked for existence of part pic before displaying a link that could potnetially fail
29/2/12 Phil: Changed all htmlentities calls to htmlspecialchars calls
28/2/12 Tim: Added functionality that allows for the set up of internal departments, and for the request of stock to be issued - a new issue account is defined in stockcategories. Issue requests must be authorised by a department manager and then issues fulfilled creates a stock adjustment with posting in the gl to the item category issue account.
28/02/2012 Vitaly: Added DB_escape_string() to narrative in SQL INSERT statements. Fixes a problem posting to database when the string contains quotes.
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/includes/MainMenuLinksArray.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -101,11 +101,16 @@
_('Customer Listing By Area/Salesperson'),
_('Sales Graphs'),
_('List Daily Transactions'),
- _('Customer Transaction Inquiries')
- );
+ _('Customer Transaction Inquiries') );
+if ($_SESSION['InvoicePortraitFormat']==0){
+ $PrintInvoicesOrCreditNotesScript = '/PrintCustTrans.php';
+} else {
+ $PrintInvoicesOrCreditNotesScript = '/PrintCustTransPortrait.php';
+}
+
$MenuItems['AR']['Reports']['URL'] = array ('/CustWhereAlloc.php',
- '/PrintCustTrans.php',
+ $PrintInvoicesOrCreditNotesScript,
'/PrintCustStatements.php',
'/SalesAnalRepts.php',
'/AgedDebtors.php',
@@ -114,8 +119,7 @@
'/PDFCustomerList.php',
'/SalesGraph.php',
'/PDFCustTransListing.php',
- '/CustomerTransInquiry.php'
- );
+ '/CustomerTransInquiry.php' );
$MenuItems['AR']['Maintenance']['Caption'] = array (_('Add Customer'),
_('Customers')
Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc 2012-03-03 21:32:10 UTC (rev 5006)
@@ -9,7 +9,7 @@
$YPos = $Page_Height - $Top_Margin;
-$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -115,$YPos-50,0,35);
+$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -118,$YPos-60,0,35);
$FontSize =15;
if ($InvOrCredit=='Invoice') {
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/includes/footer.inc 2012-03-03 21:32:10 UTC (rev 5006)
@@ -6,15 +6,15 @@
echo '<tr>';
echo '<td style="width:33%"></td><td class="footer">';
-echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © webrp.org - ' . date('Y') . '" /></td>';
+echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
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>';
-echo '<tr><td colspan="3" class="footer">webERP v' . $_SESSION['VersionNumber'] . '</td></tr>';
-
// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
-// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/weberp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
+// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
// }
echo '</table>';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-03-03 20:03:26 UTC (rev 5005)
+++ trunk/index.php 2012-03-03 21:32:10 UTC (rev 5006)
@@ -68,7 +68,7 @@
if ($_SESSION['ModulesEnabled'][$i]==1) {
// If this is the first time the application is loaded then it is possible that
// SESSION['Module'] is not set if so set it to the first module that is enabled for the user
- if (!isset($_SESSION['Module'])OR $_SESSION['Module']==''){
+ if (!isset($_SESSION['Module']) OR $_SESSION['Module']==''){
$_SESSION['Module']=$ModuleLink[$i];
}
if ($ModuleLink[$i] == $_SESSION['Module']){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-04 09:43:27
|
Revision: 5007
http://web-erp.svn.sourceforge.net/web-erp/?rev=5007&view=rev
Author: daintree
Date: 2012-03-04 09:43:21 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
James Dupin various language improvements. Fix DeliveryDetails merge errors
Modified Paths:
--------------
trunk/BankAccounts.php
trunk/DeliveryDetails.php
trunk/WWW_Users.php
trunk/includes/MainMenuLinksArray.php
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/BankAccounts.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -9,7 +9,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
-echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to "Currency Default" of "Fallback Default" to print Account details on Invoices (only one account should be set to "Fall Back Default").') . '.</div><br />';
+echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
$SelectedBankAccount=$_GET['SelectedBankAccount'];
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/DeliveryDetails.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -652,14 +652,10 @@
SELECT contractref,
stockid,
workcentreadded,
- '" . $_SESSION['Items'.$identifier]->Location ."',
- '" . Date('Y-m-d') . "',
-<<<<<<< .mine
- '2037-12-31',
- quantity
-=======
- '2099-12-31'
->>>>>>> .r4665
+ '" . $_SESSION['Items'.$identifier]->Location ."',
+ '" . Date('Y-m-d') . "',
+ '2099-12-31',
+ quantity
FROM contractbom
WHERE contractref='" . $ContractRow['contractref'] . "'",$db,$ErrMsg,$DbgMsg);
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/WWW_Users.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -649,7 +649,7 @@
foreach($ModuleList as $ModuleName){
echo '<tr>
- <td>' . _('Display') . ' ' . $ModuleName . ' ' . _('options') . ': </td>
+ <td>' . _('Display') . ' ' . $ModuleName . ' ' . _('module') . ': </td>
<td><select name="Module_' . $i . '">';
if ($ModulesAllowed[$i]==0){
echo '<option selected="selected" value="0">' . _('No') . '</option>';
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/includes/MainMenuLinksArray.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -440,7 +440,7 @@
_('Configuration Settings'),
_('User Maintenance'),
_('Maintain Security Tokens'),
- _('Role Permissions'),
+ _('Access Permissions Maintenance'),
_('Page Security Settings'),
_('Bank Accounts'),
_('Currency Maintenance'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-04 09:43:27
|
Revision: 5007
http://web-erp.svn.sourceforge.net/web-erp/?rev=5007&view=rev
Author: daintree
Date: 2012-03-04 09:43:21 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
James Dupin various language improvements. Fix DeliveryDetails merge errors
Modified Paths:
--------------
trunk/BankAccounts.php
trunk/DeliveryDetails.php
trunk/WWW_Users.php
trunk/includes/MainMenuLinksArray.php
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/BankAccounts.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -9,7 +9,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
-echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to "Currency Default" of "Fallback Default" to print Account details on Invoices (only one account should be set to "Fall Back Default").') . '.</div><br />';
+echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
$SelectedBankAccount=$_GET['SelectedBankAccount'];
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/DeliveryDetails.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -652,14 +652,10 @@
SELECT contractref,
stockid,
workcentreadded,
- '" . $_SESSION['Items'.$identifier]->Location ."',
- '" . Date('Y-m-d') . "',
-<<<<<<< .mine
- '2037-12-31',
- quantity
-=======
- '2099-12-31'
->>>>>>> .r4665
+ '" . $_SESSION['Items'.$identifier]->Location ."',
+ '" . Date('Y-m-d') . "',
+ '2099-12-31',
+ quantity
FROM contractbom
WHERE contractref='" . $ContractRow['contractref'] . "'",$db,$ErrMsg,$DbgMsg);
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/WWW_Users.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -649,7 +649,7 @@
foreach($ModuleList as $ModuleName){
echo '<tr>
- <td>' . _('Display') . ' ' . $ModuleName . ' ' . _('options') . ': </td>
+ <td>' . _('Display') . ' ' . $ModuleName . ' ' . _('module') . ': </td>
<td><select name="Module_' . $i . '">';
if ($ModulesAllowed[$i]==0){
echo '<option selected="selected" value="0">' . _('No') . '</option>';
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/includes/MainMenuLinksArray.php 2012-03-04 09:43:21 UTC (rev 5007)
@@ -440,7 +440,7 @@
_('Configuration Settings'),
_('User Maintenance'),
_('Maintain Security Tokens'),
- _('Role Permissions'),
+ _('Access Permissions Maintenance'),
_('Page Security Settings'),
_('Bank Accounts'),
_('Currency Maintenance'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-03-06 00:44:10
|
Revision: 5029
http://web-erp.svn.sourceforge.net/web-erp/?rev=5029&view=rev
Author: vvs2012
Date: 2012-03-06 00:44:02 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMExtendedQty.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -248,11 +248,10 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <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">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<td>' . _('Part') . ':</td>
<td><input type ="text" name="Part" size="20" /></td>
@@ -281,7 +280,9 @@
<div class="centre">
<br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMIndented.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -245,14 +245,13 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <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">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr>
<td>' . _('Part') . ':</td>
- <td><input type ="text" name="Part" size="20" />
+ <td><input type ="text" name="Part" size="20" /></td>
</tr>
<tr>
<td>' . _('Levels') . ':</td>
@@ -271,11 +270,12 @@
</td>
</tr>
</table>
- <p>
<div class="centre">
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </p>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMIndentedReverse.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -233,11 +233,10 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <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">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<td>' . _('Part') . ':</td>
<td><input type ="text" name="Part" size="20" /></td>
@@ -250,11 +249,12 @@
</select></td>
</tr>
</table>
- <p>
<div class="centre">
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </p>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMInquiry.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -14,21 +14,19 @@
if (!isset($_POST['StockID'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <b>
+ <div>
<br />
- </b>
<div class="page_help_text">
'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to view the costed bill of materials') . '
- <br />
- <font size="1">' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') . '</font>
+ <br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') . '
</div>
<br />
<table class="selection">
<tr>
- <td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
<td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="20" /></td>
</tr>
</table>
@@ -105,8 +103,6 @@
AND !isset($SelectedParent)) {
echo '<br />
- <hr>
- <br />
<table class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
@@ -133,7 +129,7 @@
$StockOnHand = locale_number_format($myrow['totalonhand'],2);
}
$tabindex=$j+4;
- printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s"</td>
+ printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s" /></td>
<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
@@ -149,6 +145,10 @@
echo '</table><br />';
}
+if (!isset($_POST['StockID'])) {
+ echo '</div>
+ </form>';
+}
if (isset($StockID) and $StockID!=""){
@@ -191,7 +191,7 @@
echo '<table class="selection">';
echo '<tr>
<th colspan="5">
- <div class="centre"><font size="4"><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b></font>
+ <div class="centre"><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b>
</div></th>
</tr>';
$TableHeader = '<tr>
@@ -258,9 +258,7 @@
}
if (!isset($_POST['StockID']) or $_POST['StockID']=='') {
- echo '<script>defaultControl(document.forms[0].StockCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
}
-
-echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMListing.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -112,11 +112,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'] . '" />';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">';
- echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</font></td>
+ echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</td>
<td><input tabindex="1" type="text" name="FromCriteria" size="20" maxlength="20" value="1" /></td>
</tr>';
@@ -126,10 +127,12 @@
echo '</table>
- <br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
- echo '<script>defaultControl(document.forms[0].FromCriteria);</script>';
+ <br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>
+ </div>
+ </form>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].FromCriteria);</script>';
}
- include('includes/footer.inc');;
+ include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMs.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -112,7 +112,7 @@
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
} else {
- $DrillText = '<a href="%s&Select=%s">' . _('Drill Down');
+ $DrillText = '<a href="%s&Select=%s">' . _('Drill Down') . '</a>';
$DrillLink = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?';
$DrillID=$myrow['component'];
}
@@ -146,9 +146,9 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
- <td>'.$DrillText.'</a></td>
- <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
+ <td>'.$DrillText.'</td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
$myrow['component'],
@@ -419,7 +419,6 @@
}
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select a Different BOM') . '</a></div><br />';
- echo '<table class="selection">';
// Display Manufatured Parent Items
$sql = "SELECT bom.parent,
stockmaster.description,
@@ -433,8 +432,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
$ix = 0;
- $reqnl = 0;
if( DB_num_rows($result) > 0 ) {
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -442,7 +441,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- $reqnl = $ix;
+ echo '</table>';
}
// Display Assembly Parent Items
$sql = "SELECT bom.parent,
@@ -457,7 +456,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Assembly parent items').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -465,6 +465,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
// Display Kit Sets
$sql = "SELECT bom.parent,
@@ -479,7 +480,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Kit sets').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -487,6 +489,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
// Display Phantom/Ghosts
$sql = "SELECT bom.parent,
@@ -501,7 +504,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -509,12 +513,12 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
- echo '</table>
- <br />
+ echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </font></b></th>
+ <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b></div></th>
</tr>';
$BOMTree = array();
@@ -565,6 +569,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select=' . $SelectedParent .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedComponent']) and $InputError !=1) {
@@ -596,7 +601,7 @@
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>'. ('Edit Component Details') .'</font></b></th>
+ <th colspan="13"><div class="centre"><b>'. ('Edit Component Details') .'</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component') . ':</td>
@@ -610,7 +615,7 @@
*/
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>' . _('New Component Details') .'</font></b></th>
+ <th colspan="13"><div class="centre"><b>' . _('New Component Details') .'</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component code') . ':</td>
@@ -707,7 +712,7 @@
</tr>
<tr>
<td>' . _('Quantity') . ': </td>
- <td><input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" class="number" name="Quantity" class="number" size="10" maxlength="8" value="';
+ <td><input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" class="number" name="Quantity" size="10" maxlength="8" value="';
if (isset($_POST['Quantity'])){
echo $_POST['Quantity'];
} else {
@@ -757,9 +762,9 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
-
- </form>
- </div>';
+ </div>
+ </div>
+ </form>';
} //end if record deleted no point displaying form to add record
@@ -831,13 +836,14 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
- '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br /><font size="1">' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '</font>
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
+ <div>
<br />
- <table class="selection" cellpadding="3" colspan="4">
- <tr><td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <table class="selection" cellpadding="3">
+ <tr><td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
<td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
</table>
@@ -849,7 +855,7 @@
AND !isset($SelectedParent)) {
echo '<br />
- <table cellpadding="2" colspan="7" class="selection">';
+ <table cellpadding="2" class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
@@ -896,11 +902,11 @@
//end if results to show
if (!isset($SelectedParent) or $SelectedParent=='') {
- echo '<script>defaultControl(document.forms[0].StockCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
- echo '<script>defaultControl(document.form.JournalProcessDate);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.JournalProcessDate);</script>';
}
-
+ echo '</div>';
echo '</form>';
} //end StockID already selected
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankAccounts.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -212,15 +212,15 @@
} elseif ($myrow['invoice']==2) {
$DefaultBankAccount=_('Currency Default');
}
- printf('<td>%s<br /><font size="2">%s</font></td>
+ printf('<td>%s<br />%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
- <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['accountcode'],
$myrow['accountname'],
@@ -249,6 +249,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'] . '" />';
if (isset($SelectedBankAccount) AND !isset($_GET['delete'])) {
@@ -298,9 +299,9 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
} //end while loop
@@ -336,7 +337,7 @@
</tr>
<tr>
<td>' . _('Bank Address') . ': </td>
- <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td>
+ <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td>
</tr>
<tr>
<td>' . _('Currency Of Account') . ': </td>
@@ -358,6 +359,7 @@
} //end while loop
echo '</select></td>';
+echo '</tr>';
echo '<tr>
<td>' . _('Default for Invoices') . ': </td>
@@ -394,7 +396,7 @@
echo '</tr></table><br />
<div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'" /></div>';
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankMatching.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -86,6 +86,7 @@
echo '<div class="page_help_text">' . _('Use this screen to match webERP Receipts and Payments to your Bank Statement. Check your bank statement and click the check-box when you find the matching transaction.') . '</div><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 '<input type="hidden" name="Type" value="' . $Type . '" />';
@@ -120,11 +121,12 @@
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr>
<td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
</tr>';
-echo '<td>' . _('to') . ':</td>
- <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
+echo '<tr>
+ <td>' . _('to') . ':</td>
+ <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
</tr>';
echo '<tr>
<td colspan="3">' . _('Choose outstanding') . ' ' . $TypeName . ' ' . _('only or all') . ' ' . $TypeName . ' ' . _('in the date range') . ':</td>
@@ -338,6 +340,7 @@
<input type="submit" name="Update" value="' . _('Update Matching') . '" />
</div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankReconciliation.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -9,6 +9,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'] . '" />';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
@@ -129,11 +130,10 @@
include ('includes/GLPostings.inc');
echo '</table>
- <p>
+ <br />
<div class="centre">
<input type="submit" tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '" />
</div>
- </p>
<br />';
@@ -196,7 +196,7 @@
AND amount < 0
AND ABS((amount/exrate)-amountcleared)>0.009 ORDER BY transdate";
- echo '<tr></tr>'; /*Bang in a blank line */
+ echo '<tr><td><br /></td></tr>'; /*Bang in a blank line */
$ErrMsg = _('The unpresented cheques could not be retrieved by the SQL because');
$UPChequesResult = DB_query($SQL, $db, $ErrMsg);
@@ -253,7 +253,9 @@
}
//end of while loop
- echo '<tr></tr>
+ echo '<tr>
+ <td><br /></td>
+ </tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all unpresented cheques') . '</td>
<td class="number">' . locale_number_format($TotalUnpresentedCheques,$CurrencyRow['currdecimalplaces']) . '</td>
@@ -272,7 +274,7 @@
AND amount > 0
AND ABS((amount/exrate)-amountcleared)>0.009 ORDER BY transdate";
- echo '<tr></tr>'; /*Bang in a blank line */
+ echo '<tr><td><br /></td></tr>'; /*Bang in a blank line */
$ErrMsg = _('The uncleared deposits could not be retrieved by the SQL because');
@@ -328,6 +330,7 @@
}
//end of while loop
echo '<tr>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all uncleared deposits') . '</td>
@@ -335,6 +338,7 @@
</tr>';
$FXStatementBalance = ($Balance*$CurrencyRow['rate'] - $TotalUnpresentedCheques -$TotalUnclearedDeposits);
echo '<tr>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6"><b>' . _('Bank statement balance should be') . ' (' . $CurrencyRow['currcode'] . ')</b></td>
@@ -374,10 +378,10 @@
if (isset($_POST['BankAccount'])) {
echo '<div class="centre">
<p>
- <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
+ <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
</p>
<br />
- <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
+ <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
</div>';
} else {
echo '<div class="centre">
@@ -388,7 +392,7 @@
<a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a>
</div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ 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: <vv...@us...> - 2012-03-06 00:44:10
|
Revision: 5029
http://web-erp.svn.sourceforge.net/web-erp/?rev=5029&view=rev
Author: vvs2012
Date: 2012-03-06 00:44:02 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMExtendedQty.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -248,11 +248,10 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <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">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<td>' . _('Part') . ':</td>
<td><input type ="text" name="Part" size="20" /></td>
@@ -281,7 +280,9 @@
<div class="centre">
<br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMIndented.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -245,14 +245,13 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <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">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr>
<td>' . _('Part') . ':</td>
- <td><input type ="text" name="Part" size="20" />
+ <td><input type ="text" name="Part" size="20" /></td>
</tr>
<tr>
<td>' . _('Levels') . ':</td>
@@ -271,11 +270,12 @@
</td>
</tr>
</table>
- <p>
<div class="centre">
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </p>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMIndentedReverse.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -233,11 +233,10 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <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">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<td>' . _('Part') . ':</td>
<td><input type ="text" name="Part" size="20" /></td>
@@ -250,11 +249,12 @@
</select></td>
</tr>
</table>
- <p>
<div class="centre">
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </p>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMInquiry.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -14,21 +14,19 @@
if (!isset($_POST['StockID'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <b>
+ <div>
<br />
- </b>
<div class="page_help_text">
'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to view the costed bill of materials') . '
- <br />
- <font size="1">' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') . '</font>
+ <br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') . '
</div>
<br />
<table class="selection">
<tr>
- <td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
<td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="20" /></td>
</tr>
</table>
@@ -105,8 +103,6 @@
AND !isset($SelectedParent)) {
echo '<br />
- <hr>
- <br />
<table class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
@@ -133,7 +129,7 @@
$StockOnHand = locale_number_format($myrow['totalonhand'],2);
}
$tabindex=$j+4;
- printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s"</td>
+ printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s" /></td>
<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
@@ -149,6 +145,10 @@
echo '</table><br />';
}
+if (!isset($_POST['StockID'])) {
+ echo '</div>
+ </form>';
+}
if (isset($StockID) and $StockID!=""){
@@ -191,7 +191,7 @@
echo '<table class="selection">';
echo '<tr>
<th colspan="5">
- <div class="centre"><font size="4"><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b></font>
+ <div class="centre"><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b>
</div></th>
</tr>';
$TableHeader = '<tr>
@@ -258,9 +258,7 @@
}
if (!isset($_POST['StockID']) or $_POST['StockID']=='') {
- echo '<script>defaultControl(document.forms[0].StockCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
}
-
-echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMListing.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -112,11 +112,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'] . '" />';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">';
- echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</font></td>
+ echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</td>
<td><input tabindex="1" type="text" name="FromCriteria" size="20" maxlength="20" value="1" /></td>
</tr>';
@@ -126,10 +127,12 @@
echo '</table>
- <br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
- echo '<script>defaultControl(document.forms[0].FromCriteria);</script>';
+ <br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>
+ </div>
+ </form>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].FromCriteria);</script>';
}
- include('includes/footer.inc');;
+ include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMs.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -112,7 +112,7 @@
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
} else {
- $DrillText = '<a href="%s&Select=%s">' . _('Drill Down');
+ $DrillText = '<a href="%s&Select=%s">' . _('Drill Down') . '</a>';
$DrillLink = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?';
$DrillID=$myrow['component'];
}
@@ -146,9 +146,9 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
- <td>'.$DrillText.'</a></td>
- <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
+ <td>'.$DrillText.'</td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
$myrow['component'],
@@ -419,7 +419,6 @@
}
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select a Different BOM') . '</a></div><br />';
- echo '<table class="selection">';
// Display Manufatured Parent Items
$sql = "SELECT bom.parent,
stockmaster.description,
@@ -433,8 +432,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
$ix = 0;
- $reqnl = 0;
if( DB_num_rows($result) > 0 ) {
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -442,7 +441,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- $reqnl = $ix;
+ echo '</table>';
}
// Display Assembly Parent Items
$sql = "SELECT bom.parent,
@@ -457,7 +456,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Assembly parent items').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -465,6 +465,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
// Display Kit Sets
$sql = "SELECT bom.parent,
@@ -479,7 +480,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Kit sets').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -487,6 +489,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
// Display Phantom/Ghosts
$sql = "SELECT bom.parent,
@@ -501,7 +504,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -509,12 +513,12 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
- echo '</table>
- <br />
+ echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </font></b></th>
+ <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b></div></th>
</tr>';
$BOMTree = array();
@@ -565,6 +569,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select=' . $SelectedParent .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedComponent']) and $InputError !=1) {
@@ -596,7 +601,7 @@
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>'. ('Edit Component Details') .'</font></b></th>
+ <th colspan="13"><div class="centre"><b>'. ('Edit Component Details') .'</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component') . ':</td>
@@ -610,7 +615,7 @@
*/
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>' . _('New Component Details') .'</font></b></th>
+ <th colspan="13"><div class="centre"><b>' . _('New Component Details') .'</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component code') . ':</td>
@@ -707,7 +712,7 @@
</tr>
<tr>
<td>' . _('Quantity') . ': </td>
- <td><input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" class="number" name="Quantity" class="number" size="10" maxlength="8" value="';
+ <td><input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" class="number" name="Quantity" size="10" maxlength="8" value="';
if (isset($_POST['Quantity'])){
echo $_POST['Quantity'];
} else {
@@ -757,9 +762,9 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
-
- </form>
- </div>';
+ </div>
+ </div>
+ </form>';
} //end if record deleted no point displaying form to add record
@@ -831,13 +836,14 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
- '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br /><font size="1">' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '</font>
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
+ <div>
<br />
- <table class="selection" cellpadding="3" colspan="4">
- <tr><td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <table class="selection" cellpadding="3">
+ <tr><td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
<td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
</table>
@@ -849,7 +855,7 @@
AND !isset($SelectedParent)) {
echo '<br />
- <table cellpadding="2" colspan="7" class="selection">';
+ <table cellpadding="2" class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
@@ -896,11 +902,11 @@
//end if results to show
if (!isset($SelectedParent) or $SelectedParent=='') {
- echo '<script>defaultControl(document.forms[0].StockCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
- echo '<script>defaultControl(document.form.JournalProcessDate);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.JournalProcessDate);</script>';
}
-
+ echo '</div>';
echo '</form>';
} //end StockID already selected
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankAccounts.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -212,15 +212,15 @@
} elseif ($myrow['invoice']==2) {
$DefaultBankAccount=_('Currency Default');
}
- printf('<td>%s<br /><font size="2">%s</font></td>
+ printf('<td>%s<br />%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
- <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['accountcode'],
$myrow['accountname'],
@@ -249,6 +249,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'] . '" />';
if (isset($SelectedBankAccount) AND !isset($_GET['delete'])) {
@@ -298,9 +299,9 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
} //end while loop
@@ -336,7 +337,7 @@
</tr>
<tr>
<td>' . _('Bank Address') . ': </td>
- <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td>
+ <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td>
</tr>
<tr>
<td>' . _('Currency Of Account') . ': </td>
@@ -358,6 +359,7 @@
} //end while loop
echo '</select></td>';
+echo '</tr>';
echo '<tr>
<td>' . _('Default for Invoices') . ': </td>
@@ -394,7 +396,7 @@
echo '</tr></table><br />
<div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'" /></div>';
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankMatching.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -86,6 +86,7 @@
echo '<div class="page_help_text">' . _('Use this screen to match webERP Receipts and Payments to your Bank Statement. Check your bank statement and click the check-box when you find the matching transaction.') . '</div><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 '<input type="hidden" name="Type" value="' . $Type . '" />';
@@ -120,11 +121,12 @@
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr>
<td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
</tr>';
-echo '<td>' . _('to') . ':</td>
- <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
+echo '<tr>
+ <td>' . _('to') . ':</td>
+ <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
</tr>';
echo '<tr>
<td colspan="3">' . _('Choose outstanding') . ' ' . $TypeName . ' ' . _('only or all') . ' ' . $TypeName . ' ' . _('in the date range') . ':</td>
@@ -338,6 +340,7 @@
<input type="submit" name="Update" value="' . _('Update Matching') . '" />
</div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankReconciliation.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -9,6 +9,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'] . '" />';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
@@ -129,11 +130,10 @@
include ('includes/GLPostings.inc');
echo '</table>
- <p>
+ <br />
<div class="centre">
<input type="submit" tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '" />
</div>
- </p>
<br />';
@@ -196,7 +196,7 @@
AND amount < 0
AND ABS((amount/exrate)-amountcleared)>0.009 ORDER BY transdate";
- echo '<tr></tr>'; /*Bang in a blank line */
+ echo '<tr><td><br /></td></tr>'; /*Bang in a blank line */
$ErrMsg = _('The unpresented cheques could not be retrieved by the SQL because');
$UPChequesResult = DB_query($SQL, $db, $ErrMsg);
@@ -253,7 +253,9 @@
}
//end of while loop
- echo '<tr></tr>
+ echo '<tr>
+ <td><br /></td>
+ </tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all unpresented cheques') . '</td>
<td class="number">' . locale_number_format($TotalUnpresentedCheques,$CurrencyRow['currdecimalplaces']) . '</td>
@@ -272,7 +274,7 @@
AND amount > 0
AND ABS((amount/exrate)-amountcleared)>0.009 ORDER BY transdate";
- echo '<tr></tr>'; /*Bang in a blank line */
+ echo '<tr><td><br /></td></tr>'; /*Bang in a blank line */
$ErrMsg = _('The uncleared deposits could not be retrieved by the SQL because');
@@ -328,6 +330,7 @@
}
//end of while loop
echo '<tr>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all uncleared deposits') . '</td>
@@ -335,6 +338,7 @@
</tr>';
$FXStatementBalance = ($Balance*$CurrencyRow['rate'] - $TotalUnpresentedCheques -$TotalUnclearedDeposits);
echo '<tr>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6"><b>' . _('Bank statement balance should be') . ' (' . $CurrencyRow['currcode'] . ')</b></td>
@@ -374,10 +378,10 @@
if (isset($_POST['BankAccount'])) {
echo '<div class="centre">
<p>
- <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
+ <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
</p>
<br />
- <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
+ <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
</div>';
} else {
echo '<div class="centre">
@@ -388,7 +392,7 @@
<a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a>
</div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X