diff --git a/report/report_scop_bordereau.xml b/report/report_scop_bordereau.xml
index 617333522d0aaeb6cf86de0074e8601b25188703..5841f50aee4bef1bf38904e996ae04f651cab1f6 100644
--- a/report/report_scop_bordereau.xml
+++ b/report/report_scop_bordereau.xml
@@ -6,6 +6,17 @@
<t t-call="web.external_layout">
<t t-set="o" t-value="o.with_context(lang='fr')" />
<div class="page" style="font-size: 14px;">
+
+ <div class="row">
+ <div class="col-6 offset-6 mt64 mb64">
+ <span t-field="o.partner_id.name" style="text-transform: uppercase; font-weight: 600;"/><br/>
+ <span t-field="o.partner_id.street" /><br/>
+ <t t-if="o.partner_id.street2"><span t-field="o.partner_id.street2"/><br/></t>
+ <t t-if="o.partner_id.street3"><span t-field="o.partner_id.street3"/><br/></t>
+ <span t-field="o.partner_id.zip" /> <span t-field="o.partner_id.city" style="text-transform: uppercase;"/>
+ <t t-if="o.partner_id.cedex"> <span t-field="o.partner_id.cedex"/></t>
+ </div>
+ </div>
<div class="row">
<div class="col-12 text-center">
<h2 style="color: #E5074D;">
@@ -14,7 +25,7 @@
</div>
</div>
<div class="row">
- <div class="col-12">
+ <div class="col-12 mb16">
<p>
Paris, le <span t-esc="o.date_cotisation" t-options="{'widget': 'date', 'format': 'd MMMM YYYY'}"/>
</p>
@@ -25,16 +36,6 @@
</p>
</div>
</div>
- <div class="row">
- <div class="col-6 offset-6 mt16 mb32">
- <span t-field="o.partner_id.name" style="text-transform: uppercase; font-weight: 600;"/><br/>
- <span t-field="o.partner_id.street" /><br/>
- <t t-if="o.partner_id.street2"><span t-field="o.partner_id.street2"/><br/></t>
- <t t-if="o.partner_id.street3"><span t-field="o.partner_id.street3"/><br/></t>
- <span t-field="o.partner_id.zip" /> <span t-field="o.partner_id.city" style="text-transform: uppercase;"/>
- <t t-if="o.partner_id.cedex"> <span t-field="o.partner_id.cedex"/></t>
- </div>
- </div>
<div class="row mb16">
<div class="col-12" style="font-style: italic; test-align: justify;">
Les cotisations sont calculées annuellement en début d’année sur la base du dernier exercice connu. Le versement se fait par quart tous les trimestres. Merci de retourner ce bordereau à la CG Scop avec le règlement correspondant
diff --git a/report/report_scop_bordereau_payments.xml b/report/report_scop_bordereau_payments.xml
index 663985ff8a183352932c942695935ba733a5727e..401f46fbe5f6627f2b9599d65bc2a68f98d6b8b5 100644
--- a/report/report_scop_bordereau_payments.xml
+++ b/report/report_scop_bordereau_payments.xml
@@ -6,6 +6,16 @@
<t t-call="web.external_layout">
<t t-set="o" t-value="o.with_context(lang='fr')" />
<div class="page" style="font-size: 14px;">
+ <div class="row">
+ <div class="col-6 offset-6 mt64 mb64">
+ <span t-field="o.partner_id.name" style="text-transform: uppercase; font-weight: 600;"/><br/>
+ <span t-field="o.partner_id.street" /><br/>
+ <t t-if="o.partner_id.street2"><span t-field="o.partner_id.street2"/><br/></t>
+ <t t-if="o.partner_id.street3"><span t-field="o.partner_id.street3"/><br/></t>
+ <span t-field="o.partner_id.zip" /> <span t-field="o.partner_id.city" style="text-transform: uppercase;"/>
+ <t t-if="o.partner_id.cedex"> <span t-field="o.partner_id.cedex"/></t>
+ </div>
+ </div>
<div class="row">
<div class="col-12 text-center">
<h2 style="color: #E5074D;">
@@ -14,7 +24,7 @@
</div>
</div>
<div class="row">
- <div class="col-12">
+ <div class="col-12 mb16">
<p>
N° adhérent : <t t-esc="str(o.partner_id.member_number_int)"/><br/>
Union régionale : <span t-field="o.partner_ur_id.name"/><br/>
@@ -22,16 +32,6 @@
</p>
</div>
</div>
- <div class="row">
- <div class="col-6 offset-6 mt16 mb32">
- <span t-field="o.partner_id.name" style="text-transform: uppercase; font-weight: 600;"/><br/>
- <span t-field="o.partner_id.street" /><br/>
- <t t-if="o.partner_id.street2"><span t-field="o.partner_id.street2"/><br/></t>
- <t t-if="o.partner_id.street3"><span t-field="o.partner_id.street3"/><br/></t>
- <span t-field="o.partner_id.zip" /> <span t-field="o.partner_id.city" style="text-transform: uppercase;"/>
- <t t-if="o.partner_id.cedex"> <span t-field="o.partner_id.cedex"/></t>
- </div>
- </div>
<div class="row">
<div class="col-6" style="border: 1px solid #aaa;">
<div></div>
@@ -79,15 +79,15 @@
</table>
<table class="table table-sm table-striped" style="border: none;">
<tr>
- <th class="text-right">Montant dû</th>
- <th>Total appelé</th>
+ <th>Montant dû</th>
+ <th class="text-right">Total appelé</th>
<th class="text-right">Total réglé</th>
</tr>
<tr style="border-bottom: 1px solid #ccc;">
- <td class="text-right" style="border: none; background: inherit; color: inherit;">
+ <td style="border: none; background: inherit; color: inherit;">
<t t-esc="schedule_line.get('total_residual')" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}"/>
</td>
- <td style="border: none; background: inherit; color: inherit;">
+ <td class="text-right" style="border: none; background: inherit; color: inherit;">
<t t-esc="schedule_line.get('total_amount')" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}"/>
</td>
<td class="text-right" style="border: none; background: inherit; color: inherit;">
diff --git a/report/report_scop_bordereau_refund.xml b/report/report_scop_bordereau_refund.xml
index 104ab30e424ee7185999a53e5c393c6dd4cfe516..822a22e8dd4c39f9f7fa5445912a770f79b5566c 100644
--- a/report/report_scop_bordereau_refund.xml
+++ b/report/report_scop_bordereau_refund.xml
@@ -6,6 +6,16 @@
<t t-call="web.external_layout">
<t t-set="o" t-value="o.with_context(lang='fr')" />
<div class="page" style="font-size: 14px;">
+ <div class="row">
+ <div class="col-6 offset-6 mt64 mb64">
+ <span t-field="o.partner_id.name" style="text-transform: uppercase; font-weight: 600;"/><br/>
+ <span t-field="o.partner_id.street" /><br/>
+ <t t-if="o.partner_id.street2"><span t-field="o.partner_id.street2"/><br/></t>
+ <t t-if="o.partner_id.street3"><span t-field="o.partner_id.street3"/><br/></t>
+ <span t-field="o.partner_id.zip" /> <span t-field="o.partner_id.city" style="text-transform: uppercase;"/>
+ <t t-if="o.partner_id.cedex"> <span t-field="o.partner_id.cedex"/></t>
+ </div>
+ </div>
<div class="row">
<div class="col-12 text-center">
<h2 style="color: #E5074D;">
@@ -14,7 +24,7 @@
</div>
</div>
<div class="row">
- <div class="col-12">
+ <div class="col-12 mb16">
<p>
Paris, le <span t-esc="o.date_regul" t-options="{'widget': 'date', 'format': 'd MMMM YYYY'}"/>
</p>
@@ -25,24 +35,10 @@
</p>
</div>
</div>
- <div class="row">
- <div class="col-6 offset-6 mt16 mb32">
- <span t-field="o.partner_id.name" style="text-transform: uppercase; font-weight: 600;"/><br/>
- <span t-field="o.partner_id.street" /><br/>
- <t t-if="o.partner_id.street2"><span t-field="o.partner_id.street2"/><br/></t>
- <t t-if="o.partner_id.street3"><span t-field="o.partner_id.street3"/><br/></t>
- <span t-field="o.partner_id.zip" /> <span t-field="o.partner_id.city" style="text-transform: uppercase;"/>
- <t t-if="o.partner_id.cedex"> <span t-field="o.partner_id.cedex"/></t>
- </div>
- </div>
<div class="row">
<div class="col-6" style="border: 1px solid #aaa;">
<div></div>
<h5 class="mt8" style="font-weight: 600;">Cotisations annuelles</h5>
-<!-- <p style="font-style: italic; font-size: 13px;">-->
-<!-- <t t-if="o.year_liasse_retenue">Calcul basé sur la liasse fiscale <span t-esc="str(o.year_liasse_retenue)" /><br/></t>-->
-<!-- Assiette base <span t-field="o.type_assiette_retenu" /> : <span t-field="o.montant_assiette" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" />.-->
-<!-- </p>-->
<p>
<t t-set="amount_line" t-value="o.get_contribution_type_refund()" />
<table class="table table-sm" style="border: none;">