Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5765] trunk
|
From: <tim...@us...> - 2012-12-18 23:00:05
|
Revision: 5765
http://sourceforge.net/p/web-erp/reponame/5765
Author: tim_schofield
Date: 2012-12-18 23:00:00 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Remove superfluous whitesdpace from the end of lines. Originally input by Phil Daintree to inflate his contribution to project
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/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.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/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDISendInvoices.php
trunk/EDISendInvoices_Reece.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.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/NoSalesItems.php
trunk/OffersReceived.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGLJournal.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/PDFReceipt.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Chk_ShiptRef_JobRef.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.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/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/Stocks.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeLocationCode.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteOldPrices.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.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_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
trunk/Z_poRebuildDefault.php
trunk/geo_displaymap_customers.php
trunk/geocode.php
trunk/includes/Add_SerialItems.php
trunk/includes/Add_SerialItemsOut.php
trunk/includes/ConnectDB.inc
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/CountriesArray.php
trunk/includes/DateFunctions.inc
trunk/includes/DefineCartClass.php
trunk/includes/DefineContractClass.php
trunk/includes/DefineJournalClass.php
trunk/includes/DefineLabelClass.php
trunk/includes/DefineOfferClass.php
trunk/includes/DefineReceiptClass.php
trunk/includes/DefineSpecialOrderClass.php
trunk/includes/DefineStockAdjustment.php
trunk/includes/DefineStockTransfers.php
trunk/includes/DefineSuppAllocsClass.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/DefineTenderClass.php
trunk/includes/EDIconfig.inc
trunk/includes/FreightCalculation.inc
trunk/includes/GetConfig.php
trunk/includes/GetSalesTransGLCodes.inc
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsKeyed.php
trunk/includes/InputSerialItemsSequential.php
trunk/includes/LanguageSetup.php
trunk/includes/LanguagesArray.php
trunk/includes/Login.php
trunk/includes/MiscFunctions.php
trunk/includes/OutputSerialItems.php
trunk/includes/PDFAgedDebtorsPageHeader.inc
trunk/includes/PDFDeliveryDifferencesPageHeader.inc
trunk/includes/PDFOrderPageHeader_generic.inc
trunk/includes/PDFOrderStatusPageHeader.inc
trunk/includes/PDFOrdersInvoicedPageHeader.inc
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/includes/PDFProfitAndLossPageHeader.inc
trunk/includes/PDFSalesAnalPageHeader.inc
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/PDFSalesOrder_generic.inc
trunk/includes/PDFStarter.php
trunk/includes/PDFStatementPageHeader.inc
trunk/includes/PDFTopItemsHeader.inc
trunk/includes/PDFTransPageHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/PDFTrialBalancePageHeader.inc
trunk/includes/PO_ReadInOrder.inc
trunk/includes/PO_UnsetFormVbls.php
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/includes/Z_POSDataCreation.php
trunk/includes/class.pdf.php
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/includes/htmlMimeMail.php
trunk/includes/session.inc
trunk/index.php
trunk/report_runner.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AccountGroups.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -63,7 +63,7 @@
$i=1;
$sql="SELECT count(groupname)
- FROM accountgroups
+ FROM accountgroups
WHERE groupname='".$_POST['GroupName']."'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
@@ -191,7 +191,7 @@
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
-
+
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<input type="hidden" name="OriginalAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
@@ -313,7 +313,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedAccountGroup'])) {
@@ -347,10 +347,10 @@
echo '<tr>
<th colspan="2">' . _('Edit Account Group Details') . '</th>
</tr>';
- echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
- <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
- </tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
+ <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group') . ':' . '</td>
@@ -358,7 +358,7 @@
</tr>';
} elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
-
+
if (!isset($_POST['SelectedAccountGroup'])){
$_POST['SelectedAccountGroup']='';
}
@@ -379,10 +379,10 @@
echo '<tr>
<th colspan="2">' . _('New Account Group Details') . '</th>
</tr>';
- echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
- </tr>';
echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
+ </tr>';
+ echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
<td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
</tr>';
@@ -455,7 +455,7 @@
echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
- echo '</div>';
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AccountSections.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -126,9 +126,9 @@
$myrow = DB_fetch_array($result);
if ($myrow['sections']>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
- echo '<div>';
+ echo '<div>';
echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
- echo '</div>';
+ echo '</div>';
} else {
//Fetch section name
@@ -205,7 +205,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedSectionID'])) {
@@ -266,7 +266,7 @@
} else {
echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionName);</script>';
}
- echo '</div>';
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AddCustomerContacts.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -171,7 +171,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -253,7 +253,7 @@
} else {
echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
}
- echo '</tr>';
+ echo '</tr>';
echo '<tr>
<td colspan="2">
<div class="centre">
@@ -262,7 +262,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AddCustomerNotes.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -162,7 +162,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo=' . $DebtorNo . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -244,7 +244,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AddCustomerTypeNotes.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -154,7 +154,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorType='.$DebtorType.'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -220,7 +220,7 @@
<div class="centre">
<input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AgedDebtors.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -448,7 +448,7 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
@@ -510,8 +510,8 @@
<div class="centre">
<input tabindex="7" type="submit" name="PrintPDF" value="' . _('Print PDF') , '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AgedSuppliers.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -280,7 +280,7 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
@@ -326,10 +326,10 @@
<div class="centre">
<input tabindex="6" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/Areas.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -180,7 +180,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -231,7 +231,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AuditTrail.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -117,7 +117,7 @@
$SQLString = str_replace('SET','',$SQLString);
$SQLString = str_replace('WHERE',',',$SQLString);
$SQLString = str_replace('AND',',',$SQLString);
- $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+ $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
for ($i=0; $i<sizeof($FieldArray); $i++) {
$Assigment = explode('=', $FieldArray[$i]);
$_SESSION['SQLString']['fields'][$i] = $Assigment[0];
@@ -138,11 +138,11 @@
$_SESSION['SQLString']['fields'][0] = $Assigment[0];
$_SESSION['SQLString']['values'][0] = $Assigment[1];
}
-
+
if (mb_strlen($ContainingText) > 0) {
- $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
+ $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
}else{
- $ContainingText = "";
+ $ContainingText = "";
}
if ($_POST['SelectedUser'] == 'ALL') {
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMExtendedQty.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -14,7 +14,7 @@
$FontSize=9;
$PageNumber=1;
$line_height=12;
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
if (!$_POST['Quantity'] or !is_numeric(filter_number_format($_POST['Quantity']))) {
$_POST['Quantity'] = 1;
@@ -250,8 +250,8 @@
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>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
<td>' . _('Part') . ':</td>
@@ -282,8 +282,8 @@
<br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMIndented.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -11,7 +11,7 @@
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Indented BOM Listing'));
$pdf->addInfo('Subject',_('Indented BOM Listing'));
- $FontSize=9;
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -49,7 +49,7 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -76,7 +76,7 @@
bom.quantity
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "<br />sql is $sql<br />";
@@ -132,7 +132,7 @@
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -152,27 +152,27 @@
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">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . $sql;
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM stockmaster
+ WHERE stockid = " . "'" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$assembly = $_POST['Part'];
$assemblydesc = $myrow['description'];
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
- $Tot_Val=0;
- $sql = "SELECT tempbom.*,
+ $Tot_Val=0;
+ $sql = "SELECT tempbom.*,
stockmaster.description,
stockmaster.mbflag
FROM tempbom,stockmaster
@@ -184,7 +184,7 @@
$fill = false;
$pdf->SetFillColor(224,235,255);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
while ($myrow = DB_fetch_array($result,$db)){
@@ -196,7 +196,7 @@
if ($_POST['Fill'] == 'yes'){
- $fill=!$fill;
+ $fill=!$fill;
}
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -214,7 +214,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
}
} /*end while loop */
@@ -224,10 +224,10 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
}
- if ($ListCount == 0) {
+ if ($ListCount == 0) {
$title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
@@ -243,11 +243,11 @@
$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>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr>
<td>' . _('Part') . ':</td>
@@ -271,11 +271,11 @@
</tr>
</table>
<div class="centre">
- <br />
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
@@ -283,7 +283,7 @@
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$assemblydesc) {
+ $Page_Width,$Right_Margin,$assemblydesc) {
$line_height=12;
/*PDF page header for Indented BOM Listing report */
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMIndentedReverse.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -12,7 +12,7 @@
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Indented BOM Listing'));
$pdf->addInfo('Subject',_('Indented BOM Listing'));
- $FontSize=9;
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -143,17 +143,17 @@
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;
}
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster
- WHERE stockid = '" . $_POST['Part'] . "'";
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM stockmaster
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$Assembly = $_POST['Part'];
@@ -161,18 +161,18 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin,$AssemblyDesc);
- $Tot_Val=0;
- $fill = false;
- $pdf->SetFillColor(224,235,255);
- $sql = "SELECT tempbom.*,
- stockmaster.description,
- stockmaster.mbflag
- FROM tempbom INNER JOIN stockmaster
- ON tempbom.parent = stockmaster.stockid
- ORDER BY sortpart";
+ $Tot_Val=0;
+ $fill = false;
+ $pdf->SetFillColor(224,235,255);
+ $sql = "SELECT tempbom.*,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM tempbom INNER JOIN stockmaster
+ ON tempbom.parent = stockmaster.stockid
+ ORDER BY sortpart";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
While ($myrow = DB_fetch_array($result,$db)){
@@ -184,7 +184,7 @@
// Use to alternate between lines with transparent and painted background
if ($_POST['Fill'] == 'yes'){
- $fill=!$fill;
+ $fill=!$fill;
}
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -202,7 +202,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$AssemblyDesc);
+ $Right_Margin,$AssemblyDesc);
}
} /*end while loop */
@@ -212,7 +212,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$AssemblyDesc);
+ $Right_Margin,$AssemblyDesc);
}
if ($ListCount == 0) {
$title = _('Print Reverse Indented BOM Listing Error');
@@ -234,8 +234,8 @@
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>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
<td>' . _('Part') . ':</td>
@@ -250,11 +250,11 @@
</tr>
</table>
<div class="centre">
- <br />
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
</div>
- </form>';
+ </form>';
include('includes/footer.inc');
@@ -262,7 +262,7 @@
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$AssemblyDesc) {
+ $Page_Width,$Right_Margin,$AssemblyDesc) {
$line_height=12;
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMInquiry.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -14,7 +14,7 @@
if (!isset($_POST['StockID'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
+ <div>
<br />
<div class="page_help_text">
'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to view the costed bill of materials') . '
@@ -61,9 +61,9 @@
FROM stockmaster INNER JOIN locstock
ON stockmaster.stockid = locstock.stockid
WHERE stockmaster.description " . LIKE . " '$SearchString'
- AND (stockmaster.mbflag='M'
- OR stockmaster.mbflag='K'
- OR stockmaster.mbflag='A'
+ AND (stockmaster.mbflag='M'
+ OR stockmaster.mbflag='K'
+ OR stockmaster.mbflag='A'
OR stockmaster.mbflag='G')
GROUP BY stockmaster.stockid,
stockmaster.description,
@@ -98,8 +98,8 @@
} //one of keywords or StockCode was more than a zero length string
} //end of if search
-if (isset($_POST['Search'])
- AND isset($result)
+if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
echo '<br />
@@ -130,7 +130,7 @@
}
$tabindex=$j+4;
printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s" /></td>
- <td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
</tr>',
@@ -146,23 +146,23 @@
echo '</table><br />';
}
if (!isset($_POST['StockID'])) {
- echo '</div>
- </form>';
+ echo '</div>
+ </form>';
}
if (isset($StockID) and $StockID!=""){
-
- $result = DB_query("SELECT description,
- units,
- labourcost,
- overheadcost
- FROM stockmaster
+
+ $result = DB_query("SELECT description,
+ units,
+ labourcost,
+ overheadcost
+ FROM stockmaster
WHERE stockid='" . $StockID . "'",
$db);
$myrow = DB_fetch_array($result);
$ParentLabourCost = $myrow['labourcost'];
$ParentOverheadCost = $myrow['overheadcost'];
-
+
$sql = "SELECT bom.parent,
bom.component,
stockmaster.description,
@@ -170,7 +170,7 @@
stockmaster.materialcost+ stockmaster.labourcost+stockmaster.overheadcost as standardcost,
bom.quantity,
bom.quantity * (stockmaster.materialcost+ stockmaster.labourcost+ stockmaster.overheadcost) AS componentcost
- FROM bom INNER JOIN stockmaster
+ FROM bom INNER JOIN stockmaster
ON bom.component = stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
AND bom.effectiveafter < Now()
@@ -237,7 +237,7 @@
$j++;
}
-
+
$TotalCost += $ParentLabourCost;
echo '<tr>
<td colspan="4" class="number"><b>' . _('Labour Cost') . '</b></td>
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMListing.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -17,7 +17,7 @@
$PageNumber=0;
$line_height=12;
- /*Now figure out the bills to report for the part range under review */
+ /*Now figure out the bills to report for the part range under review */
$SQL = "SELECT bom.parent,
bom.component,
stockmaster.description as compdescription,
@@ -43,7 +43,7 @@
prnMsg(_('The Bill of Material listing could not be retrieved by the SQL because'),'error');
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;
@@ -98,10 +98,10 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos,$Left_Margin, $YPos);
-
- $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
- $pdf->__destruct();
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
+
} else { /*The option to print PDF was not hit */
$title=_('Bill Of Material Listing');
@@ -113,8 +113,8 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</td>
@@ -128,8 +128,8 @@
echo '</table>
<br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>
- </div>
- </form>';
+ </div>
+ </form>';
echo '<script type="text/javascript">defaultControl(document.forms[0].FromCriteria);</script>';
}
include('includes/footer.inc');
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMs.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -20,7 +20,7 @@
FROM bom WHERE parent='" . $Parent. "'"
,$db);
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 />';
if ($Parent != $row['component']) {
@@ -85,13 +85,13 @@
locstock.quantity AS qoh,
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
- ON bom.component=stockmaster.stockid
- INNER JOIN locations ON
- bom.loccode = locations.loccode
- INNER JOIN workcentres
+ ON bom.component=stockmaster.stockid
+ INNER JOIN locations ON
+ bom.loccode = locations.loccode
+ INNER JOIN workcentres
ON bom.workcentreadded=workcentres.code
- INNER JOIN locstock
- ON bom.loccode=locstock.loccode
+ INNER JOIN locstock
+ ON bom.loccode=locstock.loccode
AND bom.component = locstock.stockid
WHERE bom.component='".$Component."'
AND bom.parent = '".$Parent."'";
@@ -106,10 +106,10 @@
while ($myrow=DB_fetch_array($result)) {
$Level1 = str_repeat('- ',$Level-1).$Level;
- if( $myrow['mbflag']=='B'
- OR $myrow['mbflag']=='K'
+ if( $myrow['mbflag']=='B'
+ OR $myrow['mbflag']=='K'
OR $myrow['mbflag']=='D') {
-
+
$DrillText = '%s%s';
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
@@ -132,12 +132,12 @@
OR $myrow['mbflag']=='K' //kit-set
OR $myrow['mbflag']=='A' // assembly
OR $myrow['mbflag']=='G') /* ghost */ {
-
+
$QuantityOnHand = _('N/A');
} else {
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
- }
-
+ }
+
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -372,8 +372,8 @@
//the link to delete a selected record was clicked instead of the Submit button
- $sql="DELETE FROM bom
- WHERE parent='".$SelectedParent."'
+ $sql="DELETE FROM bom
+ WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'
AND loccode='".$Location."'
AND workcentreadded='".$WorkCentre."'";
@@ -382,8 +382,8 @@
$DbgMsg = _('The SQL used to delete the BOM was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- $ComponentSQL = "SELECT component
- FROM bom
+ $ComponentSQL = "SELECT component
+ FROM bom
WHERE parent='" . $SelectedParent ."'";
$ComponentResult = DB_query($ComponentSQL,$db);
$ComponentArray = DB_fetch_row($ComponentResult);
@@ -453,7 +453,7 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
$ix = 0;
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -461,14 +461,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Assembly Parent Items
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='A'";
@@ -476,7 +476,7 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
@@ -485,14 +485,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Kit Sets
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='K'";
@@ -500,7 +500,7 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
@@ -509,14 +509,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Phantom/Ghosts
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='G'";
@@ -525,7 +525,7 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -533,7 +533,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
echo '<br />
<table class="selection">';
@@ -589,7 +589,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select=' . $SelectedParent .'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedComponent']) and $InputError !=1) {
@@ -601,7 +601,7 @@
workcentreadded,
quantity,
autoissue
- FROM bom
+ FROM bom
WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'";
@@ -784,7 +784,7 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
@@ -858,9 +858,9 @@
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>
- <br />
- <table class="selection" cellpadding="3">
+ <div>
+ <br />
+ <table class="selection" cellpadding="3">
<tr><td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
<td><b>' . _('OR') . '</b></td>
@@ -871,10 +871,10 @@
<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)
+ if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
-
+
echo '<br />
<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
@@ -883,9 +883,9 @@
<th>' . _('On Hand') . '</th>
<th>' . _('Units') . '</th>
</tr>';
-
+
echo $TableHeader;
-
+
$j = 1;
$k=0; //row colour counter
while ($myrow=DB_fetch_array($result)) {
@@ -911,17 +911,17 @@
$myrow['description'],
$StockOnHand,
$myrow['units']);
-
+
$j++;
//end of page full new headings if
}
//end of while loop
-
+
echo '</table>';
-
+
}
//end if results to show
-
+
if (!isset($SelectedParent) or $SelectedParent=='') {
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
@@ -941,7 +941,7 @@
foreach($array as $key => $item) {
// Serialize the current element and create a md5 hash
$hash = md5(serialize($item));
- // If the md5 didn't come up yet, add the element to
+ // If the md5 didn't come up yet, add the element to
// arrayRewrite, otherwise drop it
if (!isset($arrayHashes[$hash])) {
// Save the current element hash
@@ -958,4 +958,4 @@
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BackupDatabase.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -11,11 +11,11 @@
$BackupFiles = scandir('companies/' . $_SESSION['DatabaseName'], 0);
$DeletedFiles = false;
foreach ($BackupFiles as $BackupFile){
-
+
if (mb_substr($BackupFile,0,6)=='Backup'){
-
+
$DeleteResult = unlink('companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile);
-
+
if ($DeleteResult==true){
prnMsg(_('Deleted') . ' companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile,'info');
$DeletedFiles = true;
@@ -30,15 +30,15 @@
prnMsg(_('No backup files on the server were deleted'),'info');
}
} else {
-
+
$BackupFile = $rootpath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
-
-
+
+
$CommandOutput = array();
exec($Command,$CommandOutput, $ReturnValue);
-
+
if ($ReturnValue ==0) {
prnMsg(_('The backup file has now been created. You must now download this to your computer because in case the web-server has a disk failure the backup would then not on the same machine. Use the link below') . '<br /><br /><a href="' . $BackupFile . '">' . _('Download the backup file to your locale machine') . '</a>','success');
prnMsg(_('Once you have downloaded the database backup file to your local machine you should use the link below to delete it - backup files can consume a lot of space on your hosting account and will accumulate if not deleted - they also contain sensitive information which would otherwise be available for others to download!'),'info');
@@ -50,7 +50,7 @@
}
}
/*
-//this could be a weighty file attachment!!
+//this could be a weighty file attachment!!
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$attachment = $mail->getFile( $BackupFile);
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BankAccounts.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -318,7 +318,7 @@
$_POST['BankAccountNumber']='';
}
if (!isset($_POST['BankAccountCode'])) {
- $_POST['BankAccountCode']='';
+ $_POST['BankAccountCode']='';
}
if (!isset($_POST['BankAddress'])) {
$_POST['BankAddress']='';
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BankMatching.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -125,7 +125,7 @@
</tr>';
echo '<tr>
- <td>' . _('to') . ':</td>
+ <td>' . _('to') . ':</td>
<td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
</tr>';
echo '<tr>
@@ -343,4 +343,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BankReconciliation.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -254,8 +254,8 @@
//end of while loop
echo '<tr>
- <td><br /></td>
- </tr>
+ <td><br /></td>
+ </tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all unpresented cheques') . '</td>
<td class="number">' . locale_number_format($TotalUnpresentedCheques,$CurrencyRow['currdecimalplaces']) . '</td>
@@ -330,7 +330,7 @@
}
//end of while loop
echo '<tr>
- <td><br /></td>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all uncleared deposits') . '</td>
@@ -338,7 +338,7 @@
</tr>';
$FXStatementBalance = ($Balance*$CurrencyRow['rate'] - $TotalUnpresentedCheques -$TotalUnclearedDeposits);
echo '<tr>
- <td><br /></td>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6"><b>' . _('Bank statement balance should be') . ' (' . $CurrencyRow['currcode'] . ')</b></td>
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/COGSGLPostings.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -138,12 +138,12 @@
$sql = "INSERT INTO accountgroups ( groupname,
sectioninaccounts,
pandl,
- sequenceintb )
+ sequenceintb )
VALUES ('Sales',
'1',
'1',
'10')";
-
+
$result = DB_query($sql,$db);
}
$sql = "SELECT accountcode FROM chartmaster WHERE accountcode ='1'";
@@ -215,7 +215,7 @@
$myrow['id'],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow['id']);
-
+
}//END WHILE LIST LOOP
echo '</table>';
}
@@ -355,8 +355,8 @@
<div class="centre">
<input tabindex="5" type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/CompanyPreferences.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -524,4 +524,4 @@
echo '</div></form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -19,9 +19,9 @@
}
if (isset($_GET['LineNo'])){
- $LineNo = (int)$_GET['LineNo'];
+ $LineNo = (int)$_GET['LineNo'];
} elseif (isset($_POST['LineNo'])){
- $LineNo = (int)$_POST['LineNo'];
+ $LineNo = (int)$_POST['LineNo'];
} else {
echo '<div class="centre">
<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'. _('Select a line item to invoice').'</a>
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ConfirmDispatch_Invoice.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -116,7 +116,7 @@
$_SESSION['Items'.$identifier]->PhoneNo = $myrow['contactphone'];
$_SESSION['Items'.$identifier]->Email = $myrow['contactemail'];
$_SESSION['Items'.$identifier]->SalesPerson = $myrow['salesperson'];
-
+
$_SESSION['Items'.$identifier]->Location = $myrow['fromstkloc'];
$_SESSION['Items'.$identifier]->FreightCost = $myrow['freightcost'];
$_SESSION['Old_FreightCost'] = $myrow['freightcost'];
@@ -322,7 +322,7 @@
$_SESSION['Items'.$identifier]->totalVolume += ($LnItm->QtyDispatched * $LnItm->Volume);
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
- echo $RowStarter;
+ echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
<td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
@@ -635,9 +635,9 @@
} //end of loop around items on the order for negative check
if ($NegativesFound){
- echo '</div>';
- echo '</form>';
- echo '<div class="centre">
+ echo '</div>';
+ echo '</form>';
+ echo '<div class="centre">
<input type="submit" name="Update" value="' . _('Update'). '" /></div>';
include('includes/footer.inc');
exit;
@@ -941,7 +941,7 @@
/* Need to get the current location quantity
will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
+ $SQL="SELECT locstock.quantity
FROM locstock
WHERE locstock.stockid='" . $OrderLine->StockID . "'
AND loccode= '" . $_SESSION['Items'.$identifier]->Location . "'";
@@ -949,8 +949,8 @@
$Result = DB_query($SQL, $db, $ErrMsg);
if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
} else {
/* There must be some error this should never happen */
$QtyOnHandPrior = 0;
@@ -988,7 +988,7 @@
$StandardCost += ($AssParts['standard'] * $AssParts['quantity']) ;
/* Need to get the current location quantity
will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
+ $SQL="SELECT locstock.quantity
FROM locstock
WHERE locstock.stockid='" . $AssParts['component'] . "'
AND loccode= '" . $_SESSION['Items'.$identifier]->Location . "'";
@@ -996,9 +996,9 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Can not retrieve assembly components location stock quantities because ');
$DbgMsg = _('The SQL that failed was');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
- if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
+ if (DB_num_rows($Result)==1){
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
} else {
/*There must be some error this should never happen */
$QtyOnHandPrior = 0;
@@ -1060,7 +1060,7 @@
$OrderLine->StandardCost=0;
}
if ($MBFlag=='B' OR $MBFlag=='M'){
- $SQL = "INSERT INTO stockmoves (stockid,
+ $SQL = "INSERT INTO stockmoves (stockid,
type,
transno,
loccode,
@@ -1091,7 +1091,7 @@
'" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "',
'" . $OrderLine->Narrative . "' )";
} else {
- // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
+ // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
$OrderLine->StandardCost=0;
}
@@ -1157,7 +1157,7 @@
if ($OrderLine->Controlled ==1){
foreach($OrderLine->SerialItems as $Item){
- /*We need to add the StockSerialItem record and the StockSerialMoves as well */
+ /*We need to add the StockSerialItem record and the StockSerialMoves as well */
$SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . "
WHERE stockid='" . $OrderLine->StockID . "'
@@ -1678,4 +1678,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ContractBOM.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -399,7 +399,7 @@
}#end if SearchResults to show
echo '<hr />
- </div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ContractCosting.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -51,7 +51,7 @@
$InventoryIssues[$InventoryIssuesRow['stockid']]->Units = $InventoryIssuesRow['units'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->DecimalPlaces = $InventoryIssuesRow['decimalplaces'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->Matched = 0;
-
+
}
echo '<p class="page_title_text">
@@ -89,7 +89,7 @@
<th>' . _('Unit Cost') . '</th>
<th>' . _('Total Cost') . '</th>
</tr>';
-
+
$ContractBOMBudget = 0;
$ContractBOMActual = 0;
foreach ($_SESSION['Contract'.$identifier]->ContractBOM as $Component) {
@@ -100,9 +100,9 @@
<td>' . $Component->UOM . '</td>
<td class="number">' . locale_...
[truncated message content] |
