diff --git a/__manifest__.py b/__manifest__.py
index 80306d2..85daeb3 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','mass_mailing'],
+    'depends': ['base','mail','mass_mailing','donation_recurring'],
 
     # always loaded
     'data': [
@@ -34,7 +34,9 @@
         'views/relationship.xml',
         'views/operation.xml',
         'views/templates.xml',
-        'views/mail_mail.xml'
+        'views/mail_mail.xml',
+        'views/returnmail.xml',
+        'views/payment_batch.xml'
         
     ],
     # only loaded in demonstration mode
diff --git a/models/__init__.py b/models/__init__.py
index 4e6c361..78754b5 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -8,4 +8,6 @@ from . import email
 from . import phone
 from . import operation
 from . import mailing_mailing
-from . import relationship
\ No newline at end of file
+from . import relationship
+from . import returnmail
+from . import payment_batch
\ No newline at end of file
diff --git a/models/donation.py b/models/donation.py
index fd11f6b..3fed205 100644
--- a/models/donation.py
+++ b/models/donation.py
@@ -3,6 +3,7 @@ from odoo.exceptions import UserError, ValidationError
 from psycopg2 import sql, DatabaseError
 
 from werkzeug import utils
+import base64
 
 
 
@@ -12,8 +13,64 @@ class DonationDonation(models.Model):
 
     operation_id = fields.Many2one(
         'opendons.operation',
-        string='Donation Operation',
+        string='Operation',
         track_visibility='onchange',
         ondelete='restrict'
         
-    )
\ No newline at end of file
+    )
+    segment_id = fields.Many2one(
+        'opendons.segment',
+        string='Segment',
+        track_visibility='onchange',
+        ondelete='restrict'
+        
+    )
+    #pour les prélèvements automatiques
+    rum_direct_debit = fields.Char(
+        'RUM'
+        
+        
+    )
+    iban_direct_debit = fields.Char(
+        'iban'
+    )
+    bic_direct_debit = fields.Char(
+        'bic'
+    )
+    start_date_direct_debit = fields.Date(
+        string='Start Date',
+        index=True,
+        track_visibility='onchange'
+    )
+    end_date_direct_debit = fields.Date(
+        string='End Date',
+        index=True,
+        track_visibility='onchange'
+    )
+    frequency_direct_debit =fields.Selection(
+        [('monthly','Monthly'), ('bimonthly','Bimonthly'),('quarterly','Quarterly'),('half-yearly','Half-yearly'),('annually','Annually')],
+        default='monthly'
+        )
+    
+    sepa_status_direct_debit=fields.Selection(
+        [('done','Done'),('rejected','Rejected')]
+    )
+    rejected_date_direct_debit = fields.Date(
+        string='rejected date',
+        index=True,
+        track_visibility='onchange'
+    )
+
+
+    # payment_batch_id = fields.Many2one(
+    #         'opendons_payment_batch',
+    #         string='Payment Batch',
+    #         ondelete='set null'
+    #     )
+    
+    # def _compute_rum(self):
+    #     for rec in self:
+    #         rec.rum_direct_debit=''
+            #if rec.recurring_template: rec.rum_direct_debit='GHGHH65767688899976'
+            #rec.rum_direct_debit='GHGHH65767688899976'
+    
diff --git a/models/partner.py b/models/partner.py
index 6bcd342..c501bd0 100644
--- a/models/partner.py
+++ b/models/partner.py
@@ -125,14 +125,15 @@ class partner(models.Model):
         store=True
 
     )
-    firstname=fields.Char(
-       
-        string="First name",
-     
-
-    )
+    firstname=fields.Char(string="First name")
+    npai_count=fields.Integer(String="NPAI count", readonly=True)
     
     def _compute_key(self):
         for rec in self:
             rec.key=int(rec.id)*40456
 
