Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4647] trunk
|
From: <dai...@us...> - 2011-08-04 08:24:38
|
Revision: 4647
http://web-erp.svn.sourceforge.net/web-erp/?rev=4647&view=rev
Author: daintree
Date: 2011-08-04 08:24:32 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
ricards fix for SalesInquiry.php
Modified Paths:
--------------
trunk/SalesInquiry.php
trunk/doc/Change.log
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2011-07-31 04:42:09 UTC (rev 4646)
+++ trunk/SalesInquiry.php 2011-08-04 08:24:32 UTC (rev 4647)
@@ -176,7 +176,7 @@
salesorders.branchcode,
salesorderdetails.quantity,
salesorderdetails.qtyinvoiced,
- (salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ (salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
(salesorderdetails.quantity * stockmaster.actualcost) as extcost,
IF(salesorderdetails.quantity = salesorderdetails.qtyinvoiced ||
salesorderdetails.completed = 1,'Completed','Open') as linestatus,
@@ -213,7 +213,7 @@
salesorders.branchcode,
salesorderdetails.quantity,
salesorderdetails.qtyinvoiced,
- (tempstockmoves.qty * salesorderdetails.unitprice) * -1 as extprice,
+ (tempstockmoves.qty * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) * -1 as extprice,
(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
IF(salesorderdetails.quantity = salesorderdetails.qtyinvoiced ||
salesorderdetails.completed = 1,'Completed','Open') as linestatus,
@@ -264,7 +264,7 @@
$sql = "SELECT salesorderdetails.stkcode,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost,
stockmaster.description,
stockmaster.decimalplaces
@@ -298,7 +298,7 @@
debtorsmaster.name,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
FROM salesorderdetails
LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -331,7 +331,7 @@
debtorsmaster.name,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
FROM salesorderdetails
LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -361,7 +361,7 @@
CONCAT(MONTHNAME(salesorders.orddate),' ',YEAR(salesorders.orddate)) as monthname,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
FROM salesorderdetails
LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -390,7 +390,7 @@
stockcategory.categorydescription,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
FROM salesorderdetails
LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -419,7 +419,7 @@
salesman.salesmanname,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
FROM salesorderdetails
LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -448,7 +448,7 @@
areas.areadescription,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice) as extprice,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) as extprice,
SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
FROM salesorderdetails
LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-07-31 04:42:09 UTC (rev 4646)
+++ trunk/doc/Change.log 2011-08-04 08:24:32 UTC (rev 4647)
@@ -1,5 +1,6 @@
webERP Change Log
+4/8/11 Ricard: SalesInquiry.php now shows net sales after discounts
31/7/11 Phil: PO_Header.php - was not updating when update hit as reported by Klaus(opto)
31/7/11 Phil: BackupDatabase.php script
30/7/11 Phil: SelectCreditItems.php made it so if several sessions creating a credit note they no longer over-write each other.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
