Thread: [Weberp-svn] SF.net SVN: weberp:[5423] trunk/OrderDetails.php
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
weberp-svn
|
From: <tim...@us...> - 2011-06-20 14:22:36
|
Revision: 5423
http://weberp.svn.sourceforge.net/weberp/?rev=5423&view=rev
Author: tim_schofield
Date: 2011-06-20 14:22:30 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Show the correct units on an order
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-06-17 10:49:52 UTC (rev 5422)
+++ trunk/OrderDetails.php 2011-06-20 14:22:30 UTC (rev 5423)
@@ -125,7 +125,7 @@
stockmaster.kgs,
stockmaster.decimalplaces,
stockmaster.mbflag,
- stockmaster.units,
+ salesorderdetails.units,
stockmaster.discountcategory,
stockmaster.controlled,
stockmaster.serialised,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-11 16:40:56
|
Revision: 5749
http://weberp.svn.sourceforge.net/weberp/?rev=5749&view=rev
Author: tim_schofield
Date: 2011-07-11 16:40:50 +0000 (Mon, 11 Jul 2011)
Log Message:
-----------
Remove old references to $PageSecurity
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-11 16:40:39 UTC (rev 5748)
+++ trunk/OrderDetails.php 2011-07-11 16:40:50 UTC (rev 5749)
@@ -2,8 +2,6 @@
/* $Revision: 1.25 $ */
/* $Id$*/
-//$PageSecurity = 2;
-
/* Session started in header.inc for password checking and authorisation level check */
include('includes/session.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-14 15:53:42
|
Revision: 6155
http://weberp.svn.sourceforge.net/weberp/?rev=6155&view=rev
Author: tim_schofield
Date: 2011-07-14 15:53:36 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-14 15:53:25 UTC (rev 6154)
+++ trunk/OrderDetails.php 2011-07-14 15:53:36 UTC (rev 6155)
@@ -57,7 +57,7 @@
_('Order Details') . '" alt="" />' . ' ' . $title . '</p>';
$myrow = DB_fetch_array($GetOrdHdrResult);
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th colspan=4><font color=blue>'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
echo '<tr>
<th style="text-align: left">' . _('Customer Code') . ':</th>
@@ -145,7 +145,7 @@
$OrderTotalVolume = 0;
$OrderTotalWeight = 0;
- echo '<br /><table cellpadding=2 colspan=9 class=selection>';
+ echo '<br /><table cellpadding=2 colspan=9 class="selection">';
echo '<tr><th colspan=9><font color=blue>'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
echo '<tr>
<th>' . _('Item Code') . '</th>
@@ -201,7 +201,7 @@
</tr>
</table>';
- echo '<br /><table class=selection>
+ echo '<br /><table class="selection">
<tr>
<td>' . _('Total Weight') . ':</td>
<td>' . $DisplayWeight . '</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-15 15:02:35
|
Revision: 6307
http://weberp.svn.sourceforge.net/weberp/?rev=6307&view=rev
Author: tim_schofield
Date: 2011-07-15 15:02:28 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
XHTML quoting corrections
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-15 15:02:18 UTC (rev 6306)
+++ trunk/OrderDetails.php 2011-07-15 15:02:28 UTC (rev 6307)
@@ -177,12 +177,12 @@
echo '<td>' . $myrow['stkcode'] . '</td>
<td>' . $myrow['description'] . '</td>
- <td class=number>' . $myrow['quantity'] . '</td>
+ <td class="number">' . $myrow['quantity'] . '</td>
<td>' . $myrow['units'] . '</td>
- <td class=number>' . number_format($myrow['unitprice'],2) . '</td>
- <td class=number>' . number_format(($myrow['discountpercent'] * 100),2) . '%' . '</td>
- <td class=number>' . number_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),2) . '</td>
- <td class=number>' . number_format($myrow['qtyinvoiced'],2) . '</td>
+ <td class="number">' . number_format($myrow['unitprice'],2) . '</td>
+ <td class="number">' . number_format(($myrow['discountpercent'] * 100),2) . '%' . '</td>
+ <td class="number">' . number_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),2) . '</td>
+ <td class="number">' . number_format($myrow['qtyinvoiced'],2) . '</td>
<td>' . $DisplayActualDeliveryDate . '</td>
</tr>';
@@ -196,8 +196,8 @@
$DisplayWeight = number_format($OrderTotalWeight,2);
echo '<tr>
- <td colspan=5 class=number><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
- <td colspan=2 class=number>' . $DisplayTotal . '</td>
+ <td colspan=5 class="number"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
+ <td colspan=2 class="number">' . $DisplayTotal . '</td>
</tr>
</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-29 16:20:55
|
Revision: 7252
http://weberp.svn.sourceforge.net/weberp/?rev=7252&view=rev
Author: tim_schofield
Date: 2011-07-29 16:20:49 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-29 16:20:37 UTC (rev 7251)
+++ trunk/OrderDetails.php 2011-07-29 16:20:49 UTC (rev 7252)
@@ -196,8 +196,8 @@
$DisplayWeight = number_format($OrderTotalWeight,2);
echo '<tr>
- <td colspan=5 class="number"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
- <td colspan=2 class="number">' . $DisplayTotal . '</td>
+ <td colspan="5" class="number"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
+ <td colspan="2" class="number">' . $DisplayTotal . '</td>
</tr>
</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-29 21:23:13
|
Revision: 7282
http://weberp.svn.sourceforge.net/weberp/?rev=7282&view=rev
Author: tim_schofield
Date: 2011-07-29 21:23:07 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-29 21:22:56 UTC (rev 7281)
+++ trunk/OrderDetails.php 2011-07-29 21:23:07 UTC (rev 7282)
@@ -110,7 +110,7 @@
<td class="OddTableRows"><font>' . $myrow['freightcost'] . '</font></td>
</tr>';
echo '<tr><th style="text-align: left">'._('Comments'). ': ';
- echo '</th><td colspan=3>'.$myrow['comments'] . '</td></tr>';
+ echo '</th><td colspan="3">'.$myrow['comments'] . '</td></tr>';
echo '</table>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-29 21:27:44
|
Revision: 7305
http://weberp.svn.sourceforge.net/weberp/?rev=7305&view=rev
Author: tim_schofield
Date: 2011-07-29 21:27:38 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-29 21:27:27 UTC (rev 7304)
+++ trunk/OrderDetails.php 2011-07-29 21:27:38 UTC (rev 7305)
@@ -58,7 +58,7 @@
$myrow = DB_fetch_array($GetOrdHdrResult);
echo '<table class="selection">';
- echo '<tr><th colspan=4><font color=blue>'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
+ echo '<tr><th colspan="4"><font color="blue">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
echo '<tr>
<th style="text-align: left">' . _('Customer Code') . ':</th>
<td class="OddTableRows"><font><a href="' . $rootpath . '/SelectCustomer.php?Select=' . $myrow['debtorno'] . '">' . $myrow['debtorno'] . '</a></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-29 21:40:45
|
Revision: 7370
http://weberp.svn.sourceforge.net/weberp/?rev=7370&view=rev
Author: tim_schofield
Date: 2011-07-29 21:40:39 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-07-29 21:40:27 UTC (rev 7369)
+++ trunk/OrderDetails.php 2011-07-29 21:40:39 UTC (rev 7370)
@@ -145,8 +145,8 @@
$OrderTotalVolume = 0;
$OrderTotalWeight = 0;
- echo '<br /><table cellpadding=2 colspan=9 class="selection">';
- echo '<tr><th colspan=9><font color=blue>'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
+ echo '<br /><table cellpadding="2" colspan="9" class="selection">';
+ echo '<tr><th colspan="9"><font color="blue">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
echo '<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-08-07 16:25:43
|
Revision: 7597
http://weberp.svn.sourceforge.net/weberp/?rev=7597&view=rev
Author: tim_schofield
Date: 2011-08-07 16:25:37 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-08-07 16:25:25 UTC (rev 7596)
+++ trunk/OrderDetails.php 2011-08-07 16:25:37 UTC (rev 7597)
@@ -53,8 +53,7 @@
$GetOrdHdrResult = DB_query($OrderHeaderSQL,$db, $ErrMsg, $DbgMsg);
if (DB_num_rows($GetOrdHdrResult)==1) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Order Details') . '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Order Details') . '" alt="" />' . ' ' . $title . '</p>';
$myrow = DB_fetch_array($GetOrdHdrResult);
echo '<table class="selection">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-09-26 20:30:28
|
Revision: 8194
http://weberp.svn.sourceforge.net/weberp/?rev=8194&view=rev
Author: tim_schofield
Date: 2011-09-26 20:30:22 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Show numbers in correct formatting for the users locale
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2011-09-26 20:30:07 UTC (rev 8193)
+++ trunk/OrderDetails.php 2011-09-26 20:30:22 UTC (rev 8194)
@@ -56,8 +56,9 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Order Details') . '" alt="" />' . ' ' . $title . '</p>';
$myrow = DB_fetch_array($GetOrdHdrResult);
+ $CustomerCurrency=$myrow['currcode'];
echo '<table class="selection">';
- echo '<tr><th colspan="4"><font color="blue">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
+ echo '<tr><th colspan="4"><font size="3" color="#616161">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
echo '<tr>
<th style="text-align: left">' . _('Customer Code') . ':</th>
<td class="OddTableRows"><font><a href="' . $rootpath . '/SelectCustomer.php?Select=' . $myrow['debtorno'] . '">' . $myrow['debtorno'] . '</a></td>
@@ -82,7 +83,7 @@
</tr>';
echo '<tr>
<th style="text-align: left"h>' . _('Order Currency') . ':</th>
- <td class="OddTableRows"><font>' . $myrow['currcode'] . '</font></td>
+ <td class="OddTableRows"><font>' . $CustomerCurrency . '</font></td>
<th style="text-align: left">' . _('Delivery Address 3') . ':</th>
<td class="OddTableRows"><font>' . $myrow['deladd3'] . '</font></td>
</tr>';
@@ -106,7 +107,7 @@
</tr>';
echo '<tr>
<th style="text-align: left">' . _('Freight Cost') . ':</th>
- <td class="OddTableRows"><font>' . $myrow['freightcost'] . '</font></td>
+ <td class="OddTableRows"><font>' . locale_money_format($myrow['freightcost'],$CustomerCurrency) . '</font></td>
</tr>';
echo '<tr><th style="text-align: left">'._('Comments'). ': ';
echo '</th><td colspan="3">'.$myrow['comments'] . '</td></tr>';
@@ -115,8 +116,7 @@
/*Now get the line items */
- $LineItemsSQL = "SELECT
- stkcode,
+ $LineItemsSQL = "SELECT stkcode,
stockmaster.description,
stockmaster.volume,
stockmaster.kgs,
@@ -131,8 +131,12 @@
discountpercent,
actualdispatchdate,
qtyinvoiced
- FROM salesorderdetails, stockmaster
- WHERE salesorderdetails.stkcode = stockmaster.stockid AND orderno ='" . $_GET['OrderNumber'] . "'";
+ FROM salesorderdetails
+ LEFT JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ LEFT JOIN stockmaster
+ ON salesorderdetails.stkcode = stockmaster.stockid
+ WHERE salesorders.orderno ='" . $_GET['OrderNumber'] . "'";
$ErrMsg = _('The line items of the order cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the line items, that failed was');
@@ -145,7 +149,7 @@
$OrderTotalWeight = 0;
echo '<br /><table cellpadding="2" colspan="9" class="selection">';
- echo '<tr><th colspan="9"><font color="blue">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
+ echo '<tr><th colspan="9"><font size="3" color="#616161">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
echo '<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
@@ -167,7 +171,6 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
if ($myrow['qtyinvoiced']>0){
$DisplayActualDeliveryDate = ConvertSQLDate($myrow['actualdispatchdate']);
} else {
@@ -176,12 +179,12 @@
echo '<td>' . $myrow['stkcode'] . '</td>
<td>' . $myrow['description'] . '</td>
- <td class="number">' . $myrow['quantity'] . '</td>
+ <td class="number">' . locale_number_format($myrow['quantity'],$myrow['decimalplaces']) . '</td>
<td>' . $myrow['units'] . '</td>
- <td class="number">' . number_format($myrow['unitprice'],2) . '</td>
- <td class="number">' . number_format(($myrow['discountpercent'] * 100),2) . '%' . '</td>
- <td class="number">' . number_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),2) . '</td>
- <td class="number">' . number_format($myrow['qtyinvoiced'],2) . '</td>
+ <td class="number">' . locale_number_format($myrow['unitprice'],4) . '</td>
+ <td class="number">' . locale_number_format(($myrow['discountpercent'] * 100),2) . '%' . '</td>
+ <td class="number">' . locale_money_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),$CustomerCurrency) . '</td>
+ <td class="number">' . locale_number_format($myrow['qtyinvoiced'],$myrow['decimalplaces']) . '</td>
<td>' . $DisplayActualDeliveryDate . '</td>
</tr>';
@@ -190,9 +193,9 @@
$OrderTotalWeight = $OrderTotalWeight + $myrow['quantity'] * $myrow['kgs'];
}
- $DisplayTotal = number_format($OrderTotal,2);
- $DisplayVolume = number_format($OrderTotalVolume,2);
- $DisplayWeight = number_format($OrderTotalWeight,2);
+ $DisplayTotal = locale_money_format($OrderTotal,$CustomerCurrency);
+ $DisplayVolume = locale_number_format($OrderTotalVolume,2);
+ $DisplayWeight = locale_number_format($OrderTotalWeight,2);
echo '<tr>
<td colspan="5" class="number"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-13 22:26:01
|
Revision: 8456
http://weberp.svn.sourceforge.net/weberp/?rev=8456&view=rev
Author: tim_schofield
Date: 2012-01-13 22:25:55 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
use correct names for database functions
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-01-13 22:25:45 UTC (rev 8455)
+++ trunk/OrderDetails.php 2012-01-13 22:25:55 UTC (rev 8456)
@@ -140,9 +140,9 @@
$ErrMsg = _('The line items of the order cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the line items, that failed was');
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal = 0;
$OrderTotalVolume = 0;
@@ -162,7 +162,7 @@
<th>' . _('Last Del') . '</th>
</tr>';
$k=0;
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-09-06 09:17:53
|
Revision: 9589
http://weberp.svn.sourceforge.net/weberp/?rev=9589&view=rev
Author: tim_schofield
Date: 2012-09-06 09:17:42 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
OrderDetails.php-Make some changes for new layout structure
Modified Paths:
--------------
trunk/OrderDetails.php
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-09-06 09:17:32 UTC (rev 9588)
+++ trunk/OrderDetails.php 2012-09-06 09:17:42 UTC (rev 9589)
@@ -53,13 +53,16 @@
$GetOrdHdrResult = DB_query($OrderHeaderSQL,$db, $ErrMsg, $DbgMsg);
if (DB_num_rows($GetOrdHdrResult)==1) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Order Details') . '" alt="" />' . ' ' . $title . '</p>';
$myrow = DB_fetch_array($GetOrdHdrResult);
$CustomerCurrency=$myrow['currcode'];
echo '<table class="selection">';
- echo '<tr><th colspan="4" class="header">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</th></tr>';
echo '<tr>
+ <th colspan="4" class="header">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Order Details') . '" alt="" />'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'
+ </th>
+ </tr>';
+ echo '<tr>
<th style="text-align: left">' . _('Customer Code') . ':</th>
<td class="OddTableRows"><font>' . InternalLink($rootpath, 'SelectCustomer.php?Select=' . $myrow['debtorno'], $myrow['debtorno']) . '</td>
<th style="text-align: left">' . _('Customer Name') . ':</th><td><font>' . $myrow['name'] . '</td>
@@ -149,8 +152,12 @@
$OrderTotalWeight = 0;
echo '<br /><table cellpadding="2" class="selection">';
- echo '<tr><th colspan="9" class="header">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</th></tr>';
echo '<tr>
+ <th colspan="9" class="header">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Order Details') . '" alt="" />'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'
+ </th>
+ </tr>';
+ echo '<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
<th>' . _('Quantity') . '</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X