From 829d6f48f4955763bc8a473bf67d20edf8b0e2d8 Mon Sep 17 00:00:00 2001
From: root <raynald.candelier@gmail.com>
Date: Fri, 5 Aug 2022 17:00:14 +0200
Subject: [PATCH] corrections

---
 __manifest__.py                        |  7 +++---
 models/__init__.py                     |  1 +
 views/account_portal_templates.xml     | 19 ++++++++++++++
 views/auth_sign_up_login_templates.xml | 11 ---------
 views/booking_website_registration.xml | 34 +++++++++++++-------------
 5 files changed, 41 insertions(+), 31 deletions(-)
 delete mode 100644 views/auth_sign_up_login_templates.xml

diff --git a/__manifest__.py b/__manifest__.py
index 79aab27..c4d6183 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['base','mail','donation','event'],
+    'depends': ['base','mail','donation','event','website'],
 
     # always loaded
     'data': [
@@ -60,9 +60,10 @@
         'views/account_portal_templates.xml',
         'views/website_snippets.xml',
         'views/portal.xml',
-        'views/auth_sign_up_login_templates.xml',
         'views/portal_templates.xml',
-        'views/webclient_templates.xml'
+        'views/webclient_templates.xml',
+        'views/auth_signup_login_templates.xml',
+        'views/website_templates.xml'
 
         
     ],
diff --git a/models/__init__.py b/models/__init__.py
index d9b090d..eb005c6 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -20,4 +20,5 @@ from . import booking_donation
 from . import event_media_link
 from . import mailing_list
 #from . import account
+from . import res_users
 
diff --git a/views/account_portal_templates.xml b/views/account_portal_templates.xml
index eb37919..220d0cd 100644
--- a/views/account_portal_templates.xml
+++ b/views/account_portal_templates.xml
@@ -8,5 +8,24 @@
         </xpath>
 
 </template>
+<!-- alignement à droite du de l'entête champ status -->
+<template id="kala_portal_my_invoices_payment" name="Payment on My Invoices" inherit_id="account_payment.portal_my_invoices_payment">
+        <xpath expr="//th[4]" position="replace">
+            <th class="text-left">Status</th>
+        </xpath>
+        <xpath expr="//th[5]" position="replace">
+            <th class="text-left"></th>
+        </xpath>
+</template>
 
+<template id="kala_portal_my_invoices" name="My Invoices and Payments" inherit_id="account.portal_my_invoices">
+
+<xpath expr="t/t/thead/tr/th[6]" position="before">
+<th class="text-right">Amount</th>
+</xpath>
+
+<xpath expr="t/t/tbody/t/tr/td[6]" position="before">
+<td class="text-right"><span t-esc="invoice.amount_total" t-options='{"widget": "monetary", "display_currency": invoice.currency_id}'/></td>
+</xpath>
+</template>
 </odoo>
\ No newline at end of file
diff --git a/views/auth_sign_up_login_templates.xml b/views/auth_sign_up_login_templates.xml
deleted file mode 100644
index 4f89cf5..0000000
--- a/views/auth_sign_up_login_templates.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<odoo>
-<!-- suppression du placeholder John Doe sur le champ nom -->
-<template id="auth_signup_fields" name="auth_signup_fields" inherit_id="auth_signup.fields">
-        <xpath expr="//input[@name='name']" position="replace">
-           <input type="text" name="name" t-att-value="name" id="name" class="form-control form-control-sm"
-                    required="required" t-att-readonly="'readonly' if only_passwords else None"
-                    t-att-autofocus="'autofocus' if login and not only_passwords else None" />
-            
-        </xpath>
-    </template>
-</odoo>
\ No newline at end of file
diff --git a/views/booking_website_registration.xml b/views/booking_website_registration.xml
index b45cc15..e066f68 100644
--- a/views/booking_website_registration.xml
+++ b/views/booking_website_registration.xml
@@ -98,46 +98,46 @@
         <section class="s_website_form pt16 pb16 o_colored_level">
         <h6>Participant :</h6>
         