+    @api.onchange('street')
+    def _onchange_street(self):
+        for rec in self:
+            rec.npai_count=0
+        return
\ No newline at end of file
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index b15ded2..951d76a 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -13,3 +13,9 @@ access_opendons_relationship_nature,opendons_relationship.nature,model_opendons_
 access_opendons_relationship_type,opendons_relationship.type,model_opendons_relationship_type,donation_main.group_donation_manager,1,1,1,1
 access_opendons_partneremail,opendons_partneremail,model_opendons_partneremail,donation_main.group_donation_manager,1,1,1,1
 access_opendons_partnerphone,opendons_partnerphone,model_opendons_partnerphone,donation_main.group_donation_manager,1,1,1,1
+
+access_opendons_returnmail,opendons_returnmail,model_opendons_returnmail,donation_main.group_donation_manager,1,1,1,1
+access_opendons_returnmailnpai,opendons_returnmailnpai,model_opendons_returnmail_npai,donation_main.group_donation_manager,1,1,1,1
+
+access_opendons_payment_batch,opendons_payment_batch,model_opendons_payment_batch,donation_main.group_donation_manager,1,1,1,1
+access_opendons_payment_batch_lines,opendons_payment_batch_lines,model_opendons_payment_batch_lines,donation_main.group_donation_manager,1,1,1,1
diff --git a/views/donation.xml b/views/donation.xml
index 2f29629..2b16572 100644
--- a/views/donation.xml
+++ b/views/donation.xml
@@ -10,6 +10,7 @@
             <xpath expr="//field[@name='campaign_id']" position="replace">
                 
                 <field name="operation_id"/>
+                <field name="segment_id"/>
         
 
             </xpath>
@@ -18,4 +19,8 @@
     
     </data>
 
+
+
+
+
 </odoo>
\ No newline at end of file
diff --git a/views/operation.xml b/views/operation.xml
index 932cf39..b343738 100644
--- a/views/operation.xml
+++ b/views/operation.xml
@@ -269,6 +269,15 @@
         <menuitem id="operation_menu" action="operation_action"
         parent="operation_title_menu" sequence="10"/>
 
+        <menuitem id="returnmail_title_menu" parent="operation_top_menu"
+        sequence="15" name="Return mail"/>
+
+       
+
+
+        
+
+
     </data>
     
 
diff --git a/views/partner.xml b/views/partner.xml
index 16eb112..0c3faab 100644
--- a/views/partner.xml
+++ b/views/partner.xml
@@ -48,7 +48,7 @@
             <group>
                 <field id="company" class="o_text_overflow" name="name" default_focus="1" placeholder="e.g. Lumber Inc" attrs="{'required' : [('type', '=', 'contact'),('is_company', '=', True)], 'invisible': [('is_company','=', False)]}"/>
                 <field id="individual" class="o_text_overflow" name="name" default_focus="1" placeholder="e.g. Brandom Freeman" attrs="{'required' : [('type', '=', 'contact'), ('is_company', '=', False)], 'invisible': [('is_company','=', True)]}"/>
-                <field name="firstname"/>
+                <field name="firstname" attrs="{'invisible':[('is_company','=',True)]}"/>
                 <field name="key"/>
                
                 <field name="parent_id" string="Company Name"
@@ -78,6 +78,15 @@
             <xpath expr="//field[@name='email']" position="attributes">
             <attribute name="invisible">1</attribute>
             </xpath>
+
+            <xpath expr="//page[@name='contact_addresses']" position="replace">
+            </xpath>
+            <xpath expr="//span[@name='address_name']" position="before">
+            <field name="npai_count"/>
+            </xpath>
+            <xpath expr="//field[@name='state_id']" position="replace">
+            </xpath>
+
             
 
 
@@ -88,12 +97,7 @@
                     icon="fa-info">
                     <field string="Qualifiers" name="qualifier_count" widget="statinfo"/>
                 </button>
-                <button class="oe_stat_button" type="action"
-                    name="%(act_partner_address)d"
-                   
-                    icon="fa-home">
-                    <field string="Address" name="address_count" widget="statinfo"/>
-                </button>
+               
                 <button class="oe_stat_button" type="action"
                     name="%(act_partner_email)d"