From 454a426d8fdaa8002b63ae70c49881558152b03f Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Tue, 9 Aug 2022 17:27:44 +0200
Subject: [PATCH] [update] report templates
---
templates/report_scop_bordereau.xml | 14 +--
templates/report_scop_bordereau_payments.xml | 10 +-
templates/report_scop_bordereau_refund.xml | 8 +-
templates/report_union_sociale.xml | 2 +-
views/scop_cotisation_cg.xml | 96 ++++++++++----------
5 files changed, 64 insertions(+), 66 deletions(-)
diff --git a/templates/report_scop_bordereau.xml b/templates/report_scop_bordereau.xml
index 3a2aa80..a9247cc 100644
--- a/templates/report_scop_bordereau.xml
+++ b/templates/report_scop_bordereau.xml
@@ -5,10 +5,10 @@
<template id="report_bordereau_document">
<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="page" style="font-size: 15px;">
<div class="row">
- <div class="col-6 offset-6 mt16 mb64">
+ <div class="col-6 offset-6 oe_mt16 oe_mb64">
<span
t-field="o.partner_id.name"
style="text-transform: uppercase; font-weight: 600;"
@@ -37,7 +37,7 @@
</div>
</div>
<div class="row">
- <div class="col-12 mb16">
+ <div class="col-12 oe_mb16">
<p>
Paris, le <span
t-esc="o.date_cotisation"
@@ -57,7 +57,7 @@
</p>
</div>
</div>
- <div class="row mb16">
+ <div class="row oe_mb16">
<div
class="col-12"
style="font-style: italic; test-align: justify;"
@@ -69,7 +69,7 @@
<div class="col-6" style="border: 1px solid #aaa;">
<div />
<h5
- class="mt8"
+ class="oe_mt8"
style="font-weight: 600;"
>Cotisations annuelles</h5>
<p style="font-style: italic; font-size: 13px;">
@@ -220,7 +220,7 @@
</div>
</div>
- <div style="page-break-before: always; font-size: 12px;">
+ <div style="page-break-before: always; font-size: 14px;">
<div class="row">
<div class="col-12">
<p>
@@ -288,7 +288,7 @@
<!-- QWeb Reports -->
<record id="cgscop_bordereau_report" model="ir.actions.report">
- <field name="name">Bordereau de Cotisation CG</field>
+ <field name="name">CG Scop - Bordereau de Cotisation CG</field>
<field name="model">scop.bordereau</field>
<field name="report_type">qweb-pdf</field>
<field name="report_name">cgscop_cotisation_cg.report_bordereau</field>
diff --git a/templates/report_scop_bordereau_payments.xml b/templates/report_scop_bordereau_payments.xml
index f66de07..14f8b94 100644
--- a/templates/report_scop_bordereau_payments.xml
+++ b/templates/report_scop_bordereau_payments.xml
@@ -5,9 +5,9 @@
<template id="report_bordereau_document_with_payments">
<t t-call="web.external_layout">
<t t-set="o" t-value="o.sudo().with_context(lang='fr')" />
- <div class="page" style="font-size: 14px;">
+ <div class="page" style="font-size: 15px;">
<div class="row">
- <div class="col-6 offset-6 mt64 mb64">
+ <div class="col-6 offset-6 oe_mt64 oe_mb64">
<span
t-field="o.partner_id.name"
style="text-transform: uppercase; font-weight: 600;"
@@ -38,7 +38,7 @@
</div>
</div>
<div class="row">
- <div class="col-12 mb16">
+ <div class="col-12 oe_mb16">
<p>
N° adhérent : <t
t-esc="str(o.partner_id.member_number_int)"
@@ -56,7 +56,7 @@
<div class="col-6" style="border: 1px solid #aaa;">
<div />
<h5
- class="mt8"
+ class="oe_mt8"
style="font-weight: 600;"
>Cotisations annuelles</h5>
<p style="font-style: italic; font-size: 13px;">
@@ -239,7 +239,7 @@
<!-- QWeb Reports -->
<record id="cgscop_bordereau_report_with_payments" model="ir.actions.report">
- <field name="name">Etat des paiements</field>
+ <field name="name">CG Scop - Etat des paiements</field>
<field name="model">scop.bordereau</field>
<field name="report_type">qweb-pdf</field>
<field
diff --git a/templates/report_scop_bordereau_refund.xml b/templates/report_scop_bordereau_refund.xml
index a0b6c7f..96685c5 100644
--- a/templates/report_scop_bordereau_refund.xml
+++ b/templates/report_scop_bordereau_refund.xml
@@ -5,9 +5,9 @@
<template id="report_bordereau_document_refund">
<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="page" style="font-size: 15px;">
<div class="row">
- <div class="col-6 offset-6 mt64 mb64">
+ <div class="col-6 offset-6 oe_mt64 oe_mb64">
<span
t-field="o.partner_id.name"
style="text-transform: uppercase; font-weight: 600;"
@@ -38,7 +38,7 @@
</div>
</div>
<div class="row">
- <div class="col-12 mb16">
+ <div class="col-12 oe_mb16">
<p>
Paris, le <span
t-esc="o.date_regul"
@@ -143,7 +143,7 @@
<!-- QWeb Reports -->
<record id="cgscop_bordereau_report_refund" model="ir.actions.report">
- <field name="name">Avoir de Cotisation CG</field>
+ <field name="name">CG Scop - Avoir de Cotisation CG</field>
<field name="model">scop.bordereau</field>
<field name="report_type">qweb-pdf</field>
<field
diff --git a/templates/report_union_sociale.xml b/templates/report_union_sociale.xml
index 13207c2..f474576 100644
--- a/templates/report_union_sociale.xml
+++ b/templates/report_union_sociale.xml
@@ -217,7 +217,7 @@
<!-- QWeb Reports -->
<record id="cgscop_union_sociale_report" model="ir.actions.report">
- <field name="name">Bordereau Union Sociale</field>
+ <field name="name">CG Scop - Bordereau Union Sociale</field>
<field name="model">res.partner</field>
<field name="report_type">qweb-pdf</field>
<field name="report_name">cgscop_cotisation_cg.report_union_sociale</field>
diff --git a/views/scop_cotisation_cg.xml b/views/scop_cotisation_cg.xml
index 0554317..49bf466 100644
--- a/views/scop_cotisation_cg.xml
+++ b/views/scop_cotisation_cg.xml
@@ -145,11 +145,11 @@
<field name="state" />
<field name="member_count" />
<field name="new_member_count" />
- <field name="percent_cotiz_paid" />
- <field name="graph_values" />
- <field name="amount_called" />
- <field name="amount_paid" />
- <field name="amount_residual" />
+<!-- <field name="percent_cotiz_paid" />-->
+<!-- <field name="graph_values" />-->
+<!-- <field name="amount_called" />-->
+<!-- <field name="amount_paid" />-->
+<!-- <field name="amount_residual" />-->
<templates>
<t t-name="kanban-box">
<div
@@ -159,24 +159,22 @@
<div class="col">
<h2 class="mt16"><field name="name" /></h2>
<hr />
- <t>
- <p class="text-muted">
- Nombre d'adhérents renouvelés : <field
- name="member_count"
- /> <br />
- Nombre de nouveaux adhérents : <field
- name="new_member_count"
- /> <br />
- </p>
- </t>
+ <p class="text-muted">
+ Nombre d'adhérents renouvelés : <field
+ name="member_count"
+ /> <br />
+ Nombre de nouveaux adhérents : <field
+ name="new_member_count"
+ /> <br />
+ </p>
</div>
</div>
<div class="row">
- <div class="col-6 text-center">
- <field
- name="percent_cotiz_paid"
- widget="gauge"
- />
+ <div class="col-12 text-center">
+<!-- <field-->
+<!-- name="percent_cotiz_paid"-->
+<!-- widget="gauge"-->
+<!-- />-->
<div
class="btn-group btn-group-vertical"
role="group"
@@ -194,36 +192,36 @@
>Voir les bordereaux</button>
</div>
</div>
- <div class="col-6">
- <table class="table table-bordered">
- <tbody>
- <tr>
- <td>Montant appelé</td>
- <td><field
- name="amount_called"
- /> €</td>
- </tr>
- <tr>
- <td>Montant réglé</td>
- <td><field
- name="amount_paid"
- /> €</td>
- </tr>
- <tr>
- <td>Montant à percevoir</td>
- <td><field
- name="amount_residual"
- /> €</td>
- </tr>
- </tbody>
- </table>
- </div>
+<!-- <div class="col-6">-->
+<!-- <table class="table table-bordered">-->
+<!-- <tbody>-->
+<!-- <tr>-->
+<!-- <td>Montant appelé</td>-->
+<!-- <td><field-->
+<!-- name="amount_called"-->
+<!-- /> €</td>-->
+<!-- </tr>-->
+<!-- <tr>-->
+<!-- <td>Montant réglé</td>-->
+<!-- <td><field-->
+<!-- name="amount_paid"-->
+<!-- /> €</td>-->
+<!-- </tr>-->
+<!-- <tr>-->
+<!-- <td>Montant à percevoir</td>-->
+<!-- <td><field-->
+<!-- name="amount_residual"-->
+<!-- /> €</td>-->
+<!-- </tr>-->
+<!-- </tbody>-->
+<!-- </table>-->
+<!-- </div>-->
<div>
- <field
- name="graph_values"
- widget="dashboard_graph"
- graph_type="bar"
- />
+<!-- <field-->
+<!-- name="graph_values"-->
+<!-- widget="dashboard_graph"-->
+<!-- graph_type="bar"-->
+<!-- />-->
</div>
</div>
</div>
--
GitLab