divers

__manifest__.py

@@ -32,6 +32,7 @@
         'views/email.xml',
         'views/phone.xml',
         'views/donation.xml',
+        'views/product.xml',
         'views/recurring_donation.xml',
         'data/recurring_donation_configuration.xml',
         'data/data.xml',
@@ -59,6 +60,7 @@
         'report/report_bank_deposit.xml',
         'views/donation_tax_receipt.xml',
         'views/donation_thanks_template.xml',
+        'wizard/donation_cancel_wizard.xml',
         'views/laposte_ref.xml',
         'views/partner_import.xml',
         'views/portal.xml',

controllers/portal.py

@@ -123,7 +123,7 @@ class PortalOpendons(CustomerPortal):
         if tr:
             
             #mise à jour du champ htl à imprimer
-            tr.update_print_pdf()
+            #tr.update_print_pdf()
 
             pdf = request.env.ref('opendons.report_donation_tax_receipt').sudo()._render_qweb_pdf([tr.id])[0]
             pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]

data/data.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <odoo noupdate="1">
-    <record id="opendons_type_template_rf1" model="opendons.type_template_rf">
+    <!-- <record id="opendons_type_template_rf1" model="opendons.type_template_rf">
         <field name="name">generic</field>
     </record>
     <record id="opendons_type_template_rf2" model="opendons.type_template_rf">
@@ -9,7 +9,7 @@
     </record>
     <record id="opendons_type_template_rf3" model="opendons.type_template_rf">
         <field name="name">high amount</field>
-    </record>
+    </record> -->
 
     <record id="opendons_type_donation_thanks_template1" model="opendons.type_donation_thanks_template">
         <field name="name">generic</field>

models/accounting_deposit.py

@@ -15,8 +15,8 @@ class opendons_accounting_deposit(models.Model):
         ondelete="cascade",
         default=lambda self: self.env.company,
     )
-    payment_batch_ids = fields.One2many(
-        'opendons_payment_batch',
+    donation_ids = fields.One2many(
+        'donation.donation',
         'accountingdeposit_id',
         string='Payment batchs',
         readonly=True

models/bank_deposit.py

@@ -42,6 +42,7 @@ class opendons_bank_deposit(models.Model):
         ondelete='restrict',
         default=_default_currency
     )
+    printed=fields.Boolean('printed')
     donation_count=fields.Integer('donation count',compute='_compute_donation_count')
     total_amount=fields.Integer('total amount',compute='_compute_total_amount')
     # template_bankdeposit_id=fields.Many2one('opendons.template_bankdeposit', 'bank deposit template')
@@ -71,8 +72,9 @@ class opendons_bank_deposit(models.Model):
                     self.manual_mode_payment_id=m.id
     def action_print_bankdeposit(self):
         self.ensure_one()
-
+        self.printed=True
         return self.env.ref("opendons.report_bankdeposits").report_action(self)
+        
 
 class opendons_bank_deposit_template(models.Model):
     _name = 'opendons.bankdeposit.template'

models/donation.py

@@ -84,10 +84,45 @@ class DonationDonation(models.Model):
             string='Payment Batch',
             ondelete='set null'
         )
+    accountingdeposit_id = fields.Many2one(
+            'opendons.accountingdeposit',
+            string='accounting deposit',
+            ondelete='set null'
+        )
 
     #bank_deposit_date=fields.Datetime(related='payment_batch_id.bank_deposit_date')
-    payment_state=fields.Selection(related='payment_batch_id.state')
+    payment_state=fields.Selection(string='payment state',selection=[
+        ('draft', 'Draft'),
+        ('validated', 'Validated'),
+        ('deposited_in_bank', 'Deposited in bank'),
+        ('deposited_in_accounting', 'Deposited in accounting')
+        ],
+         compute='_compute_payment_state', store=True)
    
