From: <rc...@us...> - 2016-11-06 18:46:54
|
Revision: 7662 http://sourceforge.net/p/web-erp/reponame/7662 Author: rchacon Date: 2016-11-06 18:46:52 +0000 (Sun, 06 Nov 2016) Log Message: ----------- Fix to show price in user's locale format, add supplier's id and name to title, replace printf() with plain list echo, and regroup and document code. Modified Paths: -------------- trunk/SelectSupplier.php trunk/SupplierPriceList.php trunk/doc/Change.log trunk/doc/Manual/ManualPurchaseOrdering.html trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/SelectSupplier.php =================================================================== --- trunk/SelectSupplier.php 2016-11-03 20:33:07 UTC (rev 7661) +++ trunk/SelectSupplier.php 2016-11-06 18:46:52 UTC (rev 7662) @@ -1,15 +1,15 @@ <?php /* $Id$*/ +/* Selects a supplier. A supplier is required to be selected before any AP transactions and before any maintenance or inquiry of the supplier */ -include ('includes/session.inc'); +include('includes/session.inc'); $Title = _('Search Suppliers'); - -/* webERP manual links before header.inc */ -$ViewTopic= 'AccountsPayable'; +$ViewTopic = 'AccountsPayable'; $BookMark = 'SelectSupplier'; +include('includes/header.inc'); -include ('includes/header.inc'); -include ('includes/SQL_CommonFunctions.inc'); +include('includes/SQL_CommonFunctions.inc'); + if (!isset($_SESSION['SupplierID'])) { echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>'; } Modified: trunk/SupplierPriceList.php =================================================================== --- trunk/SupplierPriceList.php 2016-11-03 20:33:07 UTC (rev 7661) +++ trunk/SupplierPriceList.php 2016-11-06 18:46:52 UTC (rev 7662) @@ -8,19 +8,22 @@ $BookMark = 'SupplierPriceList'; include('includes/header.inc'); -if (isset($_POST['StockSearch'])) { - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"> - <div> - <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> - <input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" /> - <p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p> +if(isset($_POST['StockSearch'])) { + echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, + '/images/magnifier.png" title="', // Icon image. + _('Search'), '" /> ', // Icon title. + _('Search for Inventory Items'), '</p>';// Page title. + + echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post"> + <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" /> + <input name="SupplierID" type="hidden" value="', $_POST['SupplierID'], '" /> <table class="selection"> <tr> <td>' . _('In Stock Category') . ':<select name="StockCat">'; - if (!isset($_POST['StockCat'])) { + if(!isset($_POST['StockCat'])) { $_POST['StockCat'] = ''; } - if ($_POST['StockCat'] == 'All') { + if($_POST['StockCat'] == 'All') { echo '<option selected="True" value="All">' . _('All') . '</option>'; } else { echo '<option value="All">' . _('All') . '</option>'; @@ -30,16 +33,16 @@ FROM stockcategory ORDER BY categorydescription"; $result1 = DB_query($SQL); - while ($myrow1 = DB_fetch_array($result1)) { - if ($myrow1['categoryid'] == $_POST['StockCat']) { - echo '<option selected="True" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; + while($MyRow1 = DB_fetch_array($result1)) { + if($MyRow1['categoryid'] == $_POST['StockCat']) { + echo '<option selected="True" value="' . $MyRow1['categoryid'] . '">' . $MyRow1['categorydescription'] . '</option>'; } else { - echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; + echo '<option value="' . $MyRow1['categoryid'] . '">' . $MyRow1['categorydescription'] . '</option>'; } } echo '</select></td>'; echo '<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>'; - if (isset($_POST['Keywords'])) { + if(isset($_POST['Keywords'])) { echo '<input type="search" name="Keywords" value="' . $_POST['Keywords'] . '" autofocus="autofocus" size="34" maxlength="25" />'; } else { echo '<input type="search" name="Keywords" size="34" maxlength="25" autofocus="autofocus" placeholder="Enter part of the item description" />'; @@ -50,7 +53,7 @@ <td></td> <td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td> <td>'; - if (isset($_POST['StockCode'])) { + if(isset($_POST['StockCode'])) { echo '<input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />'; } else { echo '<input type="text" name="StockCode" size="15" maxlength="18" />'; @@ -69,19 +72,19 @@ exit; } -if (isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) { - if (!isset($_POST['Go']) AND !isset($_POST['Next']) AND !isset($_POST['Previous'])) { +if(isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) { + if(!isset($_POST['Go']) AND !isset($_POST['Next']) AND !isset($_POST['Previous'])) { // if Search then set to first page $_POST['PageOffset'] = 1; } - if ($_POST['Keywords'] AND $_POST['StockCode']) { + if($_POST['Keywords'] AND $_POST['StockCode']) { prnMsg (_('Stock description keywords have been used in preference to the Stock code extract entered'), 'info'); } - if ($_POST['Keywords']) { + if($_POST['Keywords']) { //insert wildcard characters in spaces $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']); $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%'; - if ($_POST['StockCat'] == 'All') { + if($_POST['StockCat'] == 'All') { $SQL = "SELECT stockmaster.stockid, stockmaster.description, SUM(locstock.quantity) AS qoh, @@ -124,9 +127,9 @@ stockmaster.decimalplaces ORDER BY stockmaster.stockid"; } - } elseif (isset($_POST['StockCode'])) { + } elseif(isset($_POST['StockCode'])) { $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']); - if ($_POST['StockCat'] == 'All') { + if($_POST['StockCat'] == 'All') { $SQL = "SELECT stockmaster.stockid, stockmaster.description, stockmaster.mbflag, @@ -169,8 +172,8 @@ stockmaster.decimalplaces ORDER BY stockmaster.stockid"; } - } elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) { - if ($_POST['StockCat'] == 'All') { + } elseif(!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) { + if($_POST['StockCat'] == 'All') { $SQL = "SELECT stockmaster.stockid, stockmaster.description, stockmaster.mbflag, @@ -215,42 +218,42 @@ $ErrMsg = _('No stock items were returned by the SQL because'); $DbgMsg = _('The SQL that returned an error was'); $searchresult = DB_query($SQL, $ErrMsg, $DbgMsg); - if (DB_num_rows($searchresult) == 0) { + if(DB_num_rows($searchresult) == 0) { prnMsg(_('No stock items were returned by this search please re-enter alternative criteria to try again'), 'info'); } unset($_POST['Search']); } /* end query for list of records */ /* display list if there is more than one record */ -if (isset($searchresult) AND !isset($_POST['Select'])) { +if(isset($searchresult) AND !isset($_POST['Select'])) { echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"> <div> <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />'; $ListCount = DB_num_rows($searchresult); - if ($ListCount > 0) { + if($ListCount > 0) { // If the user hit the search button and there is more than one item to show $ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']); - if (isset($_POST['Next'])) { - if ($_POST['PageOffset'] < $ListPageMax) { + if(isset($_POST['Next'])) { + if($_POST['PageOffset'] < $ListPageMax) { $_POST['PageOffset'] = $_POST['PageOffset'] + 1; } } - if (isset($_POST['Previous'])) { - if ($_POST['PageOffset'] > 1) { + if(isset($_POST['Previous'])) { + if($_POST['PageOffset'] > 1) { $_POST['PageOffset'] = $_POST['PageOffset'] - 1; } } - if ($_POST['PageOffset'] > $ListPageMax) { + if($_POST['PageOffset'] > $ListPageMax) { $_POST['PageOffset'] = $ListPageMax; } - if ($ListPageMax > 1) { + if($ListPageMax > 1) { echo '<div class="centre"><br /> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': '; echo '<select name="PageOffset">'; $ListPage = 1; - while ($ListPage <= $ListPageMax) { - if ($ListPage == $_POST['PageOffset']) { + while($ListPage <= $ListPageMax) { + if($ListPage == $_POST['PageOffset']) { echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>'; } else { echo '<option value=' . $ListPage . '>' . $ListPage . '</option>'; @@ -276,11 +279,11 @@ $j = 1; $k = 0; //row counter to determine background colour $RowIndex = 0; - if (DB_num_rows($searchresult) <> 0) { + if(DB_num_rows($searchresult) <> 0) { DB_data_seek($searchresult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']); } - while (($myrow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) { - if ($k == 1) { + while(($MyRow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) { + if($k == 1) { echo '<tr class="EvenTableRows">'; $k = 0; } else { @@ -288,9 +291,9 @@ $k++; } - echo '<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td> - <td>' . $myrow['description'] . '</td> - <td>' . $myrow['units'] . '</td> + echo '<td><input type="submit" name="Select" value="' . $MyRow['stockid'] . '" /></td> + <td>' . $MyRow['description'] . '</td> + <td>' . $MyRow['units'] . '</td> </tr>'; $RowIndex = $RowIndex + 1; //end of page full new headings if @@ -306,21 +309,21 @@ } foreach ($_POST as $key=>$value) { - if (mb_substr($key,0,6)=='Update') { + if(mb_substr($key,0,6)=='Update') { $Index = mb_substr($key,6,mb_strlen($key)-6); - $StockID=$_POST['StockID'.$Index]; - $Price=$_POST['Price'.$Index]; - $SuppUOM=$_POST['SuppUOM'.$Index]; - $ConversionFactor=$_POST['ConversionFactor'.$Index]; - $SupplierDescription=$_POST['SupplierDescription'.$Index]; - $LeadTime=$_POST['LeadTime'.$Index]; - if (isset($_POST['Preferred'.$Index])) { - $Preferred=1; - $PreferredSQL="UPDATE purchdata SET preferred=0 + $StockID = $_POST['StockID'.$Index]; + $Price = filter_number_format($_POST['Price'.$Index]);// Convert data from user format to database number format. + $SuppUOM = $_POST['SuppUOM'.$Index]; + $ConversionFactor = $_POST['ConversionFactor'.$Index]; + $SupplierDescription = $_POST['SupplierDescription'.$Index]; + $LeadTime = $_POST['LeadTime'.$Index]; + if(isset($_POST['Preferred'.$Index])) { + $Preferred = 1; + $PreferredSQL = "UPDATE purchdata SET preferred=0 WHERE stockid='" . $StockID . "'"; $PreferredResult=DB_query($PreferredSQL); } else { - $Preferred=0; + $Preferred = 0; } $EffectiveFrom=$_POST['EffectiveFrom'.$Index]; $SupplierPartNo=$_POST['SupplierPartNo'.$Index]; @@ -338,8 +341,8 @@ AND stockid='" . $StockID . "'"; $result=DB_query($sql); } - if (mb_substr($key,0,6)=='Insert') { - if (isset($_POST['Preferred0'])) { + if(mb_substr($key,0,6)=='Insert') { + if(isset($_POST['Preferred0'])) { $Preferred=1; } else { $Preferred=0; @@ -372,56 +375,58 @@ } } -if (isset($_GET['SupplierID'])) { +if(isset($_GET['SupplierID'])) { $SupplierID = trim(mb_strtoupper($_GET['SupplierID'])); -} elseif (isset($_POST['SupplierID'])) { +} elseif(isset($_POST['SupplierID'])) { $SupplierID = trim(mb_strtoupper($_POST['SupplierID'])); } -if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/ +if(isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/ $sql = "SELECT suppliers.suppname, suppliers.currcode FROM suppliers 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, $ErrMsg, $DbgMsg); - if (DB_num_rows($SuppSelResult) == 1) { - $myrow = DB_fetch_array($SuppSelResult); - $SuppName = $myrow['suppname']; - $CurrCode = $myrow['currcode']; + if(DB_num_rows($SuppSelResult) == 1) { + $MyRow = DB_fetch_array($SuppSelResult); + $SuppName = $MyRow['suppname']; + $CurrCode = $MyRow['currcode']; } 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 '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Search for a supplier') . '</p><br />'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">'; - echo '<div>'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + if(!isset($_POST['SearchSupplier'])) { + echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, + '/images/supplier.png" title="', // Icon image. + _('Search for a supplier'), '" /> ', // Icon title. + _('Search for a supplier'), '</p>';// Page title. + echo '<br /> + <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post"> + <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />'; 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><input maxlength="25" name="Keywords" size="20" type="text" /></td>'; echo '<td><b>' . _('OR') . '</b></td>'; echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>'; - echo '<td><input type="text" name="SupplierCode" size="15" maxlength="18" /></td>'; + echo '<td><input maxlength="18" name="SupplierCode" size="15" type="text" /></td>'; echo '</tr></table><br />'; - echo '<div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" /></div>'; - echo '</div> - </form>'; + echo '<div class="centre"><input name="SearchSupplier" type="submit" value="' . _('Find Suppliers Now') . '" /></div>'; + echo '</form>'; include ('includes/footer.inc'); exit; }; } -if (isset($_POST['SearchSupplier'])) { - if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') { +if(isset($_POST['SearchSupplier'])) { + if($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') { $_POST['Keywords'] = ' '; } - if (mb_strlen($_POST['Keywords']) > 0) { + if(mb_strlen($_POST['Keywords']) > 0) { //insert wildcard characters in spaces $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%'; @@ -432,7 +437,7 @@ suppliers.address2, suppliers.address3 FROM suppliers WHERE suppliers.suppname " . LIKE . " '".$SearchString."'"; - } elseif (mb_strlen($_POST['SupplierCode']) > 0) { + } elseif(mb_strlen($_POST['SupplierCode']) > 0) { $SQL = "SELECT suppliers.supplierid, suppliers.suppname, suppliers.currcode, @@ -447,61 +452,58 @@ $SuppliersResult = DB_query($SQL, $ErrMsg, $DbgMsg); } //end of if search -if (isset($SuppliersResult)) { - echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Select a supplier') . '</p><br />'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">'; - echo '<div>'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; +if(isset($SuppliersResult)) { + echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, + '/images/supplier.png" title="', // Icon image. + _('Search'), '" /> ', // Icon title. + _('Select a supplier'), '</p>';// Page title. + echo '<br /> + <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post"> + <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />'; - echo '<table cellpadding="2" class="selection">'; - $TableHeader = '<tr><th>' . _('Code') . '</th> - <th>' . _('Supplier Name') . '</th> + echo '<table cellpadding="2" class="selection"> + <tr> + <th>' . _('Code') . '</th> + <th>' . _('Supplier Name') . '</th> <th>' . _('Currency') . '</th> <th>' . _('Address 1') . '</th> <th>' . _('Address 2') . '</th> <th>' . _('Address 3') . '</th> </tr>'; - echo $TableHeader; + $k = 0; - while ($myrow = DB_fetch_array($SuppliersResult)) { - if ($k==1){ + while($MyRow = DB_fetch_array($SuppliersResult)) { + if($k == 1){ echo '<tr class="EvenTableRows">'; - $k=0; + $k = 0; } else { echo '<tr class="OddTableRows">'; - $k++; + $k = 1; } - 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'] - ); - - } - //end of while loop + echo '<td><input name="SupplierID" type="submit" value="', $MyRow['supplierid'], '" /></td> + <td>', $MyRow['suppname'], '</td> + <td>', $MyRow['currcode'], '</td> + <td>', $MyRow['address1'], '</td> + <td>', $MyRow['address2'], '</td> + <td>', $MyRow['address3'], '</td> + </tr>'; + }// END while($MyRow = DB_fetch_array($SuppliersResult)). echo '</table> - <br/> - </div> - </form>'; + </form> + <br />'; include('includes/footer.inc'); exit; -} -//end if results to show +}// END if(isset($SuppliersResult)). -if (isset($_POST['SupplierID'])) { - echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Supplier Purchasing Data') . '</p><br />'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">'; - echo '<div>'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; +if(isset($_POST['SupplierID'])) { + $MyRow = DB_fetch_array(DB_query("SELECT suppname FROM `suppliers` WHERE `supplierid`='" . $_POST['SupplierID'] . "'"));// Retrieve supplier's name from database. + $SuppName = $MyRow['suppname']; + echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, + '/images/supplier.png" title="', // Icon image. + _('Search'), '" /> ', // Icon title. + _('Supplier Purchasing Data'), '<br />', + $_POST['SupplierID'], ' - ', $SuppName, '</p>';// Page title. + $SQL="SELECT purchdata.stockid, stockmaster.description, price, @@ -518,18 +520,23 @@ ON purchdata.stockid=stockmaster.stockid WHERE supplierno='".$_POST['SupplierID']."' ORDER BY purchdata.stockid, effectivefrom DESC"; - $result=DB_query($SQL); $UOMSQL = "SELECT unitid, unitname FROM unitsofmeasure"; $UOMResult = DB_query($UOMSQL); - echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />'; - echo '<table class="selection">'; - echo '<tr><th colspan="8" style="text-align: left"><h3>' . _('Supplier purchasing data for') . ' ' . $_POST['SupplierID'] . '</h3></th>'; - echo '<th colspan="5" style="text-align: right">' . _('Find new Item Code') . ' - <button type="submit" name="StockSearch"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" alt="" /></button></th></tr>'; + + echo '<br /> + <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post"> + <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" /> + <input name="SupplierID" type="hidden" value="', $_POST['SupplierID'], '" />'; + + echo '<table class="selection"> + <tr> + <th colspan="12" style="text-align: right">' . _('Find new Item Code') . + '<button type="submit" name="StockSearch"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" alt="" /></button></th> + </tr>'; echo '<tr> <th>' . _('StockID') . '</th> <th>' . _('Description') . '</th> @@ -543,73 +550,74 @@ <th>' . _('Suppliers Item Code') . '</th> <th>' . _('Min Order Qty') . '</th> <th>', _('Save'), '</th> - </tr>'; + </tr>';// RChacon: Sortable by StockID, Description, Suppliers_Description, Suppliers_Description ? - if (isset($_POST['Select'])) { - $StockSQL="SELECT description, units FROM stockmaster WHERE stockid='" . $_POST['Select'] . "'"; - $StockResult=DB_query($StockSQL); - $StockRow=DB_fetch_array($StockResult); + if(isset($_POST['Select'])) { + $StockSQL = "SELECT description, units FROM stockmaster WHERE stockid='" . $_POST['Select'] . "'"; + $StockResult = DB_query($StockSQL); + $StockRow = DB_fetch_array($StockResult); + // RChacon: if exist, retrieve data, not a blank line? echo '<tr bgcolor="#847F7F"> <td><input type="hidden" value="' . $_POST['Select'] . '" name="StockID0" />' . $_POST['Select'] . '</td> <td>' . $StockRow['description'] . '</td> <td><input type="text" class="number" size="11" value="0.0000" name="Price0" /></td> <td><select name="SuppUOM0">'; - while ($UOMRow=DB_fetch_array($UOMResult)) { - if ($UOMRow['unitname']==$StRowoc['units']) { - echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; - } else { - echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; - } - } - DB_data_seek($UOMResult, 0); - echo '</select></td> - <td><input type="text" class="number" size="11" value="1" name="ConversionFactor0" /></td> - <td><input type="text" size="30" maxlength="50" value="" name="SupplierDescription0" /></td> - <td><input type="text" class="number" size="11" value="1" name="LeadTime0" /></td>'; - echo '<td><input type="checkbox" name="Preferred0" /></td>'; - echo '<td><input type="text" class="date" size="11" value="' . date( $_SESSION['DefaultDateFormat']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom0" /></td> - <td><input type="text" size="20" maxlength="50" value="" name="SupplierPartNo0" /></td> - <td><input type="text" class="number" size="11" value="1" name="MinOrderQty0" /></td> - <td><button type="submit" style="width:100%;text-align:left" name="Insert"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" alt="" /></button></td> + while($UOMRow=DB_fetch_array($UOMResult)) { + if($UOMRow['unitname']==$StRowoc['units']) { + echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; + } else { + echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; + } + } + DB_data_seek($UOMResult, 0); + echo '</select></td> + <td><input class="number" name="ConversionFactor0" size="11" type="text" value="1" /></td> + <td><input maxlength="50" name="SupplierDescription0" size="30" type="text" value="" /></td> + <td><input class="number" name="LeadTime0" size="11" type="text" value="1" /></td> + <td><input name="Preferred0" type="checkbox" /></td> + <td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" name="EffectiveFrom0" size="11" type="text" value="', date( $_SESSION['DefaultDateFormat']), '" /></td> + <td><input maxlength="50" name="SupplierPartNo0" size="20" type="text" value="" /></td> + <td><input class="number" name="MinOrderQty0" size="11" type="text" value="1" /></td> + <td><button name="Insert" type="submit" style="width:100%;text-align:left"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" width="15" /></button></td> </tr>'; } - $RowCounter=1; - while ($myrow=DB_fetch_array($result)) { + $RowCounter = 1; + while($MyRow = DB_fetch_array($result)) { echo '<tr> - <td><input type="hidden" value="' . $myrow['stockid'] . '" name="StockID'.$RowCounter.'" />' . $myrow['stockid'] . '</td> - <td>' . $myrow['description'] . '</td> - <td><input type="text" class="number" size="11" value="' . $myrow['price'] . '" name="Price'.$RowCounter.'" /></td> + <td class="text"><input name="StockID'. $RowCounter. '" type="hidden" value="' . $MyRow['stockid'] . '" />' . $MyRow['stockid'] . '</td> + <td class="text">' . $MyRow['description'], '</td> + <td><input class="number" size="11" type="text" value="', locale_number_format($MyRow['price'], 4), // Show price in locale user format. RChacon: Decimals from parameters ? + '" name="Price'.$RowCounter.'" /></td> <td><select name="SuppUOM'.$RowCounter.'">'; - DB_data_seek($UOMResult, 0); - while ($UOMRow=DB_fetch_array($UOMResult)) { - if ($UOMRow['unitname']==$myrow['suppliersuom']) { - echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; - } else { - echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; - } - } - echo '</select></td> - <td><input type="text" class="number" size="11" value="' . $myrow['conversionfactor'] . '" name="ConversionFactor'.$RowCounter.'" /></td> - <td><input type="text" size="30" maxlength="50" value="' . $myrow['supplierdescription'] . '" name="SupplierDescription'.$RowCounter.'" /></td> - <td><input type="text" class="number" size="11" value="' . $myrow['leadtime'] . '" name="LeadTime'.$RowCounter.'" /></td>'; - if ($myrow['preferred']==1) { - echo '<td><input type="checkbox" checked="checked" name="Preferred'.$RowCounter.'" /></td>'; - } else { - echo '<td><input type="checkbox" name="Preferred'.$RowCounter.'" /></td>'; - } - echo '<td><input type="text" class="date" size="11" value="' . ConvertSQLDate($myrow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom'.$RowCounter.'" /></td> - <td><input type="text" size="20" maxlength="50" value="' . $myrow['suppliers_partno'] . '" name="SupplierPartNo'.$RowCounter.'" /></td> - <td><input type="text" class="number" size="11" value="' . $myrow['minorderqty'] . '" name="MinOrderQty'.$RowCounter.'" /></td> - <td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" alt="" /></button></td> + DB_data_seek($UOMResult, 0); + while($UOMRow=DB_fetch_array($UOMResult)) { + if($UOMRow['unitname']==$MyRow['suppliersuom']) { + echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; + } else { + echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>'; + } + } + echo '</select></td> + <td><input class="number" name="ConversionFactor'. $RowCounter. '" size="11" type="text" value="' . $MyRow['conversionfactor'] . '" /></td> + <td><input maxlength="50" name="SupplierDescription'. $RowCounter. '" size="30" type="text" value="' . $MyRow['supplierdescription'] . '" /></td> + <td><input class="number" name="LeadTime'. $RowCounter. '" size="11" type="text" value="' . $MyRow['leadtime'] . '" /></td>'; + if($MyRow['preferred'] == 1) { + echo '<td><input checked="checked" name="Preferred'. $RowCounter. '" type="checkbox" /></td>'; + } else { + echo '<td><input name="Preferred'. $RowCounter. '" type="checkbox" /></td>'; + } + echo '<td><input class="date" size="11" name="EffectiveFrom'. $RowCounter. '" type="text" value="' . ConvertSQLDate($MyRow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" /></td> + <td><input maxlength="50" name="SupplierPartNo'. $RowCounter. '" size="20" type="text" value="' . $MyRow['suppliers_partno'] . '" /></td> + <td><input class="number" name="MinOrderQty'. $RowCounter. '" size="11" type="text" value="' . $MyRow['minorderqty'] . '" /></td> + <td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" width="15" /></button></td> </tr>'; $RowCounter++; } echo '</table>'; - echo '</div> - </form>'; + echo '</form>'; include('includes/footer.inc'); exit; } -?> +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-11-03 20:33:07 UTC (rev 7661) +++ trunk/doc/Change.log 2016-11-06 18:46:52 UTC (rev 7662) @@ -1,5 +1,6 @@ webERP Change Log +06/11/16 RChacon: On SupplierPriceList.php, fix to show price in user's locale format, add supplier's id and name to title, replace printf() with plain list echo, and regroup and document code. 03/11/16 RChacon: On Dashboard.php, fix creditors payment to point to allocation instead to payment, replace printf() with plain list echo, regroup code, and complete column styles. 01/11/16 RChacon: On SupplierInquiry.php, replace the printf() statements with echo statements to fix bug caused by a supplier invoice with a comment that includes a % character (reported by R2-G, solution by Tim). 30/10/16 RChacon: In SecurityTokens.php: Fix Description's input maxlength, fix table head in data table, move form-tables after data table, add cancel button in edit form table, add return button, add style to print data table, add title in form tables, regroup code, change from if/elseif to switch/case to improve code readability, and add code documentation. Modified: trunk/doc/Manual/ManualPurchaseOrdering.html =================================================================== --- trunk/doc/Manual/ManualPurchaseOrdering.html 2016-11-03 20:33:07 UTC (rev 7661) +++ trunk/doc/Manual/ManualPurchaseOrdering.html 2016-11-06 18:46:52 UTC (rev 7662) @@ -189,7 +189,7 @@ <li><b>Description</b>. The short part description (title) used in the company. See <a href="ManualContents.php?ViewTopic=Inventory#ItemCode">Part Descriptions</a>.</li> <li><b>Price</b>. Sales price from supplier to company, without taxes.</li> <li><b>Suppliers UOM</b>. Unit of measure used by the supplier.</li> -<li><b>Conversion Factor</b>. Quantity of company UOM in supplier's UOM. E.g. Quantity of retail units in a wholesale unit.</li> +<li><b>Conversion Factor</b>. Quantity of company UOM in supplier's UOM. It is the factor to convert the measurement in supplier's units into our measurement unit. E.g. Quantity of retail units in a wholesale unit.</li> <li><b>Suppliers Description</b>. The short part description (title) used by supplier in his documents.</li> <li><b>Lead Time</b>. .</li> <li><b>Preferred</b>. All the items with this stock Id will be purchased to this supplier?</li> @@ -200,4 +200,4 @@ </ul> -<!-- Help End: PurchaseOrdering --> \ No newline at end of file +<!-- Help End: PurchaseOrdering --> Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-03 20:33:07 UTC (rev 7661) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-06 18:46:52 UTC (rev 7662) @@ -8,14 +8,14 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-31 20:01-0600\n" -"PO-Revision-Date: 2016-10-31 20:23-0600\n" +"PO-Revision-Date: 2016-11-06 11:51-0600\n" "Last-Translator: Rafael E. Chacón <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" "X-Launchpad-Export-Date: 2011-05-24 09:54+0000\n" "X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -246,14 +246,13 @@ #: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30 #: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454 -#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 -#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236 -#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:285 BOMs.php:991 -#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7 -#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:100 -#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193 -#: Credit_Invoice.php:287 CreditStatus.php:21 CustEDISetup.php:17 -#: CustItem.php:120 CustItem.php:210 CustItem.php:238 +#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 +#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186 +#: BOMListing.php:110 BOMs.php:285 BOMs.php:991 COGSGLPostings.php:19 +#: CollectiveWorkOrderCost.php:7 CollectiveWorkOrderCost.php:273 +#: CompanyPreferences.php:100 CounterReturns.php:1629 CounterSales.php:2097 +#: CounterSales.php:2193 Credit_Invoice.php:287 CreditStatus.php:21 +#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238 #: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12 #: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105 #: FixedAssetLocations.php:13 FixedAssetRegister.php:16 @@ -284,16 +283,15 @@ #: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17 #: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 #: StockLocMovements.php:14 StockSerialItemResearch.php:30 -#: SupplierPriceList.php:16 SupplierPriceList.php:226 -#: SupplierPriceList.php:396 SupplierPriceList.php:400 -#: SupplierPriceList.php:451 SupplierPriceList.php:501 Suppliers.php:304 -#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664 -#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10 -#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10 -#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22 -#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34 -#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57 -#: ../webSHOP/includes/header.php:251 +#: SupplierPriceList.php:16 SupplierPriceList.php:226 SupplierPriceList.php:396 +#: SupplierPriceList.php:400 SupplierPriceList.php:451 +#: SupplierPriceList.php:501 Suppliers.php:304 SupplierTenderCreate.php:556 +#: SupplierTenderCreate.php:664 SupplierTenders.php:322 SupplierTenders.php:388 +#: SupplierTransInquiry.php:10 TestPlanResults.php:27 TopItems.php:118 +#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:113 +#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22 +#: WorkOrderReceive.php:34 WorkOrderStatus.php:58 WWW_Users.php:34 +#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251 msgid "Search" msgstr "Buscar" @@ -348,48 +346,47 @@ #: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308 #: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334 #: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419 -#: QATests.php:424 QATests.php:429 QATests.php:434 -#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 -#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 -#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423 -#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476 -#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389 -#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367 -#: SalesPeople.php:369 SelectCustomer.php:757 SelectProduct.php:230 -#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518 -#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576 -#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667 -#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337 -#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395 -#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495 -#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940 -#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268 -#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90 +#: QATests.php:424 QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493 +#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284 +#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420 +#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451 +#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302 +#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227 +#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757 +#: SelectProduct.php:230 SelectProduct.php:368 SelectQASamples.php:424 +#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574 +#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590 +#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293 +#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391 +#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417 +#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:938 +#: StockClone.php:940 StockClone.php:963 StockClone.php:965 Stocks.php:1266 +#: Stocks.php:1268 Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90 #: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543 #: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672 #: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780 #: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849 -#: SystemParameters.php:945 SystemParameters.php:1088 -#: SystemParameters.php:1090 SystemParameters.php:1100 -#: SystemParameters.php:1102 SystemParameters.php:1156 -#: SystemParameters.php:1168 SystemParameters.php:1170 -#: SystemParameters.php:1208 SystemParameters.php:1210 -#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311 -#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304 -#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864 -#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187 -#: UserGLAccounts.php:196 WWW_Users.php:534 WWW_Users.php:536 -#: WWW_Users.php:707 WWW_Users.php:709 WWW_Users.php:722 WWW_Users.php:724 +#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090 +#: SystemParameters.php:1100 SystemParameters.php:1102 +#: SystemParameters.php:1156 SystemParameters.php:1168 +#: SystemParameters.php:1170 SystemParameters.php:1208 +#: SystemParameters.php:1210 SystemParameters.php:1232 +#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314 +#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532 +#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924 +#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196 +#: WWW_Users.php:534 WWW_Users.php:536 WWW_Users.php:707 WWW_Users.php:709 +#: WWW_Users.php:722 WWW_Users.php:724 #: reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "Sí" #: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468 #: AddCustomerContacts.php:165 AddCustomerContacts.php:274 -#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 -#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414 -#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:142 BOMs.php:895 -#: BOMs.php:899 CompanyPreferences.php:422 CompanyPreferences.php:426 +#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BankAccounts.php:218 +#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418 +#: BankAccounts.php:426 BOMs.php:142 BOMs.php:895 BOMs.php:899 +#: CompanyPreferences.php:422 CompanyPreferences.php:426 #: CompanyPreferences.php:437 CompanyPreferences.php:441 #: CompanyPreferences.php:452 CompanyPreferences.php:456 #: ContractCosting.php:200 Currencies.php:344 Currencies.php:525 @@ -438,18 +435,17 @@ #: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673 #: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781 #: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850 -#: SystemParameters.php:946 SystemParameters.php:1087 -#: SystemParameters.php:1091 SystemParameters.php:1099 -#: SystemParameters.php:1103 SystemParameters.php:1157 -#: SystemParameters.php:1167 SystemParameters.php:1171 -#: SystemParameters.php:1207 SystemParameters.php:1211 -#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312 -#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306 -#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866 -#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189 -#: UserGLAccounts.php:199 WWW_Users.php:533 WWW_Users.php:537 -#: WWW_Users.php:706 WWW_Users.php:710 WWW_Users.php:721 WWW_Users.php:725 -#: includes/PDFLowGPPageHeader.inc:44 +#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091 +#: SystemParameters.php:1099 SystemParameters.php:1103 +#: SystemParameters.php:1157 SystemParameters.php:1167 +#: SystemParameters.php:1171 SystemParameters.php:1207 +#: SystemParameters.php:1211 SystemParameters.php:1231 +#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315 +#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535 +#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925 +#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199 +#: WWW_Users.php:533 WWW_Users.php:537 WWW_Users.php:706 WWW_Users.php:710 +#: WWW_Users.php:721 WWW_Users.php:725 includes/PDFLowGPPageHeader.inc:44 #: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "No" @@ -517,18 +513,17 @@ #: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776 #: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815 #: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874 -#: SelectOrderItems.php:1384 SelectQASamples.php:418 -#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145 -#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626 -#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117 -#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:151 SupplierContacts.php:166 -#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452 -#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127 -#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192 -#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186 -#: WorkCentres.php:146 WorkOrderEntry.php:864 WOSerialNos.php:335 -#: WWW_Access.php:133 WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60 -#: includes/OutputSerialItems.php:99 +#: SelectOrderItems.php:1384 SelectQASamples.php:418 SellThroughSupport.php:299 +#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667 +#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325 +#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 +#: SuppInvGRNs.php:151 SupplierContacts.php:166 SupplierTenderCreate.php:422 +#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90 +#: SuppTransGLAnalysis.php:127 TaxAuthorities.php:173 TaxCategories.php:186 +#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920 +#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:864 +#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:369 +#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99 #: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" @@ -731,8 +726,7 @@ #: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124 #: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76 #: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66 -#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531 -#: SupplierTypes.php:68 +#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531 SupplierTypes.php:68 msgid "has been updated" msgstr "ha sido actualizado" @@ -775,14 +769,13 @@ #: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639 #: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593 #: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679 -#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 -#: PrintCustStatements.php:99 PrintCustTrans.php:740 -#: PrintCustTransPortrait.php:788 PrintCustTransPortrait.php:1034 -#: PrintCustTransPortrait.php:1090 SelectCustomer.php:408 -#: SelectCustomer.php:730 SelectSupplier.php:290 SupplierContacts.php:156 -#: SupplierContacts.php:277 UserSettings.php:186 WWW_Users.php:322 -#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:76 -#: includes/PDFTransPageHeader.inc:85 +#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99 +#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788 +#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090 +#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290 +#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:186 +#: WWW_Users.php:322 includes/PDFPickingListHeader.inc:25 +#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85 #: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19 #: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298 #: ../webSHOP/Register.php:595 @@ -834,9 +827,8 @@ #: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247 #: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246 -#: SelectCustomer.php:406 SelectOrderItems.php:597 -#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72 -#: includes/PDFTransPageHeader.inc:84 +#: SelectCustomer.php:406 SelectOrderItems.php:597 SupplierTenderCreate.php:395 +#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84 #: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389 #: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723 msgid "Phone" @@ -1012,8 +1004,8 @@ #: AgedControlledInventory.php:12 InventoryQuantities.php:155 #: InventoryValuation.php:217 Locations.php:12 MRPCalendar.php:21 -#: MRPCreateDemands.php:193 MRPDemands.php:27 MRPDemandTypes.php:17 -#: MRP.php:542 MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247 +#: MRPCreateDemands.php:193 MRPDemands.php:27 MRPDemandTypes.php:17 MRP.php:542 +#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247 #: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevelLocation.php:12 #: ReorderLevel.php:194 SelectProduct.php:90 StockDispatch.php:321 #: StockMovements.php:22 StockQties_csv.php:8 StockQuantityByDate.php:10 @@ -1029,19 +1021,17 @@ msgstr "" #: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261 -#: StockClone.php:53 Stocks.php:63 -#: reportwriter/languages/en_US/reports.php:103 +#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103 msgid "Stock" msgstr "Existencia" #: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37 #: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109 -#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015 -#: CollectiveWorkOrderCost.php:45 CollectiveWorkOrderCost.php:317 -#: ContractBOM.php:242 ContractBOM.php:354 ContractOtherReqts.php:98 -#: CounterReturns.php:1692 CounterSales.php:2102 CounterSales.php:2256 -#: CreditStatus.php:152 CreditStatus.php:243 CustomerPurchases.php:81 -#: EmailConfirmation.php:219 EmailConfirmation.php:349 +#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015 CollectiveWorkOrderCost.php:45 +#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354 +#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102 +#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243 +#: CustomerPurchases.php:81 EmailConfirmation.php:219 EmailConfirmation.php:349 #: FixedAssetCategories.php:167 FixedAssetDepreciation.php:91 #: FixedAssetRegister.php:87 FixedAssetRegister.php:388 #: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63 @@ -1075,20 +1065,19 @@ #: SupplierInvoice.php:668 SupplierInvoice.php:750 SupplierPriceList.php:41 #: SupplierPriceList.php:273 SupplierPriceList.php:535 #: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695 -#: SupplierTenderCreate.php:853 SupplierTenders.php:326 -#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309 -#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170 -#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130 -#: WorkOrderEntry.php:972 WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35 +#: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421 +#: SupplierTenders.php:687 SuppPriceList.php:309 TestPlanResults.php:177 +#: TestPlanResults.php:280 TopItems.php:170 WorkCentres.php:130 +#: WorkOrderCosting.php:98 WorkOrderCosting.php:130 WorkOrderEntry.php:972 +#: WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35 #: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30 #: includes/PDFInventoryPlanPageHeader.inc:51 #: includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 #: includes/PDFTransPageHeader.inc:211 -#: includes/PDFTransPageHeaderPortrait.inc:256 -#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 -#: ../webSHOP/includes/PlaceOrder.php:236 +#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12 +#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236 msgid "Description" msgstr "Descripción" @@ -1127,14 +1116,13 @@ #: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430 #: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500 #: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693 -#: SelectCreditItems.php:697 SelectOrderItems.php:1323 -#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 -#: SupplierAllocations.php:457 SupplierAllocations.php:570 -#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:215 -#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 Tax.php:250 -#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271 -#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 -#: includes/PDFQuotationPageHeader.inc:119 +#: SelectCreditItems.php:697 SelectOrderItems.php:1323 SuppContractChgs.php:107 +#: SuppFixedAssetChgs.php:97 SupplierAllocations.php:457 +#: SupplierAllocations.php:570 SupplierAllocations.php:645 +#: SupplierCredit.php:407 SupplierInquiry.php:215 SuppShiptChgs.php:97 +#: SuppTransGLAnalysis.php:140 Tax.php:250 Z_CheckDebtorsControl.php:149 +#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284 +#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119 #: includes/PDFQuotationPortraitPageHeader.inc:100 #: includes/PO_PDFOrderPageHeader.inc:81 #: reportwriter/languages/en_US/reports.php:107 @@ -1197,48 +1185,47 @@ #: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157 #: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237 #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45 -#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257 -#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 -#: FTP_RadioBeacon.php:187 GetStockImage.php:143 GLBalanceSheet.php:116 -#: GLBalanceSheet.php:155 GLBalanceSheet.php:334 GLProfit_Loss.php:191 -#: GLProfit_Loss.php:203 GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 -#: GLTrialBalance.php:170 GLTrialBalance.php:182 InventoryPlanning.php:102 -#: InventoryPlanning.php:179 InventoryPlanning.php:216 -#: InventoryPlanning.php:265 InventoryPlanning.php:340 -#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244 -#: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304 -#: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87 -#: InventoryQuantities.php:98 InventoryValuation.php:67 -#: InventoryValuation.php:92 MailInventoryValuation.php:123 -#: MailInventoryValuation.php:219 MailInventoryValuation.php:243 -#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117 -#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109 -#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39 -#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48 -#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170 -#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235 -#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournalCN.php:148 -#: PDFGLJournal.php:108 PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 -#: PDFPriceList.php:147 PDFPrintLabel.php:42 PDFQALabel.php:116 -#: PDFQuotation.php:276 PDFQuotationPortrait.php:268 -#: PDFRemittanceAdvice.php:83 PDFSalesBySalesperson.php:160 -#: PDFSalesBySalesperson.php:168 PDFSellThroughSupportClaim.php:74 -#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37 -#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:271 -#: PDFWeeklyOrders.php:209 PDFWeeklyOrders.php:217 PDFWOPrint.php:109 -#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156 -#: PrintCustOrder_generic.php:256 PrintCustOrder.php:238 -#: PrintWOItemSlip.php:122 PurchaseByPrefSupplier.php:402 -#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474 -#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534 -#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28 -#: SelectCreditItems.php:32 StockCheck.php:42 StockCheck.php:63 -#: StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 StockCheck.php:188 -#: StockDispatch.php:128 StockDispatch.php:141 SupplierBalsAtPeriodEnd.php:54 -#: SupplierBalsAtPeriodEnd.php:65 SuppPaymentRun.php:112 -#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217 -#: SuppPriceList.php:142 Tax.php:57 Tax.php:171 Tax.php:310 -#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 +#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257 Dashboard.php:438 +#: DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 FTP_RadioBeacon.php:187 +#: GetStockImage.php:143 GLBalanceSheet.php:116 GLBalanceSheet.php:155 +#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203 +#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170 +#: GLTrialBalance.php:182 InventoryPlanning.php:102 InventoryPlanning.php:179 +#: InventoryPlanning.php:216 InventoryPlanning.php:265 +#: InventoryPlanning.php:340 InventoryPlanningPrefSupplier.php:186 +#: InventoryPlanningPrefSupplier.php:244 InventoryPlanningPrefSupplier.php:271 +#: InventoryPlanningPrefSupplier.php:304 InventoryPlanningPrefSupplier.php:372 +#: InventoryQuantities.php:87 InventoryQuantities.php:98 +#: InventoryValuation.php:67 InventoryValuation.php:92 +#: MailInventoryValuation.php:123 MailInventoryValuation.php:219 +#: MailInventoryValuation.php:243 MailInventoryValuation.php:251 +#: MRPPlannedPurchaseOrders.php:117 MRPPlannedPurchaseOrders.php:128 +#: MRPPlannedWorkOrders.php:109 MRPPlannedWorkOrders.php:120 +#: MRPPlannedWorkOrders.php:311 MRPReport.php:39 MRPReport.php:50 +#: MRPReport.php:150 MRPReschedules.php:48 MRPReschedules.php:60 +#: MRPShortages.php:158 MRPShortages.php:170 OutstandingGRNs.php:49 +#: OutstandingGRNs.php:62 PDFCustomerList.php:235 PDFCustomerList.php:247 +#: PDFFGLabel.php:217 PDFGLJournalCN.php:148 PDFGLJournal.php:108 +#: PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147 +#: PDFPrintLabel.php:42 PDFQALabel.php:116 PDFQuotation.php:276 +#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83 +#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168 +#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86 +#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63 +#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209 +#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 +#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256 +#: PrintCustOrder.php:238 PrintWOItemSlip.php:122 +#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450 +#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503 +#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182 +#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42 +#: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 +#: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141 +#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65 +#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186 +#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171 +#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 #: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383 #: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41 #: includes/ConstructSQLForUserDefinedSalesReport.inc:180 @@ -1279,11 +1266,10 @@ #: Payments.php:389 PDFRemittanceAdvice.php:85 PurchData.php:114 #: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267 #: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387 -#: SelectCreditItems.php:1454 SelectSalesOrder.php:213 -#: SelectSalesOrder.php:379 SellThroughSupport.php:81 -#: SellThroughSupport.php:97 SMTPServer.php:66 StockCheck.php:217 -#: StockClone.php:446 StockClone.php:520 StockCostUpdate.php:78 -#: StockCostUpdate.php:88 StockLocStatus.php:167 +#: SelectCreditItems.php:1454 SelectSalesOrder.php:213 SelectSalesOrder.php:379 +#: SellThroughSupport.php:81 SellThroughSupport.php:97 SMTPServer.php:66 +#: StockCheck.php:217 StockClone.php:446 StockClone.php:520 +#: StockCostUpdate.php:78 StockCostUpdate.php:88 StockLocStatus.php:167 #: StockLocTransferReceive.php:215 StockLocTransferReceive.php:368 #: StockMovements.php:98 StockQuantityByDate.php:98 StockReorderLevel.php:45 #: StockStatus.php:285 StockTransfers.php:202 StockTransfers.php:232 @@ -1478,19 +1464,18 @@ msgid "Horizontal Analysis of Statement of Comprehensive Income" msgstr "Análisis horizontal del estado de resultados" -#: AnalysisHorizontalIncome.php:22 GLProfit_Loss.php:14 -#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14 +#: AnalysisHorizontalIncome.php:22 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14 +#: Z_UpdateChartDetailsBFwd.php:14 msgid "... [truncated message content] |