From: <dai...@us...> - 2011-05-16 10:46:56
|
Revision: 4571 http://web-erp.svn.sourceforge.net/web-erp/?rev=4571&view=rev Author: daintree Date: 2011-05-16 10:46:50 +0000 (Mon, 16 May 2011) Log Message: ----------- various Modified Paths: -------------- trunk/PO_Header.php trunk/SelectOrderItems.php trunk/doc/Change.log Modified: trunk/PO_Header.php =================================================================== --- trunk/PO_Header.php 2011-05-16 07:41:47 UTC (rev 4570) +++ trunk/PO_Header.php 2011-05-16 10:46:50 UTC (rev 4571) @@ -84,7 +84,7 @@ if ($_POST['Status'] == 'Authorised') { if ($AuthorityLevel > $OrderTotal) { - $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete']); + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8'); $_SESSION['PO'.$identifier]->AllowPrintPO=1; } else { $OKToUpdateStatus=0; @@ -109,7 +109,7 @@ } if ($OKToUpdateStatus==1){ // none of the order has been received if ($AuthorityLevel>$OrderTotal) { - $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . $_POST['Status'] . ' ' . _('by') . $UserChangedStatus . $_POST['StatusComments'].'<br />' . $_POST['StatusCommentsComplete']; + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . $_POST['Status'] . ' ' . _('by') . $UserChangedStatus . $_POST['StatusComments'].'<br />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8'); } else { $OKToUpdateStatus=0; prnMsg( _('You do not have permission to reject this purchase order').'.<br />'. _('This order is for').' '. @@ -129,7 +129,7 @@ if (($AuthorityLevel>$OrderTotal OR $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator ) AND $OKToUpdateStatus==1) { - $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order set to pending status by') . $UserChangedStatus . $_POST['StatusComments']. '<br />' .$_POST['StatusCommentsComplete']; + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order set to pending status by') . $UserChangedStatus . $_POST['StatusComments']. '<br />' .html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8'); } elseif ($AuthorityLevel<$OrderTotal AND $_SESSION['UserID']!=$_SESSION['PO'.$identifier]->Initiator) { $OKToUpdateStatus=0; @@ -281,7 +281,7 @@ if ($_SESSION['PO'.$identifier]->Any_Already_Received()==0){ $_SESSION['RequireSupplierSelection']=1; $_SESSION['PO'.$identifier]->Status = 'Pending'; - $_SESSION['PO'.$identifier]->StatusComments==date($_SESSION['DefaultDateFormat']).' - ' . _('Supplier changed by') . ' <a href="mailto:'. $_SESSION['UserEmail'] .'">'.$_SESSION['UserID']. '</a> - '.$_POST['StatusComments'].'<br />'.$_POST['StatusCommentsComplete']; + $_SESSION['PO'.$identifier]->StatusComments==date($_SESSION['DefaultDateFormat']).' - ' . _('Supplier changed by') . ' <a href="mailto:'. $_SESSION['UserEmail'] .'">'.$_SESSION['UserID']. '</a> - '.$_POST['StatusComments'].'<br />'.html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8'); } else { echo '<br /><br />'; prnMsg(_('Cannot modify the supplier of the order once some of the order has been received'),'warn'); @@ -583,7 +583,6 @@ if ($_SESSION['ExistingOrder']) { echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo; - echo '</p>'; } if (isset($Purch_Item)) { @@ -689,7 +688,7 @@ </tr> <tr><td style="width:50%">'; //sub table starts - echo '<table class=selection width=100%>'; + echo '<table class="selection" width="100%">'; echo '<tr><td>' . _('PO Date') . ':</td><td>'; if ($_SESSION['ExistingOrder']!=0){ echo ConvertSQLDate($_SESSION['PO'.$identifier]->Orig_OrderDate); @@ -757,8 +756,9 @@ } echo '</table>'; - - echo '<td style="width:50%" valign=top><table class=selection width=100%>'; + //Set up the next column with a sub-table in it too + echo '<td style="width:50%" valign=top> + <table class="selection" width="100%">'; if($_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO'.$identifier]->Status == 'Printed'){ @@ -769,7 +769,8 @@ echo '<input type="hidden" name="Status" value="NewOrder">'; echo '<tr><td>' . _('New Purchase Order') . '</td></tr>'; } else { - echo '<tr><td>' . _('Status') . ' : </td><td><select name="Status" onChange="ReloadForm(form1.UpdateStatus)">'; + echo '<tr><td>' . _('Status') . ' : </td> + <td><select name="Status" onChange="ReloadForm(form1.UpdateStatus)">'; switch ($_SESSION['PO'.$identifier]->Status) { case 'Pending': @@ -807,8 +808,8 @@ echo '<tr><td>' . _('Status Comment') . ':</td> <td><input type=text name="StatusComments" size=50></td></tr> <tr><td colspan=2><b>' . $_SESSION['PO'.$identifier]->StatusComments .'</b></td></tr>'; - //need to use single quotes as double quotes inside the string of StatusComments - echo '<input type="hidden" name="StatusCommentsComplete" value="' . $_SESSION['PO'.$identifier]->StatusComments .'">'; + + echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlentities($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />'; echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'"></td>'; } //end its not a new order Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2011-05-16 07:41:47 UTC (rev 4570) +++ trunk/SelectOrderItems.php 2011-05-16 10:46:50 UTC (rev 4571) @@ -1652,10 +1652,9 @@ // Find the quantity on outstanding sales orders $sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem - FROM salesorderdetails, - salesorders - WHERE salesorders.orderno = salesorderdetails.orderno - AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' + FROM salesorderdetails INNER JOIN salesorders + ON salesorders.orderno = salesorderdetails.orderno + WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' AND salesorderdetails.completed=0 AND salesorders.quotation=0 AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'"; @@ -1672,7 +1671,8 @@ // Find the quantity on purchase orders $sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo - FROM purchorderdetails INNER JOIN purchorders + FROM purchorderdetails INNER JOIN purchorders + ON purchorderdetails.orderno=purchorders.orderno WHERE purchorderdetails.completed=0 AND purchorders.status<>'Cancelled' AND purchorders.status<>'Rejected' Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-05-16 07:41:47 UTC (rev 4570) +++ trunk/doc/Change.log 2011-05-16 10:46:50 UTC (rev 4571) @@ -1,6 +1,7 @@ webERP Change Log -15/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php +16/5/11 Bug in quantity on purchase order in SelectOrderItems.php added correct join syntax +16/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php 15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates - turned off error trapping on these queries as the error trapping is done in the script 15/5/11 Tim: FixedAssetCategories prior to deletion of a category check for existing assets in the category failed due to typo in SQL - fixed 14/5/11 Tim: StockTransfer now checks for negative stock before allowing transfer - launchpad changes to 4691 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |