Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ajout de la colonne EX OM à la table des propriétés baties #396

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ajout de la colonne EX OM à la table des propriétés baties #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cadastre/cadastre_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down
2 changes: 1 addition & 1 deletion cadastre/templates/proprietes_baties.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cadastre/templates/proprietes_baties_line.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion cadastre/templates/proprietes_baties_line.tpl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down