From 621fef04aa9b165e01269ea1dc012fb2d1bf9495 Mon Sep 17 00:00:00 2001
From: root <raynald.candelier@gmail.com>
Date: Sat, 23 Sep 2023 20:49:56 +0200
Subject: [PATCH] export comptable + espace donateur

---
 models/event_registration.py     | 5 ++++-
 models/partner.py                | 2 +-
 views/portal.xml                 | 2 +-
 wizard/accounting_file_wizard.py | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/models/event_registration.py b/models/event_registration.py
index eff4f29..78c6398 100755
--- a/models/event_registration.py
+++ b/models/event_registration.py
@@ -5,6 +5,8 @@ from dateutil.relativedelta import relativedelta
 from datetime import datetime
 from werkzeug import utils
 import json
+import logging
+_logger = logging.getLogger(__name__)
 
 class EventRegistration(models.Model):
     _inherit = 'event.registration'
@@ -29,7 +31,8 @@ class EventRegistration(models.Model):
                         payment_info=json.loads(rec.invoice_id.invoice_payments_widget)
                         if payment_info:
                             nb_payments=len(payment_info['content'])
-                            rec.date_payment= payment_info['content'][nb_payments]['date']
+                            _logger.info(payment_info['content'])
+                            rec.date_payment= payment_info['content'][nb_payments-1]['date']
 
                         else:
                             rec.date_payment=False
diff --git a/models/partner.py b/models/partner.py
index 7fae7a0..549ce09 100755
--- a/models/partner.py
+++ b/models/partner.py
@@ -72,7 +72,7 @@ class ResPartner(models.Model):
 
         for rec in self:
             rec.date_membership=False
-            partner_mb=self.env['kalachakra.membership'].search([('partner_id','=',int(rec.id))],order="end_date desc",limit=1)
+            partner_mb=self.env['kalachakra.membership'].sudo().search([('partner_id','=',int(rec.id))],order="end_date desc",limit=1)
             if partner_mb:
                 rec.date_membership=partner_mb.end_date
 
diff --git a/views/portal.xml b/views/portal.xml
index 99a7665..ab013f6 100755
--- a/views/portal.xml
+++ b/views/portal.xml
@@ -15,7 +15,7 @@
                                     <hr class="mt-1 mb-0"/>
                                     <div t-field="user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
                                     <div style="color:red" t-field="user_id.partner_id.member_status"/>  
-                                    <!-- <div style="font-size:15px;color:red"><span >Date de fin d'adhésion : </span><span t-field="user_id.partner_id.date_membership"/></div> -->
+                                    <div style="font-size:15px;color:red"><span >Date de fin d'adhésion : </span><span t-field="user_id.partner_id.date_membership"/></div>
         </xpath>
         
     </template>
diff --git a/wizard/accounting_file_wizard.py b/wizard/accounting_file_wizard.py
index ef3e844..7d3af61 100644
--- a/wizard/accounting_file_wizard.py
+++ b/wizard/accounting_file_wizard.py
@@ -793,6 +793,7 @@ class AccountingFileWizard(models.TransientModel):
     #écritures pour les avoirs pas encore utilisés ou payés mais jamais passé en compta
         out_refund_invoices=self.env['account.move'].search([('move_type','=','out_refund'),('state','=','posted'),('payment_state','=','not_paid'),('date_compta','=',False),('date_compta_out_refund','=',False)])
         for invoice in out_refund_invoices:
+            if invoice.invoice_date<self.start_date.date(): continue
             if not self.debug_mode: invoice.date_compta_out_refund=date_compta
             firstname=invoice.partner_id.firstname
             name=invoice.partner_id.name
@@ -841,6 +842,7 @@ class AccountingFileWizard(models.TransientModel):
         for invoice in out_refund_invoices:
                 #_logger.error(invoice.id)
                 if not self.debug_mode: invoice.date_compta=date_compta
+                if invoice.invoice_date_payment and invoice.invoice_date_payment<self.start_date.date(): continue
                 firstname=invoice.partner_id.firstname
                 name=invoice.partner_id.name
                 #_logger.error(name)