From 2a61c556bfaaa6aa9e05baae7073b87b549ee2cd Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Tue, 20 Dec 2022 18:50:14 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20colonne=20EX=20OM=20=C3=A0=20?=
 =?UTF-8?q?la=20table=20des=20propri=C3=A9t=C3=A9s=20baties?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affichage de l'Indicateur imposition aux Ordures Ménagères (D, E, V ou blanc) pour les propriétés baties (EX OM) et suppression de la colonne de coefficient de réductio (COEF REDUC).

Funded by SDEC énergie https://www.sdec-energie.fr/
Funded by Conseil Départemental du Calvados https://www.calvados.fr/
---
 CHANGELOG.md                                      | 2 ++
 cadastre/cadastre_export.py                       | 2 +-
 cadastre/templates/proprietes_baties.tpl          | 2 +-
 cadastre/templates/proprietes_baties_line.tpl     | 2 +-
 cadastre/templates/proprietes_baties_line.tpl.sql | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0827b94f..2827cc00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Ajout de la colonne EX OM au tableau des propriétés baties
+
 ## 1.18.1 - 2023-09-27
 
 * Corrections SQL
diff --git a/cadastre/cadastre_export.py b/cadastre/cadastre_export.py
index 3cafe1a8..e0c7c093 100644
--- a/cadastre/cadastre_export.py
+++ b/cadastre/cadastre_export.py
@@ -249,7 +249,7 @@ def set_composer_templates(self, compte_communal):
             'proprietes_baties_line': {
                 'names': ['section', 'ndeplan', 'ndevoirie', 'adresse', 'coderivoli', 'bat', 'ent', 'niv', 'ndeporte',
                           'numeroinvar', 'star', 'meval', 'af', 'natloc', 'cat', 'revenucadastral', 'coll', 'natexo',
-                          'anret', 'andeb', 'fractionrcexo', 'pourcentageexo', 'txom', 'coefreduc', 'rcteom'],
+                          'anret', 'andeb', 'fractionrcexo', 'pourcentageexo', 'txom', 'exom', 'rcteom'],
                 'type': 'sql',
                 'filter': 'comptecommunal',
                 'and': {
diff --git a/cadastre/templates/proprietes_baties.tpl b/cadastre/templates/proprietes_baties.tpl
index c57637ce..f9c52a0f 100644
--- a/cadastre/templates/proprietes_baties.tpl
+++ b/cadastre/templates/proprietes_baties.tpl
@@ -41,7 +41,7 @@
       <td style="text-align: center;">FRACTION RC EXO</td>
       <td style="text-align: center;">% EXO</td>
       <td style="text-align: center;">TX OM</td>
-      <td style="text-align: center;">COEF REDUC</td>
+      <td style="text-align: center;">EX OM</td>
       <td style="text-align: center;">RC TEOM</td>
     </tr>
   </thead>
diff --git a/cadastre/templates/proprietes_baties_line.tpl b/cadastre/templates/proprietes_baties_line.tpl
index 9f9eaf54..bf3cda9b 100644
--- a/cadastre/templates/proprietes_baties_line.tpl
+++ b/cadastre/templates/proprietes_baties_line.tpl
@@ -22,6 +22,6 @@
       <td align="center">$fractionrcexo</td>
       <td align="center">$pourcentageexo</td>
       <td align="center">$txom</td>
-      <td align="center">$coefreduc</td>
+      <td align="center">$exom</td>
       <td align="right">$rcteom</td>
     </tr>
diff --git a/cadastre/templates/proprietes_baties_line.tpl.sql b/cadastre/templates/proprietes_baties_line.tpl.sql
index c3d19793..3b514a9a 100644
--- a/cadastre/templates/proprietes_baties_line.tpl.sql
+++ b/cadastre/templates/proprietes_baties_line.tpl.sql
@@ -10,7 +10,7 @@ CASE
   ELSE pt.tse_bipevla
 END AS revenucadastral,
 px.ccolloc AS coll, px.gnextl AS natexo, px.janimp AS anret, px.jandeb AS andeb, Cast(px.rcexba2 * px.pexb / 100 AS numeric(10,2)) AS fractionrcexo,
-px.pexb AS pourcentageexo, l10.gtauom AS txom, '' AS coefreduc, pt.bateom as rcteom
+px.pexb AS pourcentageexo, l10.gtauom AS txom, l10.gimtom AS exom, pt.baeteom as rcteom
 FROM
 $schema"parcelle" p
 INNER JOIN $schema"local00" l ON l.parcelle = p.parcelle