Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4579] trunk
|
From: <dai...@us...> - 2011-05-29 04:07:24
|
Revision: 4579
http://web-erp.svn.sourceforge.net/web-erp/?rev=4579&view=rev
Author: daintree
Date: 2011-05-29 04:07:16 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Ricard bug fixes assigner changes
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/GetStockImage.php
trunk/PO_SelectOSPurchOrder.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/SelectProduct.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/ConfirmDispatch_Invoice.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -139,9 +139,7 @@
salesorderdetails.orderlineno,
salesorderdetails.poline,
salesorderdetails.itemdue,
- stockmaster.materialcost +
- stockmaster.labourcost +
- stockmaster.overheadcost AS standardcost
+ stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost AS standardcost
FROM salesorderdetails INNER JOIN stockmaster
ON salesorderdetails.stkcode = stockmaster.stockid
WHERE salesorderdetails.orderno ='" . $_GET['OrderNumber'] . "'
@@ -316,8 +314,7 @@
echo '<td class="number">' . $LnItm->QtyDispatched . '</td>';
} else {
echo '<td class="number"><input type=hidden name="' . $LnItm->LineNumber . '_QtyDispatched" value="' .
- $LnItm->QtyDispatched . '"><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?' . SID .
- '&LineNo='. $LnItm->LineNumber.'">' .$LnItm->QtyDispatched . '</a></td>';
+ $LnItm->QtyDispatched . '"><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?LineNo='. $LnItm->LineNumber.'">' .$LnItm->QtyDispatched . '</a></td>';
}
} else {
if (isset($_POST['ProcessInvoice'])) {
@@ -1139,8 +1136,7 @@
if ($OrderLine->Controlled ==1){
foreach($OrderLine->SerialItems as $Item){
- /*We need to add the StockSerialItem record and
- The StockSerialMoves as well */
+ /*We need to add the StockSerialItem record and the StockSerialMoves as well */
$SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . "
WHERE stockid='" . $OrderLine->StockID . "'
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/GetStockImage.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -1,7 +1,7 @@
<?php
/* $Id$*/
-//$PageSecurity = 1;
+
include ('includes/session.inc');
/*
http://127.0.0.1/~brink/webERP/GetStockImage.php
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PO_SelectOSPurchOrder.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -131,20 +131,21 @@
if (!isset($OrderNumber) or $OrderNumber=='' ){
echo '<a href="' . $rootpath . '/PO_Header.php?' .SID . '&NewOrder=Yes">' . _('Add Purchase Order') . '</a>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'</p>';
- echo '<table class=selection><tr><td>'._('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
- $sql = 'SELECT loccode, locationname FROM locations';
+ echo '<table class=selection><tr><td>'._('Order Number') . ': <input type="text" name="OrderNumber" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':<select name="StockLocation">';
+
+ $sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation'])){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '<option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']== $_SESSION['UserStockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -180,23 +181,23 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
-echo "<br><font size=1><div class='page_help_text'>" ._('To search for purchase orders for a specific part use the part selection facilities below')
- ."</div> </font>";
-echo "<br><table class=selection><tr>";
+echo '<br /><font size=1><div class="page_help_text">' ._('To search for purchase orders for a specific part use the part selection facilities below')
+ .'</div> </font>';
+echo '<br /><table class="selection"><tr>';
-echo "<td><font size=1>" . _('Select a stock category') . ":</font><select name='StockCat'>";
+echo '<td><font size="1">' . _('Select a stock category') . ':</font><select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid']==$_POST['StockCat']){
- echo "<option selected value='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'] . '</option>';
+ echo '<option selected 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>";
-echo "<td><font size=1>" . _('Enter text extracts in the') . "<b>" . _('description') . "</b>:</font></td>";
+echo '</select>';
+echo '<td><font size=1>' . _('Enter text extracts in the') . '<b>' . _('description') . '</b>:</font></td>';
echo '<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr><tr><td></td>';
-echo "<td><font size<b>" . _('OR') . "</b></font><font size=1>" . _('Enter extract of the') . "<b>" . _('Stock Code') . "</b>:</font></td>";
+echo '<td><font size<b>' . _('OR') . '</b></font><font size=1>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
echo '<td><input type="Text" name="StockCode" size=15 maxlength=18></td></tr></table><br>';
echo '<table><tr><td><input type=submit name="SearchParts" value="' . _('Search Parts Now') . '">';
echo '<input type=submit name="ResetPart" value="' . _('Show All') . '"></td></tr></table>';
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcAssignCashToTab.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -155,7 +155,7 @@
DB_free_result($result);
$SQL = "SELECT tabcode
FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'
+ WHERE assigner='" . $_SESSION['UserID'] . "'
ORDER BY tabcode";
$result = DB_query($SQL,$db);
@@ -198,7 +198,7 @@
}
$sql = "SELECT * FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL , ".$Days." DAY)
+ AND date >=DATE_SUB(CURDATE(), INTERVAL , " . $Days . " DAY)
ORDER BY date, counterindex ASC";
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcAuthorizeExpenses.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -2,7 +2,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Authorization of Petty Cash Expenses');
+$title = _('Authorisation of Petty Cash Expenses');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -40,10 +40,10 @@
if (isset($SelectedTabs)) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorization Of Petty Cash Expenses ') . ''.$SelectedTabs.'</p>';
+ '" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . ''.$SelectedTabs.'</p>';
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorization Of Petty Cash Expenses ') . '</p>';
+ '" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . '</p>';
}
if (isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
@@ -248,8 +248,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authorizer=ConvertSQLDate($myrow['authorized']);
- if(($Authorizer!='00/00/0000')){
+ $Authoriser=ConvertSQLDate($myrow['authorized']);
+ if(($Authoriser!='00/00/0000')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'">';
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcReportTab.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -146,7 +146,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
$YPos -= $line_height;
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authorizer '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authoriser '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['authorizer']);
@@ -172,7 +172,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+200,$YPos,100,$FontSize,_('Amount'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,100,$FontSize,_('Note'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+350,$YPos,100,$FontSize,_('Receipt'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authorizer'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authoriser'));
$YPos -= (2 * $line_height);
while ($myrow=DB_fetch_array($TabDetail)) {
@@ -262,7 +262,7 @@
'<td>' . _('To') . '</td><td>:</td><td>' .
''.$_POST['ToDate'].'</td></tr>';
- echo '<tr><td>' . _('Authorizer') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
+ echo '<tr><td>' . _('Authoriser') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
</tr>';
echo '<tr><td>' . _('Currency') . '</td><td>:</td><td>' . ''.$Tabs['currency'].'</td>
</tr>';
@@ -299,7 +299,7 @@
$BalanceNotAut['0']=0;
}
- echo '<tr><td>' . _('Total not authorized before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
+ echo '<tr><td>' . _('Total not authorised before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
echo '</table>';
@@ -326,7 +326,7 @@
<th>' . _('Amount') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Receipt') . '</th>
- <th>' . _('Date Authorized') . '</th>
+ <th>' . _('Date Authorised') . '</th>
</tr>';
$j = 1;
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcTabs.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -21,7 +21,8 @@
unset($_POST['SelectTabs']);
unset($_POST['SelectCurrency']);
unset($_POST['TabLimit']);
- unset($_POST['SelectAuthorizer']);
+ unset($_POST['SelectAssigner']);
+ unset($_POST['SelectAuthoriser']);
unset($_POST['GLAccountCash']);
unset($_POST['GLAccountPcashTab']);
}
@@ -64,10 +65,15 @@
echo prnMsg(_('You must select a type of tab from the list'),'error');
$Errors[$i] = 'TabType';
$i++;
- } elseif (($_POST['SelectAuthorizer'])=='') {
+ } elseif (($_POST['SelectAssigner'])=='') {
$InputError = 1;
+ echo prnMsg(_('You must select a User to assign cash to this tab'),'error');
+ $Errors[$i] = 'AssignerName';
+ $i++;
+ } elseif (($_POST['SelectAuthoriser'])=='') {
+ $InputError = 1;
echo prnMsg(_('You must select a User to authorise this tab'),'error');
- $Errors[$i] = 'AuthorizerName';
+ $Errors[$i] = 'AuthoriserName';
$i++;
} elseif (($_POST['GLAccountCash'])=='') {
$InputError = 1;
@@ -87,12 +93,13 @@
typetabcode = '" . $_POST['SelectTabs'] . "',
currency = '" . $_POST['SelectCurrency'] . "',
tablimit = '" . $_POST['TabLimit'] . "',
- authorizer = '" . $_POST['SelectAuthorizer'] . "',
+ assigner = '" . $_POST['SelectAssigner'] . "',
+ authorizer = '" . $_POST['SelectAuthoriser'] . "',
glaccountassignment = '" . $_POST['GLAccountCash'] . "',
glaccountpcash = '" . $_POST['GLAccountPcashTab'] . "'
WHERE tabcode = '".$SelectedTab."'";
- $msg = _('The Tabs Of Code') . ' ' . $SelectedTab . ' ' . _('has been updated');
+ $msg = _('The Petty Cash Tab') . ' ' . $SelectedTab . ' ' . _('has been updated');
} elseif ( $InputError !=1 ) {
// First check the type is not being duplicated
@@ -116,6 +123,7 @@
typetabcode,
currency,
tablimit,
+ assigner,
authorizer,
glaccountassignment,
glaccountpcash)
@@ -124,11 +132,12 @@
'" . $_POST['SelectTabs'] . "',
'" . $_POST['SelectCurrency'] . "',
'" . $_POST['TabLimit'] . "',
- '" . $_POST['SelectAuthorizer'] . "',
+ '" . $_POST['SelectAssigner'] . "',
+ '" . $_POST['SelectAuthoriser'] . "',
'" . $_POST['GLAccountCash'] . "',
'" . $_POST['GLAccountPcashTab'] . "')";
- $msg = _('Tab with Code ') . ' ' . $_POST['TabCode'] . ' ' . _('has been created');
+ $msg = _('The Petty Cash Tab') . ' ' . $_POST['tabcode'] . ' ' . _('has been created');
}
}
@@ -143,7 +152,8 @@
unset($_POST['SelectTabs']);
unset($_POST['SelectCurrency']);
unset($_POST['TabLimit']);
- unset($_POST['SelectAuthorizer']);
+ unset($_POST['SelectAssigner']);
+ unset($_POST['SelectAuthoriser']);
unset($_POST['GLAccountCash']);
unset($_POST['GLAccountPcashTab']);
}
@@ -153,7 +163,7 @@
$sql="DELETE FROM pctabs WHERE tabcode='".$SelectedTab."'";
$ErrMsg = _('The Tab record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
- prnMsg(_('Tab type') . ' ' . $SelectedTab . ' ' . _('has been deleted') ,'success');
+ prnMsg(_('The Petty Cash Tab') . ' ' . $SelectedTab . ' ' . _('has been deleted') ,'success');
unset ($SelectedTab);
unset($_GET['delete']);
}
@@ -170,6 +180,7 @@
typetabdescription,
currabrev,
tablimit,
+ assigner,
authorizer,
glaccountassignment,
glaccountpcash,
@@ -194,7 +205,8 @@
<th>' . _('Type Of Tab') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Limit') . '</th>
- <th>' . _('Authorizer') . '</th>
+ <th>' . _('Assigner') . '</th>
+ <th>' . _('Authoriser') . '</th>
<th>' . _('GL Account For Cash Assignment') . '</th>
<th>' . _('GL Account Petty Cash Tab') . '</th>
</tr>';
@@ -218,6 +230,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td><a href="%sSelectedTab=%s">' . _('Edit') . '</td>
<td><a href="%sSelectedTab=%s&delete=yes" onclick=\' return confirm("' . _('Are you sure you wish to delete this tab code?') . '");\'>' . _('Delete') . '</td>
</tr>',
@@ -226,6 +239,7 @@
$myrow['typetabdescription'],
$myrow['currabrev'],
number_format($myrow['tablimit'],$myrow['decimalplaces']),
+ $myrow['assigner'],
$myrow['authorizer'],
$myrow['glaccountassignment'].' - '. $myrow['glactassigntname'],
$myrow['glaccountpcash'].' - '.$myrow['glactpcashname'],
@@ -262,7 +276,8 @@
$_POST['SelectTabs'] = $myrow['typetabcode'];
$_POST['SelectCurrency'] = $myrow['currency'];
$_POST['TabLimit'] = $myrow['tablimit'];
- $_POST['SelectAuthorizer'] = $myrow['authorizer'];
+ $_POST['SelectAssigner'] = $myrow['assigner'];
+ $_POST['SelectAuthoriser'] = $myrow['authorizer'];
$_POST['GLAccountCash'] = $myrow['glaccountassignment'];
$_POST['GLAccountPcashTab'] = $myrow['glaccountpcash'];
@@ -358,8 +373,8 @@
echo '<tr><td>' . _('Limit Of Tab') . ':</td>
<td><input type="Text" class="number" name="TabLimit" size="12" maxlength="11" value="' . $_POST['TabLimit'] . '"></td></tr>';
- echo '<tr><td>' . _('Authoriser') . ':</td>
- <td><select name="SelectAuthorizer">';
+ echo '<tr><td>' . _('Assigner') . ':</td>
+ <td><select name="SelectAssigner">';
DB_free_result($result);
$SQL = "SELECT userid,
@@ -370,14 +385,34 @@
$result = DB_query($SQL,$db);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAuthorizer']) and $myrow['userid']==$_POST['SelectAuthorizer']) {
+ if (isset($_POST['SelectAssigner']) and $myrow['userid']==$_POST['SelectAssigner']) {
+ echo "<option selected value='";
+ } else {
+ echo "<option value='";
+ }
+ echo $myrow['userid'] . "'>" . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
+
+ } //end while loop get assigner
+
+ echo '<tr><td>' . _('Authoriser') . ":</td><td><select name='SelectAuthoriser'>";
+
+ DB_free_result($result);
+ $SQL = "SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid";
+
+ $result = DB_query($SQL,$db);
+
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($_POST['SelectAuthoriser']) and $myrow['userid']==$_POST['SelectAuthoriser']) {
echo '<option selected value="';
} else {
echo '<option value="';
}
echo $myrow['userid'] . '">' . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
- } //end while loop get authorizer
+ } //end while loop get authoriser
echo '</select></td></tr>';
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/SelectProduct.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -417,7 +417,7 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
+ echo '<div class="centre"><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120">';
}
if (($myrow['mbflag'] == 'B') AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
echo '<br />';
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/SelectSalesOrder.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -807,80 +807,80 @@
/*Check authority to create POs if user has authority then show the check boxes to select sales orders to place POs for otherwise don't provide this option */
if ($AuthRow['cancreate']==0 AND $myrow['poplaced']==0){ //cancreate==0 if the user can create POs and not already placed
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Invoice') . "</a></td>
- <td><a target='_blank' href='%s'>" . $PrintText . " <IMG SRC='" .$rootpath."/css/".$theme."/images/pdf.png' title='" . _('Click for PDF') . "'></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td><input type=checkbox name=PlacePO_%s value><input type=hidden name=OrderNo_PO_%s value=%s></td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue,
- $i,
- $i,
- $myrow['orderno']);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '"></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td><input type=checkbox name="PlacePO_%s" value><input type="hidden" name="OrderNo_PO_%s" value="%s"></td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue,
+ $i,
+ $i,
+ $myrow['orderno']);
} else { /*User is not authorised to create POs so don't even show the option */
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Invoice') . "</a></td>
- <td><a target='_blank' href='%s'>" . $PrintText . " <IMG SRC='" .$rootpath."/css/".$theme."/images/pdf.png' title='" . _('Click for PDF') . "'></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath . '/css/' . $theme .'/images/pdf.png" title="' . _('Click for PDF') . '"></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue);
}
} else { /*must be quotes only */
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . $PrintText . "</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $PrintQuotation,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . $PrintText . '</a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $PrintQuotation,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue);
}
- $i++;
+ $i++;
$j++;
$OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/doc/Change.log 2011-05-29 04:07:16 UTC (rev 4579)
@@ -1,5 +1,8 @@
webERP Change Log
+28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
+28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
+28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/includes/ConnectDB.inc 2011-05-29 04:07:16 UTC (rev 4579)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.04'; //must update manually every time there is a DB change
+$Version='4.04.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 04:07:16 UTC (rev 4579)
@@ -15517,16 +15517,16 @@
msgstr ""
#: PcAuthorizeExpenses.php:5
-msgid "Authorization of Petty Cash Expenses"
-msgstr ""
+msgid "Authorisation of Petty Cash Expenses"
+msgstr "Authorization of Petty Cash Expenses"
#: PcAuthorizeExpenses.php:29
msgid "You Must First Select a Petty Cash Tab To Authorise"
-msgstr ""
+msgstr "You Must First Select a Petty Cash Tab To Authorize"
#: PcAuthorizeExpenses.php:43 PcAuthorizeExpenses.php:46
-msgid "Authorization Of Petty Cash Expenses "
-msgstr ""
+msgid "Authorisation Of Petty Cash Expenses "
+msgstr "Authorization Of Petty Cash Expenses"
#: PcAuthorizeExpenses.php:58
msgid "Detail Of Movement For Last "
@@ -15543,7 +15543,7 @@
#: PcAuthorizeExpenses.php:293
#, fuzzy
msgid "Authorise expenses to Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr "Authorize expenses to Petty Cash Tab"
#: PcClaimExpensesFromTab.php:6
msgid "Claim Petty Cash Expenses From Tab"
@@ -15560,7 +15560,7 @@
#: PcClaimExpensesFromTab.php:67
#, fuzzy
msgid "The Amount must be greater than 0"
-msgstr "The shipping-method ID must be an integer"
+msgstr "The Amount must be greater than 0"
#: PcClaimExpensesFromTab.php:79 PcClaimExpensesFromTab.php:105
msgid "The Expense Claim on Tab"
@@ -15569,7 +15569,7 @@
#: PcClaimExpensesFromTab.php:124
#, fuzzy
msgid "Petty Cash Expense record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr "Petty Cash Expense record could not be deleted because"
#: PcClaimExpensesFromTab.php:126
msgid "Petty cash Expense record"
@@ -15592,12 +15592,12 @@
#: PcClaimExpensesFromTab.php:176
#, fuzzy
msgid "Select another tab"
-msgstr "Select the Vendor"
+msgstr "Select another tab"
#: PcClaimExpensesFromTab.php:182
#, fuzzy
msgid "Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr "Petty Cash Tab"
#: PcClaimExpensesFromTab.php:183
msgid "Detail Of Movements For Last "
@@ -15611,15 +15611,15 @@
#: PcClaimExpensesFromTab.php:211 PcReportTab.php:325
#, fuzzy
msgid "Expense Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcClaimExpensesFromTab.php:213
-msgid "Authorized"
-msgstr ""
+msgid "Authorised"
+msgstr "Authorized"
#: PcClaimExpensesFromTab.php:240
msgid "Unauthorised"
-msgstr ""
+msgstr "Unauthorized"
#: PcClaimExpensesFromTab.php:253
#, php-format
@@ -15644,7 +15644,7 @@
#: PcExpenses.php:51
#, fuzzy
msgid "The Expense code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcExpenses.php:57
msgid ""
@@ -15656,22 +15656,22 @@
msgid ""
"The Expense description cannot contain any of the following characters \" ' "
"- &"
-msgstr "The terrirory desscription must be twenty five characters or less long"
+msgstr ""
#: PcExpenses.php:69 PcTypeTabs.php:49
#, fuzzy
msgid "The tab code must be Fifty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcExpenses.php:76
#, fuzzy
msgid "The tab code description must be entered"
-msgstr "The territory description may not be left blank"
+msgstr ""
#: PcExpenses.php:82
#, fuzzy
msgid "A general ledger code must be selected for this expense"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcExpenses.php:93
msgid "The Expenses type"
@@ -15707,12 +15707,12 @@
#: PcExpenses.php:152
#, fuzzy
msgid "tab types using this expense code"
-msgstr "branches using this territory code"
+msgstr ""
#: PcExpenses.php:158
#, fuzzy
msgid "The expense type record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PcExpenses.php:160
msgid "Expense type"
@@ -15721,7 +15721,7 @@
#: PcExpenses.php:183
#, fuzzy
msgid "Account Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcExpenses.php:209
#, php-format
@@ -15794,7 +15794,7 @@
#: PcExpensesTypeTab.php:198
#, fuzzy
msgid "Select Expense Code"
-msgstr "Select Vendor"
+msgstr ""
#: PcReportTab.php:8
msgid "Petty Cash Management Report"
@@ -15807,12 +15807,12 @@
#: PcReportTab.php:64
#, fuzzy
msgid "From Date :"
-msgstr "Vendor Order"
+msgstr ""
#: PcReportTab.php:67
#, fuzzy
msgid "To Date:"
-msgstr "Vendor Order"
+msgstr ""
#: PcReportTab.php:70
msgid "Show HTML"
@@ -15854,12 +15854,12 @@
#: PcReportTab.php:115
#, fuzzy
msgid "No Petty Cash tabs were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:133
#, fuzzy
msgid "Tab Code :"
-msgstr "Territory Code"
+msgstr ""
#: PcReportTab.php:134 PcReportTab.php:137 PcReportTab.php:142
#: PcReportTab.php:145 PcReportTab.php:150 PcReportTab.php:155
@@ -15881,8 +15881,8 @@
msgstr ""
#: PcReportTab.php:149
-msgid "Authorizer "
-msgstr ""
+msgid "Authoriser "
+msgstr "Authorizer"
#: PcReportTab.php:154
msgid "Currency "
@@ -15903,12 +15903,12 @@
#: PcReportTab.php:246
#, fuzzy
msgid "No Petty Cash Tabs were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:253 PcTabs.php:192 PcTabs.php:274 PcTabs.php:280
#, fuzzy
msgid "Tab Code"
-msgstr "Territory Code"
+msgstr ""
#: PcReportTab.php:265 PcTabs.php:197
msgid "Authorizer"
@@ -15921,11 +15921,11 @@
#: PcReportTab.php:319
#, fuzzy
msgid "No Petty Cash movements for this tab were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:329
-msgid "Date Authorized"
-msgstr ""
+msgid "Date Authorised"
+msgstr "Date Authorized"
#: PcReportTab.php:399
msgid "Balance At"
@@ -15947,7 +15947,7 @@
#: PcTabs.php:54
#, fuzzy
msgid "The Tab code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcTabs.php:59
msgid "You must select a User for this tab"
@@ -15960,7 +15960,7 @@
#: PcTabs.php:69
#, fuzzy
msgid "You must select a User to authorise this tab"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcTabs.php:74
msgid "You must select a General ledger code for the cash to be assigned from"
@@ -15981,7 +15981,7 @@
#: PcTabs.php:109
#, fuzzy
msgid " already exists"
-msgstr "The territory code entered already exists"
+msgstr ""
#: PcTabs.php:131
msgid "Tab with Code "
@@ -15990,7 +15990,7 @@
#: PcTabs.php:154
#, fuzzy
msgid "The Tab record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PcTabs.php:156 PcTypeTabs.php:135
msgid "Tab type"
@@ -16016,7 +16016,7 @@
#: PcTabs.php:199 PcTabs.php:408
#, fuzzy
msgid "GL Account Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcTabs.php:222
#, php-format
@@ -16026,7 +16026,7 @@
#: PcTabs.php:243
#, fuzzy
msgid "Show All Tabs Defined"
-msgstr "Review Territories Defined"
+msgstr ""
#: PcTabs.php:358
msgid "Limit Of Tab"
@@ -16034,12 +16034,12 @@
#: PcTabs.php:361
msgid "Authoriser"
-msgstr ""
+msgstr "Authorizer"
#: PcTabs.php:384
#, fuzzy
msgid "GL Account Cash Assignment"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcTypeTabs.php:5
msgid "Maintenance Of Petty Cash Type of Tabs"
@@ -16048,18 +16048,18 @@
#: PcTypeTabs.php:36
#, fuzzy
msgid "The Tabs type code cannot be an empty string"
-msgstr "The territory code may not be left blank"
+msgstr ""
#: PcTypeTabs.php:41
#, fuzzy
msgid "The tab code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcTypeTabs.php:46
#, fuzzy
msgid ""
"The petty cash tab type code cannot contain any of the illegal characters"
-msgstr "The terrirory desscription must be twenty five characters or less long"
+msgstr ""
#: PcTypeTabs.php:60
msgid "The Tabs type"
@@ -16077,7 +16077,6 @@
#, fuzzy
msgid "The number of tabs using this Tab type could not be retrieved"
msgstr ""
-"The vendors matching the criteria entered could not be retrieved because"
#: PcTypeTabs.php:122
#, fuzzy
@@ -16085,8 +16084,6 @@
"Cannot delete this tab type because tabs have been created using this tab "
"type"
msgstr ""
-"Cannot delete this territory because customer branches have been created "
-"using this area"
#: PcTypeTabs.php:126
msgid "Return to list of tab types"
@@ -16102,7 +16099,7 @@
#: PcTypeTabs.php:187
#, fuzzy
msgid "Show All Types Tabs Defined"
-msgstr "Review Territories Defined"
+msgstr ""
#: PcTypeTabs.php:212 PcTypeTabs.php:224
msgid "Code Of Type Of Tab"
@@ -16336,7 +16333,7 @@
#: PDFCustTransListing.php:91
#, fuzzy
msgid "Customer Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFCustTransListing.php:31 PDFStockTransListing.php:34
#: PDFSuppTransListing.php:31
@@ -16364,7 +16361,7 @@
#: PDFCustTransListing.php:74
#, fuzzy
msgid "The SQL used to get the transaction information that failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFCustTransListing.php:82 PDFStockTransListing.php:92
#: PDFSuppTransListing.php:82
@@ -16499,7 +16496,7 @@
#: PDFGrn.php:73
#, fuzzy
msgid "Could not get the supplier of the selected GRN"
-msgstr "Could not load shipping-method"
+msgstr "Could not get the vendor of the selected GRN"
#: PDFGrn.php:115
msgid "Date of Receipt: "
@@ -16516,7 +16513,7 @@
#: PDFGrn.php:122
#, fuzzy
msgid "There were no GRNs to print"
-msgstr "There are no shipping-methods defined"
+msgstr ""
#: PDFLowGP.php:8 PDFLowGP.php:14 PDFLowGP.php:15
msgid "Low Gross Profit Sales"
@@ -16632,7 +16629,7 @@
#: PDFStockTransListing.php:24 PDFStockTransListing.php:101
#, fuzzy
msgid "Stock Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:31
msgid "Enter the date from which the transactions are to be listed"
@@ -16641,7 +16638,7 @@
#: PDFPeriodStockTransListing.php:35
#, fuzzy
msgid "Enter the date to which the transactions are to be listed"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFPeriodStockTransListing.php:43 PDFStockTransListing.php:42
#: PrintCustTrans.php:59 PrintCustTransPortrait.php:57 SalesInquiry.php:1055
@@ -16656,7 +16653,7 @@
#: PDFPeriodStockTransListing.php:45 PDFStockTransListing.php:44
#, fuzzy
msgid "Location Transfer"
-msgstr "Select Vendor"
+msgstr ""
#: PDFPeriodStockTransListing.php:46 PDFStockTransListing.php:45
msgid "Stock Adjustment"
@@ -16665,7 +16662,7 @@
#: PDFPeriodStockTransListing.php:47 PDFStockTransListing.php:46
#, fuzzy
msgid "Purchase Order Delivery"
-msgstr "Select Vendor"
+msgstr ""
#: PDFPeriodStockTransListing.php:48 PDFStockTransListing.php:47
msgid "Work Order Receipt"
@@ -16674,7 +16671,7 @@
#: PDFPeriodStockTransListing.php:49 PDFStockTransListing.php:48
#, fuzzy
msgid "Work Order Issue"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PDFPeriodStockTransListing.php:56 StockQuantityByDate.php:39
msgid "For Stock Location"
@@ -16684,31 +16681,31 @@
#: PDFStockTransListing.php:83 PDFStockTransListing.php:89
#, fuzzy
msgid "Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:137
#, fuzzy
msgid "There were no transactions found in the database between the dates"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PDFPeriodStockTransListing.php:147 PDFStockTransListing.php:102
#, fuzzy
msgid "Stock transaction listing from"
-msgstr "Vendor Balance Listing"
+msgstr "Inventory transaction listing from"
#: PDFPeriodStockTransListing.php:154
#: includes/PDFCustTransListingPageHeader.inc:15
#: includes/PDFStockTransListingPageHeader.inc:15
#, fuzzy
msgid "Customer Invoices"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:157
#: includes/PDFCustTransListingPageHeader.inc:18
#: includes/PDFStockTransListingPageHeader.inc:18
#, fuzzy
msgid "Customer Credit Notes"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:160 SelectProduct.php:417
#: includes/PDFStockTransListingPageHeader.inc:21
@@ -16749,7 +16746,7 @@
#: PDFPickingList.php:22
#, fuzzy
msgid "Select Picking Lists"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PDFPickingList.php:32
msgid "Create picking lists for all deliveries to be made on"
@@ -16758,13 +16755,13 @@
#: PDFPickingList.php:34
#, fuzzy
msgid "From Warehouse"
-msgstr "Vendor Order"
+msgstr ""
#: PDFPickingList.php:47
#, fuzzy
msgid ""
"There was a problem retrieving the order header details from the database"
-msgstr "There was a problem testing for a default shipping-method because"
+msgstr ""
#: PDFPickingList.php:129 PDFPickingList.php:324
msgid "Print Picking List Error"
@@ -16789,7 +16786,7 @@
#: PDFPickingList.php:204
#, fuzzy
msgid "There was a problem retrieving the order line details for Order Number"
-msgstr "There was a problem testing for a default shipping-method because"
+msgstr ""
#: PDFPriceList.php:16
msgid "Price Listing Report"
@@ -16894,7 +16891,7 @@
#: PDFPriceList.php:296
#, fuzzy
msgid "Full Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PDFPriceList.php:299 PDFPriceList.php:336 PDFPriceList.php:338
msgid "Effective As At"
@@ -16948,7 +16945,7 @@
#: PDFPrintLabel.php:91
#, fuzzy
msgid "Select label type"
-msgstr "Select the Vendor"
+msgstr ""
#: PDFPrintLabel.php:92
msgid "Number of labels per item"
@@ -16961,12 +16958,12 @@
#: PDFPrintLabel.php:94
#, fuzzy
msgid "Update values"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PDFPrintLabel.php:117
#, fuzzy
msgid "Print labels"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PDFPrintLabel.php:118
msgid "Print labels with borders"
@@ -16988,7 +16985,7 @@
#: PDFPrintLabel.php:500
#, fuzzy
msgid "Couldnt get the currency data"
-msgstr "Could not load shipping-method"
+msgstr ""
#: PDFQuotation.php:10 PDFQuotationPortrait.php:11
msgid "Select Quotation To Print"
@@ -17124,7 +17121,7 @@
#, fuzzy
msgid ""
"The details of the payment to the supplier could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr "The details of the payment to the vendor could not be retrieved because"
#: PDFRemittanceAdvice.php:114
msgid "Remittance_Advices"
@@ -17145,7 +17142,7 @@
#: PDFRemittanceAdvice.php:269
#, fuzzy
msgid "Our Code:"
-msgstr "Territory Code"
+msgstr ""
#: PDFRemittanceAdvice.php:311
msgid "This Payment"
@@ -17166,7 +17163,7 @@
#: PDFStockCheckComparison.php:38
#, fuzzy
msgid "The inventory check file could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PDFStockCheckComparison.php:61
msgid "Stock Count Comparison"
@@ -17175,7 +17172,7 @@
#: PDFStockCheckComparison.php:64
#, fuzzy
msgid "The inventory counts file could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PDFStockCheckComparison.php:117 PDFStockCheckComparison.php:153
#: PDFStockCheckComparison.php:171
@@ -17335,7 +17332,7 @@
#: PDFStockNegatives.php:20
#, fuzzy
msgid "The sql that failed to retrieve the negative quantities was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFStockNegatives.php:37
msgid "There are no negative stocks to list"
@@ -17344,7 +17341,7 @@
#: PDFStockTransfer.php:12
#, fuzzy
msgid "The entered transfer reference is expected to be numeric"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr ""
#: PDFStockTransfer.php:18
#, fuzzy
@@ -17371,7 +17368,7 @@
#: PDFStockTransfer.php:63
#, fuzzy
msgid "There was no transfer found with number"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: PDFStockTransfer.php:64
msgid "Try Again"
@@ -17385,12 +17382,12 @@
#: PDFSuppTransListing.php:91
#, fuzzy
msgid "Supplier Transaction Listing"
-msgstr "Vendor Balance Listing"
+msgstr "Vendor Transaction Listing"
#: PDFSuppTransListing.php:92
#, fuzzy
msgid "Supplier transaction listing from"
-msgstr "Vendor Balance Listing"
+msgstr "Vendor transaction listing from"
#: PDFTopItems.php:8
msgid "Top Items Search Result"
@@ -17399,7 +17396,7 @@
#: PDFTopItems.php:117
#, fuzzy
msgid "There were no records returned "
-msgstr "There are no shipping-methods defined"
+msgstr ""
#: PeriodsInquiry.php:7
msgid "Periods Inquiry"
@@ -17424,7 +17421,7 @@
#: PO_AuthorisationLevels.php:50
#, fuzzy
msgid "The authentication details cannot be inserted because"
-msgstr "The shipping GL posting could not be inserted because"
+msgstr ""
#: PO_AuthorisationLevels.php:53
msgid "There already exists an entry for this user/currency combination"
@@ -17433,18 +17430,18 @@
#: PO_AuthorisationLevels.php:76
#, fuzzy
msgid "The authentication details cannot be updated because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PO_AuthorisationLevels.php:85
#, fuzzy
msgid "The authentication details cannot be deleted because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PO_AuthorisationLevels.php:96 PO_AuthorisationLevels.php:119
#: PO_AuthorisationLevels.php:195
#, fuzzy
msgid "The authentication details cannot be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PO_AuthorisationLevels.php:126
#, fuzzy
@@ -17486,7 +17483,7 @@
#: PO_AuthoriseMyOrders.php:60
#, fuzzy
msgid "Date Ordered"
-msgstr "Vendor Order"
+msgstr ""
#: PO_AuthoriseMyOrders.php:61 PO_OrderDetails.php:105
#: PO_SelectPurchOrder.php:396 includes/PO_PDFOrderPageHeader.inc:54
@@ -17497,7 +17494,7 @@
#: POReport.php:1492 ReprintGRN.php:75 includes/PDFPickingListHeader.inc:46
#, fuzzy
msgid "Delivery Date"
-msgstr "City-State-zip"
+msgstr ""
#: PO_AuthoriseMyOrders.php:94 PO_Header.php:789 PO_Header.php:805
#: PO_SelectOSPurchOrder.php:173 PO_SelectOSPurchOrder.php:175
@@ -17652,7 +17649,7 @@
#: PO_Header.php:286
#, fuzzy
msgid "Supplier changed by"
-msgstr "Vendor Purchasing Data"
+msgstr "Vendor changed by"
#: PO_Header.php:289
msgid ""
@@ -17809,7 +17806,7 @@
#: PO_Header.php:832
#, fuzzy
msgid "Supplier Info"
-msgstr "Vendor Code"
+msgstr "Vendor Info"
#: PO_Header.php:837 includes/PDFPickingListHeader.inc:13
msgid "Warehouse"
@@ -17873,13 +17870,13 @@
msgid ""
"The quantity in the supplier units is expected to be numeric. Please re-"
"enter as a number"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr ""
#: PO_Items.php:48
#, fuzzy
msgid ""
"The supplier price is expected to be numeric. Please re-enter as a number"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr "The vendor price is expected to be numeric. Please re-enter as a number"
#: PO_Items.php:64
#, fuzzy
@@ -17905,7 +17902,7 @@
#: PO_Items.php:96 SelectSalesOrder.php:111 SelectSalesOrder.php:279
#, fuzzy
msgid "Order Created and Authorised by"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:101 SelectSalesOrder.php:121 SelectSalesOrder.php:289
msgid "Your authority to approve purchase orders in"
@@ -18020,7 +18017,7 @@
#: PO_Items.php:416
#, fuzzy
msgid "The account details for"
-msgstr "The vendor pricing details for"
+msgstr ""
#: PO_Items.php:417
#, fuzzy
@@ -18113,7 +18110,7 @@
#: PO_Items.php:637
#, fuzzy
msgid "Our Unit"
-msgstr "Vendor Unit"
+msgstr ""
#: PO_Items.php:638
msgid "Price Our Units"
@@ -18163,7 +18160,7 @@
#: PO_Items.php:718
#, fuzzy
msgid "Not an Asset"
-msgstr "Select the Vendor"
+msgstr ""
#: PO_Items.php:721
msgid "Not yet purchased"
@@ -18193,7 +18190,7 @@
#: PO_Items.php:925
#, fuzzy
msgid "Our Units"
-msgstr "Vendor Unit"
+msgstr ""
#: PO_Items.php:927
#, fuzzy
@@ -18207,7 +18204,7 @@
#: PO_Items.php:958
#, fuzzy
msgid "Could not retrieve the purchasing data for the item"
-msgstr "The shipping-method record has been added"
+msgstr ""
#: PO_OrderDetails.php:11
msgid "Reviewing Purchase Order Number"
@@ -18260,7 +18257,7 @@
#: PO_OrderDetails.php:89 RecurringSalesOrders.php:371
#, fuzzy
msgid "Order Header Details"
-msgstr "Credit Shipping"
+msgstr ""
#: PO_OrderDetails.php:90 Suppliers.php:652 Suppliers.php:835
#: SuppLoginSetup.php:238 SuppLoginSetup.php:404 WWW_Users.php:264
@@ -18521,12 +18518,12 @@
#: POReport.php:541 POReport.php:626 POReport.php:1286 POReport.php:1337
#, fuzzy
msgid "Supplier No"
-msgstr "Vendor Name"
+msgstr "Vendor No"
#: POReport.php:543 POReport.php:1288 SalesInquiry.php:799
#, fuzzy
msgid "Order Qty"
-msgstr "Sales Order Inquiry"
+msgstr "S"
#: POReport.php:544 POReport.php:629 POReport.php:744 POReport.php:1289
#: POReport.php:1340 POReport.php:1429 SalesInquiry.php:800
@@ -18576,7 +18573,7 @@
#: POReport.php:1466
#, fuzzy
msgid "The report has been exported as a csv file."
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: POReport.php:1483 SalesInquiry.php:1033 StockDispatch.php:295
msgid "Report Type"
@@ -18615,7 +18612,7 @@
#: POReport.php:1585 SalesInquiry.php:1159
#, fuzzy
msgid "Run Inquiry"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:401 StockStatus.php:360
#: StockUsage.php:185
@@ -18652,7 +18649,7 @@
#: PO_SelectOSPurchOrder.php:151 PO_SelectPurchOrder.php:123
#, fuzzy
msgid "Order Status:"
-msgstr "Credit Shipping"
+msgstr ""
#: PO_SelectOSPurchOrder.php:153 PO_SelectOSPurchOrder.php:155
msgid "Pending and Authorised"
@@ -18695,7 +18692,7 @@
#: PO_SelectOSPurchOrder.php:432
#, fuzzy
msgid "Order #"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_SelectOSPurchOrder.php:434
msgid "Initiated by"
@@ -18764,7 +18761,7 @@
#: PricesBasedOnMarkUp.php:81 PricesBasedOnMarkUp.php:221
#, fuzzy
msgid "Preferred Supplier Cost Data"
-msgstr "Vendor Contacts"
+msgstr "Preferred Vendor Cost Data"
#: PricesBasedOnMarkUp.php:75 PricesBasedOnMarkUp.php:79
#: PricesBasedOnMarkUp.php:83
@@ -18847,7 +18844,7 @@
#: PricesBasedOnMarkUp.php:203
#, fuzzy
msgid "Base price list selected"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: PricesBasedOnMarkUp.php:204
msgid ""
@@ -18928,7 +18925,7 @@
#: PricesBasedOnMarkUp.php:291
#, fuzzy
msgid "There is no default price defined in the base price list for the item"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: PricesBasedOnMarkUp.php:300
msgid ""
@@ -18980,7 +18977,7 @@
#: PricesByCost.php:113
#, fuzzy
msgid "Cost in Price List"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PricesByCost.php:121 Prices_Customer.php:338 Prices.php:220
#: RecurringSalesOrders.php:417 WorkOrderEntry.php:473
@@ -19115,7 +19112,7 @@
#: Prices_Customer.php:202 Prices_Customer.php:248
#, fuzzy
msgid "The SQL used to retrieve these records was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: Prices_Customer.php:209
msgid "There are no default prices set up for this part"
@@ -19169,22 +19166,22 @@
#: Prices.php:142
#, fuzzy
msgid "The price has been updated"
-msgstr "The shipping charge has been updated"
+msgstr ""
#: Prices.php:160
#, fuzzy
msgid "The new price could not be added"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: Prices.php:164
#, fuzzy
msgid "The new price has been inserted"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: Prices.php:180
#, fuzzy
msgid "Could not delete this price"
-msgstr "Could not load shipping-method"
+msgstr ""
#: Prices.php:182
msgid "The selected price has been deleted"
@@ -19587,7 +19584,7 @@
#: PrintCustTransPortrait.php:89
#, fuzzy
msgid "Bank Code:"
-msgstr "Territory Code"
+msgstr ""
#: PrintCustTransPortrait.php:525
msgid "Print Invoices or Credit Notes (Portrait Mode)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