-            <div class="form-group s_website_form_field col-12 col-sm-6 col-md-6 s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field  s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">Name</span>
                         <span class="s_website_form_mark"> *</span>
                       </label>
-                      <div class="col-12 col-sm-6 col-md-6">
-                        <input type="text" class="form-control s_website_form_input" name="name" t-att-value="partner.name" required="1" id="name" style="cursor: auto;"/>
+                      <div class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3">
+                        <input  type="text" class="form-control s_website_form_input" name="name" t-att-value="partner.name" required="1" id="name" style="cursor: auto;"/>
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_field col-12 col-sm-6 col-md-6 s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">First name</span>
                         <span class="s_website_form_mark"> *</span>
                       </label>
-                      <div class="col-12 col-sm-6 col-md-6">
+                      <div class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3">
                         <input type="text" class="form-control s_website_form_input" name="firstname" t-att-value="partner.firstname" required="1" id="firstname" style="cursor: auto;"/>
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_field  col-12 col-sm-4 col-md-4 s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field   s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">Age</span>
                         <span class="s_website_form_mark"> *</span>
                       </label>
-                      <div class="col-12 col-sm-4 col-md-4">
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-2 col-xl-2">
                         <input type="number" class="form-control s_website_form_input" name="age" required="1" id="age" style="cursor: auto;"/>
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_field col-12 col-sm-4 col-md-4 s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">Gender</span>
                         <span class="s_website_form_mark"> *</span>
                       </label>
-                      <div class="col-12 col-sm-4 col-md-4">
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-2 col-xl-2">
                         <select id="gender" name="gender" class="form-control s_website_form_input">
                             <option  name="male" value="male" label="Homme"></option>
                             <option  name="femelle" value="femelle" label="Femme"></option>
@@ -146,47 +146,47 @@
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_field col-12 col-sm-5 col-md-5 s_website_form_custom s_website_form_required" data-type="char"  data-name="Field">
+            <div class="form-group s_website_form_field  s_website_form_custom s_website_form_required" data-type="char"  data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">City</span>
                         <span class="s_website_form_mark"> *</span>
                         
                       </label>
-                      <div class="col-12 col-sm-5 col-md-5">
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-2 col-xl-2">
                       <input type="text" id='city' class="form-control s_website_form_input" name="city" t-att-value="partner.city"  style="cursor: auto;"/>
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_field col-12 col-sm-5 col-md-5 s_website_form_custom " data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field s_website_form_custom " data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">Phone</span>
                         <span class="s_website_form_mark"></span>
                       </label>
-                      <div class="col-12 col-sm-5 col-md-5">
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-2 col-xl-2">
                       <input type="text" id='phone' class="form-control s_website_form_input" name="phone" t-att-value="partner.phone"  style="cursor: auto;"/>
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_field col-12 col-sm-5 col-md-5 s_website_form_custom" data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field  s_website_form_custom" data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">Mobile</span>
                         <span class="s_website_form_mark"></span>
                       </label>
-                      <div class="col-12 col-sm-5 col-md-5">
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-2 col-xl-2">
                       <input type="text" class="form-control s_website_form_input" name="mobile"  t-att-value="partner.mobile" id="mobile" style="cursor: auto;"/>
                       </div>
                     </div>
             </div>
-            <div class="form-group s_website_form_fieldcol-12 col-sm-6 col-md-6 s_website_form_custom" data-type="char" data-name="Field">
+            <div class="form-group s_website_form_field s_website_form_custom" data-type="char" data-name="Field">
                     <div class="row s_col_no_resize s_col_no_bgcolor">
                       <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="9ois9pkv0wv">
                         <span class="s_website_form_label_content">email</span>
                         <span class="s_website_form_mark"></span>
                       </label>
-                      <div class="col-12 col-sm-12 col-md-6">
+                      <div class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3">
                       <input type="text" class="form-control s_website_form_input" name="email"  t-att-value="partner.email" id="email" style="cursor: auto;"/>
                       </div>
                     </div>