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 @@ FRACTION RC EXO % EXO TX OM - COEF REDUC + EX OM RC TEOM 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 @@ $fractionrcexo $pourcentageexo $txom - $coefreduc + $exom $rcteom 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