[Weberp-svn] SF.net SVN: weberp:[5216] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[5216] trunk
|
From: <tim...@us...> - 2011-04-23 18:42:42
|
Revision: 5216
http://weberp.svn.sourceforge.net/weberp/?rev=5216&view=rev
Author: tim_schofield
Date: 2011-04-23 18:42:35 +0000 (Sat, 23 Apr 2011)
Log Message:
-----------
XHTML and quoting changes
Modified Paths:
--------------
trunk/AccountSections.php
trunk/AgedDebtors.php
trunk/AuditTrail.php
trunk/BOMIndented.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractOtherReqts.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/api/api_branches.php
trunk/api/api_customers.php
trunk/api/api_stock.php
trunk/api/api_suppliers.php
trunk/config.distrib.php
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/AccountSections.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -176,11 +176,11 @@
$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 "<table name='SectionList' class='selection'>
+ echo '<table name="SectionList" class="selection">
<tr>
- <th>" . _('Section Number') . "</th>
- <th>" . _('Section Description') . "</th>
- </tr>";
+ <th>' . _('Section Number') . '</th>
+ <th>' . _('Section Description') . '</th>
+ </tr>';
$k=0; //row colour counter
while ($myrow = DB_fetch_row($result)) {
@@ -212,7 +212,7 @@
if (! isset($_GET['delete'])) {
- echo "<form method='post' name='AccountSections' action='" . $_SERVER['PHP_SELF'] . '?' . SID . "'>";
+ echo '<form method="post" name="AccountSections" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedSectionID'])) {
@@ -233,10 +233,10 @@
$_POST['SectionID'] = $myrow['sectionid'];
$_POST['SectionName'] = $myrow['sectionname'];
- echo "<input type=hidden name='SelectedSectionID' value='" . $_POST['SectionID'] . "'>";
- echo "<table class=selection>
- <td>" . _('Section Number') . ':' . "</td>
- <td>" . $_POST['SectionID'] . "</td>";
+ echo '<input type=hidden name="SelectedSectionID" value="' . $_POST['SectionID'] . '">';
+ echo '<table class=selection>
+ <td>' . _('Section Number') . ':' . '</td>
+ <td>' . $_POST['SectionID'] . '</td>';
}
} else {
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/AgedDebtors.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -267,9 +267,9 @@
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
echo '<p>' . _('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db);
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$SQL";
+ echo '<br>'.$SQL;
}
include('includes/footer.inc');
exit;
@@ -365,7 +365,7 @@
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
echo '<br><br>' . _('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db);
- echo "<br><a href='$rootpath/index.php'>" . _('Back to the menu') . '</a>';
+ echo '<br><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br>' . _('The SQL that failed was') . '<p>' . $sql;
}
@@ -439,7 +439,7 @@
if ($debug==1){
prnMsg($SQL,'info');
}
- echo "<br><a href='$rootpath/index.php'>" . _('Back to the menu') . '</a>';
+ echo '<br><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
}
@@ -471,31 +471,31 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo '<form action=' . $_SERVER['PHP_SELF'] . " method='post'><table>";
+ echo '<form action=' . $_SERVER['PHP_SELF'] . ' method="post"><table>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><td>' . _('From Customer Code') . ':' . "</font></td><td><input tabindex='1' Type=text maxlength=6 size=7 name=FromCriteria value='0'></td></tr>";
- echo '<tr><td>' . _('To Customer Code') . ':' . "</td><td><input tabindex='2' Type=text maxlength=6 size=7 name=ToCriteria value='zzzzzz'></td></tr>";
+ echo '<tr><td>' . _('From Customer Code') . ':' . '</font></td><td><input tabindex="1" Type=text maxlength=6 size=7 name=FromCriteria value="0"></td></tr>';
+ echo '<tr><td>' . _('To Customer Code') . ':' . '</td><td><input tabindex="2" Type=text maxlength=6 size=7 name=ToCriteria value="zzzzzz"></td></tr>';
- echo '<tr><td>' . _('All balances or overdues only') . ':' . "</td><td><select tabindex='3' name='All_Or_Overdues'>";
- echo "<option selected Value='All'>" . _('All customers with balances');
- echo "<option Value='OverduesOnly'>" . _('Overdue accounts only');
- echo "<option Value='HeldOnly'>" . _('Held accounts only');
+ echo '<tr><td>' . _('All balances or overdues only') . ':' . '</td><td><select tabindex="3" name="All_Or_Overdues">';
+ echo '<option selected Value="All">' . _('All customers with balances') . '</option>';
+ echo '<option Value="OverduesOnly">' . _('Overdue accounts only') . '</option>';
+ echo '<option Value="HeldOnly">' . _('Held accounts only') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('Only Show Customers Of') . ':' . "</td><td><select tabindex='4' name='Salesman'>";
+ echo '<tr><td>' . _('Only Show Customers Of') . ':' . '</td><td><select tabindex="4" name="Salesman">';
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$result=DB_query($sql,$db);
- echo "<option value=''></option>";
+ echo '<option value=""></option>';
while ($myrow=DB_fetch_array($result)){
- echo "<option value='" . $myrow['salesmancode'] . "'>" . $myrow['salesmanname'];
+ echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Only show customers trading in') . ':' . "</td><td><select tabindex='5' name='Currency'>";
+ echo '<tr><td>' . _('Only show customers trading in') . ':' . '</td><td><select tabindex="5" name="Currency">';
$sql = "SELECT currency, currabrev FROM currencies";
@@ -504,17 +504,17 @@
while ($myrow=DB_fetch_array($result)){
if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
- echo "<option selected value='" . $myrow['currabrev'] . "'>" . $myrow['currency'];
+ echo '<option selected value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
} else {
- echo "<option value='" . $myrow['currabrev'] . "'>" . $myrow['currency'];
+ echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
}
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Summary or detailed report') . ':' . "</td>
- <td><select tabindex='6' name='DetailedReport'>";
- echo "<option selected value='No'>" . _('Summary Report');
- echo "<option value='Yes'>" . _('Detailed Report');
+ echo '<tr><td>' . _('Summary or detailed report') . ':' . '</td>
+ <td><select tabindex="6" name="DetailedReport">';
+ echo '<option selected value="No">' . _('Summary Report');
+ echo '<option value="Yes">' . _('Detailed Report');
echo '</select></td></tr>';
echo '</table><br><div class="centre"><input tabindex="7" type=submit name="PrintPDF" value="' . _('Print PDF') , '"></div>';
@@ -523,4 +523,4 @@
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/AuditTrail.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -30,42 +30,42 @@
// Get list of users
$userresult = DB_query("SELECT userid FROM www_users",$db);
-echo '<form action=' . $_SERVER['PHP_SELF'] . '?' . SID . ' method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class=selection>';
echo '<tr><td>'. _('From Date') . ' ' . $_SESSION['DefaultDateFormat'] .'</td>
- <td><input tabindex="1" type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="FromDate" size="11" maxlength="10" value=' .$_POST['FromDate'].'></td></tr>';
+ <td><input tabindex="1" type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="FromDate" size="11" maxlength="10" value="' .$_POST['FromDate'].'"></td></tr>';
echo '<tr><td>'. _('To Date') . ' ' . $_SESSION['DefaultDateFormat'] .'</td>
- <td><input tabindex="2" type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="ToDate" size="11" maxlength="10" value=' . $_POST['ToDate'] . '></td></tr>';
+ <td><input tabindex="2" type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="ToDate" size="11" maxlength="10" value="' . $_POST['ToDate'] . '"></td></tr>';
// Show user selections
echo '<tr><td>'. _('User ID'). '</td>
<td><select tabindex="3" name="SelectedUser">';
-echo '<option value=ALL>ALL';
+echo '<option value=ALL>ALL</option>';
while ($users = DB_fetch_row($userresult)) {
if (isset($_POST['SelectedUser']) and $users[0]==$_POST['SelectedUser']) {
- echo '<option selected value=' . $users[0] . '>' . $users[0];
+ echo '<option selected value=' . $users[0] . '>' . $users[0] . '</option>';
} else {
- echo '<option value=' . $users[0] . '>' . $users[0];
+ echo '<option value=' . $users[0] . '>' . $users[0] . '</option>';
}
}
echo '</select></td></tr>';
// Show table selections
echo '<tr><td>'. _('Table '). '</td><td><select tabindex="4" name="SelectedTable">';
-echo '<option value=ALL>ALL';
+echo '<option value=ALL>ALL</option>';
while ($tables = DB_fetch_row($tableresult)) {
if (isset($_POST['SelectedTable']) and $tables[0]==$_POST['SelectedTable']) {
- echo '<option selected value=' . $tables[0] . '>' . $tables[0];
+ echo '<option selected value=' . $tables[0] . '>' . $tables[0] . '</option>';
} else {
- echo '<option value=' . $tables[0] . '>' . $tables[0];
+ echo '<option value=' . $tables[0] . '>' . $tables[0] . '</option>';
}
}
echo '</select></td></tr>';
echo '</table><br />';
-echo "<div class=centre><input tabindex='5' type=submit name=View value='" . _('View') . "'></div>";
+echo '<div class=centre><input tabindex="5" type=submit name=View value="' . _('View') . '"></div>';
echo '</form>';
// View the audit trail
@@ -176,7 +176,7 @@
for ($i=1; $i<sizeof($_SESSION['SQLString']['fields']); $i++) {
if (isset($_SESSION['SQLString']['values'][$i]) and (trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) != "") &
(trim($_SESSION['SQLString']['fields'][$i]) != 'password') &
- (trim($_SESSION['SQLString']['fields'][$i]) != "www_users.password")) {
+ (trim($_SESSION['SQLString']['fields'][$i]) != 'www_users.password')) {
echo '<tr bgcolor='.$RowColour.'>';
echo '<td></td>
<td></td>
@@ -195,4 +195,4 @@
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/BOMIndented.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -151,9 +151,9 @@
$title = _('Indented BOM Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Indented BOM Listing could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
- echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$sql";
+ echo '<br>'.$sql;
}
include('includes/footer.inc');
exit;
@@ -237,7 +237,7 @@
$title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -253,21 +253,21 @@
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=' . $_SERVER['PHP_SELF'] . " method='post'><table class=selection>";
+ echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . ' method="post"><table class=selection>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><td>' . _('Part') . ":</td>";
- echo "<td><input type ='text' name='Part' size='20'>";
+ echo '<tr><td>' . _('Part') . ':</td>';
+ echo '<td><input type ="text" name="Part" size="20">';
- echo '<tr><td>' . _('Levels') . ":</td><td><select name='Levels'>";
- echo "<option selected value='All'>" . _('All Levels');
- echo "<option value='One'>" . _('One Level');
+ echo '<tr><td>' . _('Levels') . ':</td><td><select name="Levels">';
+ echo '<option selected value="All">' . _('All Levels') . '</option>';
+ echo '<option value="One">' . _('One Level') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('Print Option') . ":</td><td><select name='Fill'>";
- echo "<option selected value='yes'>" . _('Print With Alternating Highlighted Lines');
- echo "<option value='no'>" . _('Plain Print');
+ echo '<tr><td>' . _('Print Option') . ':</td><td><select name="Fill">';
+ echo '<option selected value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>';
+ echo '<option value="no">' . _('Plain Print') . '</option>';
echo '</select></td></tr>';
- echo "</table><p><div class='centre'><input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
+ echo '</table><p><div class="centre"><input type=submit name="PrintPDF" value="' . _('Print PDF') . '"></div>';
include('includes/footer.inc');
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/BOMListing.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -48,9 +48,9 @@
$title = _('Bill of Materials Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg(_('The Bill of Material listing could not be retrieved by the SQL because'),'error');
- echo "<br><a href='" .$rootpath ."/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$SQL";
+ echo '<br>' . $SQL;
}
include('includes/footer.inc');
exit;
@@ -105,20 +105,7 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos,$Left_Margin, $YPos);
- /*
- $buf = $pdf->output();
- $len = strlen($buf);
-
- header('Content-type: application/pdf');
- header('Content-Length: '.$len);
- header('Content-Disposition: inline; filename=BOMListing.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->stream();
- */
- $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');//UldisN
$pdf->__destruct(); //UldisN
} else { /*The option to print PDF was not hit */
@@ -131,19 +118,19 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo '<form action=' . $_SERVER['PHP_SELF'] . " method='POST'><table class=selection>";
+ echo '<form action=' . $_SERVER['PHP_SELF'] . ' method="POST"><table class=selection>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><td>' . _('From Inventory Part Code') . ':' . "</font></td><td><input tabindex='1' type=text name=FromCriteria size=20 maxlength=20 VALUE='1'></td></tr>";
+ echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</font></td><td><input tabindex="1" type=text name=FromCriteria size=20 maxlength=20 VALUE="1"></td></tr>';
- echo '<tr><td>' . _('To Inventory Part Code') . ':' . "</td><td><input tabindex='2' type=text name=ToCriteria size=20 maxlength=20 VALUE='zzzzzzz'></td></tr>";
+ echo '<tr><td>' . _('To Inventory Part Code') . ':' . '</td><td><input tabindex="2" type=text name=ToCriteria size=20 maxlength=20 VALUE="zzzzzzz"></td></tr>';
- 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>";
+ 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>';
}
include('includes/footer.inc');;
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/BOMs.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -137,7 +137,7 @@
} else {
$QuantityOnHand = number_format($myrow[10],$myrow[11]);
}
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -147,10 +147,10 @@
<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\">" . _('Delete') . "</a></td>
- </tr>",
+ <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">' . _('Delete') . '</a></td>
+ </tr>',
$Level1,
$myrow[0],
$myrow[1],
@@ -496,14 +496,14 @@
echo (($reqnl)?'<br>':'').'<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
echo '</div></td></tr>';
}
- echo "</table><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></tr>';
+ echo '</table><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></tr>';
// *** POPAD&T
$BOMTree = array();
@@ -547,7 +547,7 @@
}
}
// *** end POPAD&T
- echo "</table><br>";
+ echo '</table><br>';
if (! isset($_GET['delete'])) {
@@ -578,21 +578,21 @@
$_POST['AutoIssue'] = $myrow['autoissue'];
prnMsg(_('Edit the details of the selected component in the fields below') . '. <br>' . _('Click on the Enter Information button to update the component details'),'info');
- echo "<br><input type=hidden name='SelectedParent' VALUE='$SelectedParent'>";
- echo "<input type=hidden name='SelectedComponent' VALUE='$SelectedComponent'>";
+ echo '<br><input type=hidden name="SelectedParent" VALUE="'.$SelectedParent.'">';
+ 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></tr>';
+ echo '<tr><th colspan=13><div class="centre"><font color=blue size=3><b>'. ('Edit Component Details') .'</font></b></th></tr>';
echo '<tr><td>' . _('Component') . ':</td><td><b>' . $SelectedComponent . '</b></td></tr>';
} else { //end of if $SelectedComponent
- echo "<input type=hidden name='SelectedParent' VALUE='$SelectedParent'>";
+ echo '<input type=hidden name="SelectedParent" VALUE="'.$SelectedParent.'">';
/* echo "Enter the details of a new component in the fields below. <br>Click on 'Enter Information' to add the new component, once all fields are completed.";
*/
echo '<table class=selection>';
- echo "<tr><th colspan=13><div class='centre'><font color=blue size=3><b>". ('New Component Details') .'</font></b></th></tr>';
+ echo '<tr><th colspan=13><div class="centre"><font color=blue size=3><b>'. ('New Component Details') .'</font></b></th></tr>';
echo '<tr><td>' . _('Component code') . ':</td><td>';
- echo "<select " . (in_array('ComponentCode',$Errors) ? 'class="selecterror"' : '' ) ." tabindex='1' name='Component'>";
+ echo '<select ' . (in_array('ComponentCode',$Errors) ? 'class="selecterror"' : '' ) .' tabindex="1" name="Component">';
if ($ParentMBflag=='A'){ /*Its an assembly */
@@ -627,13 +627,13 @@
while ($myrow = DB_fetch_array($result)) {
- echo "<option VALUE=".$myrow['stockid'].'>' . str_pad($myrow['stockid'],21, '_', STR_PAD_RIGHT) . $myrow['description'];
+ echo '<option VALUE="'.$myrow['stockid'].'">' . str_pad($myrow['stockid'],21, '_', STR_PAD_RIGHT) . $myrow['description'] . '</option>';
} //end while loop
echo '</select></td></tr>';
}
- echo "<tr><td>" . _('Location') . ": </td><td><select tabindex='2' name='LocCode'>";
+ echo '<tr><td>' . _('Location') . ': </td><td><select tabindex="2" name="LocCode">';
DB_free_result($result);
$sql = "SELECT locationname, loccode FROM locations";
@@ -641,50 +641,49 @@
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['LocCode']) and $myrow['loccode']==$_POST['LocCode']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="'.$myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="'.$myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
- echo $myrow['loccode'] . "'>" . $myrow['locationname'];
} //end while loop
DB_free_result($result);
- echo "</select></td></tr><tr><td>" . _('Work Centre Added') . ": </td><td>";
- echo "<select tabindex='3' name='WorkCentreAdded'>";
+ echo '</select></td></tr><tr><td>' . _('Work Centre Added') . ': </td><td>';
+ echo '<select tabindex="3" name="WorkCentreAdded">';
$sql = "SELECT code, description FROM workcentres";
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
prnMsg( _('There are no work centres set up yet') . '. ' . _('Please use the link below to set up work centres'),'warn');
- echo "<br><a href='$rootpath/WorkCentres.php?" . SID . "'>" . _('Work Centre Maintenance') . '</a>';
+ echo '<br /><a href="'.$rootpath.'/WorkCentres.php">' . _('Work Centre Maintenance') . '</a>';
include('includes/footer.inc');
exit;
}
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['WorkCentreAdded']) and $myrow['code']==$_POST['WorkCentreAdded']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="'.$myrow['code'] . '">' . $myrow['description'] . '</option>';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="'.$myrow['code'] . '">' . $myrow['description'] . '</option>';
}
- echo $myrow['code'] . "'>" . $myrow['description'];
} //end while loop
DB_free_result($result);
- echo "</select></td></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=";
+ echo '</select></td></tr><tr><td>' . _('Quantity') . ': </td><td>';
+ ;
if (isset($_POST['Quantity'])){
- echo $_POST['Quantity'];
+ echo '<input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .'
+ tabindex="4" type="Text" class=number name="Quantity" class=number size=10 maxlength=8 value="'.$_POST['Quantity'] . '" />';
} else {
- echo 1;
+ echo '<input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .'
+ tabindex="4" type="Text" class=number name="Quantity" class=number size=10 maxlength=8 value="1" />';
}
- echo "></td></tr>";
+ echo '</td></tr>';
if (!isset($_POST['EffectiveTo']) OR $_POST['EffectiveTo']=='') {
$_POST['EffectiveTo'] = Date($_SESSION['DefaultDateFormat'],Mktime(0,0,0,Date('m'),Date('d'),(Date('y')+20)));
@@ -693,12 +692,12 @@
$_POST['EffectiveAfter'] = Date($_SESSION['DefaultDateFormat'],Mktime(0,0,0,Date('m'),Date('d')-1,Date('y')));
}
- echo "<tr><td>" . _('Effective After') . " (" . $_SESSION['DefaultDateFormat'] . "):</td>
- <td><input " . (in_array('EffectiveAfter',$Errors) ? 'class="inputerror"' : '' ) .
- " tabindex='5' type='Text' name='EffectiveAfter' class=date alt='".$_SESSION['DefaultDateFormat']."' size=11 maxlength=10 VALUE=" . $_POST['EffectiveAfter'] .">
- </td></tr><tr><td>" . _('Effective To') . " (" . $_SESSION['DefaultDateFormat'] . "):</td><td>
- <input " . (in_array('EffectiveTo',$Errors) ? 'class="inputerror"' : '' ) .
- " tabindex='6' type='Text' name='EffectiveTo' class=date alt='".$_SESSION['DefaultDateFormat']."' size=11 maxlength=10 VALUE=" . $_POST['EffectiveTo'] ."></td></tr>";
+ echo '<tr><td>' . _('Effective After') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
+ <td><input ' . (in_array('EffectiveAfter',$Errors) ? 'class="inputerror"' : '' ) .
+ ' tabindex="5" type="Text" name="EffectiveAfter" class=date alt="'.$_SESSION['DefaultDateFormat'].'" size=11 maxlength=10 VALUE=' . $_POST['EffectiveAfter'] .'>
+ </td></tr><tr><td>' . _('Effective To') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td><td>
+ <input ' . (in_array('EffectiveTo',$Errors) ? 'class="inputerror"' : '' ) .
+ ' tabindex="6" type="Text" name="EffectiveTo" class=date alt="'.$_SESSION['DefaultDateFormat'].'" size=11 maxlength=10 VALUE="' . $_POST['EffectiveTo'] .'"></td></tr>';
if ($ParentMBflag=='M' OR $ParentMBflag=='G'){
echo '<tr><td>' . _('Auto Issue this Component to Work Orders') . ':</td>
@@ -709,11 +708,11 @@
$_POST['AutoIssue'] = $_SESSION['AutoIssue'];
}
if ($_POST['AutoIssue']==0) {
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+ echo '<option selected VALUE=0>' . _('No') . '</option>';
+ echo '<option VALUE=1>' . _('Yes') . '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE=1>' . _('Yes') . '</option>';
+ echo '<option VALUE=0>' . _('No') . '</option>';
}
@@ -722,7 +721,7 @@
echo '<input type=hidden name="AutoIssue" VALUE=0>';
}
- echo "</table><br><div class='centre'><input tabindex='8' type='Submit' name='Submit' value='" . _('Enter Information') . "'></form></div>";
+ echo '</table><br><div class="centre"><input tabindex="8" type="Submit" name="Submit" value="' . _('Enter Information') . '"></form></div>';
} //end if record deleted no point displaying form to add record
@@ -791,16 +790,16 @@
if (!isset($SelectedParent)) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
- echo "<form action=" . $_SERVER['PHP_SELF'] . "?" . SID ." 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><br><table class=selection cellpadding=3 colspan=4><tr><td><font size=1>" . _('Enter text extracts in the') .
- " <b>" . _('description') . "</b>:</font></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><input tabindex='2' type='Text' name='StockCode' size=15 maxlength=18></td>
- </tr></table><br><div class='centre'><input tabindex='3' type=submit name='Search' VALUE=" . _('Search Now') . "></div>";
+ echo '<form action=' . $_SERVER['PHP_SELF'] . '" 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><br><table class=selection cellpadding=3 colspan=4><tr><td><font size=1>' . _('Enter text extracts in the') .
+ ' <b>' . _('description') . '</b>:</font></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><input tabindex="2" type="Text" name="StockCode" size=15 maxlength=18></td>
+ </tr></table><br><div class="centre"><input tabindex="3" type=submit name="Search" value="' . _('Search Now') . '"></div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_POST['Search']) and isset($result) AND !isset($SelectedParent)) {
@@ -830,10 +829,10 @@
$StockOnHand = number_format($myrow['totalonhand'],2);
}
$tab = $j+3;
- printf("<td><input tabindex='".$tab."' type=submit name='Select' VALUE='%s'</td>
+ printf('<td><input tabindex="'.$tab.'" type=submit name="Select" VALUE="%s" /></td>
<td>%s</td>
<td class=number>%s</td>
- <td>%s</td></tr>",
+ <td>%s</td></tr>',
$myrow['stockid'],
$myrow['description'],
$StockOnHand,
@@ -856,7 +855,7 @@
echo "<script>defaultControl(document.form.JournalProcessDate);</script>";
}
-echo "</form>";
+echo '</form>';
} //end StockID already selected
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/BankAccounts.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -193,14 +193,14 @@
echo '<table class="selection">';
- echo "<tr><th>" . _('GL Account Code') . "</th>
- <th>" . _('Bank Account Name') . "</th>
- <th>" . _('Bank Account Code') . "</th>
- <th>" . _('Bank Account Number') . "</th>
- <th>" . _('Bank Address') . "</th>
- <th>" . _('Currency') . "</th>
- <th>" . _('Default for Invoices') . "</th>
- </tr>";
+ echo '<tr><th>' . _('GL Account Code') . '</th>
+ <th>' . _('Bank Account Name') . '</th>
+ <th>' . _('Bank Account Code') . '</th>
+ <th>' . _('Bank Account Number') . '</th>
+ <th>' . _('Bank Address') . '</th>
+ <th>' . _('Currency') . '</th>
+ <th>' . _('Default for Invoices') . '</th>
+ </tr>';
$k=0; //row colour counter
while ($myrow = DB_fetch_row($result)) {
@@ -216,16 +216,16 @@
} else {
$defacc=_('Yes');
}
- printf("<td>%s<br><font size=2>%s</font></td>
+ printf('<td>%s<br><font size=2>%s</font></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\">" . _('Delete') . "</td>
- </tr>",
+ <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=1">' . _('Delete') . '</td>
+ </tr>',
$myrow[0],
$myrow[2],
$myrow[3],
@@ -247,12 +247,12 @@
}
if (isset($SelectedBankAccount)) {
- echo '<p>';
+ echo '<br />';
echo '<div class="centre"><p><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Bank Accounts Defined') . '</a></div>';
- echo '<p>';
+ echo '<br />';
}
-echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . ">";
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedBankAccount) AND !isset($_GET['delete'])) {
@@ -285,7 +285,7 @@
echo $_POST['AccountCode'] . '</td></tr>';
} else { //end of if $Selectedbank account only do the else when a new record is being entered
echo '<table class=selection><tr><td>' . _('Bank Account GL Code') .
- ":</td><td><Select tabindex='1' " . (in_array('AccountCode',$Errors) ? 'class="selecterror"' : '' ) ." name='AccountCode'>";
+ ':</td><td><Select tabindex="1" ' . (in_array('AccountCode',$Errors) ? 'class="selecterror"' : '' ) .' name="AccountCode">';
$sql = "SELECT accountcode,
accountname
@@ -298,11 +298,10 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected VALUE=';
+ echo '<option selected VALUE="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
} else {
- echo '<option VALUE=';
+ echo '<option VALUE="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
}
- echo $myrow['accountcode'] . '>' . $myrow['accountname'];
} //end while loop
@@ -339,11 +338,10 @@
$result = DB_query("SELECT currabrev, currency FROM currencies",$db);
while ($myrow = DB_fetch_array($result)) {
if ($myrow['currabrev']==$_POST['CurrCode']) {
- echo '<option selected VALUE=';
+ echo '<option selected VALUE="'.$myrow['currabrev'] . '">' . $myrow['currabrev'] . '</option>';
} else {
- echo '<option VALUE=';
+ echo '<option VALUE="'.$myrow['currabrev'] . '">' . $myrow['currabrev'] . '</option>';
}
- echo $myrow['currabrev'] . '>' . $myrow['currabrev'];
} //end while loop
echo '</select></td>';
@@ -374,4 +372,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/COGSGLPostings.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -275,11 +275,10 @@
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['Area']) and $myrow['areacode']==$_POST['Area']) {
- echo '<option selected VALUE="';
+ echo '<option selected VALUE="'.$myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} else {
- echo '<option VALUE="';
+ echo '<option VALUE="'.$myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
}
- echo $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} //end while loop
DB_free_result($result);
@@ -294,11 +293,10 @@
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['StkCat']) and $myrow["categoryid"]==$_POST['StkCat']) {
- echo '<option selected VALUE="';
+ echo '<option selected VALUE="'.$myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} else {
- echo '<option VALUE="';
+ echo '<option VALUE="'.$myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
- echo $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} //end while loop
@@ -314,11 +312,10 @@
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['SalesType']) and $myrow['typeabbrev']==$_POST['SalesType']) {
- echo '<option selected VALUE="';
+ echo '<option selected VALUE="'.$myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
} else {
- echo '<option VALUE="';
+ echo '<option VALUE="'.$myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
}
- echo $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
} //end while loop
@@ -340,11 +337,10 @@
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['GLCode']) and $myrow['accountcode']==$_POST['GLCode']) {
- echo '<option selected VALUE="';
+ echo '<option selected VALUE="'.$myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
} else {
- echo '<option VALUE="';
+ echo '<option VALUE="'.$myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
} //end while loop
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/ConfirmDispatch_Invoice.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -390,7 +390,7 @@
if (!isset($_POST['ProcessInvoice'])) {
echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?' . SID . '&LineNo='. $LnItm->LineNumber.'">';
if ($LnItm->Serialised==1){
- echo _("Enter Serial Numbers");
+ echo _('Enter Serial Numbers');
} else { /*Just batch/roll/lot control */
echo _('Enter Batch/Roll/Lot #');
}
@@ -404,7 +404,7 @@
}
}//end foreach ($line)
-/*Don't re-calculate freight if some of the order has already been delivered -
+/*Do not re-calculate freight if some of the order has already been delivered -
depending on the business logic required this condition may not be required.
It seems unfair to charge the customer twice for freight if the order
was not fully delivered the first time ?? */
@@ -1657,7 +1657,7 @@
<input type=submit tabindex='.$j.' name=Update Value=' . _('Update'). '><br>';
$j++;
- echo '<br><input type=submit tabindex='.$j.' name="ProcessInvoice" Value="'._('Process Invoice').'"</div>';
+ echo '<br><input type=submit tabindex='.$j.' name="ProcessInvoice" Value="'._('Process Invoice').'" /></div>';
echo '<input type=hidden name="ShipVia" VALUE="' . $_SESSION['Items']->ShipVia . '">';
}
@@ -1665,4 +1665,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/ContractBOM.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -11,7 +11,7 @@
$identifier=$_GET['identifier'];
-/* If a contract header doesn't exist, then go to
+/* If a contract header does n0t exist, then go to
* Contracts.php to create one
*/
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/ContractOtherReqts.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -11,7 +11,7 @@
$identifier=$_GET['identifier'];
-/* If a contract header doesn't exist, then go to
+/* If a contract header does not exist, then go to
* Contracts.php to create one
*/
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/Credit_Invoice.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -382,10 +382,10 @@
echo '</td>';
echo '<td class=number>' . $DisplayTaxAmount . '</td>
- <td class=number>' . $DisplayGrossLineTotal . "</td>
- <td><a href='". $_SERVER['PHP_SELF'] . "?" . SID . "&Delete=" . $LnItm->LineNumber . "'>" . _('Delete') . '</a></td></tr>';
+ <td class=number>' . $DisplayGrossLineTotal . '</td>
+ <td><a href="'. $_SERVER['PHP_SELF'] . '?Delete=' . $LnItm->LineNumber . '">' . _('Delete') . '</a></td></tr>';
- echo '<tr'.$RowStarter . "><td colspan=12><TEXTAREA tabindex=".$j." name='Narrative_" . $LnItm->LineNumber . "' cols=100% rows=1>" . $LnItm->Narrative . "</TEXTAREa><br><hr></td></tr>";
+ echo '<tr'.$RowStarter . '><td colspan=12><textarea tabindex="'.$j.'" name="Narrative_' . $LnItm->LineNumber . '" cols=100% rows=1>' . $LnItm->Narrative . '</textarea><br><hr></td></tr>';
$j++;
}
} /*end foreach loop displaying the invoice lines to credit */
@@ -399,8 +399,8 @@
<td colspan=3 class=number>' . _('Freight cost charged on invoice') . '</td>
<td class=number>' . number_format($_SESSION['Old_FreightCost'],2) . '</td>
<td></td>
- <td colspan=2 class=number>' . _('Credit Freight Cost') . "</td>
- <td><input tabindex=".$j." type=text class=number size=6 maxlength=6 name='ChargeFreightCost' value=" . $_SESSION['CreditItems']->FreightCost . "></td>";
+ <td colspan=2 class=number>' . _('Credit Freight Cost') . '</td>
+ <td><input tabindex="'.$j.'" type=text class=number size=6 maxlength=6 name="ChargeFreightCost" value="' . $_SESSION['CreditItems']->FreightCost . '"></td>';
echo '<td>';
echo '</td><td>';
@@ -816,7 +816,7 @@
true);
}
} /* end of assembly explosion and updates */
- /*Update the cart with the recalculated standard cost from the explosion of the assembly's components*/
+ /*Update the cart with the recalculated standard cost from the explosion of the assemblys components*/
$_SESSION['CreditItems']->LineItems[$OrderLine->LineNumber]->StandardCost = $StandardCost;
$OrderLine->StandardCost = $StandardCost;
}
@@ -985,7 +985,7 @@
'" . $OrderLine->QtyDispatched . "',
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
- '" . ($QtyOnHandPrior +$OrderLine->QtyDispatched) . "'',
+ '" . ($QtyOnHandPrior +$OrderLine->QtyDispatched) . "',
'" . $OrderLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
@@ -1447,9 +1447,9 @@
echo '<div class="centre">'._('Credit Note number') . ' ' . $CreditNo . ' ' . _('has been processed');
if ($_SESSION['InvoicePortraitFormat']==0){
- echo "<br/><a href='". $rootpath . "/PrintCustTrans.php?" . SID . "&FromTransNo=" . $CreditNo . "&InvOrCredit=Credit&PrintPDF=True'>" . _('Print this credit note') . '</a>';
+ echo '<br/><a href="'. $rootpath . '/PrintCustTrans.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit&PrintPDF=True">' . _('Print this credit note') . '</a>';
} else {
- echo "<br/><a href='". $rootpath . "/PrintCustTransPortrait.php?" . SID . "&FromTransNo=" . $CreditNo . "&InvOrCredit=Credit&PrintPDF=True'>" . _('Print this credit note') . '</a>';
+ echo '<br/><a href="'. $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit&PrintPDF=True">' . _('Print this credit note') . '</a>';
}
echo '</div>';
/*end of process credit note */
@@ -1457,9 +1457,9 @@
} else { /*Process Credit NOT set so allow inputs to set up the credit note */
- echo "<br><table class=selection>";
+ echo '<br><table class=selection>';
- echo '<tr><td>' . _('Credit Note Type') . "</td><td><select tabindex=".$j." name=CreditType>";
+ echo '<tr><td>' . _('Credit Note Type') . '</td><td><select tabindex="'.$j.'" name=CreditType>';
if (!isset($_POST['CreditType']) OR $_POST['CreditType']=="Return"){
echo '<option selected value="Return">' . _('Goods returned to store') . '</option>';
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/Currencies.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -216,17 +216,17 @@
}
if ($myrow[1]!=$FunctionalCurrency){
- printf("<td><img src=\"%s\"></td>
+ printf('<td><img src=\'%s\'></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
- <td><a href=\"%s&SelectedCurrency=%s\">%s</a></td>
- <td><a href=\"%s&SelectedCurrency=%s&delete=1\">%s</a></td>
- <td><a href=\"%s/ExchangeRateTrend.php?%s\">" . _('Graph') . "</a></td>
- </tr>",
+ <td><a href="%s&SelectedCurrency=%s">%s</a></td>
+ <td><a href="%s&SelectedCurrency=%s&delete=1">%s</a></td>
+ <td><a href="%s/ExchangeRateTrend.php?%s">' . _('Graph') . '</a></td>
+ </tr>',
$ImageFile,
$myrow[1],
$myrow[0],
@@ -243,14 +243,14 @@
$rootpath,
SID . '&CurrencyToShow=' . $myrow[1]);
} else {
- printf("<td><img src=\"%s\"></td>
+ printf('<td><img src="%s"></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
<td colspan=4>%s</td>
- </tr>",
+ </tr>',
$ImageFile,
$myrow[1],
$myrow[0],
@@ -273,7 +273,7 @@
if (!isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCurrency) AND $SelectedCurrency!='') {
@@ -343,4 +343,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/api/api_branches.php
===================================================================
--- trunk/api/api_branches.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/api/api_branches.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -14,7 +14,7 @@
return $Errors;
}
-/* Verify that the branch number is valid, and doesn't already
+/* Verify that the branch number is valid, and does not already
exist.*/
function VerifyBranchNo($DebtorNumber, $BranchNumber, $i, $Errors, $db) {
if ((strlen($BranchNumber)<1) or (strlen($BranchNumber)>10)) {
@@ -510,7 +510,7 @@
return $Errors;
}
/* This function takes a debtorno and branch code and returns an associative array containing
- the database record for that branch. If the debtor/branch code doesn't exist
+ the database record for that branch. If the debtor/branch code does not exist
then it returns an $Errors array.
*/
function GetCustomerBranch($DebtorNumber, $BranchCode, $user, $password) {
Modified: trunk/api/api_customers.php
===================================================================
--- trunk/api/api_customers.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/api/api_customers.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -1,7 +1,7 @@
<?php
/* $Id: api_customers.php 4521 2011-03-29 09:04:20Z daintree $*/
-/* Verify that the debtor number is valid, and doesn't already
+/* Verify that the debtor number is valid, and does not already
exist.*/
function VerifyDebtorNo($DebtorNumber, $i, $Errors, $db) {
if ((strlen($DebtorNumber)<1) or (strlen($DebtorNumber)>10)) {
@@ -246,7 +246,7 @@
names of the fields in the debtorsmaster table, and the values are the
values to insert. The only mandatory fields are the debtorno, name,
currency code, sales type, payment terms, and reason code
- fields. If the other fields aren't set, then the database defaults
+ fields. If the other fields are not set, then the database defaults
are used. The function returns an array called $Errors. The database
is only updated if the $Errors is empty, else the function returns an
array of one to many error codes.
@@ -498,7 +498,7 @@
}
/* This function takes a debtorno and returns an associative array containing
- the database record for that debtor. If the debtor number doesn't exist
+ the database record for that debtor. If the debtor number does not exist
then it returns an $Errors array.
*/
function GetCustomer($DebtorNumber, $user, $password) {
Modified: trunk/api/api_stock.php
===================================================================
--- trunk/api/api_stock.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/api/api_stock.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -268,7 +268,7 @@
names of the fields in the stockmaster table, and the values are the
values to insert. The only mandatory fields are the stockid, description,
long description, category, and tax category
- fields. If the other fields aren't set, then the database defaults
+ fields. If the other fields are not set, then the database defaults
are used. The function returns an array called $Errors. The database
is only updated if the $Errors is empty, else the function returns an
array of one to many error codes.
@@ -386,7 +386,7 @@
names of the fields in the stockmaster table, and the values are the
values to update. The only mandatory fields are the stockid, description,
long description, category, and tax category
- fields. If the other fields aren't set, then the database defaults
+ fields. If the other fields are not set, then the database defaults
are used. The function returns an array called $Errors. The database
is only updated if the $Errors is empty, else the function returns an
array of one to many error codes.
@@ -495,7 +495,7 @@
}
/* This function takes a stock code and returns an associative array containing
- the database record for that item. If the stock item number doesn't exist
+ the database record for that item. If the stock item number does not exist
then it returns an $Errors array.
*/
function GetStockItem($StockID, $user, $password) {
Modified: trunk/api/api_suppliers.php
===================================================================
--- trunk/api/api_suppliers.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/api/api_suppliers.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -1,7 +1,7 @@
<?php
/* $Id: api_suppliers.php 4521 2011-03-29 09:04:20Z daintree $*/
-/* Verify that the supplier number is valid, and doesn't already
+/* Verify that the supplier number is valid, and does not already
exist.*/
function VerifySupplierNo($SupplierNumber, $i, $Errors, $db) {
if ((strlen($SupplierNumber)<1) or (strlen($SupplierNumber)>10)) {
@@ -306,7 +306,7 @@
}
/* This function takes a supplier id and returns an associative array containing
- the database record for that supplier. If the supplier id doesn't exist
+ the database record for that supplier. If the supplier id does not exist
then it returns an $Errors array.
*/
function GetSupplier($SupplierID, $user, $password) {
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2011-04-23 09:57:28 UTC (rev 5215)
+++ trunk/config.distrib.php 2011-04-23 18:42:35 UTC (rev 5216)
@@ -71,7 +71,7 @@
/*The $rootpath is used in most scripts to tell the script the installation details of the files.
-NOTE: In some windows installation this command doesn't work and the administrator must set this to the path of the installation manually:
+NOTE: In some windows installation this command does not work and the administrator must set this to the path of the installation manually:
eg. if the files are under the webserver root directory then rootpath =''; if they are under weberp then weberp is the rootpath - notice no additional slashes are necessary.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