+    def generate_each_tax_receipt(self):
+        #pas de création du RF à la validation du don, mais génération des RF ponctuels en mode batch
+        return False
+    
+    def generate_each_tax_receipt_batch(self):
+       #on générère tous les dons avec taxreceipt_option= qui n'on pas de RF rattaché
+        donations=self.env['donation.donation'].search([('tax_receipt_option','=','each'),('tax_receipt_id','=',False)])
+       
+        for d in donations:
+            if not d.company_currency_id.is_zero(d.tax_receipt_total):
+                receipt_vals = d._prepare_each_tax_receipt()
+                receipt = self.env["donation.tax.receipt"].create(receipt_vals)
+                d.tax_receipt_id=receipt.id
+
+        return True
+
+
+    def _compute_payment_state(self):
+        for rec in self:
+            rec.payment_state='draft'
+            if rec.payment_batch_id:
+                rec.payment_state=rec.payment_batch_id.state
+            if rec.source_recurring_id:
+                rec.payment_state='deposited_in_bank'
     #accounting_deposit_date=fields.Datetime(related='payment_batch_id.accounting_deposit_date')
 
     year_donation_date=fields.Integer('Year donation date',compute='_compute_year_donation_date',store=True)
@@ -98,7 +133,16 @@ class DonationDonation(models.Model):
         readonly=True
     )
     html_content_print=fields.Html('html content print')
-    
+    cancel_reason=fields.Selection(string='cancel reason',selection=[
+        ('debit error','Debit error'),
+        ('donor error','Donor error'),
+        ('amount error','Amount error'),
+        ('invalid check','invalid check'),
+        ('affectation error','Affectation error'),
+        ('date error','Date error'),
+        ('other','Other'),
+        ])
+
     def done2cancel(self):
         """from Done state to Cancel state"""
         for donation in self:
@@ -112,12 +156,25 @@ class DonationDonation(models.Model):
                     )
                     % donation.tax_receipt_id.number
                 )
-            #if donation.move_id:
-                #donation.move_id.button_cancel()
-                #donation.move_id.unlink()
-            donation.write({"state": "cancel"})
-            donation.partner_id._update_donor_rank()
-            donation.reverse_accounting_entries()
+            
+            
+            view=self.env.ref('opendons.donation_cancel_view')
+
+            wiz=self.env['opendons.donation_cancel.wizard'].create({'donation_id':self.id})
+
+            return {
+                'name': _('Cancel donation'),
+                'type': 'ir.actions.act_window',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'opendons.donation_cancel.wizard',
+                'views': [(view.id, 'form')],
+                'view_id': view.id,
+                'target': 'new',
+                'res_id': wiz.id,
+                'context': self.env.context,
+            }
+            
     
     def reverse_accounting_entries(self):
         move=self.env['account.move'].search([('id','=',int(self.move_id))])
@@ -174,12 +231,12 @@ class DonationDonation(models.Model):
 
     @api.model
     def create(self, vals):
-        vals['tax_receipt_option']='annual'
+        #vals['tax_receipt_option']='annual'
         
         res = super(DonationDonation, self).create(vals)
 
-        #si don hors lot de paiement, création auto du lot de paiement
-        if not res.payment_batch_id and res.state!='draft' :
+        #si don hors lot de paiement,ne provenant pas d'un PA : création auto du lot de paiement
+        if not res.payment_batch_id and res.state!='draft' and res.source_recurring_id==False :
            vals={}
            vals['payment_mode_id']=int(res.payment_mode_id)
            batch=self.env['opendons_payment_batch'].create(vals)
@@ -189,15 +246,15 @@ class DonationDonation(models.Model):
         return res
 
     
