Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5615] trunk
|
From: <tim...@us...> - 2012-08-30 18:26:53
|
Revision: 5615
http://web-erp.svn.sourceforge.net/web-erp/?rev=5615&view=rev
Author: tim_schofield
Date: 2012-08-30 18:26:44 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Thomas Timothy Lie: Fix more typos in gettext strings
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndentedReverse.php
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/FixedAssetLocations.php
trunk/GLProfit_Loss.php
trunk/Labels.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/PurchData.php
trunk/SMTPServer.php
trunk/SalesInquiry.php
trunk/WOSerialNos.php
trunk/api/api_xml-rpc.php
trunk/reportwriter/languages/en_US/reports.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMExtendedQty.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -27,7 +27,7 @@
part char(20),
extendedqpa double,
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMIndentedReverse.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -23,7 +23,7 @@
part char(20),
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (
@@ -48,7 +48,7 @@
CONCAT(bom.component,bom.parent) AS sortpart
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -75,7 +75,7 @@
bom.quantity
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -106,7 +106,7 @@
bom.quantity
FROM bom,passbom
WHERE bom.component = passbom.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -126,7 +126,7 @@
CONCAT(passbom2.sortpart,bom.parent) AS sortpart
FROM bom,passbom2
WHERE bom.component = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$result = DB_query("SELECT COUNT(*) FROM bom,passbom WHERE bom.component = passbom.part",$db);
@@ -172,8 +172,8 @@
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)){
$YPos -=$line_height;
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/ConfirmDispatch_Invoice.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -830,7 +830,7 @@
} else {
$AssetNumber = intval(mb_substr($OrderLine->StockID,6,mb_strlen($OrderLine->StockID)-$HyphenOccursAt-1));
}
- prnMsg (_('The asset number beind disposed of is:') . ' ' . $AssetNumber, 'info');
+ prnMsg (_('The asset number being disposed of is:') . ' ' . $AssetNumber, 'info');
} else {
$IsAsset = false;
$AssetNumber = 0;
@@ -1440,7 +1440,7 @@
'" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('disposal') . "',
'" . -$DisposalRow['cost'] . "')";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on dispoal GL posting could not be inserted because');
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on disposal GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GLTrans record was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
}
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/CounterSales.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -996,13 +996,13 @@
/* Now Get the area where the sale is to from the branches table */
- $SQL = "SELECT area,
+ $SQL = "SELECT area,
defaultshipvia
FROM custbranch
WHERE custbranch.debtorno ='". $_SESSION['Items'.$identifier]->DebtorNo . "'
AND custbranch.branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "'";
- $ErrMsg = _('We were unable to load the area where the sale is to from the custbranch table');
+ $ErrMsg = _('We were unable to load the area from the custbranch table where the sale is to ');
$Result = DB_query($SQL,$db, $ErrMsg);
$myrow = DB_fetch_row($Result);
$Area = $myrow[0];
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/FixedAssetLocations.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -28,7 +28,7 @@
}
}
if (isset($_GET['SelectedLocation'])) {
- $sql="SELECT * FROM fixedassetlocations
+ $sql="SELECT * FROM fixedassetlocations
WHERE locationid='".$_GET['SelectedLocation']."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -50,11 +50,11 @@
$InputError=1;
}
if ($InputError==0) {
- $sql="UPDATE fixedassetlocations
+ $sql="UPDATE fixedassetlocations
SET locationdescription='" . $_POST['LocationDescription'] . "',
parentlocationid='" . $_POST['ParentLocationID'] . "'
WHERE locationid ='" . $_POST['LocationID'] . "'";
-
+
$result=DB_query($sql,$db);
echo '<meta http-equiv="Refresh" content="0; url="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'">';
}
@@ -74,7 +74,7 @@
$result = DB_query($sql,$db);
$myrow=DB_fetch_row($result);
if ($myrow[0]>0) {
- prnMsg(_('You have assets in this location location so it cannot be removed'), 'warn');
+ prnMsg(_('You have assets in this location so it cannot be removed'), 'warn');
$InputError=1;
}
if ($InputError==0) {
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/GLProfit_Loss.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -12,8 +12,8 @@
$_POST['SelectADifferentPeriod']='Select A Different Period';
}
-if ((!isset($_POST['FromPeriod'])
- AND !isset($_POST['ToPeriod']))
+if ((!isset($_POST['FromPeriod'])
+ AND !isset($_POST['ToPeriod']))
OR isset($_POST['SelectADifferentPeriod'])){
include('includes/header.inc');
@@ -21,12 +21,12 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . '
</p>';
- echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
+ echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statement, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
'<br />'
. _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />'
. _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
-
+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -46,9 +46,9 @@
<tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
- $sql = "SELECT periodno,
- lastdate_in_period
- FROM periods
+ $sql = "SELECT periodno,
+ lastdate_in_period
+ FROM periods
ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
@@ -594,7 +594,7 @@
accountgroups.sequenceintb,
accountgroups.groupname,
chartdetails.accountcode";
-
+
$AccountsResult = DB_query($SQL,$db,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was'));
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" />' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>';
@@ -814,7 +814,7 @@
locale_number_format($TotalIncome - $SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($TotalBudgetIncome - $SectionPrdBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($TotalLYIncome - $SectionPrdLY,$_SESSION['CompanyRecord']['decimalplaces']));
-
+
if ($TotalIncome !=0){
$PrdGPPercent = 100*($TotalIncome - $SectionPrdActual)/$TotalIncome;
} else {
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/Labels.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -42,7 +42,7 @@
WHERE labelfieldid='" . $_POST['LabelFieldID' . $i] . "'",
$db);
} else {
- prnMsg (_('Entries for Vertical Position, Horizonal Position, and Font Size must be integers.'),'error');
+ prnMsg (_('Entries for Vertical Position, Horizontal Position, and Font Size must be integers.'),'error');
}
}
}
@@ -433,7 +433,7 @@
FROM labelfields
WHERE labelid = '" . $SelectedLabelID . "'
ORDER BY vpos DESC";
- $ErrMsg = _('Could note get the label fields because');
+ $ErrMsg = _('Could not get the label fields because');
$result = DB_query($SQL,$db,$ErrMsg);
$i=0;
echo '<table class="selection">
@@ -443,7 +443,7 @@
<tr>
<th>' . _('Field') . '</th>
<th>' . _('Vertical') . '<br />' . _('Position') . '<br />(VPos)</th>
- <th>' . _('Horizonal') . '<br />' . _('Position') . '<br />(HPos)</th>
+ <th>' . _('Horizontal') . '<br />' . _('Position') . '<br />(HPos)</th>
<th>' . _('Font Size') . '</th>
<th>' . _('Bar-code') . '</th>
</tr>';
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRP.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -24,7 +24,7 @@
$sql = "CREATE TEMPORARY TABLE passbom (part char(20),
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (parent char(20),
Modified: trunk/MRPCalendar.php
===================================================================
--- trunk/MRPCalendar.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRPCalendar.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -83,15 +83,15 @@
manufacturingflag smallint(6) NOT NULL default '1',
INDEX (daynumber),
PRIMARY KEY (calendardate)) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$i = 0;
/* $DaysTextArray used so can get text of day based on the value get from DayOfWeekFromSQLDate of
- the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
+ the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
$DaysTextArray = array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-
+
$ExcludeDays = array($_POST['Sunday'],$_POST['Monday'],$_POST['Tuesday'],$_POST['Wednesday'],
$_POST['Thursday'],$_POST['Friday'],$_POST['Saturday']);
@@ -122,7 +122,7 @@
// manufacturing day that precedes it. That way can read the table by the non-manufacturing day,
// subtract the leadtime from the daynumber, and find the valid manufacturing day with that daynumber.
$DayNumber = 1;
- $sql = "SELECT * FROM mrpcalendar
+ $sql = "SELECT * FROM mrpcalendar
ORDER BY calendardate";
$result = DB_query($sql,$db,$ErrMsg);
while ($myrow = DB_fetch_array($result)) {
@@ -306,7 +306,7 @@
if (!isset($_POST['ChangeDate'])) {
$_POST['ChangeDate']=date($_SESSION['DefaultDateFormat']);
}
-
+
echo '<br />
<table class="selection">
<tr>
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/PurchData.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -8,15 +8,15 @@
include ('includes/header.inc');
if (isset($_GET['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
} elseif (isset($_POST['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
}
if (isset($_GET['StockID'])) {
- $StockID = trim(mb_strtoupper($_GET['StockID']));
+ $StockID = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])) {
- $StockID = trim(mb_strtoupper($_POST['StockID']));
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
}
if (isset($_POST['StockUOM'])) {
@@ -28,12 +28,13 @@
echo '<a href="' . $rootpath . '/SelectProduct.php">' . _('Back to Items') . '</a><br />';
if (isset($_POST['SupplierDescription'])) {
- $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
+ $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
}
if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)) { /*Validate Inputs */
$InputError = 0; /*Start assuming the best */
- if ($StockID == '' OR !isset($StockID)) {
+
+if ($StockID == '' OR !isset($StockID)) {
$InputError = 1;
prnMsg(_('There is no stock item set up enter the stock code or select a stock item using the search page'), 'error');
}
@@ -41,8 +42,7 @@
$InputError = 1;
unset($_POST['Price']);
prnMsg(_('The price entered was not numeric and a number is expected. No changes have been made to the database'), 'error');
- }
- if ($_POST['Price'] == 0) {
+ }elseif ($_POST['Price'] == 0) {
prnMsg(_('The price entered is zero') . ' ' . _('Is this intentional?'), 'warn');
}
if (!is_numeric(filter_number_format($_POST['LeadTime']))) {
@@ -60,252 +60,227 @@
unset($_POST['ConversionFactor']);
prnMsg(_('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br />' . _('E.g.') . ' ' . _('The supplier sells an item by the tonne and we hold stock by the kg') . '. ' . _('The suppliers price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br /><br />' . _('No changes will be made to the database'), 'error');
}
- if ($InputError == 0 AND isset($_POST['AddRecord'])) {
- $sql = "INSERT INTO purchdata (supplierno,
- stockid,
- price,
- effectivefrom,
- suppliersuom,
- conversionfactor,
- supplierdescription,
- suppliers_partno,
- leadtime,
- minorderqty,
- preferred)
- VALUES ('" . $SupplierID . "',
- '" . $StockID . "',
- '" . filter_number_format($_POST['Price']) . "',
- '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
- '" . $_POST['SuppliersUOM'] . "',
- '" . $_POST['ConversionFactor'] . "',
- '" . $_POST['SupplierDescription'] . "',
- '" . $_POST['SupplierCode'] . "',
- '" . $_POST['LeadTime'] . "',
- '" . $_POST['MinOrderQty'] . "',
- '" . $_POST['Preferred'] . "'
- )";
- $ErrMsg = _('The supplier purchasing details could not be added to the database because');
- $DbgMsg = _('The SQL that failed was');
- $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
-
- /* If the new purchdata is the preferred one, the old ones from the same suppliers shouldn't be preferred.
- Are kept only for historic information only */
- if ($_POST['Preferred'] == 1){
- $sql = "UPDATE purchdata SET preferred='0'
- WHERE purchdata.stockid='".$StockID."'
- AND purchdata.supplierno='".$SupplierID."'
- AND purchdata.effectivefrom < '" . FormatDateForSQL($_POST['EffectiveFrom']) . "'";
- $ErrMsg = _('The preferred supplier details could not be update because');
- $DbgMsg = _('The SQL that failed was');
- $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('Supplier preferred flag has been updated'), 'success');
- }
- }
- if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
- $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
- effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
- suppliersuom='" . $_POST['SuppliersUOM'] . "',
- conversionfactor='" . $_POST['ConversionFactor'] . "',
- supplierdescription='" . $_POST['SupplierDescription'] . "',
- suppliers_partno='" . $_POST['SupplierCode'] . "',
- leadtime='" . $_POST['LeadTime'] . "',
- minorderqty='" . $_POST['MinOrderQty'] . "',
- preferred='" . $_POST['Preferred'] . "'
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ $sql = "INSERT INTO purchdata (supplierno,
+ stockid,
+ price,
+ effectivefrom,
+ suppliersuom,
+ conversionfactor,
+ supplierdescription,
+ suppliers_partno,
+ leadtime,
+ minorderqty,
+ preferred)
+ VALUES ('" . $SupplierID . "',
+ '" . $StockID . "',
+ '" . filter_number_format($_POST['Price']) . "',
+ '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ '" . $_POST['SuppliersUOM'] . "',
+ '" . filter_number_format($_POST['ConversionFactor']) . "',
+ '" . $_POST['SupplierDescription'] . "',
+ '" . $_POST['SupplierCode'] . "',
+ '" . filter_number_format($_POST['LeadTime']) . "', '" . filter_number_format($_POST['MinOrderQty']) . "',
+ '" . $_POST['Preferred'] . "')";
+ $ErrMsg = _('The supplier purchasing details could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
+ }
+ if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+ $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
+ effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ suppliersuom='" . $_POST['SuppliersUOM'] . "',
+ conversionfactor='" . filter_number_format($_POST['ConversionFactor']) . "',
+ supplierdescription='" . $_POST['SupplierDescription'] . "',
+ suppliers_partno='" . $_POST['SupplierCode'] . "',
+ leadtime='" . filter_number_format($_POST['LeadTime']) . "',
+ minorderqty='" . filter_number_format($_POST['MinOrderQty']) . "',
+ preferred='" . $_POST['Preferred'] . "'
WHERE purchdata.stockid='".$StockID."'
- AND purchdata.supplierno='".$SupplierID."'
- AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be update because');
- $DbgMsg = _('The SQL that failed was');
- $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('Supplier purchasing data has been updated'), 'success');
- }
- if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
- /*update or insert took place and need to clear the form */
- unset($SupplierID);
- unset($_POST['Price']);
- unset($CurrCode);
- unset($_POST['SuppliersUOM']);
- unset($_POST['EffectiveFrom']);
- unset($_POST['ConversionFactor']);
- unset($_POST['SupplierDescription']);
- unset($_POST['LeadTime']);
- unset($_POST['Preferred']);
- unset($_POST['SupplierCode']);
- unset($_POST['MinOrderQty']);
- unset($SuppName);
- }
+ AND purchdata.supplierno='".$SupplierID."'
+ AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details could not be updated because');
+ $DbgMsg = _('The SQL that failed was'
+);
+ $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('Supplier purchasing data has been updated'), 'success');
+ }
+ if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
+ /*update or insert took place and need to clear the form */
+ unset($SupplierID);
+ unset($_POST['Price']);
+ unset($CurrCode);
+ unset($_POST['SuppliersUOM']);
+ unset($_POST['EffectiveFrom']);
+ unset($_POST['ConversionFactor']
+);
+ unset($_POST['SupplierDescription']);
+ unset($_POST['LeadTime']);
+ unset($_POST['Preferred']);
+ unset($_POST['SupplierCode']);
+ unset($_POST['MinOrderQty']);
+ unset($SuppName);
+ }
}
if (isset($_GET['Delete'])) {
- $sql = "DELETE FROM purchdata
- WHERE purchdata.supplierno='".$SupplierID."'
- AND purchdata.stockid='".$StockID."'
- AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be deleted because');
- $DelResult = DB_query($sql, $db, $ErrMsg);
- prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
- unset($SupplierID);
+ $sql = "DELETE FROM purchdata
+ WHERE purchdata.supplierno='".$SupplierID."'
+ AND purchdata.stockid='".$StockID."'
+ AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details could not be deleted because');
+ $DelResult = DB_query($sql, $db, $ErrMsg);
+ prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
+ unset($SupplierID);
}
if (!isset($_GET['Edit'])) {
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
- $sql = "SELECT purchdata.supplierno,
- suppliers.suppname,
- purchdata.price,
- suppliers.currcode,
- purchdata.effectivefrom,
- purchdata.suppliersuom,
- purchdata.supplierdescription,
- purchdata.leadtime,
- purchdata.suppliers_partno,
- purchdata.minorderqty,
- purchdata.preferred,
- purchdata.conversionfactor,
- currencies.decimalplaces AS currdecimalplaces
- FROM purchdata
- INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE purchdata.stockid = '" . $StockID . "'
- ORDER BY purchdata.effectivefrom DESC, supplierno";
- $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
- $PurchDataResult = DB_query($sql, $db, $ErrMsg);
- if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
+ $sql = "SELECT purchdata.supplierno,
+ suppliers.suppname,
+ purchdata.price,
+ suppliers.currcode,
+ purchdata.effectivefrom,
+ purchdata.suppliersuom,
+ purchdata.supplierdescription,
+ purchdata.leadtime,
+ purchdata.suppliers_partno,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ purchdata.conversionfactor,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchdata.stockid = '" . $StockID . "'
+ ORDER BY purchdata.effectivefrom DESC";
+ $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
+ $PurchDataResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
- $sql="SELECT stockmaster.decimalplaces
- FROM stockmaster
- WHERE stockmaster.stockid = '" . $StockID . "'";
- $DecimalPlacesResult=DB_query($sql, $db);
- $DecimalPlacesRow=DB_fetch_array($DecimalPlacesResult);
- $StockDecimalPlaces=$DecimalPlacesRow['decimalplaces'];
$NoPurchasingData=1;
- } else if ($StockID != '') {
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Supplier') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Currency') . '</th>
- <th>' . _('Effective From') . '</th>
- <th>' . _('Supplier Unit') . '</th>
- <th>' . _('Conversion Factor') . '</th>
- <th>' . _('Price Our Units') . '</th>
- <th>' . _('Min Order Qty') . '</th>
- <th>' . _('Lead Time') . '</th>
- <th>' . _('Preferred') . '</th>
- </tr>';
- echo $TableHeader;
- $CountPreferreds = 0;
- $k = 0; //row colour counter
- while ($myrow = DB_fetch_array($PurchDataResult)) {
- if ($myrow['preferred'] == 1) {
- echo '<tr class="EvenTableRows">';
- } elseif ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
- if ($myrow['preferred'] == 1) {
- $DisplayPreferred = _('Yes');
- $CountPreferreds++;
- } else {
- $DisplayPreferred = _('No');
- }
- printf('<td>%s</td>
+ } else if ($StockID != '') {
+ echo '<table cellpadding="2" class="selection">';
+ $TableHeader = '<tr><th>' . _('Supplier') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Supplier Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th>' . _('Cost Per Our Unit') . '</th>
+ <th>' . _('Currency') . '</th>
+ <th>' . _('Effective From') . '</th>
+ <th>' . _('Min Order Qty') . '</th>
+ <th>' . _('Lead Time') . '</th>
+ <th>' . _('Preferred') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $CountPreferreds = 0;
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($PurchDataResult)) {
+ if ($myrow['preferred'] == 1) {
+ echo '<tr class="EvenTableRows">';
+ } elseif ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ if ($myrow['preferred'] == 1) {
+ $DisplayPreferred = _('Yes');
+ $CountPreferreds++;
+
+ } else {
+ $DisplayPreferred = _('No');
+ }
+ $UPriceDecimalPlaces = max($myrow['currdecimalplaces'],$_Session['StandardCostDecimalPlaces']);
+ printf('<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s ' . _('days') . '</td>
<td>%s</td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Copy=1&EffectiveFrom=%s">' . _('Copy') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this suppliers price?') . '\');">' . _('Delete') . '</a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s ' . _('days') . '</td>
+ <td>%s</td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick=\'return confirm("' . _('Are you sure you wish to delete this suppliers price?') . '");\'>' . _('Delete') . '</a></td>
</tr>',
$myrow['suppname'],
- locale_number_format($myrow['price'], $myrow['currdecimalplaces']),
- $myrow['currcode'],
- ConvertSQLDate($myrow['effectivefrom']),
+ locale_number_format($myrow['price'],$UPriceDecimalPlaces),
$myrow['suppliersuom'],
locale_number_format($myrow['conversionfactor'],'Variable'),
- locale_number_format($myrow['price']/$myrow['conversionfactor'],$myrow['currdecimalplaces']),
+ locale_number_format($myrow['price']/$myrow['conversionfactor'],$UPriceDecimalPlaces),
+ $myrow['currcode'],
+ ConvertSQLDate($myrow['effectivefrom']),
locale_number_format($myrow['minorderqty'],'Variable'),
locale_number_format($myrow['leadtime'],'Variable'),
$DisplayPreferred,
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
+ htmlspecialchars($_SERVER['PHP_SELF']),
$StockID,
$myrow['supplierno'],
$myrow['effectivefrom'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
+ htmlspecialchars($_SERVER['PHP_SELF']),
$StockID,
$myrow['supplierno'],
- $myrow['effectivefrom'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
- $StockID,
- $myrow['supplierno'],
$myrow['effectivefrom']);
- } //end of while loop
- echo '</table><br />';
- if ($CountPreferreds > 1) {
- prnMsg(_('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'), 'warn');
- } elseif ($CountPreferreds == 0) {
- prnMsg(_('There are NO preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should make one supplier only the preferred supplier'), 'warn');
- }
- } // end of there are purchsing data rows to show
- echo '<br />';
+ } //end of while loop
+ echo '</table><br/>';
+ if ($CountPreferreds > 1) {
+ prnMsg(_('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'), 'warn');
+ } elseif ($CountPreferreds == 0) {
+ prnMsg(_('There are NO preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should make one supplier only the preferred supplier'), 'warn');
+ }
+ } // end of there are purchsing data rows to show
+ echo '<br/>';
} /* Only show the existing purchasing data records if one is not being edited */
-if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
- $sql = "SELECT suppliers.suppname,
+if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN
+ EXISTING BUT SUPPLIER selected OR ENTERED*/
+ $sql = "SELECT suppliers.suppname,
suppliers.currcode,
currencies.decimalplaces AS currdecimalplaces
- FROM suppliers
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE supplierid='".$SupplierID."'";
- $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
- $DbgMsg = _('The SQL that failed was');
- $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- if (DB_num_rows($SuppSelResult) == 1) {
- $myrow = DB_fetch_array($SuppSelResult);
- $SuppName = $myrow['suppname'];
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- } else {
- prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
- unset($SupplierID);
- }
+ FROM suppliers
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='".$SupplierID."'";
+ $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ if (DB_num_rows($SuppSelResult) == 1) {
+ $myrow = DB_fetch_array($SuppSelResult);
+ $SuppName = $myrow['suppname'];
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ } else {
+ prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
+ unset($SupplierID);
+ }
} else {
- if ($NoPurchasingData=0) {
+ if ($NoPurchasingData==0) {
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
}
- if (!isset($_POST['SearchSupplier'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
+ if (!isset($_POST['SearchSupplier'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table cellpadding="3" colspan="4" class="selection">
+ <tr>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
- echo '<table cellpadding="3" class="selection">
- <tr>';
- echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
- echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
- echo '<td><b>' . _('OR') . '</b></td>';
- echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>';
- echo '<td><input type="text" name="SupplierCode" size="10" maxlength="10" /></td>';
- echo '</tr></table><br />';
- echo '<div class="centre">
+ echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+ echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
+ echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
+ echo '<td><b>' . _('OR') . '</b></td>';
+ echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>';
+ echo '<td><input type="text" name="SupplierCode" size="20" maxlength="50" /></td>';
+ echo '</tr></table><br />';
+ echo '<div class="centre">
<input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" />
</div>
- </div>
</form>';
- include ('includes/footer.inc');
- exit;
- };
+ include ('includes/footer.inc');
+ exit;
+ };
}
if (isset($_GET['Edit'])) {
@@ -313,15 +288,15 @@
}
if (isset($_POST['SearchSupplier'])) {
- if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
- prnMsg( _('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.', 'info' );
- echo '<br />';
- }
- if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
- $_POST['Keywords'] = ' ';
- }
- if (mb_strlen($_POST['Keywords']) > 0) {
- //insert wildcard characters in spaces
+ if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
+ prnMsg( _('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.', 'info' );
+ echo '<br />';
+ }
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ $_POST['Keywords'] = ' ';
+ }
+ if (mb_strlen($_POST['Keywords']) > 0) {
+ //insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT suppliers.supplierid,
@@ -330,65 +305,63 @@
suppliers.address1,
suppliers.address2,
suppliers.address3
- FROM suppliers
- WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
+ FROM suppliers
+ WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
- } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
- $SQL = "SELECT suppliers.supplierid,
+ } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.currcode,
suppliers.address1,
suppliers.address2,
suppliers.address3
- FROM suppliers
- WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
+ FROM suppliers
+ WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
- } //one of keywords or SupplierCode was more than a zero length string
- $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
- $DbgMsg = _('The SQL to retrieve supplier details that failed was');
- $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+ } //one of keywords or SupplierCode was more than a zero length string
+ $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
+ $DbgMsg = _('The SQL to retrieve supplier details that failed was');
+ $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
} //end of if search
-if (isset($StockID)) {
- $result = DB_query("SELECT stockmaster.description,
+if (isset($SuppliersResult)) {
+ if (isset($StockID)) {
+ $result = DB_query("SELECT stockmaster.description,
stockmaster.units,
stockmaster.mbflag
FROM stockmaster
WHERE stockmaster.stockid='".$StockID."'", $db);
- $myrow = DB_fetch_array($result);
- $StockUOM = $myrow['units'];
- if (DB_num_rows($result) == 1) {
- if ($myrow['mbflag'] == 'D' OR $myrow['mbflag'] == 'A' OR $myrow['mbflag'] == 'K') {
- prnMsg($StockID . ' - ' . $myrow['description'] . '<br /> ' . _('The item selected is a dummy part or an assembly or kit set part') . ' - ' . _('it is not purchased') . '. ' . _('Entry of purchasing information is therefore inappropriate'), 'warn');
- include ('includes/footer.inc');
- exit;
- } else {
- // echo '<br /><font color="blue" size="3"><b>' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('In Units of') . ' ' . $myrow[1] . ' )</font>';
- }
- } else {
- prnMsg(_('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
- }
-} else {
- $StockID = '';
- $StockUOM = 'each';
-}
-
-if (isset($SuppliersResult)) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
+ $myrow = DB_fetch_row($result);
+ $StockUOM = $myrow[1];
+ if (DB_num_rows($result) == 1) {
+ if ($myrow[2] == 'D' OR $myrow[2] == 'A' OR $myrow[2] == 'K') {
+ prnMsg($StockID . ' - ' . $myrow[0] . '<p> ' . _('The item selected is a dummy part or an assembly or kit set part') . ' - ' . _('it is not purchased') . '. ' . _('Entry of purchasing information is therefore inappropriate'), 'warn');
+ include ('includes/footer.inc');
+ exit;
+ } else {
+ // echo '<br /><b>' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('In Units of') . ' ' . $myrow[1] . ' )';
+ }
+ } else {
+ prnMsg(_('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
+ }
+ } else {
+ $StockID = '';
+ $StockUOM = 'each';
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table cellpadding="2" colspan="7" class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Supplier Name') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Address 1') . '</th>
<th>' . _('Address 2') . '</th>
<th>' . _('Address 3') . '</th>
</tr>';
- echo $TableHeader;
+ echo $TableHeader;
$k = 0;
- while ($myrow = DB_fetch_array($SuppliersResult)) {
+ while ($myrow = DB_fetch_array($SuppliersResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -396,34 +369,34 @@
echo '<tr class="OddTableRows">';
$k++;
}
- printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s',
- $myrow['supplierid'],
- $myrow['suppname'],
- $myrow['currcode'],
- $myrow['address1'],
- $myrow['address2'],
- $myrow['address3']);
+ printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['currcode'],
+ $myrow['address1'],
+ $myrow['address2'],
+ $myrow['address3']);
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
- echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" /></td></tr>';
+ echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+ echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" />';
- }
- //end of while loop
- echo '</table><br/>';
- echo '</div>
- </form>';
+ }
+ //end of while loop
+ echo '</table><br/></form>';
}
//end if results to show
/*Show the input form for new supplier purchasing details */
if (!isset($SuppliersResult)) {
- if (isset($_GET['Edit']) or isset($_GET['Copy'])) {
- $sql = "SELECT purchdata.supplierno,
+ if (isset($_GET['Edit'])) {
+
+ $sql = "SELECT purchdata.supplierno,
suppliers.suppname,
purchdata.price,
purchdata.effectivefrom,
@@ -447,134 +420,127 @@
AND purchdata.stockid='".$StockID."'
AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details for the selected supplier and item could not be retrieved because');
- $EditResult = DB_query($sql, $db, $ErrMsg);
- $myrow = DB_fetch_array($EditResult);
- $SuppName = $myrow['suppname'];
- if (isset($_GET['Edit'])) {
- $_POST['EffectiveFrom'] = ConvertSQLDate($myrow['effectivefrom']);
- $_POST['Price'] = $myrow['price'];
- } else {
- $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
- $_POST['Price'] = 0;
- }
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- $_POST['SuppliersUOM'] = $myrow['suppliersuom'];
- $_POST['SupplierDescription'] = $myrow['supplierdescription'];
- $_POST['LeadTime'] = locale_number_format($myrow['leadtime'],'Variable');
+ $ErrMsg = _('The supplier purchasing details for the selected supplier and item could not be retrieved because');
+ $EditResult = DB_query($sql, $db, $ErrMsg);
+ $myrow = DB_fetch_array($EditResult);
+ $SuppName = $myrow['suppname'];
+ $UPriceDecimalPlaces = max($myrow['currdecimalplaces'],$_Session['StandardCostDecimalPlaces']);
+ $_POST['Price'] = locale_number_format(round($myrow['price'],$UPriceDecimalPlaces),$UPriceDecimalPlaces);
+ $_POST['EffectiveFrom'] = ConvertSQLDate($myrow['effectivefrom']);
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ $_POST['SuppliersUOM'] = $myrow['suppliersuom'];
+ $_POST['SupplierDescription'] = $myrow['supplierdescription'];
+ $_POST['LeadTime'] = locale_number_format($myrow['leadtime'],'Variable');
- $_POST['ConversionFactor'] = locale_number_format($myrow['conversionfactor'],'Variable');
- $_POST['Preferred'] = $myrow['preferred'];
- $_POST['MinOrderQty'] = locale_number_format($myrow['minorderqty'],'Variable');
- $_POST['SupplierCode'] = $myrow['suppliers_partno'];
+ $_POST['ConversionFactor'] = locale_number_format($myrow['conversionfactor'],'Variable');
+ $_POST['Preferred'] = $myrow['preferred'];
+ $_POST['MinOrderQty'] = locale_number_format($myrow['minorderqty'],'Variable');
+ $_POST['SupplierCode'] = $myrow['suppliers_partno'];
$StockUOM=$myrow['units'];
- }
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class="selection">
- <tr>
- <th colspan="3"><h3>' . _('Data for Purchasing') . ' ' . $StockID . ' ' . _('from') . ' '. $SupplierID . '</h3></th>
- </tr>';
- if (!isset($SupplierID)) {
- $SupplierID = '';
- }
+ if (!isset($SupplierID)) {
+ $SupplierID = '';
+ }
if (isset($_GET['Edit'])) {
- echo '<tr><td>' . _('Supplier Name') . ':</td>
- <td><input type="hidden" name="SupplierID" value="' . $SupplierID . '" />' . $SupplierID . ' - ' . $SuppName . '<input type="hidden" name="WasEffectiveFrom" value="' . $myrow['effectivefrom'] . '" /></td>
- </tr>';
- } else {
- echo '<tr>
- <td>' . _('Supplier Name') . ':
- <input type="hidden" name="SupplierID" maxlength="10" size="11" value="' . $SupplierID . '" />
- </td>';
- if (!isset($SuppName) OR $SuppName == "") {
- echo '<td>(' . _('A search facility is available below if necessary') . ')';
- } else {
+ echo '<tr><td>' . _('Supplier Name') . ':</td>
+ <td><input type="hidden" name="SupplierID" value="' . $SupplierID . '" />' . $SupplierID . ' - ' . $SuppName . '<input type="hidden" name="WasEffectiveFrom" value="' . $myrow['effectivefrom'] . '" /></td>
+ </tr>';
+ } else {
+ echo '<tr>
+ <td>' . _('Supplier Name') . ':</td>
+ <input type="hidden" name="SupplierID" maxlength="10" size="11" value="' . $SupplierID . '" />';
+ if ($SupplierID!='') {
echo '<td>'.$SuppName;
}
- echo '</td></tr>';
- }
- echo '<tr><td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" /></td></tr>';
- if (!isset($CurrCode)) {
- $CurrCode = '';
- }
- if (!isset($_POST['Price'])) {
- $_POST['Price'] = 0;
- }
- if (!isset($_POST['EffectiveFrom'])) {
- $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
- }
- if (!isset($_POST['SuppliersUOM'])) {
- $_POST['SuppliersUOM'] = '';
- }
- if (!isset($_POST['SupplierDescription'])) {
- $_POST['SupplierDescription'] = '';
- }
+ if (!isset($SuppName) OR $SuppName = "") {
+ echo '(' . _('A search facility is available below if necessary') . ')';
+ } else {
+ echo '<td>'.$SuppName;
+ }
+ echo '</td></tr>';
+ }
+ echo '<td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" />';
+ if (!isset($CurrCode)) {
+ $CurrCode = '';
+ }
+ if (!isset($_POST['Price'])) {
+ $_POST['Price'] = 0;
+ }
+ if (!isset($_POST['EffectiveFrom'])) {
+ $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
+ }
+ if (!isset($_POST['SuppliersUOM'])) {
+ $_POST['SuppliersUOM'] = '';
+ }
+ if (!isset($_POST['SupplierDescription'])) {
+ $_POST['SupplierDescription'] = '';
+ }
if (!isset($_POST['SupplierCode'])) {
- $_POST['SupplierCode'] = '';
- }
+ $_POST['SupplierCode'] = '';
+ }
if (!isset($_POST['MinOrderQty'])) {
- $_POST['MinOrderQty'] = '1';
- }
- echo '<tr><td>' . _('Currency') . ':</td>
- <td><input type="hidden" name="CurrCode" value="' . $CurrCode . '" />' . $CurrCode . '</td></tr>';
- echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
+ $_POST['MinOrderQty'] = '1';
+ }
+ echo '<tr><td>' . _('Currency') . ':</td>
+ <td><input type="hidden" name="CurrCode" . value="' . $CurrCode . '" />' . $CurrCode . '</td></tr>';
+ echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
<td><input type="text" class="number" name="Price" maxlength="12" size="12" value="' . $_POST['Price'] . '" /></td></tr>';
- echo '<tr><td>' . _('Date Updated') . ':</td>
+ echo '<tr><td>' . _('Date Updated') . ':</td>
<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom" maxlength="10" size="11" value="' . $_POST['EffectiveFrom'] . '" /></td></tr>';
- echo '<tr><td>' . _('Our Unit of Measure') . ':</td>';
+ echo '<tr><td>' . _('Our Unit of Measure') . ':</td>';
if (isset($SupplierID)) {
echo '<td>' . $StockUOM . '</td></tr>';
}
- echo '<tr><td>' . _('Suppliers Unit of Measure') . ':</td>';
- echo '<td><input type="text" name="SuppliersUOM" size="20" maxlength="20" value ="' . $_POST['SuppliersUOM'] . '"/>';
- echo '</td></tr>';
- if (!isset($_POST['ConversionFactor'])
+ echo '<tr><td>' . _('Suppliers Unit of Measure') . ':</td>';
+ echo '<td><input type="text" name="SuppliersUOM" size="20" maxlength="20" value ="' . $_POST['SuppliersUOM'] . '"/>';
+ echo '</td></tr>';
+ if (!isset($_POST['ConversionFactor'])
OR $_POST['ConversionFactor'] == '') {
- $_POST['ConversionFactor'] = 1;
- }
- echo '<tr><td>' . _('Conversion Factor (to our UOM)') . ':</td>
+ $_POST['ConversionFactor'] = 1;
+ }
+ echo '<tr><td>' . _('Conversion Factor (to our UOM)') . ':</td>
<td><input type="text" class="number" name="ConversionFactor" maxlength="12" size="12" value="' . $_POST['ConversionFactor'] . '" /></td></tr>';
- echo '<tr><td>' . _('Supplier Stock Code') . ':</td>
+ echo '<tr><td>' . _('Supplier Stock Code') . ':</td>
<td><input type="text" name="SupplierCode" maxlength="50" size="20" value="' . $_POST['SupplierCode'] . '" /></td></tr>';
- echo '<tr><td>' . _('MinOrderQty') . ':</td>
+ echo '<tr><td>' . _('MinOrderQty') . ':</td>
<td><input type="text" class="number" name="MinOrderQty" maxlength="15" size="15" value="' . $_POST['MinOrderQty'] . '" /></td></tr>';
- echo '<tr><td>' . _('Supplier Stock Description') . ':</td>
- <td><input type="text" name="SupplierDescription" maxlength="50" size="50" value="' . $_POST['SupplierDescription'] . '" /></td></tr>';
- if (!isset($_POST['LeadTime']) OR $_POST['LeadTime'] == "") {
- $_POST['LeadTime'] = 1;
- }
- echo '<tr><td>' . _('Lead Time') . ' (' . _('in days from date of order') . '):</td>
+ echo '<tr><td>' . _('Supplier Stock Description') . ':</td>
+ <td><input type="text" name="SupplierDescription" maxlength="50" size="51" value="' . $_POST['SupplierDescription'] . '" /></td></tr>';
+ if (!isset($_POST['LeadTime']) OR $_POST['LeadTime'] == "") {
+ $_POST['LeadTime'] = 1;
+ }
+ echo '<tr><td>' . _('Lead Time') . ' (' . _('in days from date of order') . '):</td>
<td><input type="text" class="number" name="LeadTime" maxlength="4" size="5" value="' . $_POST['LeadTime'] . '" /></td></tr>';
- echo '<tr><td>' . _('Preferred Supplier') . ':</td>
+ echo '<tr><td>' . _('Preferred Supplier') . ':</td>
<td><select name="Preferred">';
- if ($_POST['Preferred'] == 1) {
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
- echo '<option value="0">' . _('No') . '</option>';
- } else {
- echo '<option value="1">' . _('Yes') . '</option>';
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
- }
- echo '</select></td></tr></table><br /><div class="centre">';
- if (isset($_GET['Edit'])) {
- echo '<input type="submit" name="UpdateRecord" value="' . _('Update') . '" />';
- } else {
- echo '<input type="submit" name="AddRecord" value="' . _('Add') . '" />';
- }
- echo '</div>';
- echo '<div class="centre">';
- if (isset($StockLocation) and isset($StockID) AND mb_strlen($StockID) != 0) {
- echo '<br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
- echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
- echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
- echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
- }
- echo '</div>';
- echo '</div>
- </form>';
+ if ($_POST['Preferred'] == 1) {
+ echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ echo '<option value="0">' . _('No') . '</option>';
+ } else {
+ echo '<option value="1">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="0">' . _('No') . '</option>';
+ }
+ echo '</select></td></tr></table><br /><div class="centre">';
+ if (isset($_GET['Edit'])) {
+ echo '<input type="submit" name="UpdateRecord" value="' . _('Update') . '" />';
+ } else {
+ echo '<input type="submit" name="AddRecord" value="' . _('Add') . '" />';
+ }
+ echo '</div>';
+ echo '<div class="centre">';
+ if (isset($StockLocation) and isset($StockID) AND mb_strlen($StockID) != 0) {
+ echo '<br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
+ }
+ echo '</form></div>';
}
+
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SMTPServer.php
===================================================================
--- trunk/SMTPServer.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/SMTPServer.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -18,7 +18,7 @@
username='".$_POST['UserName']."',
password='".$_POST['Password']."',
auth='".$_POST['Auth']."'";
- $ErrMsg = _('The email setting information is failed to update');
+ $ErrMsg = _('The email setting information failed to update');
$DbgMsg = _('The SQL failed to update is ');
$result1=DB_query($sql, $db, $ErrMsg, $DbgMsg);
unset($_POST['MailServerSetting']);
@@ -32,7 +32,7 @@
heloaddress,
username,
password,
- auth)
+ auth)
VALUES (
'".$_POST['Host']."',
'".$_POST['Port']."',
@@ -40,7 +40,7 @@
'".$_POST['UserName']."',
'".$_POST['Password']."',
'".$_POST['Auth']."')";
- $ErrMsg = _('The email settings are failed to be inserted');
+ $ErrMsg = _('The email settings failed to be inserted');
$DbgMsg = _('The SQL failed to insert the email information is');
$result2 = DB_query($sql,$db);
DB_free_result($result2);
@@ -61,13 +61,13 @@
auth
FROM emailsettings";
$ErrMsg = _('The email settings information cannot be retrieved');
- $DbgMsg = _('The SQL that faild was');
+ $DbgMsg = _('The SQL that failed was');
$result=DB_query($sql, $db,$ErrMsg,$DbgMsg);
if(DB_num_rows($result)!=0){
$MailServerSetting = 1;
$myrow=DB_fetch_array($result);
- }else{
+ }else{
DB_free_result($result);
$MailServerSetting = 0;
$myrow['host']='';
@@ -77,8 +77,8 @@
$myrow['password']='';
$myrow['timeout']=5;
}
-
-
+
+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/SalesInquiry.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -131,7 +131,7 @@
} else {
$WhereDebtorNo = ' ';
}
-
+
$WhereDebtorName = ' ';
if (mb_strlen($DebtorName) > 0 AND $DebtorNameOp == 'LIKE') {
$DebtorName = $DebtorName . '%';
@@ -209,8 +209,8 @@
LEFT JOIN stockmaster ON salesorderdetails.stkcode = stockmaster.stockid
WHERE salesorders.orddate >='" . $FromDate . "'
AND salesorders.orddate <='" . $ToDate . "'
- AND salesorders.quotation = '" . $_POST['OrderType'] . "'" .
- $WherePart .
+ AND salesorders.quotation = '" . $_POST['OrderType'] . "'" .
+ $WherePart .
$WhereOrderNo .
$WhereDebtorNo .
$WhereDebtorName .
@@ -485,7 +485,7 @@
$WhereSalesman .
$WhereCategory .
"GROUP BY " . $_POST['SummaryType'] .
- ",areas.areadescription
+ ",areas.areadescription
ORDER BY " . $orderby;
}
} else {
@@ -1196,7 +1196,7 @@
echo '<tr><td> </td></tr>
<tr><td> </td></tr>
<tr><td> </td></tr>';
-
+
echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>
<td><select name="SummaryType">
@@ -1241,7 +1241,7 @@
$ToDate = FormatDateForSQL($_POST['ToDate']);
$sql = "CREATE TEMPORARY TABLE tempstockmoves LIKE stockmoves";
- $ErrMsg = _('The SQL to to the create temp stock moves table failed with the message');
+ $ErrMsg = _('The SQL to the create temp stock moves table failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "INSERT tempstockmoves
@@ -1258,7 +1258,7 @@
AND SUBSTR(tempstockmoves.reference,10,10) = stockmoves.transno
AND tempstockmoves.stockid = stockmoves.stockid
AND stockmoves.type ='10'";
- $ErrMsg = _('The SQL to to update tempstockmoves failed with the message');
+ $ErrMsg = _('The SQL to update tempstockmoves failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/WOSerialNos.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -53,9 +53,9 @@
} else {
DB_Txn_Begin($db);
/*Process the additional controlled items into woserialnos and update the quantity on the work order order in woitems*/
-
+
$InputError =...
[truncated message content] |
