fix(stock report) correctly calculate sum when details are not displayed

closes #4384
Third-Culture-Software · May 4, 2020 · 48400df · 48400df
1 parent 870b717
commit 48400df
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/server/controllers/stock/reports/stock/exit/exitToDepot.js b/server/controllers/stock/reports/stock/exit/exitToDepot.js
@@ -11,7 +11,7 @@ function fetch(depotUuid, dateFrom, dateTo, showDetails) {
   const sql = `
   SELECT 
     i.code, i.text, iu.text AS unit_text, BUID(m.document_uuid) AS document_uuid,
-    (m.quantity * m.unit_cost) AS cost, m.unit_cost,
+    SUM(m.quantity * m.unit_cost) AS cost, m.unit_cost,
     SUM(m.quantity) as quantity, m.date, m.description,
     u.display_name AS user_display_name,
     dm.text AS document_reference, dd.text AS depot_name

diff --git a/server/controllers/stock/reports/stock/exit/exitToLoss.js b/server/controllers/stock/reports/stock/exit/exitToLoss.js
@@ -11,7 +11,7 @@ function fetch(depotUuid, dateFrom, dateTo, showDetails) {
   const sql = `
   SELECT 
     i.code, i.text, iu.text AS unit_text, BUID(m.document_uuid) AS document_uuid,
-    (m.quantity * m.unit_cost) AS cost, m.unit_cost,
+    SUM(m.quantity * m.unit_cost) AS cost, m.unit_cost,
     SUM(m.quantity) as quantity, m.date, m.description,
     u.display_name AS user_display_name,
     dm.text AS document_reference

diff --git a/server/controllers/stock/reports/stock/exit/exitToPatient.js b/server/controllers/stock/reports/stock/exit/exitToPatient.js
@@ -12,7 +12,7 @@ function fetch(depotUuid, dateFrom, dateTo, showDetails) {
   const sql = `
   SELECT
     i.code, i.text, iu.text AS unit_text, BUID(m.document_uuid) AS document_uuid,
-    (m.quantity * m.unit_cost) AS cost, m.unit_cost,
+    SUM(m.quantity * m.unit_cost) AS cost, m.unit_cost,
     SUM(m.quantity) as quantity, m.date, m.description,
     u.display_name AS user_display_name, p.display_name AS patient_display_name,
     dm.text AS document_reference, d.text AS depot_name,

diff --git a/server/controllers/stock/reports/stock/exit/exitToService.js b/server/controllers/stock/reports/stock/exit/exitToService.js
@@ -11,7 +11,7 @@ function fetch(depotUuid, dateFrom, dateTo, showDetails) {
   const sql = `
   SELECT 
     i.code, i.text, iu.text AS unit_text, BUID(m.document_uuid) AS document_uuid,
-    (m.quantity * m.unit_cost) AS cost, m.unit_cost,
+    SUM(m.quantity * m.unit_cost) AS cost, m.unit_cost,
     SUM(m.quantity) as quantity, m.date, m.description,
     u.display_name AS user_display_name,
     dm.text AS document_reference, d.text AS depot_name,