Modifications diverses

[auf_coda_additions.git] / db / procedures / auf_p_intero_cumul_dep_rec.sql

diff --git a/db/procedures/auf_p_intero_cumul_dep_rec.sql b/db/procedures/auf_p_intero_cumul_dep_rec.sql
index ba4cbac..8a3bbfe 100644 (file)
--- a/db/procedures/auf_p_intero_cumul_dep_rec.sql
+++ b/db/procedures/auf_p_intero_cumul_dep_rec.sql
@@ -137,14 +137,12 @@ WHERE
     AND yr = @exercice
     AND period BETWEEN 1 AND @periode
     AND curcode = 'EUR'
-    AND repbasis = 5
+    AND repbasis = 4
     AND balcode = 'ENGAGEMENT'
     AND el1 NOT LIKE '4%'
     AND el1 NOT LIKE '96%'
     AND el1 NOT LIKE '97%'
     AND el1 NOT LIKE '98%'
-    AND len(rtrim(el3)) <> 8
-    AND LEFT(el3,2) <> '95'
     AND el3 LIKE @like_el3
     AND el3 = imp.code
     AND imp.elmlevel = 3
@@ -199,7 +197,9 @@ FROM
         ON cumul.el3 = e.code
         AND e.cmpcode = 'AUF'
         AND e.elmlevel = 3
-WHERE LEFT(cumul.el3,2) <> '95'
+WHERE
+    (@exercice < 2014 AND LEN(cumul.el3) = 7 AND LEFT(cumul.el3,2) <> '95')
+    OR (@exercice >= 2014 AND LEN(cumul.el3) = 8 AND LEFT(cumul.el3,1) <> 'P')
 GROUP BY cumul.el3, e.sname, e.[name]
 ORDER BY cumul.el3
 GO