-    def write(self, vals):
-
-        res = super(DonationDonation, self).write(vals)
-        #si don hors lot de paiement, création auto du lot de paiement
-        if not self.payment_batch_id and self.state!='draft' :
-           vals={}
-           vals['payment_mode_id']=int(self.payment_mode_id)
-           batch=self.env['opendons_payment_batch'].create(vals)
-           batch.write({'donation_ids':[(4,int(self.id))]})
+    # def write(self, vals):
+        
+    #     res = super(DonationDonation, self).write(vals)
+    #     #si don hors lot de paiement, création auto du lot de paiement
+    #     if not self.payment_batch_id and self.state!='draft' :
+    #        vals={}
+    #        vals['payment_mode_id']=int(self.payment_mode_id)
+    #        batch=self.env['opendons_payment_batch'].create(vals)
+    #        batch.write({'donation_ids':[(4,int(self.id))]})
 
    
 
@@ -354,11 +411,13 @@ class DonationDonation(models.Model):
                 }
                 #creation du don à partir du template de don récurrent
                 new_donation = donation.copy(default=default)
+                new_donation.payment_state='deposited_in_bank'
                 #ajout du don à la collection des dons générés pour affichage
                 new_donation_ids.append(new_donation.id)
                 #mise à jour de la date de dernière génération
                 donation.lastexecution_date=date_generation
                 
+                
         payment_mode_id=donation.payment_mode_id.id
         if not new_donation_ids : raise Warning ("aucun don n'a été généré")
         
@@ -709,6 +768,13 @@ class DonationLine(models.Model):
     donation_date=fields.Date(related='donation_id.donation_date')
     partner_id=fields.Many2one(related='donation_id.partner_id')
 
+    @api.model
+    def create(self, values): 
+
+        res = super(DonationLine, self).create(values)
+        res.analytic_account_id=res.product_id.analytic_account_id
+        return res
+
 
 
         

models/donation_tax_receipt.py

@@ -1,58 +1,41 @@
 from odoo import api, fields, models
-
+from datetime import datetime,timedelta,date
 
 class DonationTaxReceipt(models.Model):
     _inherit = "donation.tax.receipt"
     
     template_rf_id=fields.Many2one('opendons.template_rf', 'RF template')
-    html_content=fields.Html('html content',compute='_html_content_rf')
+    #html_content=fields.Html('html content',)
     html_content_print=fields.Html('html content print')
-    #donation_type=fields.Char('letter', compute='_compute_donation_type')
-    
+    pdf_file=fields.Binary("PDF")
     
 
-    #     #res = super(DonationTaxReceipt, self).create(vals)
-    # def _compute_donation_type(self):
-        
-    #     if len(self.donation_ids)>1:
-    #     #1 cas d'un RF à plusieurs dons
-    #         simple=True
-    #         i=1
-    #         for  d in self.donation_ids:
-    #             for l in d.donation_lines:
-    #                 if i==1: product_id=l.product_id
-    #                 else:
-    #                     if product_id!=l.product_id: 
-    #                         simple=False
-    #                         break
-    #                 i=i+1
-    #         if simple==True :
-    #             self.donation_type='simple'
-    #             self.product_id=product_id
-    #         if simple==False :
-    #             self.donation_type='multiple'
-    #             self.product_id=False
+    @api.model
+    def create(self, values): 
+
+        res = super(DonationTaxReceipt, self).create(values)
+        #génération du RF au format HTML pour impression pdf
+        template_rf=self.env['opendons.template_rf'].search([('type_rf','=','generic'),('active','=',True)],limit=1)
         
+        html_content_print=template_rf.html_content
         
+        html_content_print=html_content_print.replace('{{partner_id.name}}',str(self.partner_id.name))
+        html_content_print=html_content_print.replace('{{partner_id.firstname}}',str(self.partner_id.firstname))
+        html_content_print=html_content_print.replace('{{adresse}}',str(self.update_adresse()))
+        html_content_print=html_content_print.replace('{{donor_id}}',str(self.partner_id.donor_id))
+        res.html_content_print=html_content_print
+        res.template_rf_id=template_rf.id
+        return res
 
 
     def get_portal_url(self):
-        return "my/taxreceipt/print?id="+str(self.id)
+        return "/my/taxreceipt/print?id="+str(self.id)
     def action_print_rf(self):
         self.ensure_one()
