corrections pour katarzyna

__manifest__.py

@@ -68,7 +68,8 @@
         'views/asset.xml',
         'views/payment_transaction.xml',
         'views/donation.xml',
-        'views/mediatheque.xml'
+        'views/mediatheque.xml',
+        'views/account.xml'
         
         #'views/payment_views.xml'
 

models/__init__.py

@@ -19,7 +19,7 @@ from . import booking_donation
 #from . import booking_sale_order
 from . import event_media_link
 from . import mailing_list
-#from . import account_move
+from . import account_move
 from . import res_users
 from . import membership_import
 from . import online_payment

models/account_move.py

@@ -5,24 +5,55 @@ import logging
 from werkzeug import utils
 import re
 _logger = logging.getLogger(__name__)
+import json
 
 class AccountMove(models.Model):
     _inherit = 'account.move'
 
-    def write(self,vals):
-            res=super(AccountMove, self).write(vals)
-            
-            m=self.env['kalachakra.membership'].sudo().search([('invoice_id','=',int(self.id))])
-            
-            if m:
-                if self.payment_state == 'not_paid':
-                    m.payment_state='not paid'
-                    m.state='draft'
-                else:
-                    m.payment_state='paid'
-                    m.state='done'
-                _logger.error("errK2"+str(m.payment_state))
-            
-            return res
-            
+    description=fields.Char(compute='_compute_description')
+    transaction_date=fields.Datetime(compute='_compute_transaction_date')
+    transaction_amount=fields.Float(compute='_compute_transaction_amount')
+    systempay_ref=fields.Text(compute='_compute_systempay_ref')
+
+
+    def _compute_description(self):
+        
+        for a in self:
+            description=''
+            for line in a.line_ids:
+                    a.description=line.product_id.name
+                    break
+    
+    def _compute_transaction_date(self):
+        
+        for a in self:
+            a.transaction_date=False
+            for t in a.transaction_ids:
+                    a.transaction_date=t.date
+                    break
+
+    def _compute_transaction_amount(self):
+        
+        for a in self:
+            a.transaction_amount=False
+            for t in a.transaction_ids:
+                    a.transaction_amount=t.amount
+                    break
+
+    def _compute_systempay_ref(self):
+        
+        for a in self:
+            a.systempay_ref=False
+            for t in a.transaction_ids:
+                    if t.systempay_raw_data:
+                        raw1=t.systempay_raw_data.split(",")
+                        vads_order_id_s=raw1[21].split(":")
+                        # raw1=raw1.replace("\r", "")
+                        # raw1=raw1.replace("'","\"")
+                        # raise Warning(raw1)
+                        # raw=json.loads(raw1)
+                        
+                        a.systempay_ref=vads_order_id_s[1].replace("'","")
+                    break
+
                 

models/donation.py

@@ -39,7 +39,7 @@ class DonationDonation(models.Model):
     invoice_id=fields.Many2one('account.move','invoice')
     transaction_id=fields.Many2one('payment.transaction','payment transaction')
     state_done=fields.Boolean(compute='_compute_donation_state',store=True)
-    
+    affectation=fields.Char(compute='_compute_affectation')
     # @api.depends('transaction_id.state')
     # def transaction_state(self):
     #     _logger.error("onchange_transaction_state")
@@ -55,6 +55,19 @@ class DonationDonation(models.Model):
     #                 membership=request.env['kalachakra.membership'].sudo().search([('id','=',int(membership_id))])
     #                 if membership:membership.state='done'
 
+    def _compute_affectation(self):
+        
+        i=1
+        for d in self:
+            affectation=''
+            for line in d.line_ids:
+                if i==1:
+                    affectation=line.product_id.name
+                else:
+                     affectation=affectation+ ' ' +line.product_id.name
+                i=i+1
+            d.affectation=affectation
+
     @api.depends('invoice_id.payment_state','transaction_id.state')
     def _compute_donation_state(self):
         for d in self:

views/account.xml

@@ -0,0 +1,20 @@
+<odoo>
+
+<record id="view_kala_account_tree" model="ir.ui.view">
+        <field name="name">kala.account.tree</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_out_invoice_tree" />
+        <field name="arch" type="xml">
+         <xpath expr="//field[@name='name']" position="after">
+            <field  string="Systempay Ref" name="systempay_ref"/>
+             <field  string="Description" name="description"/>
+             <field  string="Payment mode" name="payment_mode_id"/>
+            <field  string="Payment date" name="transaction_date"/>
+            <field  string="Amount paid" name="transaction_amount"/>
+             
+           
+            </xpath>
+        </field>
+</record>
+
+</odoo>

views/donation.xml

@@ -18,4 +18,22 @@
             </xpath>
          </field>
 </record>
+
+<record id="view_kala_donation_tree" model="ir.ui.view">
+        <field name="name">opendons.donation.tree</field>
+        <field name="model">donation.donation</field>
+        <field name="inherit_id" ref="donation.donation_tree" />
+        <field name="arch" type="xml">
+
+         <xpath expr="//field[@name='donation_date']" position="after">
+            
+             <field  string="Affectation" name="affectation"/>
+           
+            
+            </xpath>
+        </field>
+</record>
+
+
+
 </odoo>

views/event.xml

@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
+<record model="ir.actions.act_window" id="event.action_event_view">
+      <field name="name">Events</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">event.event</field>
+           <field name="view_mode">tree,form,pivot,graph,kanban,calendar</field>
+           <field name="search_view_id" ref="event.view_event_search"/>
+           <field name="context">{'search_default_upcoming': 1}</field>
+           <field name="domain">[('individual_booking_event', '=', False)]</field>
+           <field name="help" type="html">
+              <p class="o_view_nocontent_smiling_face">
+                Add a new event
+              </p><p>
+                Schedule and organize your events efficiently:
+                track registrations and participations, automate the confirmation emails, sell tickets, etc.
+              </p>
+            </field>
+    </record>
+
 <record id="event_tag_category_view_form" model="ir.ui.view">
         <field name="name">event_tag_category_view_form_inherit_kalachakra</field>
         <field name="model">event.tag.category</field>