Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6310] trunk
|
From: <dai...@us...> - 2013-08-29 10:42:56
|
Revision: 6310
http://sourceforge.net/p/web-erp/reponame/6310
Author: daintree
Date: 2013-08-29 10:42:50 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
spacing concatenation and autofocusing
Modified Paths:
--------------
trunk/AccountGroups.php
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/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/Factors.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLJournal.php
trunk/GLJournalInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/ImportBankTrans.php
trunk/ImportBankTransAnalysis.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/Locations.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/MailingGroupMaintenance.php
trunk/MaintenanceTasks.php
trunk/MaintenanceUserSchedule.php
trunk/Manufacturers.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OrderDetails.php
trunk/PDFBankingSummary.php
trunk/PDFCustomerList.php
trunk/PDFGLJournal.php
trunk/PDFGrn.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PageSecurity.php
trunk/PaymentAllocations.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcReportTab.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevelLocation.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesCategories.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCreditItems.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/ShopParameters.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockLocMovements.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/Stocks.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_BottomUpCosts.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_DataExport.php
trunk/Z_DescribeTable.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_MakeNewCompany.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangRemaining.php
trunk/geocode.php
trunk/includes/Add_SerialItems.php
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/InputSerialItemsKeyed.php
trunk/includes/InputSerialItemsSequential.php
trunk/includes/Login.php
trunk/includes/MiscFunctions.php
trunk/includes/OutputSerialItems.php
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/RFC822.php
trunk/includes/header.inc
trunk/index.php
trunk/install/index.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AccountGroups.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -230,7 +230,7 @@
if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$RroupRow['groupname']) {
echo '<option selected="selected" value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($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="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
}
}
echo '</select>';
@@ -283,7 +283,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.'<br /></p>';
+ 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>
@@ -323,7 +323,7 @@
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
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>';
+ 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>';
@@ -410,17 +410,17 @@
$sql = "SELECT groupname FROM accountgroups";
$groupresult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
if (!isset($_POST['ParentGroupName'])){
- echo '<option selected="selected" value="">' ._('Top Level Group').'</option>';
+ echo '<option selected="selected" value="">' ._('Top Level Group') . '</option>';
} else {
- echo '<option value="">' ._('Top Level Group').'</option>';
+ echo '<option value="">' ._('Top Level Group') . '</option>';
}
while ( $grouprow = DB_fetch_array($groupresult) ) {
if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
- echo '<option selected="selected" value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($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="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($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></td>
@@ -433,9 +433,9 @@
$secresult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
while( $secrow = DB_fetch_array($secresult) ) {
if ($_POST['SectionInAccounts']==$secrow['sectionid']) {
- echo '<option selected="selected" value="'.$secrow['sectionid'].'">'.$secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
+ echo '<option selected="selected" value="'.$secrow['sectionid'].'">' . $secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
} else {
- echo '<option value="'.$secrow['sectionid'].'">'.$secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
+ echo '<option value="'.$secrow['sectionid'].'">' . $secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
}
}
echo '</select></td>
@@ -445,14 +445,14 @@
<td><select tabindex="4" name="PandL" title="' . _('Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account') . '">';
if ($_POST['PandL']!=0 ) {
- echo '<option selected="selected" value="1">' . _('Yes').'</option>';
+ echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
} else {
- echo '<option value="1">' . _('Yes').'</option>';
+ echo '<option value="1">' . _('Yes') . '</option>';
}
if ($_POST['PandL']==0) {
- echo '<option selected="selected" value="0">' . _('No').'</option>';
+ echo '<option selected="selected" value="0">' . _('No') . '</option>';
} else {
- echo '<option value="0">' . _('No').'</option>';
+ echo '<option value="0">' . _('No') . '</option>';
}
echo '</select></td>
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AccountSections.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -169,7 +169,7 @@
$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.'<br /></p>';
+ 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>
@@ -191,9 +191,9 @@
echo '<td>' . $myrow['sectionid'] . '</td><td>' . $myrow['sectionname'] . '</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>';
+ echo '<td><b>' . _('Restricted') . '</b></td>';
} else {
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' . _('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
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AddCustomerContacts.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -76,7 +76,7 @@
if ($InputError !=1) {
$result = DB_query($sql,$db);
- //echo '<br />'.$sql;
+ //echo '<br />' . $sql;
echo '<br />';
prnMsg($msg, 'success');
@@ -119,7 +119,7 @@
WHERE debtorno='".$DebtorNo."'
ORDER BY contid";
$result = DB_query($sql,$db);
- //echo '<br />'.$sql;
+ //echo '<br />' . $sql;
echo '<table class="selection">';
echo '<tr>
@@ -146,7 +146,7 @@
<td><a href="mailto:%s">%s</a></td>
<td>%s</td>
<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>',
+ <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'],
@@ -203,7 +203,7 @@
echo '<br />
<table class="selection">
<tr>
- <td>'. _('Contact Code').':</td>
+ <td>' . _('Contact Code').':</td>
<td>' . $_POST['Con_ID'] . '</td>
</tr>';
} else {
@@ -211,7 +211,7 @@
}
echo '<tr>
- <td>'. _('Contact Name') . '</td>';
+ <td>' . _('Contact Name') . '</td>';
if (isset($_POST['ContactName'])) {
echo '<td><input type="text" autofocus="autofocus" required="required" name="ContactName" value="' . $_POST['ContactName']. '" size="35" maxlength="40" /></td>
</tr>';
@@ -249,7 +249,7 @@
echo '<tr>
<td>' . _('Notes') . '</td>';
if (isset($_POST['ContactNotes'])) {
- echo '<td><textarea name="ContactNotes" rows="3" cols="40">'. $_POST['ContactNotes'] . '</textarea></td>';
+ echo '<td><textarea name="ContactNotes" rows="3" cols="40">' . $_POST['ContactNotes'] . '</textarea></td>';
} else {
echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
}
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AddCustomerNotes.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -66,7 +66,7 @@
if ($InputError !=1) {
$result = DB_query($sql,$db);
- //echo '<br />'.$sql;
+ //echo '<br />' . $sql;
echo '<br />';
prnMsg($msg, 'success');
@@ -98,7 +98,7 @@
WHERE debtorno='".$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'] . '</b></p>
<br />';
$sql = "SELECT noteid,
@@ -134,8 +134,8 @@
<td>%s</td>
<td><a href="%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 customer note?') . '\');">'. _('Delete'). '</td></tr>',
+ <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 customer note?') . '\');">' . _('Delete'). '</td></tr>',
ConvertSQLDate($myrow['date']),
$myrow['note'],
$myrow['href'],
@@ -154,7 +154,7 @@
}
if (isset($Id)) {
echo '<div class="centre">
- <a href="'.htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">'._('Review all notes for this Customer').'</a>
+ <a href="'.htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">' . _('Review all notes for this Customer') . '</a>
</div>';
}
echo '<br />';
@@ -193,7 +193,7 @@
echo '<input type="hidden" name="DebtorNo" value="' . $_POST['debtorno'] . '" />';
echo '<table class="selection">
<tr>
- <td>'. _('Note ID').':</td>
+ <td>' . _('Note ID').':</td>
<td>' . $_POST['Noteid'] . '</td>
</tr>';
} else {
@@ -210,7 +210,7 @@
</tr>';
}
echo '<tr>
- <td>'. _('WWW').'</td>';
+ <td>' . _('WWW') . '</td>';
if (isset($_POST['Href'])) {
echo '<td><input type="url" name="Href" value="'.$_POST['Href'].'" size="35" maxlength="100" /></td>
</tr>';
@@ -219,7 +219,7 @@
</tr>';
}
echo '<tr>
- <td>' . _('Date') .'</td>';
+ <td>' . _('Date') . '</td>';
if (isset($_POST['NoteDate'])) {
echo '<td><input type="date" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" value="'.ConvertSQLDate($_POST['NoteDate']).'" size="10" maxlength="10" /></td>
</tr>';
@@ -228,7 +228,7 @@
</tr>';
}
echo '<tr>
- <td>'. _('Priority'). '</td>';
+ <td>' . _('Priority'). '</td>';
if (isset($_POST['Priority'])) {
echo '<td><input type="number" required min="1" name="Priority" class="number" value="' . $_POST['Priority']. '" size="1" maxlength="3" /></td>
</tr>';
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AddCustomerTypeNotes.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -91,7 +91,7 @@
$SQLname="SELECT typename from debtortype where typeid='".$DebtorType."'";
$result = DB_query($SQLname,$db);
$myrow = DB_fetch_array($result);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p>
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'] . '</b></p>
<br />';
$sql = "SELECT noteid,
@@ -104,7 +104,7 @@
WHERE typeid='".$DebtorType."'
ORDER BY date DESC";
$result = DB_query($sql,$db);
- //echo '<br />'.$sql;
+ //echo '<br />' . $sql;
echo '<table class="selection">';
echo '<tr>
@@ -128,8 +128,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sId=%s&DebtorType=%s">'. _('Edit') . '</a></td>
- <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete') . '</a></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'],
@@ -147,7 +147,7 @@
}
if (isset($Id)) {
echo '<div class="centre">
- <a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorType=' . $DebtorType . '">' . _('Review all notes for this Customer Type') .'</a>
+ <a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorType=' . $DebtorType . '">' . _('Review all notes for this Customer Type') . '</a>
</div>';
}
@@ -171,7 +171,7 @@
AND typeid='".$DebtorType."'";
$result = DB_query($sql, $db);
- //echo '<br />'.$sql;
+ //echo '<br />' . $sql;
$myrow = DB_fetch_array($result);
@@ -186,7 +186,7 @@
echo '<input type="hidden" name="DebtorType" value="' . $_POST['typeid'] . '" />';
echo '<table class="selection">
<tr>
- <td>'. _('Note ID').':</td>
+ <td>' . _('Note ID').':</td>
<td>' . $_POST['NoteID'] . '</td>
</tr>';
} else {
@@ -200,19 +200,19 @@
}
echo '<tr>
- <td>'._('Contact Group Note').':</td>
- <td><textarea name="Note" autofocus required rows="3" cols="32">'. $_POST['Note'].'</textarea></td>
+ <td>' . _('Contact Group Note').':</td>
+ <td><textarea name="Note" autofocus required rows="3" cols="32">' . $_POST['Note'] . '</textarea></td>
</tr>
<tr>
- <td>'. _('Web site').':</td>
+ <td>' . _('Web site').':</td>
<td><input type="url" name="Href" value="'. $_POST['Href'].'" size="35" maxlength="100" /></td>
</tr>
<tr>
- <td>'. _('Date').':</td>
+ <td>' . _('Date').':</td>
<td><input type="date" required name="NoteDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" value="'. $_POST['NoteDate']. '" size="10" maxlength="10" /></td>
</tr>
<tr>
- <td>'. _('Priority').':</td>
+ <td>' . _('Priority').':</td>
<td><input type="number" required min="1" class="number" name="Priority" value="'. $_POST['Priority'] .'" size="1" maxlength="3" /></td>
</tr>
</table>
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AgedDebtors.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -445,7 +445,7 @@
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
if ((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AgedSuppliers.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -273,7 +273,7 @@
$Title = _('Aged Supplier Analysis');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/Areas.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -141,7 +141,7 @@
FROM areas";
$result = DB_query($sql,$db);
- 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 . '</p><br />';
echo '<table class="selection">
<tr>
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/AuditTrail.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -8,7 +8,7 @@
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
if (!isset($_POST['FromDate'])){
$_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail']));
@@ -40,17 +40,17 @@
echo '<table class="selection">';
echo '<tr>
- <td>'. _('From Date') . ' ' . $_SESSION['DefaultDateFormat'] .'</td>
+ <td>' . _('From Date') . ' ' . $_SESSION['DefaultDateFormat'] . '</td>
<td><input tabindex="1" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="FromDate" size="11" maxlength="10" autofocus="autofocus" required="required" value="' .$_POST['FromDate']. '" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')"/></td>
</tr>
<tr>
- <td>'. _('To Date') . ' ' . $_SESSION['DefaultDateFormat'] .'</td>
+ <td>' . _('To Date') . ' ' . $_SESSION['DefaultDateFormat'] . '</td>
<td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ToDate" size="11" maxlength="10" required="required" value="' . $_POST['ToDate'] . '" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')"/></td>
</tr>';
// Show user selections
echo '<tr>
- <td>'. _('User ID'). '</td>
+ <td>' . _('User ID'). '</td>
<td><select tabindex="3" name="SelectedUser">
<option value="ALL">' . _('All') . '</option>';
while ($Users = DB_fetch_row($UserResult)) {
@@ -64,7 +64,7 @@
// Show table selections
echo '<tr>
- <td>'. _('Table '). '</td>
+ <td>' . _('Table '). '</td>
<td><select tabindex="4" name="SelectedTable">
<option value="ALL">' . _('All') . '</option>';
while ($Tables = DB_fetch_row($TableResult)) {
@@ -213,8 +213,8 @@
<td></td>
<td></td>
<td></td>';
- echo '<td>'.$_SESSION['SQLString']['fields'][$i].'</td>
- <td>'. trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) .'</td>';
+ echo '<td>' . $_SESSION['SQLString']['fields'][$i] . '</td>
+ <td>' . trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) . '</td>';
echo '</tr>';
}
}
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BOMExtendedQty.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -249,7 +249,7 @@
$Title=_('Quantity Extended BOM Listing');
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 '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BOMIndented.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -243,7 +243,7 @@
$Title=_('Indented BOM Listing');
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 '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BOMIndentedReverse.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -232,7 +232,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BOMInquiry.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -183,7 +183,7 @@
if (DB_num_rows($BOMResult)==0){
prnMsg(_('The bill of material for this part is not set up') . ' - ' . _('there are no components defined for it'),'warn');
} else {
- echo '<a href="'.$RootPath.'/index.php">'._('Return to Main Menu').'</a>';
+ echo '<a href="'.$RootPath.'/index.php">' . _('Return to Main Menu') . '</a>';
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
</p>
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BOMs.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -22,7 +22,7 @@
if (DB_num_rows($c_result) > 0) {
while ($row = DB_fetch_array($c_result)) {
- //echo '<br />Parent: ' . $Parent . ' Level: ' . $Level . ' row[component]: ' . $row['component'] .'<br />';
+ //echo '<br />Parent: ' . $Parent . ' Level: ' . $Level . ' row[component]: ' . $row['component'] . '<br />';
if ($Parent != $row['component']) {
// indent and display the title of this child
$BOMTree[$i]['Level'] = $Level; // Level
@@ -111,7 +111,7 @@
OR $myrow['mbflag']=='D') {
$DrillText = '%s%s';
- $DrillLink = '<div class="centre">'._('No lower levels').'</div>';
+ $DrillLink = '<div class="centre">' . _('No lower levels') . '</div>';
$DrillID='';
} else {
$DrillText = '<a href="%s&Select=%s">' . _('Drill Down') . '</a>';
@@ -149,7 +149,7 @@
<td>%s</td>
<td class="number">%s</td>
<td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
- <td>'.$DrillText.'</td>
+ <td>' . $DrillText . '</td>
<td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s&Location=%s&WorkCentre=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
@@ -229,7 +229,7 @@
$SelectedParent = $Select;
unset($Select);// = NULL;
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $Title.'</p><br />';
+ '" alt="" />' . ' ' . $Title . '</p><br />';
if (isset($SelectedParent) AND isset($_POST['Submit'])) {
@@ -454,9 +454,9 @@
$ix = 0;
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
+ 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'].'">'.
+ echo (($ix)?', ':'') . '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">' .
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -477,10 +477,10 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
+ 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'].'">'.
+ echo (($ix)?', ':'') . '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">' .
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -501,10 +501,10 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Kit sets').' : ';
+ 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'].'">'.
+ echo (($ix)?', ':'') . '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">' .
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -526,10 +526,10 @@
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">
<tr>
- <td><div class="centre">'._('Phantom').' : ';
+ <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'].'">'. $myrow['description'].' ('.$myrow['parent'].')</a>';
+ echo (($ix)?', ':'') . '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">' . $myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
echo '</div></td>
@@ -563,7 +563,7 @@
echo $TableHeader;
if(count($BOMTree) == 0) {
echo '<tr class="OddTableRows">
- <td colspan="8">'._('No materials found.').'</td>
+ <td colspan="8">' . _('No materials found.') . '</td>
</tr>';
} else {
$UltimateParent = $SelectedParent;
@@ -621,7 +621,7 @@
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><b>'. ('Edit Component Details') .'</b></div></th>
+ <th colspan="13"><div class="centre"><b>' . ('Edit Component Details') . '</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component') . ':</td>
@@ -636,7 +636,7 @@
*/
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><b>' . _('New Component Details') .'</b></div></th>
+ <th colspan="13"><div class="centre"><b>' . _('New Component Details') . '</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component code') . ':</td>
@@ -861,7 +861,7 @@
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 />' . _('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 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">
@@ -869,7 +869,7 @@
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></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>
+ <td><input tabindex="2" type="text" name="StockCode" autofocus="autofocus" size="15" maxlength="18" /></td>
</tr>
</table>
<br /><div class="centre"><input tabindex="3" type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
@@ -926,11 +926,6 @@
}
//end if results to show
- if (!isset($SelectedParent) or $SelectedParent=='') {
- echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
- } else {
- echo '<script type="text/javascript">defaultControl(document.form.JournalProcessDate);</script>';
- }
echo '</div>';
echo '</form>';
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BankAccounts.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -374,23 +374,23 @@
$result = DB_query("SELECT invoice FROM bankaccounts where accountcode =" . $SelectedBankAccount ,$db);
while ($myrow = DB_fetch_array($result)) {
if ($myrow['invoice']== 1) {
- echo '<option selected="selected" value="1">'._('Fall Back Default').'</option>
- <option value="2">'._('Currency Default') . '</option>
- <option value="0">'._('No').'</option>';
+ echo '<option selected="selected" value="1">' . _('Fall Back Default') . '</option>
+ <option value="2">' . _('Currency Default') . '</option>
+ <option value="0">' . _('No') . '</option>';
} elseif ($myrow['invoice']== 2) {
- echo '<option value="0">'._('No').'</option>
- <option selected="selected" value="2">'._('Currency Default') . '</option>
- <option value="1">'._('Fall Back Default').'</option>';
+ echo '<option value="0">' . _('No') . '</option>
+ <option selected="selected" value="2">' . _('Currency Default') . '</option>
+ <option value="1">' . _('Fall Back Default') . '</option>';
} else {
- echo '<option selected="selected" value="0">'._('No').'</option>
- <option value="2">'._('Currency Default') . '</option>
- <option value="1">'._('Fall Back Default').'</option>';
+ echo '<option selected="selected" value="0">' . _('No') . '</option>
+ <option value="2">' . _('Currency Default') . '</option>
+ <option value="1">' . _('Fall Back Default') . '</option>';
}
}//end while loop
} else {
- echo '<option value="1">'._('Fall Back Default').'</option>
- <option value="2">'._('Currency Default') . '</option>
- <option value="0">'._('No').'</option>';
+ echo '<option value="1">' . _('Fall Back Default') . '</option>
+ <option value="2">' . _('Currency Default') . '</option>
+ <option value="0">' . _('No') . '</option>';
}
echo '</select></td>';
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BankMatching.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -272,7 +272,7 @@
echo '<table cellpadding="2" class="selection">
<tr>
- <th class="ascending">'. _('Cheque No') . '</th>
+ <th class="ascending">' . _('Cheque No') . '</th>
<th class="ascending">' . _('Ref') . '</th>
<th class="ascending">' . $TypeName . '</th>
<th class="ascending">' . _('Date') . '</th>
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/BankReconciliation.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -14,7 +14,7 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
if (isset($_GET['Account'])) {
$_POST['BankAccount']=$_GET['Account'];
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/COGSGLPostings.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -16,7 +16,7 @@
$SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID'];
}
-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 . '</p><br />';
if (isset($_POST['submit'])) {
@@ -110,7 +110,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</a></td></tr>',
$myrow['area'],
$myrow['stkcat'],
$myrow['salestype'],
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/CompanyPreferences.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -100,7 +100,7 @@
} /* end of if submit */
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $Title.'</p>';
+ '" alt="" />' . ' ' . $Title . '</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -24,7 +24,7 @@
$LineNo = (int)$_POST['LineNo'];
} else {
echo '<div class="centre">
- <a href="' . $RootPath . '/ConfirmDispatch_Invoice.php">'. _('Select a line item to invoice').'</a>
+ <a href="' . $RootPath . '/ConfirmDispatch_Invoice.php">' . _('Select a line item to invoice') . '</a>
<br />
<br />';
prnMsg( _('This page can only be opened if a line item on a sales order to be invoiced has been selected') . '. ' . _('Please do that first'),'error');
@@ -36,7 +36,7 @@
if (!isset($_SESSION['Items'.$identifier]) OR !isset($_SESSION['ProcessingOrder'])) {
/* This page can only be called with a sales order number to invoice */
echo '<div class="centre">
- <a href="' . $RootPath . '/SelectSalesOrder.php">'. _('Select a sales order to invoice') . '</a>
+ <a href="' . $RootPath . '/SelectSalesOrder.php">' . _('Select a sales order to invoice') . '</a>
<br />';
prnMsg( _('This page can only be opened if a sales order and line item has been selected Please do that first'),'error');
echo '</div>';
@@ -51,7 +51,7 @@
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
- echo '<div class="centre"><a href="' . $RootPath . '/ConfirmDispatch_Invoice.php">'. _('Back to the Sales Order'). '</a></div>';
+ echo '<div class="centre"><a href="' . $RootPath . '/ConfirmDispatch_Invoice.php">' . _('Back to the Sales Order'). '</a></div>';
echo '<br />';
prnMsg( _('The line item must be defined as controlled to require input of the batch numbers or serial numbers being sold'),'error');
include('includes/footer.inc');
@@ -63,9 +63,9 @@
********************************************/
echo '<div class="centre">';
-echo '<br /><a href="'. $RootPath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
+echo '<br /><a href="'. $RootPath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">' . _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
-echo '<br /><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items'.$identifier]->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></div>';
+echo '<br /><b>' . _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items'.$identifier]->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></div>';
/** vars needed by InputSerialItem : **/
$StockID = $LineItem->StockID;
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/ConfirmDispatch_Invoice.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -213,7 +213,7 @@
} else { /*end if the order was returned sucessfully */
- echo '<br />'.
+ echo '<br />' .
prnMsg( _('This order item could not be retrieved. Please select another order'), 'warn');
include ('includes/footer.inc');
exit;
@@ -265,7 +265,7 @@
'" alt="" />' . ' ' . _('Confirm Dispatch and Invoice'). '</p>';
echo '<table class="selection">
<tr>
- <th><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th>
+ <th><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . '</b></th>
<th>' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName. '</b></th>
</tr>
<tr>
@@ -326,10 +326,10 @@
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
echo $RowStarter;
- echo '<td>'.$LnItm->StockID.'</td>
- <td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription.'</td>
+ echo '<td>' . $LnItm->StockID . '</td>
+ <td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription . '</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
- <td>'.$LnItm->Units.'</td>
+ <td>' . $LnItm->Units . '</td>
<td class="number">' . locale_number_format($LnItm->QtyInv,$LnItm->DecimalPlaces) . '</td>';
if ($LnItm->Controlled==1){
@@ -349,9 +349,9 @@
$DisplayDiscountPercent = locale_number_format($LnItm->DiscountPercent*100,2) . '%';
$DisplayLineNetTotal = locale_number_format($LineTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
$DisplayPrice = locale_number_format($LnItm->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<td class="number">'.$DisplayPrice.'</td>
- <td class="number">'.$DisplayDiscountPercent.'</td>
- <td class="number">'.$DisplayLineNetTotal.'</td>';
+ echo '<td class="number">' . $DisplayPrice . '</td>
+ <td class="number">' . $DisplayDiscountPercent . '</td>
+ <td class="number">' . $DisplayLineNetTotal . '</td>';
/*Need to list the taxes applicable to this line */
echo '<td>';
@@ -400,8 +400,8 @@
$DisplayGrossLineTotal = locale_number_format($LineTotal+ $TaxLineTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<td class="number">'.$DisplayTaxAmount.'</td>
- <td class="number">'.$DisplayGrossLineTotal.'</td>';
+ echo '<td class="number">' . $DisplayTaxAmount . '</td>
+ <td class="number">' . $DisplayGrossLineTotal . '</td>';
if ($LnItm->Controlled==1){
if (!isset($_POST['ProcessInvoice'])) {
@@ -461,7 +461,7 @@
$BestShipper = $ShipperReturned[0];
} else {
prnMsg( _('There are no shippers defined') . '. ' . _('Please use the link below to set up shipping freight companies, the system expects the shipping company to be selected or a default freight company to be used'),'error');
- echo '<a href="' . $RootPath . 'Shippers.php">'. _('Enter') . '/' . _('Amend Freight Companies'). '</a>';
+ echo '<a href="' . $RootPath . 'Shippers.php">' . _('Enter') . '/' . _('Amend Freight Companies'). '</a>';
}
}
}
@@ -489,11 +489,11 @@
AND (!isset($_SESSION['Items'.$identifier]->FreightCost)
OR $_POST['ChargeFreightCost']==0)) {
- echo '<td colspan="2" class="number">'. _('Charge Freight Cost inc Tax').'</td>
+ echo '<td colspan="2" class="number">' . _('Charge Freight Cost inc Tax') . '</td>
<td><input tabindex="'.$j.'" type="text" required="required" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="0" /></td>';
$_SESSION['Items'.$identifier]->FreightCost=0;
} else {
- echo '<td colspan="2" class="number">'. _('Charge Freight Cost inc Tax').'</td>';
+ echo '<td colspan="2" class="number">' . _('Charge Freight Cost inc Tax') . '</td>';
if (isset($_POST['ProcessInvoice'])) {
echo '<td class="number">' . locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
} else {
@@ -558,7 +558,7 @@
echo '<tr>
<td colspan="8" class="number">' . _('Invoice Totals'). '</td>
- <td class="number"><hr /><b>'.$DisplaySubTotal.'</b><hr /></td>
+ <td class="number"><hr /><b>' . $DisplaySubTotal . '</b><hr /></td>
<td colspan="2"></td>
<td class="number"><hr /><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
<td class="number"><hr /><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
@@ -694,7 +694,7 @@
/*there should be the same number of items returned from this query as there are lines on the invoice - if not then someone has already invoiced or credited some lines */
if ($debug==1){
- echo '<br />'.$SQL;
+ echo '<br />' . $SQL;
echo '<br />' . _('Number of rows returned by SQL') . ':' . DB_num_rows($Result);
echo '<br />' . _('Count of items in the session') . ' ' . count($_SESSION['Items'.$identifier]->LineItems);
}
@@ -715,13 +715,13 @@
if ($_SESSION['Items'.$identifier]->LineItems[$myrow['orderlineno']]->Quantity != $myrow['quantity']
OR $_SESSION['Items'.$identifier]->LineItems[$myrow['orderlineno']]->QtyInv != $myrow['qtyinvoiced']) {
- echo '<br />'. _('Orig order for'). ' ' . $myrow['orderlineno'] . ' '. _('has a quantity of'). ' ' . $myrow['quantity'] . ' '. _('and an invoiced qty of'). ' ' . $myrow['qtyinvoiced'] . ' '. _('the session shows quantity of'). ' ' . $_SESSION['Items'.$identifier]->LineItems[$myrow['orderlineno']]->Quantity . ' ' . _('and quantity invoice of'). ' ' . $_SESSION['Items'.$identifier]->LineItems[$myrow['orderlineno']]->QtyInv;
+ echo '<br />' . _('Orig order for'). ' ' . $myrow['orderlineno'] . ' '. _('has a quantity of'). ' ' . $myrow['quantity'] . ' '. _('and an invoiced qty of'). ' ' . $myrow['qtyinvoiced'] . ' '. _('the session shows quantity of'). ' ' . $_SESSION['Items'.$identifier]->LineItems[$myrow['orderlineno']]->Quantity . ' ' . _('and quantity invoice of'). ' ' . $_SESSION['Items'.$identifier]->LineItems[$myrow['orderlineno']]->QtyInv;
prnMsg( _('This order has been changed or invoiced since this delivery was started to be confirmed') . ' ' . _('Processing halted.') . ' ' . _('To enter and confirm this dispatch, it must be re-selected and re-read again to update the changes made by the other user'), 'error');
echo '<br />';
- echo '<div class="centre"><a href="'. $RootPath . '/SelectSalesOrder.php">'. _('Select a sales order for confirming deliveries and invoicing'). '</a></div>';
+ echo '<div class="centre"><a href="'. $RootPath . '/SelectSalesOrder.php">' . _('Select a sales order for confirming deliveries and invoicing'). '</a></div>';
unset($_SESSION['Items'.$identifier]->LineItems);
unset($_SESSION['Items'.$identifier]);
@@ -1232,7 +1232,7 @@
salesanalysis.salesperson";
$ErrMsg = _('The count of existing Sales analysis records could not run because');
- $DbgMsg = '<br />'. _('SQL to count the no of sales analysis records');
+ $DbgMsg = '<br />' . _('SQL to count the no of sales analysis records');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
$myrow = DB_fetch_row($Result);
@@ -1632,12 +1632,12 @@
echo '<br /><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">' . _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
} else {
- echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">' . _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
}
- echo '<a href="'.$RootPath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />';
- echo '<a href="'.$RootPath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />';
+ echo '<a href="'.$RootPath.'/SelectSalesOrder.php">' . _('Select another order for invoicing'). '</a><br /><br />';
+ echo '<a href="'.$RootPath.'/SelectOrderItems.php?NewOrder=Yes">' . _('Sales Order Entry') . '</a></div><br />';
/*end of process invoice */
@@ -1671,8 +1671,8 @@
$j++;
echo '<tr>
- <td>'._('Action For Balance'). ':</td>
- <td><select tabindex="'.$j.'" name="BOPolicy"><option selected="selected" value="BO">'._('Automatically put balance on back order').'</option><option value="CAN">'._('Cancel any quantities not delivered').'</option></select></td>
+ <td>' . _('Action For Balance'). ':</td>
+ <td><select tabindex="'.$j.'" name="BOPolicy"><option selected="selected" value="BO">' . _('Automatically put balance on back order') . '</option><option value="CAN">' . _('Cancel any quantities not delivered') . '</option></select></td>
</tr>';
$j++;
echo '<tr>
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/ContractBOM.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -233,7 +233,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="7">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</th>
+ <th colspan="7">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
</tr>';
}
@@ -241,7 +241,7 @@
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Quantity') . '</th>
- <th>' . _('UOM') .'</th>
+ <th>' . _('UOM') . '</th>
<th>' . _('Unit Cost') . '</th>
<th>' . _('Sub-total') . '</th>
</tr>';
@@ -303,12 +303,12 @@
<tr>
<td><select name="StockCat">';
- echo '<option selected="selected" value="All">' . _('All').'</option>';
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $_POST['StockCat']==$myrow1['categoryid']){
- echo '<option selected="selected" value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
+ echo '<option selected="selected" value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
} else {
- echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
+ echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
}
@@ -373,7 +373,7 @@
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
$ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
} else {
- $ImageSource = '<i>'._('No Image').'</i>';
+ $ImageSource = '<i>' . _('No Image') . '</i>';
}
echo '<td>' . $myrow['stockid'] . '</td>
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2013-08-29 01:32:47 UTC (rev 6309)
+++ trunk/ContractCosting.php 2013-08-29 10:42:50 UTC (rev 6310)
@@ -63,12 +63,12 @@
} elseif ($_SESSION['Contract'.$identifier]->Status==1){
echo _('Quoted') . ' ';
}
-echo _('Contract') . '<br />' . $_SESSION['Contract'.$identifier]->CustomerName . '<br />' . $_SESSION['Contract'.$identifier]->ContractDescription.'</p>';
+echo _('Contract') . '<br />' . $_SESSION['Contract'.$identifier]->CustomerName . '<br />' . $_SESSION['Contr...
[truncated message content] |
