audrius/stock-logistics-reporting
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-reporting.git synced 2025-02-16 17:13:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use day precision and do not avoid past dates

Browse Source
This commit is contained in:
eLBati
2016-09-30 16:02:42 +02:00
committed by Alex Comba
parent d84200e959
commit 2c0d4ad8e5
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
stock_analysis_forecast/models/report_stock_forecast.py
View File

@@ -49,7 +49,7 @@ class ReportStockForecast(models.Model):
MIN(sq.id) AS id,
sq.product_id,
date_trunc(
'week',
'day',
to_date(to_char(CURRENT_DATE, 'YYYY/MM/DD'),
'YYYY/MM/DD')) AS date,
SUM(sq.qty) AS product_qty,
@@ -69,15 +69,10 @@ class ReportStockForecast(models.Model):
SELECT
MIN(-sm.id) AS id,
sm.product_id,
CASE WHEN sm.date_expected > CURRENT_DATE
THEN date_trunc(
'week',
date_trunc(
'day',
to_date(to_char(sm.date_expected, 'YYYY/MM/DD'),
'YYYY/MM/DD'))
ELSE date_trunc(
'week',
to_date(
to_char(CURRENT_DATE, 'YYYY/MM/DD'), 'YYYY/MM/DD')) END
AS date,
0 AS product_qty,
SUM(sm.product_qty) AS in_quantity,
@@ -102,15 +97,10 @@ class ReportStockForecast(models.Model):
SELECT
MIN(-sm.id) AS id,
sm.product_id,
CASE WHEN sm.date_expected > CURRENT_DATE
THEN date_trunc(
'week',
date_trunc(
'day',
to_date(to_char(sm.date_expected, 'YYYY/MM/DD'),
'YYYY/MM/DD'))
ELSE date_trunc(
'week',
to_date(to_char(CURRENT_DATE, 'YYYY/MM/DD'),
'YYYY/MM/DD')) END
AS date,
0 AS product_qty,
0 AS in_quantity,
@@ -136,10 +126,10 @@ class ReportStockForecast(models.Model):
(SELECT DISTINCT date
FROM
(
SELECT date_trunc('week', CURRENT_DATE) AS DATE
SELECT date_trunc('day', CURRENT_DATE) AS DATE
UNION ALL
SELECT date_trunc(
'week',
'day',
to_date(to_char(sm.date_expected, 'YYYY/MM/DD'),
'YYYY/MM/DD')) AS date
FROM stock_move sm
@@ -151,7 +141,6 @@ class ReportStockForecast(models.Model):
ON sm.location_dest_id = dest_location.id
WHERE
sm.state IN ('confirmed','assigned','waiting') AND
sm.date_expected > CURRENT_DATE AND
((dest_location.usage = 'internal'
AND source_location.usage != 'internal')
OR (source_location.usage = 'internal'