From: <vv...@us...> - 2012-04-02 03:37:20
|
Revision: 5202 http://web-erp.svn.sourceforge.net/web-erp/?rev=5202&view=rev Author: vvs2012 Date: 2012-04-02 03:37:13 +0000 (Mon, 02 Apr 2012) Log Message: ----------- xhtml Modified Paths: -------------- trunk/OffersReceived.php trunk/OrderDetails.php trunk/OutstandingGRNs.php trunk/PageSecurity.php trunk/PaymentAllocations.php trunk/PaymentMethods.php trunk/PaymentTerms.php trunk/Payments.php Modified: trunk/OffersReceived.php =================================================================== --- trunk/OffersReceived.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/OffersReceived.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -1,277 +1,281 @@ -<?php - -/*$Id: OffersReceived.php 4500 2011-02-27 09:18:42Z daintree $ */ - -include('includes/session.inc'); -$title = _('Supplier Offers'); -include('includes/header.inc'); -include('includes/SQL_CommonFunctions.inc'); - -if (isset($_POST['supplierid'])) { - $sql="SELECT suppname, - email, - currcode, - paymentterms - FROM suppliers - WHERE supplierid='".$_POST['supplierid']."'"; - $result = DB_query($sql, $db); - $myrow=DB_fetch_array($result); - $SupplierName=$myrow['suppname']; - $Email=$myrow['email']; - $CurrCode=$myrow['currcode']; - $PaymentTerms=$myrow['paymentterms']; -} - -if (!isset($_POST['supplierid'])) { - $sql="SELECT DISTINCT - offers.supplierid, - suppliers.suppname - FROM offers - LEFT JOIN purchorderauth - ON offers.currcode=purchorderauth.currabrev - LEFT JOIN suppliers - ON suppliers.supplierid=offers.supplierid - WHERE purchorderauth.userid='".$_SESSION['UserID']."' - AND offers.expirydate>'".date('Y-m-d')."' - AND purchorderauth.cancreate=0"; - $result=DB_query($sql, $db); - if (DB_num_rows($result)==0) { - prnMsg(_('There are no offers outstanding that you are authorised to deal with'), 'information'); - } else { - echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Select Supplier') . '" alt="" /> - ' . ' ' . _('Select Supplier') . '</p>'; - echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - echo '<table class="selection"> - <tr> - <td>'._('Select Supplier').'</td> - <td><select name=supplierid>'; - while ($myrow=DB_fetch_array($result)) { - echo '<option value="'.$myrow['supplierid'].'">'.$myrow['suppname'].'</option>'; - } - echo '</select></td> - </tr> - <tr><td colspan="12"> - <div class="centre"> - <input type="submit" name="select" value="' . _('Enter Information') . '" /> - </div> - </td> - </tr> - </table> - </form>'; - } -} - -if (!isset($_POST['submit']) and isset($_POST['supplierid'])) { - $sql = "SELECT offers.offerid, - offers.tenderid, - offers.supplierid, - suppliers.suppname, - offers.stockid, - stockmaster.description, - offers.quantity, - offers.uom, - offers.price, - offers.expirydate, - offers.currcode, - stockmaster.decimalplaces, - currencies.decimalplaces AS currdecimalplaces - FROM offers INNER JOIN purchorderauth - ON offers.currcode=purchorderauth.currabrev - INNER JOIN suppliers - ON suppliers.supplierid=offers.supplierid - INNER JOIN currencies - ON suppliers.currcode=currencies.currabrev - LEFT JOIN stockmaster - ON stockmaster.stockid=offers.stockid - WHERE purchorderauth.userid='" . $_SESSION['UserID'] . "' - AND offers.expirydate>'" . date('Y-m-d') . "' - AND offers.supplierid='" . $_POST['supplierid'] . "' - ORDER BY offerid"; - $result=DB_query($sql, $db); - - echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - - echo '<p class="page_title_text"> - <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Supplier Offers') . '" alt="" />' . ' ' . _('Supplier Offers') . ' - </p>'; - - echo '<table class="selection"> - <tr> - <th>'._('Offer ID').'</th> - <th>'._('Supplier').'</th> - <th>'._('Stock Item').'</th> - <th>'._('Quantity').'</th> - <th>'._('Units').'</th> - <th>'._('Price').'</th> - <th>'._('Total').'</th> - <th>'._('Currency').'</th> - <th>'._('Offer Expires').'</th> - <th>'._('Accept').'</th> - <th>'._('Reject').'</th> - <th>'._('Defer').'</th> - </tr>'; - $k=0; - - while ($myrow=DB_fetch_array($result)) { - if ($k==1){ - echo '<tr class="EvenTableRows">'; - $k=0; - } else { - echo '<tr class="OddTableRows">'; - $k++; - } - echo '<td>'.$myrow['offerid'].'</td> - <td>'.$myrow['suppname'].'</td> - <td>'.$myrow['description'].'</td> - <td class="number">'.locale_number_format($myrow['quantity'],$myrow['decimalplaces']).'</td> - <td>'.$myrow['uom'].'</td> - <td class="number">'.locale_number_format($myrow['price'],$myrow['currdecimalplaces']).'</td> - <td class="number">'.locale_number_format($myrow['price']*$myrow['quantity'],$myrow['currdecimalplaces']).'</td> - <td>'.$myrow['currcode'].'</td> - <td>'.$myrow['expirydate'].'</td> - <td><input type="radio" name="action'.$myrow['offerid'].'" value="1" /></td> - <td><input type="radio" name="action'.$myrow['offerid'].'" value="2" /></td> - <td><input type="radio" checked name="action'.$myrow['offerid'].'" value="3" /></td> - <td><input type="hidden" name="supplierid" value="'.$myrow['supplierid'].'" /></td> - </tr>'; - } - echo '<tr> - <td colspan="12"> - <div class="centre"> - <input type="submit" name="submit" value="' . _('Enter Information') . '" /> - </div> - </td> - </tr> - </form> - </table>'; -} else if(isset($_POST['submit']) and isset($_POST['supplierid'])) { - include ('includes/htmlMimeMail.php'); - $accepts=array(); - $rejects=array(); - $defers=array(); - foreach ($_POST as $key => $value) { - if(mb_substr($key,0,6)=='action') { - $OfferID=mb_substr($key,6); - switch ($value) { - case 1: - $accepts[]=$OfferID; - break; - case 2: - $rejects[]=$OfferID; - break; - case 3: - $defers[]=$OfferID; - break; - } - } - } - if (sizeOf($accepts)>0){ - $MailText=_('This email has been automatically generated by the webERP installation at').' '. - $_SESSION['CompanyRecord']['coyname']."\n"; - $MailText.=_('The following offers you made have been accepted')."\n"; - $MailText.=_('An official order will be sent to you in due course')."\n\n"; - $sql="SELECT rate FROM currencies where currabrev='" . $CurrCode ."'"; - $result=DB_query($sql, $db); - $myrow=DB_fetch_array($result); - $Rate=$myrow['rate']; - $OrderNo = GetNextTransNo(18, $db); - $sql="INSERT INTO purchorders ( - orderno, - supplierno, - orddate, - rate, - initiator, - intostocklocation, - deliverydate, - status, - stat_comment, - paymentterms) - VALUES ( - '".$OrderNo."', - '".$_POST['supplierid']."', - '".date('Y-m-d')."', - '".$Rate."', - '".$_SESSION['UserID']."', - '".$_SESSION['DefaultFactoryLocation']."', - '".date('Y-m-d')."', - '"._('Pending')."', - '"._('Automatically generated from tendering system')."', - '".$PaymentTerms."')"; - DB_query($sql, $db); - foreach ($accepts as $AcceptID) { - $sql="SELECT offers.quantity, - offers.price, - offers.uom, - stockmaster.description, - stockmaster.stockid - FROM offers - LEFT JOIN stockmaster - ON offers.stockid=stockmaster.stockid - WHERE offerid='".$AcceptID."'"; - $result= DB_query($sql, $db); - $myrow=DB_fetch_array($result); - $MailText.=$myrow['description']."\t"._('Quantity').' '.$myrow['quantity']."\t"._('Price').' '. - locale_number_format($myrow['price'])."\n"; - $sql="INSERT INTO purchorderdetails (orderno, - itemcode, - deliverydate, - itemdescription, - unitprice, - actprice, - quantityord, - suppliersunit) - VALUES ('".$OrderNo."', - '".$myrow['stockid']."', - '".date('Y-m-d')."', - '".$myrow['description']."', - '".$myrow['price']."', - '".$myrow['price']."', - '".$myrow['quantity']."', - '".$myrow['uom']."')"; - $result=DB_query($sql, $db); - $sql="DELETE FROM offers WHERE offerid='".$AcceptID."'"; - $result=DB_query($sql, $db); - } - $mail = new htmlMimeMail(); - $mail->setSubject(_('Your offer to').' '.$_SESSION['CompanyRecord']['coyname'].' '._('has been accepted')); - $mail->setText($MailText); - $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>'); - $result = $mail->send(array($Email), 'smtp'); - prnMsg(_('The accepted offers from').' '.$SupplierName.' '._('have been converted to purchase orders and an email sent to') - .' '.$Email."\n"._('Please review the order contents').' '.'<a href="'.$rootpath . - '/PO_Header.php?ModifyOrderNumber=' . $OrderNo.'">'._('here').'</a>', 'success'); - } - if (sizeOf($rejects)>0){ - $MailText=_('This email has been automatically generated by the webERP installation at').' '. - $_SESSION['CompanyRecord']['coyname']."\n"; - $MailText.=_('The following offers you made have been rejected')."\n\n"; - foreach ($rejects as $RejectID) { - $sql="SELECT offers.quantity, - offers.price, - stockmaster.description - FROM offers - LEFT JOIN stockmaster - ON offers.stockid=stockmaster.stockid - WHERE offerid='".$RejectID."'"; - $result= DB_query($sql, $db); - $myrow=DB_fetch_array($result); - $MailText.=$myrow['description']."\t"._('Quantity').' '.$myrow['quantity']."\t"._('Price').' '. - locale_number_format($myrow['price'])."\n"; - $sql="DELETE FROM offers WHERE offerid='".$RejectID."'"; - $result=DB_query($sql, $db); - } - $mail = new htmlMimeMail(); - $mail->setSubject(_('Your offer to').' '.$_SESSION['CompanyRecord']['coyname'].' '._('has been rejected')); - $mail->setText($MailText); - $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>'); - $result = $mail->send(array($Email), 'smtp'); - prnMsg(_('The rejected offers from').' '.$SupplierName.' '._('have been removed from the system and an email sent to') - .' '.$Email, 'success'); - } - prnMsg(_('All offers have been processed, and emails sent where appropriate'), 'success'); -} -include('includes/footer.inc'); - +<?php + +/*$Id: OffersReceived.php 4500 2011-02-27 09:18:42Z daintree $ */ + +include('includes/session.inc'); +$title = _('Supplier Offers'); +include('includes/header.inc'); +include('includes/SQL_CommonFunctions.inc'); + +if (isset($_POST['supplierid'])) { + $sql="SELECT suppname, + email, + currcode, + paymentterms + FROM suppliers + WHERE supplierid='".$_POST['supplierid']."'"; + $result = DB_query($sql, $db); + $myrow=DB_fetch_array($result); + $SupplierName=$myrow['suppname']; + $Email=$myrow['email']; + $CurrCode=$myrow['currcode']; + $PaymentTerms=$myrow['paymentterms']; +} + +if (!isset($_POST['supplierid'])) { + $sql="SELECT DISTINCT + offers.supplierid, + suppliers.suppname + FROM offers + LEFT JOIN purchorderauth + ON offers.currcode=purchorderauth.currabrev + LEFT JOIN suppliers + ON suppliers.supplierid=offers.supplierid + WHERE purchorderauth.userid='".$_SESSION['UserID']."' + AND offers.expirydate>'".date('Y-m-d')."' + AND purchorderauth.cancreate=0"; + $result=DB_query($sql, $db); + if (DB_num_rows($result)==0) { + prnMsg(_('There are no offers outstanding that you are authorised to deal with'), 'information'); + } else { + echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Select Supplier') . '" alt="" /> + ' . ' ' . _('Select Supplier') . '</p>'; + echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection"> + <tr> + <td>'._('Select Supplier').'</td> + <td><select name=supplierid>'; + while ($myrow=DB_fetch_array($result)) { + echo '<option value="'.$myrow['supplierid'].'">'.$myrow['suppname'].'</option>'; + } + echo '</select></td> + </tr> + <tr><td colspan="12"> + <div class="centre"> + <input type="submit" name="select" value="' . _('Enter Information') . '" /> + </div> + </td> + </tr> + </table> + </div> + </form>'; + } +} + +if (!isset($_POST['submit']) and isset($_POST['supplierid'])) { + $sql = "SELECT offers.offerid, + offers.tenderid, + offers.supplierid, + suppliers.suppname, + offers.stockid, + stockmaster.description, + offers.quantity, + offers.uom, + offers.price, + offers.expirydate, + offers.currcode, + stockmaster.decimalplaces, + currencies.decimalplaces AS currdecimalplaces + FROM offers INNER JOIN purchorderauth + ON offers.currcode=purchorderauth.currabrev + INNER JOIN suppliers + ON suppliers.supplierid=offers.supplierid + INNER JOIN currencies + ON suppliers.currcode=currencies.currabrev + LEFT JOIN stockmaster + ON stockmaster.stockid=offers.stockid + WHERE purchorderauth.userid='" . $_SESSION['UserID'] . "' + AND offers.expirydate>'" . date('Y-m-d') . "' + AND offers.supplierid='" . $_POST['supplierid'] . "' + ORDER BY offerid"; + $result=DB_query($sql, $db); + + echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + + echo '<p class="page_title_text"> + <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Supplier Offers') . '" alt="" />' . ' ' . _('Supplier Offers') . ' + </p>'; + + echo '<table class="selection"> + <tr> + <th>'._('Offer ID').'</th> + <th>'._('Supplier').'</th> + <th>'._('Stock Item').'</th> + <th>'._('Quantity').'</th> + <th>'._('Units').'</th> + <th>'._('Price').'</th> + <th>'._('Total').'</th> + <th>'._('Currency').'</th> + <th>'._('Offer Expires').'</th> + <th>'._('Accept').'</th> + <th>'._('Reject').'</th> + <th>'._('Defer').'</th> + </tr>'; + $k=0; + + while ($myrow=DB_fetch_array($result)) { + if ($k==1){ + echo '<tr class="EvenTableRows">'; + $k=0; + } else { + echo '<tr class="OddTableRows">'; + $k++; + } + echo '<td>'.$myrow['offerid'].'</td> + <td>'.$myrow['suppname'].'</td> + <td>'.$myrow['description'].'</td> + <td class="number">'.locale_number_format($myrow['quantity'],$myrow['decimalplaces']).'</td> + <td>'.$myrow['uom'].'</td> + <td class="number">'.locale_number_format($myrow['price'],$myrow['currdecimalplaces']).'</td> + <td class="number">'.locale_number_format($myrow['price']*$myrow['quantity'],$myrow['currdecimalplaces']).'</td> + <td>'.$myrow['currcode'].'</td> + <td>'.$myrow['expirydate'].'</td> + <td><input type="radio" name="action'.$myrow['offerid'].'" value="1" /></td> + <td><input type="radio" name="action'.$myrow['offerid'].'" value="2" /></td> + <td><input type="radio" checked name="action'.$myrow['offerid'].'" value="3" /></td> + <td><input type="hidden" name="supplierid" value="'.$myrow['supplierid'].'" /></td> + </tr>'; + } + echo '<tr> + <td colspan="12"> + <div class="centre"> + <input type="submit" name="submit" value="' . _('Enter Information') . '" /> + </div> + </td> + </tr> + </table> + </div> + </form>'; +} else if(isset($_POST['submit']) and isset($_POST['supplierid'])) { + include ('includes/htmlMimeMail.php'); + $accepts=array(); + $rejects=array(); + $defers=array(); + foreach ($_POST as $key => $value) { + if(mb_substr($key,0,6)=='action') { + $OfferID=mb_substr($key,6); + switch ($value) { + case 1: + $accepts[]=$OfferID; + break; + case 2: + $rejects[]=$OfferID; + break; + case 3: + $defers[]=$OfferID; + break; + } + } + } + if (sizeOf($accepts)>0){ + $MailText=_('This email has been automatically generated by the webERP installation at').' '. + $_SESSION['CompanyRecord']['coyname']."\n"; + $MailText.=_('The following offers you made have been accepted')."\n"; + $MailText.=_('An official order will be sent to you in due course')."\n\n"; + $sql="SELECT rate FROM currencies where currabrev='" . $CurrCode ."'"; + $result=DB_query($sql, $db); + $myrow=DB_fetch_array($result); + $Rate=$myrow['rate']; + $OrderNo = GetNextTransNo(18, $db); + $sql="INSERT INTO purchorders ( + orderno, + supplierno, + orddate, + rate, + initiator, + intostocklocation, + deliverydate, + status, + stat_comment, + paymentterms) + VALUES ( + '".$OrderNo."', + '".$_POST['supplierid']."', + '".date('Y-m-d')."', + '".$Rate."', + '".$_SESSION['UserID']."', + '".$_SESSION['DefaultFactoryLocation']."', + '".date('Y-m-d')."', + '"._('Pending')."', + '"._('Automatically generated from tendering system')."', + '".$PaymentTerms."')"; + DB_query($sql, $db); + foreach ($accepts as $AcceptID) { + $sql="SELECT offers.quantity, + offers.price, + offers.uom, + stockmaster.description, + stockmaster.stockid + FROM offers + LEFT JOIN stockmaster + ON offers.stockid=stockmaster.stockid + WHERE offerid='".$AcceptID."'"; + $result= DB_query($sql, $db); + $myrow=DB_fetch_array($result); + $MailText.=$myrow['description']."\t"._('Quantity').' '.$myrow['quantity']."\t"._('Price').' '. + locale_number_format($myrow['price'])."\n"; + $sql="INSERT INTO purchorderdetails (orderno, + itemcode, + deliverydate, + itemdescription, + unitprice, + actprice, + quantityord, + suppliersunit) + VALUES ('".$OrderNo."', + '".$myrow['stockid']."', + '".date('Y-m-d')."', + '".$myrow['description']."', + '".$myrow['price']."', + '".$myrow['price']."', + '".$myrow['quantity']."', + '".$myrow['uom']."')"; + $result=DB_query($sql, $db); + $sql="DELETE FROM offers WHERE offerid='".$AcceptID."'"; + $result=DB_query($sql, $db); + } + $mail = new htmlMimeMail(); + $mail->setSubject(_('Your offer to').' '.$_SESSION['CompanyRecord']['coyname'].' '._('has been accepted')); + $mail->setText($MailText); + $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>'); + $result = $mail->send(array($Email), 'smtp'); + prnMsg(_('The accepted offers from').' '.$SupplierName.' '._('have been converted to purchase orders and an email sent to') + .' '.$Email."\n"._('Please review the order contents').' '.'<a href="'.$rootpath . + '/PO_Header.php?ModifyOrderNumber=' . $OrderNo.'">'._('here').'</a>', 'success'); + } + if (sizeOf($rejects)>0){ + $MailText=_('This email has been automatically generated by the webERP installation at').' '. + $_SESSION['CompanyRecord']['coyname']."\n"; + $MailText.=_('The following offers you made have been rejected')."\n\n"; + foreach ($rejects as $RejectID) { + $sql="SELECT offers.quantity, + offers.price, + stockmaster.description + FROM offers + LEFT JOIN stockmaster + ON offers.stockid=stockmaster.stockid + WHERE offerid='".$RejectID."'"; + $result= DB_query($sql, $db); + $myrow=DB_fetch_array($result); + $MailText.=$myrow['description']."\t"._('Quantity').' '.$myrow['quantity']."\t"._('Price').' '. + locale_number_format($myrow['price'])."\n"; + $sql="DELETE FROM offers WHERE offerid='".$RejectID."'"; + $result=DB_query($sql, $db); + } + $mail = new htmlMimeMail(); + $mail->setSubject(_('Your offer to').' '.$_SESSION['CompanyRecord']['coyname'].' '._('has been rejected')); + $mail->setText($MailText); + $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>'); + $result = $mail->send(array($Email), 'smtp'); + prnMsg(_('The rejected offers from').' '.$SupplierName.' '._('have been removed from the system and an email sent to') + .' '.$Email, 'success'); + } + prnMsg(_('All offers have been processed, and emails sent where appropriate'), 'success'); +} +include('includes/footer.inc'); + ?> \ No newline at end of file Modified: trunk/OrderDetails.php =================================================================== --- trunk/OrderDetails.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/OrderDetails.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -61,7 +61,7 @@ echo '<table class="selection"> <tr> - <th colspan="4"><font color="blue">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th> + <th colspan="4"><h3>'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</h3></th> </tr> <tr> <th style="text-align: left">' . _('Customer Code') . ':</th> @@ -88,7 +88,7 @@ <td class="OddTableRows">' . $myrow['deladd2'] . '</td> </tr> <tr> - <th style="text-align: left"h>' . _('Order Currency') . ':</th> + <th style="text-align: left">' . _('Order Currency') . ':</th> <td class="OddTableRows">' . $myrow['currcode'] . '</td> <th style="text-align: left">' . _('Delivery Address 3') . ':</th> <td class="OddTableRows">' . $myrow['deladd3'] . '</td> @@ -156,7 +156,7 @@ echo '<br /> <table class="selection"> <tr> - <th colspan="9"><font color="blue">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th> + <th colspan="9"><h3>'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</h3></th> </tr> <tr> <th>' . _('Item Code') . '</th> Modified: trunk/OutstandingGRNs.php =================================================================== --- trunk/OutstandingGRNs.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/OutstandingGRNs.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -161,8 +161,9 @@ '" alt="" />' . ' ' . $title . '</p>'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> - <table class="selection">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + <div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection">'; echo '<tr> <td>' . _('From Supplier Code') . ':</td> @@ -175,8 +176,10 @@ </table> <br /> <div class="centre"> - <input type="submit" Name="PrintPDF" value="' . _('Print PDF') . '" /> - </div>'; + <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /> + </div> + </div> + </form>'; include('includes/footer.inc'); Modified: trunk/PageSecurity.php =================================================================== --- trunk/PageSecurity.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/PageSecurity.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -1,61 +1,63 @@ -<?php - -/*$Id: PageSecurity.php 4500 2011-02-27 09:18:42Z daintree $ */ - -include('includes/session.inc'); -$title = _('Page Security Levels'); -include('includes/header.inc'); - -echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/security.png" title="' . _('Page Security Levels') . '" alt="" />' . ' ' . $title.'</p><br />'; - -if (isset($_POST['Update'])) { - foreach ($_POST as $ScriptName => $PageSecurityValue) { - if ($ScriptName!='Update' and $ScriptName!='FormID') { - $ScriptName = mb_substr($ScriptName, 0, mb_strlen($ScriptName)-4).'.php'; - $sql="UPDATE scripts SET pagesecurity='". $PageSecurityValue . "' WHERE script='" . $ScriptName . "'"; - $UpdateResult=DB_query($sql, $db,_('Could not update the page security value for the script because')); - } - } -} - -$sql="SELECT script, - pagesecurity, - description - FROM scripts"; - -$result=DB_query($sql, $db); - -echo '<br /><form method="post" id="PageSecurity" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; -echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - -echo '<table class="selection">'; - -$TokenSql="SELECT tokenid, - tokenname - FROM securitytokens"; -$TokenResult=DB_query($TokenSql, $db); - -while ($myrow=DB_fetch_array($result)) { - echo '<tr><td>'.$myrow['script'].'</td>'; - echo '<td><select name="'.$myrow['script'].'">'; - while ($mytokenrow=DB_fetch_array($TokenResult)) { - if ($mytokenrow['tokenid']==$myrow['pagesecurity']) { - echo '<option selected="selected" value="'.$mytokenrow['tokenid'].'">'.$mytokenrow['tokenname'].'</option>'; - } else { - echo '<option value="'.$mytokenrow['tokenid'].'">'.$mytokenrow['tokenname'].'</option>'; - } - } - echo '</select></td></tr>'; - DB_data_seek($TokenResult, 0); -} - -echo '</table><br />'; - -echo '<div class="centre"> - <input type="submit" name="Update" value="'._('Update Security Levels').'" /> - </div> - <br /> - </form>'; - -include('includes/footer.inc'); +<?php + +/*$Id: PageSecurity.php 4500 2011-02-27 09:18:42Z daintree $ */ + +include('includes/session.inc'); +$title = _('Page Security Levels'); +include('includes/header.inc'); + +echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/security.png" title="' . _('Page Security Levels') . '" alt="" />' . ' ' . $title.'</p><br />'; + +if (isset($_POST['Update'])) { + foreach ($_POST as $ScriptName => $PageSecurityValue) { + if ($ScriptName!='Update' and $ScriptName!='FormID') { + $ScriptName = mb_substr($ScriptName, 0, mb_strlen($ScriptName)-4).'.php'; + $sql="UPDATE scripts SET pagesecurity='". $PageSecurityValue . "' WHERE script='" . $ScriptName . "'"; + $UpdateResult=DB_query($sql, $db,_('Could not update the page security value for the script because')); + } + } +} + +$sql="SELECT script, + pagesecurity, + description + FROM scripts"; + +$result=DB_query($sql, $db); + +echo '<br /><form method="post" id="PageSecurity" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; +echo '<div>'; +echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + +echo '<table class="selection">'; + +$TokenSql="SELECT tokenid, + tokenname + FROM securitytokens"; +$TokenResult=DB_query($TokenSql, $db); + +while ($myrow=DB_fetch_array($result)) { + echo '<tr><td>'.$myrow['script'].'</td>'; + echo '<td><select name="'.$myrow['script'].'">'; + while ($mytokenrow=DB_fetch_array($TokenResult)) { + if ($mytokenrow['tokenid']==$myrow['pagesecurity']) { + echo '<option selected="selected" value="'.$mytokenrow['tokenid'].'">'.$mytokenrow['tokenname'].'</option>'; + } else { + echo '<option value="'.$mytokenrow['tokenid'].'">'.$mytokenrow['tokenname'].'</option>'; + } + } + echo '</select></td></tr>'; + DB_data_seek($TokenResult, 0); +} + +echo '</table><br />'; + +echo '<div class="centre"> + <input type="submit" name="Update" value="'._('Update Security Levels').'" /> + </div> + <br /> + </div> + </form>'; + +include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/PaymentAllocations.php =================================================================== --- trunk/PaymentAllocations.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/PaymentAllocations.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -31,7 +31,7 @@ <img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Payments') . '" alt="" />' . ' ' . _('Payment Allocation for Supplier') . ': ' . $SuppID . _(' and') . ' ' . _('Invoice') . ': ' . $InvID . '</p>'; echo '<div class="page_help_text">' . - _('This shows how the payment to the supplier was allocated') . '<a href="SupplierInquiry.php?&SupplierID=' . $SuppID . '">' . _('Back to supplier inquiry') . '</a> + _('This shows how the payment to the supplier was allocated') . '<a href="SupplierInquiry.php?&SupplierID=' . $SuppID . '">' . _('Back to supplier inquiry') . '</a> </div> <br />'; Modified: trunk/PaymentMethods.php =================================================================== --- trunk/PaymentMethods.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/PaymentMethods.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -198,23 +198,24 @@ <td>' . ($myrow['receipttype'] ? _('Yes') : _('No')) . '</td> <td>' . ($myrow['usepreprintedstationery'] ? _('Yes') : _('No')) . '</td> <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '">' . _('Edit') . '</a></td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment method?') . '\');">' . _('Delete') .'</a></td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment method?') . '\');">' . _('Delete') .'</a></td> </tr>'; } //END WHILE LIST LOOP - echo '</table><p>'; + echo '</table><br />'; } //end of ifs and buts! if (isset($SelectedPaymentID)) { - echo '<div class="centre"><a href=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID .'>' . _('Review Payment Methods') . '</a></div>'; + echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID .'">' . _('Review Payment Methods') . '</a></div>'; } -echo '<p>'; +echo '<br />'; if (! isset($_GET['delete'])) { echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedPaymentID)) { @@ -259,28 +260,29 @@ echo '<tr> <td>' . _('Use For Payments') . ':' . '</td> <td><select name="ForPayment"> - <option' . ($_POST['ForPayment'] ? ' selected' : '') .' value="1">' . _('Yes') . '</option> - <option' . ($_POST['ForPayment'] ? '' : ' selected') .' value="0">' . _('No') . '</select></td> + <option' . ($_POST['ForPayment'] ? ' selected="selected"' : '') .' value="1">' . _('Yes') . '</option> + <option' . ($_POST['ForPayment'] ? '' : ' selected="selected"') .' value="0">' . _('No') . '</option> + </select></td> </tr>'; echo '<tr> <td>' . _('Use For Receipts') . ':' . '</td> <td><select name="ForReceipt"> - <option' . ($_POST['ForReceipt'] ? ' selected' : '') .' value="1">' . _('Yes') . '</option> - <option' . ($_POST['ForReceipt'] ? '' : ' selected') .' value="0">' . _('No') . '</option> + <option' . ($_POST['ForReceipt'] ? ' selected="selected"' : '') .' value="1">' . _('Yes') . '</option> + <option' . ($_POST['ForReceipt'] ? '' : ' selected="selected"') .' value="0">' . _('No') . '</option> </select></td> </tr>'; echo '<tr> <td>' . _('Use Pre-printed Stationery') . ':' . '</td> <td><select name="UsePrePrintedStationery"> - <option' . ($_POST['UsePrePrintedStationery'] ? ' selected': '' ) .' value="1">' . _('Yes') . '</option> - <option' . ($_POST['UsePrePrintedStationery']==1 ? '' : ' selected' ) .' value="0">' . _('No') . '</option> + <option' . ($_POST['UsePrePrintedStationery'] ? ' selected="selected"': '' ) .' value="1">' . _('Yes') . '</option> + <option' . ($_POST['UsePrePrintedStationery']==1 ? '' : ' selected="selected"' ) .' value="0">' . _('No') . '</option> </select></td> </tr>'; echo '</table>'; echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>'; - + echo '</div>'; echo '</form>'; } //end if record deleted no point displaying form to add record Modified: trunk/PaymentTerms.php =================================================================== --- trunk/PaymentTerms.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/PaymentTerms.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -175,7 +175,7 @@ echo '<table class="selection">'; echo '<tr> - <th colspan="6"><font color="blue" size="3">'._('Payment Terms.').'</font></th> + <th colspan="6"><h3>'._('Payment Terms.').'</h3></th> </tr>'; echo '<tr> <th>' . _('Term Code') . '</th> @@ -203,7 +203,7 @@ <td>%s</td> <td>%s</td> <td><a href="%s?SelectedTerms=%s">' . _('Edit') . '</a></td> - <td><a href="%s?SelectedTerms=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment term?') . '\');">' . _('Delete') . '</a></td> + <td><a href="%s?SelectedTerms=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment term?') . '\');">' . _('Delete') . '</a></td> </tr>', $myrow['termsindicator'], $myrow['terms'], @@ -215,7 +215,7 @@ $myrow[0]); } //END WHILE LIST LOOP - echo '</table><p>'; + echo '</table><br />'; } //end of ifs and buts! if (isset($SelectedTerms)) { @@ -227,6 +227,7 @@ if (!isset($_GET['delete'])) { echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedTerms)) { @@ -252,7 +253,7 @@ echo '<br /> <table class="selection">'; echo '<tr> - <th colspan="6"><font color="blue" size="3">'._('Update Payment Terms.').'</font></th> + <th colspan="6"><h3>'._('Update Payment Terms.').'</h3></th> </tr>'; echo '<tr> <td>' . _('Term Code') . ':</td> @@ -272,7 +273,7 @@ echo '<table class="selection">'; echo '<tr> - <th colspan="6"><font color=blue size="3">'._('New Payment Terms.').'</font></th> + <th colspan="6"><h3>'._('New Payment Terms.').'</h3></th> </tr>'; echo '<tr> <td>' . _('Term Code') . ':</td> @@ -307,8 +308,9 @@ <br /> <div class="centre"> <input type="submit" name="submit" value="'._('Enter Information').'" /> - </form> </div>'; + echo '</div> + </form>'; } //end if record deleted no point displaying form to add record include('includes/footer.inc'); Modified: trunk/Payments.php =================================================================== --- trunk/Payments.php 2012-04-02 02:54:14 UTC (rev 5201) +++ trunk/Payments.php 2012-04-02 03:37:13 UTC (rev 5202) @@ -48,8 +48,7 @@ . '" alt="" />' . ' ' . _('Payment Entry') . ' </p>'; echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account. <br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div> - <br /> - <div class="centre">'; + <br />'; if (isset($_GET['SupplierID'])){ /*The page was called with a supplierID check it is valid and default the inputs for Supplier Name and currency of payment */ @@ -278,11 +277,12 @@ // it is a supplier payment by cheque and haven't printed yet so print cheque echo '<br /> - <a href="' . $rootpath . '/PrintCheque.php?ChequeNum=' . $_POST['ChequeNum'] . '&identifier=' . $identifier . '">' . _('Print Cheque using pre-printed stationery') . '</a> + <a href="' . $rootpath . '/PrintCheque.php?ChequeNum=' . $_POST['ChequeNum'] . '&identifier=' . $identifier . '">' . _('Print Cheque using pre-printed stationery') . '</a> <br /> <br />'; echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo _('Has the cheque been printed') . '? <br /> @@ -293,6 +293,8 @@ <input type="submit" name="PaymentCancelled" value="' . _('No / Cancel Payment') . '" />'; echo '<br />Payment amount = ' . $_SESSION['PaymentDetail' . $identifier]->Amount; + echo '</div> + </form>'; } else { @@ -728,11 +730,12 @@ } echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; -echo '<p><table class="selection">'; +echo '<br /><table class="selection">'; -echo '<tr><th colspan="4"><font size="3" color="blue">' . _('Payment'); +echo '<tr><th colspan="4"><h3>' . _('Payment'); if ($_SESSION['PaymentDetail' . $identifier]->SupplierID!=''){ echo ' ' . _('to') . ' ' . $_SESSION['PaymentDetail' . $identifier]->SuppName; @@ -742,7 +745,7 @@ echo ' ' . _('from the') . ' ' . $_SESSION['PaymentDetail' . $identifier]->BankAccountName; } -echo ' ' . _('on') . ' ' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '</font></th></tr>'; +echo ' ' . _('on') . ' ' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '</h3></th></tr>'; $SQL = "SELECT bankaccountname, bankaccounts.accountcode, @@ -809,11 +812,11 @@ </tr>'; } } else { /*its a supplier payment so it must be in the suppliers currency */ - echo '<tr> - <td>' . _('Supplier Currency') . ':</td> + echo '<tr>'; + echo '<td><input type="hidden" name="Currency" value="' . $_SESSION['PaymentDetail' . $identifier]->Currency . '" /> + ' . _('Supplier Currency') . ':</td> <td>' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</td> </tr>'; - echo '<input type="hidden" name="Currency" value="' . $_SESSION['PaymentDetail' . $identifier]->Currency . '" />'; /*get the default rate from the currency table if it has not been set */ if (!isset($_POST['ExRate']) OR $_POST['ExRate']==''){ $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->Currency ."'"; @@ -906,7 +909,7 @@ echo '<td><input type="hidden" name="SuggestedExRate1" value="'.$SuggestedExRate.'" /></td>'; } echo ' - <td colspan="3"><div class="centre"><input type="submit" name="UpdateHeader" value="' . _('Update'). '" /></td> + <td colspan="3"><div class="centre"><input type="submit" name="UpdateHeader" value="' . _('Update'). '" /></div></td> </tr>'; @@ -917,7 +920,7 @@ /* Set upthe form for the transaction entry for a GL Payment Analysis item */ echo '<br /><table class="selection">'; - echo '<tr><th colspan="2"><font size="3" color="blue">' . _('General Ledger Payment Analysis Entry') . '</font></th></tr>'; + echo '<tr><th colspan="2"><h3>' . _('General Ledger Payment Analysis Entry') . '</h3></th></tr>'; //Select the Tag echo '<tr> @@ -951,7 +954,7 @@ } else { echo '<tr> <td>' . _('Enter GL Account Manually') . ':</td> - <td><input type="text" class="number" Name="GLManualCode" maxlength="12" size="12" onchange="return inArray(this, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" /></td></tr>'; + <td><input type="text" class="number" name="GLManualCode" maxlength="12" size="12" onchange="return inArray(this, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" /></td></tr>'; } echo '<tr> @@ -1007,9 +1010,9 @@ echo '<option value=""></option>'; while ($myrow=DB_fetch_array($result)){ if (isset($_POST['GLCode']) AND $_POST['GLCode']==$myrow['accountcode']){ - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>'; } } echo '</select></td></tr>'; @@ -1077,7 +1080,7 @@ <td>' . $PaymentItem->GLCode . ' - ' . $PaymentItem->GLActName . '</td> <td>' . stripslashes($PaymentItem->Narrative) . '</td> <td>' . $PaymentItem->Tag . ' - ' . $TagName . '</td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '&Delete=' . $PaymentItem->ID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment analysis item?') . '\');">' . _('Delete') . '</a></td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '&Delete=' . $PaymentItem->ID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment analysis item?') . '\');">' . _('Delete') . '</a></td> </tr>'; $PaymentTotal += $PaymentItem->Amount; } @@ -1090,7 +1093,7 @@ </tr> </table> <br />'; - echo '<input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" />'; + echo '<div class="centre"><input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" /></div>'; } } else { @@ -1104,17 +1107,18 @@ </tr>'; if (isset($_SESSION['PaymentDetail' . $identifier]->SupplierID)){ /*So it is a supplier payment so show the discount entry item */ - echo '<tr> - <td>' . _('Amount of Discount') . ':</td> + echo '<tr>'; + echo '<td><input type="hidden" name="SuppName" value="' . $_SESSION['PaymentDetail' . $identifier]->SuppName . '" /> + ' . _('Amount of Discount') . ':</td> <td><input class="number" type="text" name="Discount" maxlength="12" size="13" value="' . $_SESSION['PaymentDetail' . $identifier]->Discount . '" /></td> </tr>'; - echo '<input type="hidden" name="SuppName" value="' . $_SESSION['PaymentDetail' . $identifier]->SuppName . '" />'; } else { echo '<input type="hidden" name="Discount" value="0" />'; } echo '</table><br />'; - echo '<input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" />'; + echo '<div class="centre"><input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" /></div>'; } +echo '</div>'; echo '</form>'; include('includes/footer.inc'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |