Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4650] trunk
|
From: <dai...@us...> - 2011-08-06 01:48:19
|
Revision: 4650
http://web-erp.svn.sourceforge.net/web-erp/?rev=4650&view=rev
Author: daintree
Date: 2011-08-06 01:48:12 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/PaymentTerms.php
trunk/SelectProduct.php
trunk/doc/Change.log
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-08-04 10:18:14 UTC (rev 4649)
+++ trunk/PO_Header.php 2011-08-06 01:48:12 UTC (rev 4650)
@@ -157,7 +157,9 @@
}
/*New order initiated by user clicking on supplier purchasing data from items page */
-if (isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])) {
+if (isset($_GET['NewOrder'])
+ AND isset($_GET['StockID'])
+ AND isset($_GET['SelectedSupplier'])) {
/*
* initialise a new order
*/
@@ -173,10 +175,10 @@
/* set the SupplierID we got */
$_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
$_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']);
+
$_SESSION['RequireSupplierSelection'] = 0;
$_POST['Select'] = $_GET['SelectedSupplier'];
-
/*
* the item (it's item code) that should be purchased
*/
@@ -210,7 +212,9 @@
$_SESSION['PO'.$identifier]->ExRate = $_POST['ExRate'];
$_SESSION['PO'.$identifier]->Comments = $_POST['Comments'];
$_SESSION['PO'.$identifier]->DeliveryBy = $_POST['DeliveryBy'];
- $_SESSION['PO'.$identifier]->StatusMessage = $_POST['StatusComments'];
+ if (isset($_POST['StatusComments'])){
+ $_SESSION['PO'.$identifier]->StatusComments = $_POST['StatusComments'];
+ }
$_SESSION['PO'.$identifier]->PaymentTerms = $_POST['PaymentTerms'];
$_SESSION['PO'.$identifier]->Contact = $_POST['Contact'];
$_SESSION['PO'.$identifier]->Tel = $_POST['Tel'];
@@ -519,25 +523,29 @@
_('Purchase Order') . '" alt="">' . ' ' . _('Purchase Order: Select Supplier') . '';
echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier=' . $identifier . '" method="post" name="choosesupplier">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<input type="hidden" name="SuppliersReturned" value="' . $SuppliersReturned .'" />';
+ if (isset($SuppliersReturned)){
+ echo '<input type="hidden" name="SuppliersReturned" value="' . $SuppliersReturned .'" />';
+ }
- echo '<table cellpadding=3 colspan=4 class=selection>
+ echo '<table cellpadding="3" colspan="4" class="selection">
<tr>
<td><font size=1>' . _('Enter text in the supplier name') . ':</font></td>
- <td><input type="Text" name="Keywords" size="20" maxlength="25"></td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
<td><font size=3><b>' . _('OR') . '</b></font></td>
<td><font size=1>' . _('Enter text extract in the supplier code') . ':</font></td>
- <td><input type="text" name="SuppCode" size="15" maxlength="18"></td>
+ <td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
</tr>
- </table><br /><div class="centre">
- <input type="submit" name="SearchSuppliers" value="' . _('Search Now') . '">
- <input type="submit" action="reset" value="' . _('Reset') . '"></div>';
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="SearchSuppliers" value="' . _('Search Now') . '" />
+ <input type="submit" action="reset" value="' . _('Reset') . '" /></div>';
echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>';
if (isset($result_SuppSelect)) {
- echo '<br /><table cellpadding=3 colspan=7 class=selection>';
+ echo '<br /><table cellpadding="3" colspan="7" class="selection">';
$tableheader = '<tr>
<th>' . _('Code') . '</th>
@@ -606,7 +614,11 @@
/* the link */
echo '<li><a href="'.$rootpath.'/PO_Items.php?NewItem=' . $Purch_Item . '&identifier=' . $identifier . '">' . _('Enter Line Item to this purchase order') . '</a></li>';
- echo '</td></tr></table></div><br />';
+ echo '</td>
+ </tr>
+ </table>
+ </div>
+ <br />';
if (isset($_GET['Quantity'])) {
$Qty=$_GET['Quantity'];
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-08-04 10:18:14 UTC (rev 4649)
+++ trunk/PO_Items.php 2011-08-06 01:48:12 UTC (rev 4650)
@@ -93,7 +93,7 @@
$AuthRow=DB_fetch_array($AuthResult);
if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['PO'.$identifier]->Order_Value()) { //user has authority to authrorise as well as create the order
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . ' - '.$_SESSION['PO'.$identifier]->StatusMessage.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
$_SESSION['PO'.$identifier]->Status = 'Authorised';
} else { // no authority to authorise this order
@@ -110,18 +110,16 @@
_('The order will be created with a status of pending and will require authorisation'), 'warn');
$_SESSION['PO'.$identifier]->AllowPrintPO=0;
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . ' - '.$_SESSION['PO'.$identifier]->StatusMessage.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->Status = 'Pending';
}
} else { //auto authorise is set to off
$_SESSION['PO'.$identifier]->AllowPrintPO=0;
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . ' - '.$_SESSION['PO'.$identifier]->StatusMessage.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . ' - '.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->Status = 'Pending';
}
if ($_SESSION['ExistingOrder']==0){ /*its a new order to be inserted */
-
-//Do we need to check authorisation to create - no because already trapped when new PO session started
/*Get the order number */
$_SESSION['PO'.$identifier]->OrderNo = GetNextTransNo(18, $db);
@@ -284,7 +282,10 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
}
} else if ($POLine->PODetailRec=='') {
-
+ /*When the purchase order line is an existing record the auto-increment
+ * field PODetailRec is given to the session for that POLine
+ * So it will only be a new POLine if PODetailRec is empty
+ */
$sql = "INSERT INTO purchorderdetails ( orderno,
itemcode,
deliverydate,
@@ -328,7 +329,7 @@
completed=1,
assetid='" . $POLine->AssetID . "',
conversionfactor = '" . $POLine->ConversionFactor . "'
- WHERE podetailitem='" . $POLine->PODetailRec . "'";
+ WHERE podetailitem='" . $POLine->PODetailRec . "'";
} else {
$sql = "UPDATE purchorderdetails SET itemcode='" . $POLine->StockID . "',
deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
@@ -354,7 +355,7 @@
prnMsg(_('Purchase Order') . ' ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . _('has been updated'),'success');
if ($_SESSION['PO'.$identifier]->AllowPrintPO==1
AND ($_SESSION['PO'.$identifier]->Status=='Authorised'
- OR $_SESSION['PO'.$identifier]->Status=='Printed')){
+ OR $_SESSION['PO'.$identifier]->Status=='Printed')){
echo '<br /><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a>';
}
} /*end of if its a new order or an existing one */
@@ -409,8 +410,8 @@
if ($_SESSION['PO'.$identifier]->GLLink==1){
$sql = "SELECT accountname
- FROM chartmaster
- WHERE accountcode ='" . (int) $_POST['GLCode'] . "'";
+ FROM chartmaster
+ WHERE accountcode ='" . $_POST['GLCode'] . "'";
$ErrMsg = _('The account details for') . ' ' . $_POST['GLCode'] . ' ' . _('could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the details of the account, but failed was');
$GLValidResult = DB_query($sql,$db,$ErrMsg,$DbgMsg,false,false);
@@ -438,10 +439,10 @@
$ValidAssetResult = DB_query("SELECT assetid,
description,
costact
- FROM fixedassets
- INNER JOIN fixedassetcategories
- ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
- WHERE assetid='" . $_POST['AssetID'] . "'",$db);
+ FROM fixedassets
+ INNER JOIN fixedassetcategories
+ ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
+ WHERE assetid='" . $_POST['AssetID'] . "'",$db);
if (DB_num_rows($ValidAssetResult)==0){ // then the asset id entered doesn't exist
$AllowUpdate = false;
prnMsg(_('An asset code was entered but it does not yet exist. Only pre-existing asset ids can be entered when ordering a fixed asset'),'error');
@@ -494,9 +495,10 @@
if (isset($_POST['NewItem'])){
/* NewItem is set from the part selection list as the part code selected
* take the form entries and enter the data from the form into the PurchOrder class variable
- * A series of form variables of the format "Qty" with the ItemCode concatenated are created on the search for adding new
- * items for each of these form variables need to parse out the items and look up the details to add them to the purchase
- * order $_POST is of course the global array of all posted form variables */
+ * A series of form variables of the format "NewQty" with the ItemCode concatenated are created on the search for adding new
+ * items for each of these form variables need to parse out the item code and look up the details to add them to the purchase
+ * order $_POST is of course the global array of all posted form variables
+ */
foreach ($_POST as $FormVariableName => $Quantity) {
@@ -632,7 +634,7 @@
echo ' ' . _('Purchase Order') .' '. $_SESSION['PO'.$identifier]->OrderNo ;
}
echo '<br /><b>'._(' Order Summary') . '</b>';
- echo '<table cellpadding=2 colspan=7 class=selection>';
+ echo '<table cellpadding="2" colspan="7" class="selection">';
echo '<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -688,12 +690,15 @@
}
$DisplayTotal = number_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
- echo '<tr><td colspan="10" class=number>' . _('TOTAL') . _(' excluding Tax') . '</td>
- <td class=number><b>' . $DisplayTotal . '</b></td>
+ echo '<tr><td colspan="10" class="number">' . _('TOTAL') . _(' excluding Tax') . '</td>
+ <td class="number"><b>' . $DisplayTotal . '</b></td>
</tr></table>';
- echo '<br /><div class="centre"><input type="submit" name="UpdateLines" value="Update Order Lines">';
+ echo '<br />
+ <div class="centre">
+ <input type="submit" name="UpdateLines" value="Update Order Lines" />';
- echo ' <input type="submit" name="Commit" value="Process Order"></div>';
+ echo ' <input type="submit" name="Commit" value="Process Order" />
+ </div>';
} /*Only display the order line items if there are any !! */
@@ -716,7 +721,7 @@
}
echo '</select></td></tr>';
echo '<tr><td>'._('OR Asset ID'). '</td>
- <td><select name="AssetID">';
+ <td><select name="AssetID">';
$AssetsResult = DB_query("SELECT assetid, description, datepurchased FROM fixedassets ORDER BY assetid DESC",$db);
echo '<option selected value="Not an Asset">' . _('Not an Asset') . '</option>';
while ($AssetRow = DB_fetch_array($AssetsResult)){
@@ -738,7 +743,9 @@
<tr><td>'._('Delivery Date').'</td>
<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size=11 value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'"></td></tr>';
echo '</table>';
- echo '<div class=centre><input type=submit name="EnterLine" value="Enter Item"></div>';
+ echo '<div class="centre">
+ <input type=submit name="EnterLine" value="Enter Item" />
+ </div>';
}
/* Now show the stock item selection search stuff below */
@@ -752,8 +759,25 @@
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['StockCat']=='All'){
-
- $sql = "SELECT stockmaster.stockid,
+ if ($_POST['SupplierItemsOnly']=='on'){
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND stockmaster.description " . LIKE . " '" . $SearchString ."'
+ ORDER BY stockmaster.stockid
+ LIMIT " .$_SESSION['DefaultDisplayRecordsMax'];
+ } else { // not just supplier purchdata items
+
+ $sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
@@ -765,28 +789,65 @@
AND stockmaster.description " . LIKE . " '" . $SearchString ."'
ORDER BY stockmaster.stockid
LIMIT " .$_SESSION['DefaultDisplayRecordsMax'];
- } else {
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND stockmaster.description " . LIKE . " '". $SearchString ."'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ }
+ } else { //for a specific stock category
+ if ($_POST['SupplierItemsOnly']=='on'){
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND stockmaster.discontinued<>1
+ AND stockmaster.description " . LIKE . " '". $SearchString ."'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ } else {
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND stockmaster.description " . LIKE . " '". $SearchString ."'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ }
}
} elseif ($_POST['StockCode']){
$_POST['StockCode'] = '%' . $_POST['StockCode'] . '%';
-
+
if ($_POST['StockCat']=='All'){
- $sql = "SELECT stockmaster.stockid,
+ if ($_POST['SupplierItemsOnly']=='on'){
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND stockmaster.discontinued<>1
+ AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ } else {
+ $sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
@@ -798,8 +859,27 @@
AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
ORDER BY stockmaster.stockid
LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
- } else {
- $sql = "SELECT stockmaster.stockid,
+ }
+ } else { //for a specific stock category and LIKE stock code
+ if ($_POST['SupplierItemsOnly']=='on'){
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ and stockmaster.discontinued<>1
+ AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ } else {
+ $sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
@@ -812,11 +892,28 @@
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
ORDER BY stockmaster.stockid
LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ }
}
} else {
if ($_POST['StockCat']=='All'){
- $sql = "SELECT stockmaster.stockid,
+ if ($_POST['SupplierItemsOnly']=='on'){
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND stockmaster.discontinued<>1
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DefaultDisplayRecordsMax'];
+ } else {
+ $sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
@@ -827,8 +924,26 @@
AND stockmaster.discontinued<>1
ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DefaultDisplayRecordsMax'];
- } else {
- $sql = "SELECT stockmaster.stockid,
+ }
+ } else { // for a specific stock category
+ if ($_POST['SupplierItemsOnly']=='on'){
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND stockmaster.discontinued<>1
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DefaultDisplayRecordsMax'];
+ } else {
+ $sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
@@ -840,6 +955,7 @@
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DefaultDisplayRecordsMax'];
+ }
}
}
@@ -870,13 +986,13 @@
$DbgMsg = _('The SQL used to retrieve the category details but failed was');
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<table class=selection>
+ echo '<table class="selection">
<tr>
<th colspan=3><font size=3 color=blue>'. _('Search For Stock Items') . '</th>';
echo ':</font>
</tr>
- <tr><td><select name="StockCat">';
+ <tr><td>' . _('Item Category') . ': <select name="StockCat">';
echo '<option selected value="All">' . _('All') . '</option>';
@@ -902,7 +1018,11 @@
echo '</select></td>
<td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size=20 maxlength=25 value="' . $_POST['Keywords'] . '"></td></tr>
- <tr><td></td>
+ <tr><td>' . _('Only items defined as from this Supplier') . ' <input type="checkbox" name="SupplierItemsOnly" ';
+ if (isset($_POST['SupplierItemsOnly']) AND $_POST['SupplierItemsOnly']=='on'){
+ echo 'checked';
+ }
+ echo ' /></td>
<td><font size=3><b>' . _('OR') . ' </b></font>' . _('Enter extract of the Stock Code') . ':</td>
<td><input type="text" name="StockCode" size=15 maxlength=18 value="' . $_POST['StockCode'] . '"></td>
</tr>
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2011-08-04 10:18:14 UTC (rev 4649)
+++ trunk/PO_PDFPurchOrder.php 2011-08-06 01:48:12 UTC (rev 4650)
@@ -225,7 +225,9 @@
$POLine['itemdescription']=str_pad('',50,'x');
$POLine['unitprice']=9999.99;
$POLine['units']=str_pad('',4,'x');
- $POLine['quantityord']=999.99;
+ $POLine['suppliersunit']=str_pad('',4,'x');
+ $POLine['quantityord']=9999.99;
+ $POLine['conversionfactor']=1;
$POLine['decimalplaces']=2;
}
$DisplayQty = number_format($POLine['quantityord']/$POLine['conversionfactor'],$POLine['decimalplaces']);
@@ -275,8 +277,7 @@
/* If we are previewing we want to stop showing order
* lines after the first one */
if ($OrderNo=='Preview') {
-// unlink(sys_get_temp_dir().'/PurchaseOrder.xml');
- unset($OrderNo);
+ $OrderNo='Preview_PurchaseOrder';
}
} //end while there are line items to print out
if ($YPos-$line_height <= $Bottom_Margin){ // need to ensure space for totals
@@ -308,7 +309,7 @@
$mail->setText( _('Please find herewith our purchase order number').' ' . $OrderNo);
$mail->setSubject( _('Purchase Order Number').' ' . $OrderNo);
$mail->addAttachment($attachment, $PdfFileName, 'application/pdf');
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . "<" . $_SESSION['CompanyRecord']['email'] .">");
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] .'>');
$Success = $mail->send(array($_POST['EmailTo']));
if ($Success==1){
$title = _('Email a Purchase Order');
@@ -350,14 +351,14 @@
$_POST['PrintOrEmail'] = 'Print';
}
if ($ViewingOnly!=0){
- echo '<option selected value="Print">'. _('Print');
+ echo '<option selected value="Print">'. _('Print') . '</option>';
} else {
if ($_POST['PrintOrEmail']=='Print'){
- echo '<option selected value="Print">'. _('Print');
- echo '<option value="Email">' . _('Email');
+ echo '<option selected value="Print">'. _('Print') . '</option>';
+ echo '<option value="Email">' . _('Email') . '</option>';
} else {
- echo '<option value="Print">'. _('Print');
- echo '<option selected value="Email">'. _('Email');
+ echo '<option value="Print">'. _('Print') . '</option>';
+ echo '<option selected value="Email">'. _('Email') . '</option>';
}
}
echo '</select></td></tr>';
@@ -367,11 +368,11 @@
$_POST['ShowAmounts'] = 'Yes';
}
if ($_POST['ShowAmounts']=='Yes'){
- echo '<option selected value="Yes">'. _('Yes');
- echo '<option value="No">' . _('No');
+ echo '<option selected value="Yes">'. _('Yes') . '</option>';
+ echo '<option value="No">' . _('No') . '</option>';
} else {
- echo '<option value="Yes">'. _('Yes');
- echo '<option selected value="No">'. _('No');
+ echo '<option value="Yes">'. _('Yes') . '</option>';
+ echo '<option selected value="No">'. _('No') . '</option>';
}
echo '</select></td></tr>';
if ($_POST['PrintOrEmail']=='Email'){
Modified: trunk/PaymentTerms.php
===================================================================
--- trunk/PaymentTerms.php 2011-08-04 10:18:14 UTC (rev 4649)
+++ trunk/PaymentTerms.php 2011-08-06 01:48:12 UTC (rev 4650)
@@ -75,7 +75,7 @@
/*SelectedTerms could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- if (isset($_POST['DaysOrFoll']) and $_POST['DaysOrFoll']=='on') {
+ if (isset($_POST['DaysOrFoll']) AND $_POST['DaysOrFoll']=='on') {
$sql = "UPDATE paymentterms SET
terms='" . $_POST['Terms'] . "',
dayinfollowingmonth=0,
@@ -271,7 +271,7 @@
<tr>
<td>'._('Due After A Given No. Of Days').':</td>
<td><input type="checkbox" name="DaysOrFoll" ';
- if ( isset($DayInFollowingMonth) && !$DayInFollowingMonth) {
+ if (isset($DayInFollowingMonth) AND !$DayInFollowingMonth) {
echo 'checked';
}
echo ' ></td>
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-08-04 10:18:14 UTC (rev 4649)
+++ trunk/SelectProduct.php 2011-08-06 01:48:12 UTC (rev 4650)
@@ -376,7 +376,7 @@
echo '<td class="select">' . _('No') . '</td>';
}
echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes&SelectedSupplier=' .
- $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
+ $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'&LeadTime='.$SuppRow['leadtime'] . '">' . _('Order') . ' </a></td>';
echo '</tr>';
}
echo '</table></td>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-08-04 10:18:14 UTC (rev 4649)
+++ trunk/doc/Change.log 2011-08-06 01:48:12 UTC (rev 4650)
@@ -1,5 +1,7 @@
webERP Change Log
+6/8/11 Phil: PO_Items.php now has checkbox to select items that have purchasing data entered for the supplier ordering from - as per Klaus's (opto) suggestion
+6/8/11 Exson: Added leadtime to the link from SelectProduct.php so that delivery dates used when creating purchase orders make sense
4/8/11 Phil: Fix GP Percent reported when discounts updated by discount matrix
4/8/11 Phil: Make PO_SelectOSPurchOrder.php behave similarly to SelectPurchOrder.php (for inquiries) where the order number is the link that takes you to the order
4/8/11 Ricard: SalesInquiry.php now shows net sales after discounts
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