+        self.print_date=datetime.now()
 
-        
-        html_content_print=self.html_content
-        html_content_print=html_content_print.replace('{{partner_id.name}}',self.partner_id.name)
-        html_content_print=html_content_print.replace('{{partner_id.firstname}}',self.partner_id.firstname)
-        html_content_print=html_content_print.replace('{{adresse}}',self.update_adresse())
-        html_content_print=html_content_print.replace('{{donor_id}}',self.partner_id.donor_id)
-        self.html_content_print=html_content_print
-        
-        #self.env['donation.tax_receipt'].write(vals)
-        #res=super(donation_tax_receipt, self).write(vals)
         return self.env.ref("opendons.report_donation_tax_receipt").report_action(self)
-        #return True
+
     
     def _html_content_rf(self):
         self.html_content=self.template_rf_id.html_content

models/product.py

@@ -5,6 +5,17 @@ from psycopg2 import sql, DatabaseError
 from werkzeug import utils
 
 
+class KalachakraProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    analytic_account_id = fields.Many2one(
+        "account.analytic.account",
+        "Analytic Account",
+        ondelete="restrict",
+        
+    )
+
+
 
 
         

models/settings.py

@@ -7,7 +7,9 @@ class OpendonsSettings(models.TransientModel):
     generation_day=fields.Integer('Generation day in the month',config_parameter='opendons.generation_day')
     limit_days_before=fields.Integer('Limit days before generation day',config_parameter='opendons.limit_days_before')
     pa_debug_mode=fields.Boolean('Debug mode',config_parameter='opendons.pa_debug_mode')
+    #RF
     donation_big_amount=fields.Integer('Donation big amount threshold',config_parameter='opendons.donation_big_amount')
+    
 
     
 

models/template_rf.py

@@ -17,17 +17,13 @@ class opendons_template_rf(models.Model):
     description=fields.Text('description')
     active=fields.Boolean('active')
     html_content=fields.Html('Html content')
-    type_id=fields.Many2one('opendons.type_template_rf', required=True)
+    type_rf=fields.Selection(string='type',selection=[('generic','Generic'),('affectation','Affectation'),('high amount','High amount')])
     
-    def action_update_receipts(self):
+   
 
-        rf=self.env['donation.tax.receipt'].search([('template_rf_id','=',int(self.id))])
-
-        for r in rf:
-            r.html_content=self.html_content
-
-class opendons_type_template_rf(models.Model):
-    _name = 'opendons.type_template_rf'
-    _description = 'manage type rf template'
+# class opendons_type_template_rf(models.Model):
+#     _name = 'opendons.type_template_rf'
+#     _description = 'manage type rf template'
     
-    name=fields.Char('name')
+#     name=fields.Char('name')
+#     type_rf=fields.Selection(string='type',selection=[('generic','Generic'),('affectation','Affectation'),('high amount','High amount')])

report/report_bank_deposit.xml

@@ -67,7 +67,7 @@
                                 <t t-foreach="d.line_ids" t-as="l">
                                     <tr>
                                     <td><span t-esc="d.partner_id.donor_id"/></td>
-                                        <td><span t-esc="d.partner_id.name+' '+d.partner_id.firstname"/></td>
+                                        <td><span t-esc="d.partner_id.name"/></td>
                                         <td><span t-esc="l.amount" t-options='{"widget": "monetary", "display_currency": l.currency_id}'/></td>
                                         
                                     </tr>

security/ir.model.access.csv

@@ -33,7 +33,7 @@ access_opendons_duplicate_partner,opendons_duplicate_partner,model_opendons_dupl
 
 
 access_opendons_template_rf,opendons_template_rf,model_opendons_template_rf,donation.group_donation_manager,1,1,1,1
