Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4711] trunk
|
From: <dai...@us...> - 2011-10-05 05:19:17
|
Revision: 4711
http://web-erp.svn.sourceforge.net/web-erp/?rev=4711&view=rev
Author: daintree
Date: 2011-10-05 05:19:10 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
number_format
Modified Paths:
--------------
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2011-10-02 09:51:33 UTC (rev 4710)
+++ trunk/PO_AuthorisationLevels.php 2011-10-05 05:19:10 UTC (rev 4711)
@@ -119,13 +119,15 @@
$ErrMsg = _('The authentication details cannot be retrieved because');
$Result=DB_query($sql,$db,$ErrMsg);
-echo '<table class="selection"><tr>
+echo '<table class="selection">
+ <tr>
<th>' . _('User ID') . '</th>
<th>' . _('User Name') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Create Order') . '</th>
<th>' . _('Can Release') . '<br />'. _('Invoices').'</th>
- <th>' . _('Authority Level') . '</th></tr>';
+ <th>' . _('Authority Level') . '</th>
+ </tr>';
while ($myrow=DB_fetch_array($Result)) {
if ($myrow['cancreate']==0) {
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2011-10-02 09:51:33 UTC (rev 4710)
+++ trunk/PO_AuthoriseMyOrders.php 2011-10-05 05:19:10 UTC (rev 4711)
@@ -20,13 +20,13 @@
if (mb_substr($key,0,6)=='status') {
$OrderNo=mb_substr($key,6);
$Status=$_POST['status'.$OrderNo];
- $Comment=date($_SESSION['DefaultDateFormat']).' - '._('Authorised by').' '.'<a href="mailto:' . $EmailRow['email'].'">'.$_SESSION['UserID'].'</a>
+ $Comment=date($_SESSION['DefaultDateFormat']).' - '._('Authorised by').' <a href="mailto:' . $EmailRow['email'].'">'.$_SESSION['UserID'].'</a>
<br />' . $_POST['comment'];
$sql="UPDATE purchorders
SET status='".$Status."',
stat_comment='".$Comment."',
allowprint=1
- WHERE orderno='".filter_number_format($OrderNo)."'";
+ WHERE orderno='". $OrderNo."'";
$result=DB_query($sql, $db);
}
}
@@ -74,8 +74,8 @@
$AuthLevel=$myauthrow['authlevel'];
$OrderValueSQL="SELECT sum(unitprice*quantityord) as ordervalue
- FROM purchorderdetails
- WHERE orderno='".$myrow['orderno'] . "'";
+ FROM purchorderdetails
+ WHERE orderno='".$myrow['orderno'] . "'";
$OrderValueResult=DB_query($OrderValueSQL, $db);
$MyOrderValueRow=DB_fetch_array($OrderValueResult);
@@ -127,7 +127,7 @@
<td>'.$LineRow['description'].'</td>
<td class="number">'.locale_number_format($LineRow['quantityord'],$DecimalPlaces).'</td>
<td>'.$myrow['currcode'].'</td>
- <td class="number">'.locale_number_format($LineRow['unitprice'],$myrow['decimalplaces']).'</td>
+ <td class="number">'.locale_number_format($LineRow['unitprice'],$myrow['currdecimalplaces']).'</td>
<td class="number">'.locale_number_format($LineRow['unitprice']*$LineRow['quantityord'],$myrow['currdecimalplaces']).'</td>
</tr>';
} // end while order line detail
@@ -136,6 +136,5 @@
} //end while header loop
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="UpdateAll" value="' . _('Update'). '"></form>';
-
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2011-10-02 09:51:33 UTC (rev 4710)
+++ trunk/PO_OrderDetails.php 2011-10-05 05:19:10 UTC (rev 4711)
@@ -57,7 +57,7 @@
ON suppliers.currcode = currencies.currabrev
LEFT JOIN www_users
ON purchorders.initiator=www_users.userid
- WHERE purchorders.orderno = '" . filter_number_format($_GET['OrderNo']) ."'";
+ WHERE purchorders.orderno = '" . $_GET['OrderNo'] ."'";
$GetOrdHdrResult = DB_query($OrderHeaderSQL,$db, $ErrMsg);
@@ -132,16 +132,16 @@
$ErrMsg = _('The line items of the purchase order could not be retrieved');
$LineItemsSQL = "SELECT purchorderdetails.*,
stockmaster.decimalplaces
- FROM purchorderdetails
+ FROM purchorderdetails
LEFT JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
- WHERE purchorderdetails.orderno = '" . filter_number_format($_GET['OrderNo']) ."'";
+ WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
echo '<table colspan="8" class="selection" cellpadding="0">';
-echo '<tr><th colspan=8><font size=3 color=navy>'. _('Order Line Details'). '</font></th></tr>';
+echo '<tr><th colspan="8"><font size="3" color="navy">'. _('Order Line Details'). '</font></th></tr>';
echo '<tr>
<th>' . _('Item Code'). '</td>
<th>' . _('Item Description'). '</td>
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2011-10-02 09:51:33 UTC (rev 4710)
+++ trunk/PO_PDFPurchOrder.php 2011-10-05 05:19:10 UTC (rev 4711)
@@ -339,7 +339,7 @@
dateprinted = '" . Date('Y-m-d') . "',
status = 'Printed',
stat_comment = '" . DB_escape_string($StatusComment) . "'
- WHERE purchorders.orderno = '" . filter_number_format($OrderNo) ."'";
+ WHERE purchorders.orderno = '" . $OrderNo ."'";
$result = DB_query($sql,$db);
}
include('includes/footer.inc');
@@ -353,8 +353,11 @@
}
echo '<br /><br />';
echo '<input type=hidden name="OrderNo" value="'. $OrderNo. '">';
- echo '<table><tr><td>'. _('Print or Email the Order'). '</td><td>
- <select name="PrintOrEmail">';
+ echo '<table>
+ <tr>
+ <td>'. _('Print or Email the Order'). '</td>
+ <td><select name="PrintOrEmail">';
+
if (!isset($_POST['PrintOrEmail'])){
$_POST['PrintOrEmail'] = 'Print';
}
@@ -389,7 +392,7 @@
suppliercontacts.email
FROM suppliercontacts INNER JOIN purchorders
ON suppliercontacts.supplierid=purchorders.supplierno
- WHERE purchorders.orderno='".filter_number_format($OrderNo)."'";
+ WHERE purchorders.orderno='". $OrderNo ."'";
$ContactsResult=DB_query($SQL,$db, $ErrMsg);
if (DB_num_rows($ContactsResult)>0){
echo '<tr><td>'. _('Email to') .':</td><td><select name="EmailTo">';
@@ -412,8 +415,12 @@
} else {
echo '</table>';
}
- echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '"></div>';
- echo '</form>';
+ echo '<br />
+ <div class="centre">
+ <input type="submit" name="DoIt" value="' . _('OK') . '" />
+ </div>
+ </form>';
+
include('includes/footer.inc');
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
