projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Volltext-Suche: Hintergrund-Job: POD
[kivitendo-erp.git]
/
SL
/
LiquidityProjection.pm
diff --git
a/SL/LiquidityProjection.pm
b/SL/LiquidityProjection.pm
index
710c099
..
5954e00
100644
(file)
--- a/
SL/LiquidityProjection.pm
+++ b/
SL/LiquidityProjection.pm
@@
-113,6
+113,7
@@
sub create {
FROM periodic_invoices pi
LEFT JOIN periodic_invoices_configs pcfg ON (pi.config_id = pcfg.id)
WHERE pcfg.active
FROM periodic_invoices pi
LEFT JOIN periodic_invoices_configs pcfg ON (pi.config_id = pcfg.id)
WHERE pcfg.active
+ AND NOT pcfg.periodicity = 'o'
AND (pi.period_start_date >= to_date($q_min_date, 'YYYY-MM-DD'))
SQL
AND (pi.period_start_date >= to_date($q_min_date, 'YYYY-MM-DD'))
SQL
@@
-138,6
+139,7
@@
SQL
LEFT JOIN buchungsgruppen bg ON (p.buchungsgruppen_id = bg.id)
LEFT JOIN employee e ON (COALESCE(oe.salesman_id, oe.employee_id) = e.id)
WHERE pcfg.active
LEFT JOIN buchungsgruppen bg ON (p.buchungsgruppen_id = bg.id)
LEFT JOIN employee e ON (COALESCE(oe.salesman_id, oe.employee_id) = e.id)
WHERE pcfg.active
+ AND NOT pcfg.periodicity = 'o'
SQL
# 3. Iterieren über Saldierungsintervalle, vormerken
SQL
# 3. Iterieren über Saldierungsintervalle, vormerken
@@
-180,7
+182,7
@@
SQL
WHERE (oe.customer_id IS NOT NULL)
AND NOT COALESCE(oe.quotation, FALSE)
AND NOT COALESCE(oe.closed, FALSE)
WHERE (oe.customer_id IS NOT NULL)
AND NOT COALESCE(oe.quotation, FALSE)
AND NOT COALESCE(oe.closed, FALSE)
- AND (oe.id NOT IN (SELECT oe_id FROM periodic_invoices_configs))
+ AND (oe.id NOT IN (SELECT oe_id FROM periodic_invoices_configs
WHERE periodicity <> 'o'
))
SQL
# 5. Initialisierung der Datenstrukturen zum Speichern der
SQL
# 5. Initialisierung der Datenstrukturen zum Speichern der