-access_opendons_type_template_rf,opendons_type_template_rf,model_opendons_type_template_rf,donation.group_donation_manager,1,1,1,1
+
 access_opendons_donation_thanks_type_template,opendons_donation_thanks_type_template,model_opendons_type_donation_thanks_template,donation.group_donation_manager,1,1,1,1
 
 
@@ -42,8 +42,12 @@ access_opendons_laposte_ref,opendons_laposte_ref,model_opendons_laposte_ref,dona
 
 
 access_opendons_recurring_donation_wizard,opendons_recurring_donation_wizard,model_opendons_recurringdonation_wizard,donation.group_donation_manager,1,1,1,1
+
 access_opendons_recurring_donationprint_wizard,opendons_recurring_donationprint_wizard,model_opendons_recurringdonationprint_wizard,donation.group_donation_manager,1,1,1,1
 access_opendons_recurring_donation,opendons_recurring_donation,model_opendons_recurring_donation,donation.group_donation_manager,1,1,1,1
+
+access_opendons_donation_cancel_wizard,opendons_donation_cancel_wizard,model_opendons_donation_cancel_wizard,donation.group_donation_manager,1,1,1,1
+
 access_opendons_template_pa_letter,opendons_template_pa_letter,model_opendons_template_pa_letter,donation.group_donation_manager,1,1,1,1
 
 access_opendons_print_donation_email_history,opendons_print_donation_email_history,model_opendons_donation_print_email_history,donation.group_donation_manager,1,1,1,1

views/accounting_deposit.xml

@@ -10,7 +10,7 @@
         <tree>
           <field name="create_date"/>
           <field name="create_uid"/>
-          <field name="payment_batch_ids"/>
+          <field name="donation_ids"/>
           
         </tree>
       </field>
@@ -21,20 +21,13 @@
             <field name="model">opendons.accountingdeposit</field>
             <field name="arch" type="xml">
             
-            
                 <form string="accounting_deposit_form">
                 <group name="accounting_deposit">
                     <field name="create_date"/>
                         <field name="create_uid"/>
-                        <field name="payment_batch_ids">
-                        <tree>
-                            <field name="create_date"/>
-                            <field name="create_uid"/>
-                            <field name="payment_mode_id"/>
-                            <field  name="amount_total" string="Total"/>
-                            <field  name="payment_count" string="Payments count"/>
-                        </tree>
-                        </field>
+                        <field name="donation_ids"/>
+                        
+                        
                  </group>
                 </form>
            
@@ -51,9 +44,14 @@
       
     </record>
 
+<record id="action_create_new_accounting_deposit" model="ir.actions.act_window">
+            <field name="name">Create an accounting deposit</field>
+            <field name="res_model">opendons.createaccountingdeposit</field>
+            <field name="view_mode">form</field>
+            <field name="binding_model_id" ref="donation.model_donation_donation"/>
+        </record>
+
 
-<menuitem id="accounting_deposit_menu" action="accounting_deposit_action"
-parent="payment_batch_top_menu" sequence="30"/>
 
   </data>
 </odoo>

views/bank_deposit.xml

@@ -29,6 +29,7 @@
                 <group name="bank_deposit">
                     <field name="create_date"/>
                         <field name="create_uid"/>
+                        <field name="printed"/>
                         <field name="payment_batch_ids">
                         <tree>
                             <field name="create_date"/>
@@ -47,10 +48,23 @@
             </field>
         </record>
 
+
+<record id="opendons.bank_deposit_search" model="ir.ui.view">
+      <field name="name">opendons_bank_deposit.search</field>
+      <field name="model">opendons.bankdeposit</field>
+      <field name="arch"  type="xml">
+        <search>
+        <filter string="Printed" name="printed" domain="[('printed', '=', True)]"/>
+        <filter string="Not printed" name="not_printed" domain="[('printed', '=', False)]"/>
+        </search>
+      </field>
+  </record>
+
 <record model="ir.actions.act_window" id="bank_deposit_action">
       <field name="name">Bank deposits</field>
       <field name="res_model">opendons.bankdeposit</field>
       <field name="view_mode">tree,form</field>
+      <field name="context">{"search_default_not_printed":1}</field>
 
       
     </record>

views/donation.xml

@@ -14,4 +14,54 @@
             </xpath>
         </field>
 </record>
+
+<record id="view_opendons_donation_form2" model="ir.ui.view">
+        <field name="name">opendons.donation.form</field>
+        <field name="model">donation.donation</field>
+        <field name="inherit_id" ref="donation.donation_form" />
+        <field name="arch" type="xml">
+           
+            
+            
+         <xpath expr="//field[@name='partner_id']" position="attributes">
+         <attribute name="attrs">{'readonly':['|',('state','=','cancel'),('recurring_template','=','stopped')]}</attribute>
+         </xpath>
+         <xpath expr="//field[@name='payment_mode_id']" position="attributes">
+         <attribute name="attrs">{'readonly':[('state','=','cancel')]}</attribute>
+         </xpath>
+         <xpath expr="//field[@name='mandate_id']" position="attributes">
+         <attribute name="attrs">{'readonly':[('state','=','cancel')],'required': [('mandate_required', '=', True)], 'invisible': [('mandate_required', '=', False)]}</attribute>
+         </xpath>
+         <xpath expr="//field[@name='line_ids']" position="attributes">
+         <attribute name="attrs">{'readonly':[('state','in',['done','cancel'])]}</attribute>
+         </xpath>
+         <xpath expr="//field[@name='tax_receipt_option']" position="attributes">
+         <attribute name="attrs">{'readonly':[('state','in',['done','cancel'])]}</attribute>
+         </xpath>
+      
+         
+         <xpath expr="//button[@name='done2cancel']" position="attributes">
+            
+            <attribute name="confirm">this action is irreversible, do you confirm ?</attribute>
+                
+           
+            
+            </xpath>
+        </field>
+</record>
+
+<record id="donation.donation_action" model="ir.actions.act_window">
+<field name="context">{'form_no_edit':[('state','=','cancel')]}</field>
+</record>
+
+<menuitem id="accounting_deposit_donation_menu" name="Accounting deposits"
+parent="donation.donation_top_menu" sequence="30"/>
+
+<menuitem id="accounting_deposit_donation_action_menu" action="accounting_deposit_action"
+parent="accounting_deposit_donation_menu" sequence="10"/>
+
+<menuitem id="create_accounting_deposit_donation_menu" action="action_create_new_accounting_deposit"
+parent="accounting_deposit_donation_menu" sequence="20"/>
+
+
 </odoo>

views/donation_tax_receipt.xml

@@ -9,8 +9,9 @@
         <field name="inherit_id" ref="donation_base.donation_tax_receipt_form" />
         <field name="arch" type="xml">
         <xpath expr="//field[@name='company_id']" position="after">
+            <field name="PDF"/>
             <field name="template_rf_id"/>
-            <field name="html_content"/>
+            <field name="html_content_print"/>
             
         </xpath>
 
@@ -22,4 +23,15 @@
         </field>
 </record>
 
+<record id="view_opendons_donation_tax_receipt_tree" model="ir.ui.view">
+        <field name="name">opendons.donation.tax_receipt.tree</field>
+        <field name="model">donation.tax.receipt</field>
+        <field name="inherit_id" ref="donation_base.donation_tax_receipt_tree" />
+        <field name="arch" type="xml">
+        <xpath expr="//field[@name='company_id']" position="replace">
+        <field name="create_date"/>
+        </xpath>
+       </field>
+</record>
+
 </odoo>

views/payment_batch.xml

@@ -128,8 +128,7 @@ parent="payment_batch_title_menu" sequence="10"/>
 
 <menuitem id="payment_batch_account_payment_order" action="account_payment_order.account_payment_order_inbound_action"
 parent="payment_batch_title_menu" sequence="20"/>
-<!-- <menuitem id="payment_batch_bank_deposit" action="payment_batch_to_deposit_in_bank_action"
-parent="payment_batch_title_menu" sequence="19"/> -->
+
 
 
   </data>

views/recurring_donation.xml

@@ -8,15 +8,15 @@
         <field name="arch" type="xml">
             
             <xpath expr="//field[@name='donation_date']" position="replace">
-                <field name="donation_date" string="date" attrs="{'readonly':[('recurring_template','=','stopped')]}"/>
+                <field name="donation_date" string="date" attrs="{'readonly':['|',('recurring_template','=','stopped'),('state','in',['done','cancel'])]}"/>
                 <field name="start_date" string="start date" attrs="{'invisible':[('recurring_template','=',False)],'required':[('recurring_template','=',True)],'readonly':[('recurring_template','=','stopped')]}"/>
                 <field name="lastexecution_date" t-options='{"format": "dd / MM / yyyy  HH / mm"}' attrs="{'invisible':[('recurring_template','not in',('active','suspended','stopped'))]}"/>
                 <field name="suspended_date"  attrs="{'invisible':[('recurring_template','not in',('active','suspended','stopped'))]}"/>
                 <field name="end_date" attrs="{'readonly':[('recurring_template','=','stopped')],'invisible':[('recurring_template','not in',('active','suspended','stopped'))]}"/>
                 <field name="stopped_date"  attrs="{'invisible':['|',('recurring_template','not in',('active','suspended','stopped')),('stopped_date','=',False)]}"/>
                 <field name="stopped_reason"  attrs="{'readonly':[('recurring_template','=','stopped')],'invisible':['|',('recurring_template','not in',('active','suspended','stopped')),('stopped_date','=',False)]}"/>
-                <field name="operation_id" attrs="{'readonly':[('recurring_template','=','stopped')]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
-                <field name="segment_id" attrs="{'readonly':[('recurring_template','=','stopped')]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
+                <field name="operation_id" attrs="{'readonly':['|',('recurring_template','=','stopped'),('state','in',['done','cancel'])]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
+                <field name="segment_id" attrs="{'readonly':['|',('recurring_template','=','stopped'),('state','in',['done','cancel'])]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
                 <field name="frequency"  attrs="{'readonly':[('recurring_template','=','stopped')],'invisible':[('recurring_template','not in',('active','suspended','stopped'))]}"/>
 
             

views/template_rf.xml

@@ -13,8 +13,8 @@
           <sheet>
             <group name="main"> 
              <field name="name"/>
-             <field name="type_id"/>
-                <field name="description"/>
+             <field name="type_rf"/>
+              <field name="description"/>
               <field name="active"/>
               <field name="html_content"/>
             
@@ -33,7 +33,7 @@
           <tree>
              <field name="name"/>
               <field name="active"/>
-              <field name="type_id"/>
+              <field name="type_rf"/>
                <field name="description"/>
               
           </tree>

wizard/__init__.py

@@ -1,4 +1,6 @@
 from . import operation_duplicate_wizard
 from . import recurring_donation_wizard
 from . import create_bank_deposit_wizard
-from . import create_accounting_deposit_wizard
+from . import create_accounting_deposit_wizard
+from . import donation_cancel_wizard
+#from . import tax_receipt_annual_create

wizard/create_accounting_deposit_wizard.xml

@@ -6,7 +6,7 @@
             <field name="arch" type="xml">
                 <form>
                 <p>
-                Are you sure do you want to create a accounting deposit with selected payments ?
+                Are you sure do you want to create a accounting deposit for bank deposit or canceled payments ? 
             </p>
                        
                         <footer>
@@ -18,12 +18,6 @@
         </record>
 
 
-<record id="action_create_new_accounting_deposit" model="ir.actions.act_window">
-            <field name="name">Create an accounting deposit</field>
-            <field name="res_model">opendons.createaccountingdeposit</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="binding_model_id" ref="opendons.model_opendons_payment_batch"/>
-        </record>
+
 
 </odoo>