18 Commits

Author SHA1 Message Date
Stéphan Sainléger
cb302a30b4 [IMP] event_generate_quotation_from_registration: block field edition
of event.registration.financier if the quotation is done.
2025-06-05 09:05:45 +02:00
Stéphan Sainléger
fcfb571112 [IMP] event_generate_quotation_from_registration: prevent edition attempts of done sale orders 2025-06-05 08:42:31 +02:00
Stéphan Sainléger
56723348db [FIX] event_generate_quotation_from_registration: fix dependency issue
by modifying Xpath on sale_order view
2025-05-16 15:02:46 +02:00
clementthomas
a123c3cc88 [IMP] event_generate_quotation_from_registration: add terms to financiers of registration 2025-01-24 10:00:15 +01:00
clementthomas
c8e2f102ee [IMP] event_track_calendar_event: event_tracks.speakers moved to calendar_events 2025-01-24 08:42:59 +01:00
clementthomas
b8bc91f7bc [FIX] event_track_calendar_event: disable partner_ids from calendar events of event track to prevent unexpected notifications from google 2025-01-10 10:39:02 +01:00
clementthomas
ddefa78b49 [IMP] event_generate_quotation_from_registration: add link to registration in generated sale order and invoice
diplay this link in tree and form views
2024-12-23 17:30:29 +01:00
clementthomas
85cb66c6d9 [NEW] event_generate_quotation_from_registration 2024-12-12 16:08:02 +01:00
clementthomas
0207cd5845 [FIX] event_track_calendar_event:
return res on create
2024-11-18 10:29:08 +01:00
clementthomas
eecfd25614 [FIX] event_track_calendar_event_event:
QuickFix
2024-07-26 11:34:36 +02:00
clementthomas
bc014155fa [IMP] event_track_calendar_event_event_speaker:
change position of event_speaker in data model
2024-07-26 10:44:59 +02:00
clementthomas
a72126d0a8 [IMP] event_track_calendar_event:
rename view
2024-07-26 10:44:16 +02:00
clementthomas
269c6b106b [NEW] event_track_copy 2024-07-26 10:33:19 +02:00
clementthomas
ee20c84f8b [IMP] event_track_calendar_event:
Do not send mail to attendees in created calendar event
2024-07-16 10:06:42 +02:00
clementthomas
a94e819f8c [IMP] event_track_calendar_event:
copy calendar events on event_track copy
2024-07-11 09:36:40 +02:00
clementthomas
5fadf2c769 [FIX] event_track_calendar_event_event_track_location:
improve notification when location already in use (avoid doublon)
2024-07-11 09:35:43 +02:00
clementthomas
70527dbb63 [DEL] event_sale_configurator_optionnal
module not so useful and potentialy risked
2024-05-30 12:16:39 +02:00
clementthomas
756f907ac8 [NEW] event_sale_configurator_optionnal 2024-05-15 10:19:13 +02:00
29 changed files with 368 additions and 29 deletions

View File

@@ -0,0 +1 @@
from . import models

View File

@@ -0,0 +1,22 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "event_generate_quotation_from_registration",
"version": "16.0.1.0.0",
"license": "AGPL-3",
"author": "Elabore",
"website": "https://www.elabore.coop",
"category": "",
'summary': 'Generate quotation from event registration',
'description': """
Generate quotation from event registration :
""",
"depends": ["event_sale"],
"data": [
'security/ir.model.access.csv',
'views/event_registration_views.xml',
'views/sale_order_views.xml',
'views/account_move_views.xml',
],
"installable": True,
}

View File

@@ -0,0 +1,4 @@
from . import event_registration
from . import event_registration_financier
from . import sale_order
from . import account_move

View File

@@ -0,0 +1,6 @@
from odoo import _, api, Command, fields, models
class AccountMove(models.Model):
_inherit = "account.move"
event_registration_id = fields.Many2one('event.registration', string="Stagiaire")

View File

@@ -0,0 +1,46 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import fields, models, api, Command
import logging
_logger = logging.getLogger(__name__)
class EventRegistration(models.Model):
_inherit = "event.registration"
financier_ids = fields.One2many('event.registration.financier', 'registration_id', string="Financements")
def name_get(self):
result = []
for registration in self:
if registration.partner_id and registration.event_id:
name = f"{registration.partner_id.name} ({registration.event_id.name})"
result.append((registration.id, name))
return result
@api.depends("partner_id", "event_id")
def _compute_display_name(self):
for registration in self:
if registration.partner_id and registration.event_id:
registration.display_name = f"{registration.partner_id.name} ({registration.event_id.name})"
else:
registration.display_name = super(EventRegistration, registration)._compute_display_name()
def generate_quotation(self):
for registration in self:
for financier in registration.financier_ids:
if not financier.quotation_id:
so_values = financier.get_sale_order_values()
so_values['order_line'] = financier.get_sale_order_line_values()
sale_order = self.env['sale.order'].create(so_values)
financier.quotation_id = sale_order
else:
order_lines = self.env['sale.order.line'].search([
('order_id','=',financier.quotation_id.id),
('product_id','=',financier.get_product_id()),
('state', '!=', 'done'),
])
if order_lines:
order_lines[0].price_unit = financier.amount
financier.quotation_id.write(financier.get_sale_order_values())

View File

@@ -0,0 +1,44 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import fields, models, api, Command
import logging
from odoo.exceptions import UserError
_logger = logging.getLogger(__name__)
class EventRegistrationFinancier(models.Model):
_name = "event.registration.financier"
_rec_name = 'financier_id'
company_id = fields.Many2one("res.company")
company_currency_id = fields.Many2one('res.currency', related="company_id.currency_id")
registration_id = fields.Many2one('event.registration')
quotation_id = fields.Many2one('sale.order', string="Devis")
financier_id = fields.Many2one('res.partner', string="Financeur", required=True)
terms = fields.Char('Modalités')
amount = fields.Monetary('Montant', currency_field="company_currency_id")
state = fields.Selection(
related='quotation_id.state',
string="Order Status",
copy=False, store=True, precompute=True)
def get_product_id(self):
if self.registration_id.event_ticket_id:
return self.registration_id.event_ticket_id.product_id.id
elif self.registration_id.event_id.event_ticket_ids:
return self.registration_id.event_id.event_ticket_ids[0].product_id.id
raise UserError('Un ticket doit être défini dans la session de formation afin de générer le devis')
def get_sale_order_values(self):
return {
'event_registration_id':self.registration_id.id,
'partner_id':self.financier_id.id,
}
def get_sale_order_line_values(self):
return [Command.create({
"price_unit": self.amount,
"product_id": self.get_product_id()
})]

View File

@@ -0,0 +1,39 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import fields, models, api, Command
import logging
_logger = logging.getLogger(__name__)
class SaleOrder(models.Model):
_inherit = "sale.order"
event_registration_id = fields.Many2one('event.registration', string="Stagiaire")
def _prepare_invoice(self):
"""Copy event_registration_id to generated invoice
"""
res = super(SaleOrder, self)._prepare_invoice()
res["event_registration_id"] = self.event_registration_id.id
return res
def linked_to_registration(self):
return len(self.env['event.registration.financier'].search([('quotation_id','=',self.id)])) > 0
def action_confirm(self):
res = super(SaleOrder, self).action_confirm()
#if sale order is linked to event.registration.financier, don't open wizard
if isinstance(res, dict) and res.get('xml_id') == 'event_sale.action_sale_order_event_registration' and self.linked_to_registration():
return True
return res
class SaleOrderLine(models.Model):
_inherit = "sale.order.line"
def _update_registrations(self, confirm=True, cancel_to_draft=False, registration_data=None, mark_as_paid=False):
# bypass _update_registrations if order generated by event registration
if self.order_id.linked_to_registration():
return
return super(SaleOrderLine, self)._update_registrations(confirm, cancel_to_draft, registration_data, mark_as_paid)

View File

@@ -0,0 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_event_registration_financier,access.event.registration.financier,model_event_registration_financier,sales_team.group_sale_salesman,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_event_registration_financier access.event.registration.financier model_event_registration_financier sales_team.group_sale_salesman 1 1 1 1

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="view_move_form" model="ir.ui.view">
<field name="name">view.move.form.inherit.event.generate.quotation</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form" />
<field name="arch" type="xml">
<field name="partner_shipping_id" position="after">
<field name="event_registration_id" />
</field>
</field>
</record>
<record id="view_out_invoice_tree" model="ir.ui.view">
<field name="name">view.out.invoice.tree.inherit.event.generate.quotation</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_out_invoice_tree" />
<field name="arch" type="xml">
<field name="invoice_date" position="before">
<field name="event_registration_id" />
</field>
</field>
</record>
</odoo>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="ir.ui.view" id="view_event_registration_form_event_generate_quotation_from_registration">
<field name="name">view.event.registration.form.event.generate.quotation.from.registration</field>
<field name="model">event.registration</field>
<field name="inherit_id" ref="event_sale.event_registration_ticket_view_form" />
<field name="arch" type="xml">
<sheet position="inside">
<group name="quotation" string="Financement" colspan="1">
<field name="financier_ids" nolabel="1" colspan="2">
<tree editable="bottom">
<field name="state" invisible="1"/>
<field name="financier_id" attrs="{'readonly': [('state', 'in', ['done', 'cancel'])]}"/>
<field name="amount" attrs="{'readonly': [('state', 'in', ['done', 'cancel'])]}" />
<field name="terms" />
<field name="quotation_id" readonly="True" />
</tree>
</field>
<button name="generate_quotation" type="object" string="Créer/adapter les devis" colspan="2" />
</group>
</sheet>
</field>
</record>
</odoo>

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="sale_order_view_form" model="ir.ui.view">
<field name="name">sale.order.form.inherit.event.generate.quotation</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<group name="order_details" position="inside">
<field name="event_registration_id" />
</group>
</field>
</record>
<record id="view_quotation_tree" model="ir.ui.view">
<field name="name">view.quotation.tree.inherit.event.generate.quotation</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_quotation_tree" />
<field name="arch" type="xml">
<field name="partner_id" position="after">
<field name="event_registration_id" />
</field>
</field>
</record>
</odoo>

View File

@@ -1,5 +1,3 @@
# Copyright 2016-2020 Akretion France (<https://www.akretion.com>)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
@@ -8,6 +6,7 @@
"license": "AGPL-3",
"author": "Elabore",
"website": "https://www.elabore.coop",
'summary': 'Not usefull anymore for CTL',
"category": "",
"depends": ["website_event_track"],
"data": [

View File

@@ -1,5 +1,3 @@
# Copyright 2016-2020 Akretion France (<https://www.akretion.com>)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{

View File

@@ -13,5 +13,6 @@ class CalendarEvent(models.Model):
for event in res:
if event.event_track_id:
event.event_track_id.sync_calendar_event()
return res

View File

@@ -6,11 +6,9 @@ _logger = logging.getLogger(__name__)
class EventEvent(models.Model):
_inherit = "event.event"
def write(self, vals):
_logger.warning("call write...")
def write(self, vals):
res = super().write(vals)
for event in self:
for track in event.track_ids:
track.sync_calendar_event()
_logger.warning("called !")
track.sync_calendar_event()
return res

View File

@@ -6,14 +6,11 @@ _logger = logging.getLogger(__name__)
class EventRegistration(models.Model):
_inherit = "event.registration"
def write(self, vals):
_logger.warning("call write...")
res = super(EventRegistration,self).write(vals)
_logger.warning("Super Write OK")
def write(self, vals):
res = super(EventRegistration,self).write(vals)
for registration in self:
for track in registration.event_id.track_ids:
track.sync_calendar_event()
_logger.warning("called !")
track.sync_calendar_event()
return res
@api.model_create_multi

View File

@@ -9,7 +9,7 @@ _logger = logging.getLogger(__name__)
class EventTrack(models.Model):
_inherit = "event.track"
calendar_event_ids = fields.One2many('calendar.event', 'event_track_id', 'Days')
calendar_event_ids = fields.One2many('calendar.event', 'event_track_id', 'Time slot', copy=True)
date = fields.Datetime(compute="_compute_date")
def _compute_date(self):
@@ -25,9 +25,13 @@ class EventTrack(models.Model):
"""return default values of calendar events
"""
return {
'partner_ids':[Command.set(self.get_calendar_event_partner_value())],
# due to google calendar unexpected notifications, for the moment we disable attendees of calendar event
# uncomment following line to re-enable
#'partner_ids':[Command.set(self.get_calendar_event_partner_value())],
'partner_ids':[Command.set([])],
'location':self.location_id.name if self.location_id else '',
'user_id':self.user_id.id
#'user_id':self.user_id.id,
'privacy':"confidential"
}
def get_calendar_event_partner_value(self):
@@ -51,7 +55,7 @@ class EventTrack(models.Model):
"""
_logger.warning("sync_calendar_event...")
for track in self:
track.calendar_event_ids.write(track.get_calendar_event_values())
track.calendar_event_ids.with_context(no_mail_to_attendees=True).write(track.get_calendar_event_values())
_logger.warning("sync_calendar_event done !")
@@ -71,3 +75,10 @@ class EventTrack(models.Model):
res = super().write(vals)
self.sync_calendar_event()
return res
def unlink(self):
for track in self:
for calendar_event in track.calendar_event_ids:
calendar_event.unlink()
return super(EventTrack, self).unlink()

View File

@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="ir.ui.view" id="view_event_track_form_ctl_training_customization">
<field name="name">event.track.form.ctl.training.customization</field>
<record model="ir.ui.view" id="view_event_track_form_event_track_calendar_event">
<field name="name">event.track.form.event.track.calendar.event</field>
<field name="inherit_id" ref="website_event_track.view_event_track_form" />
<field name="model">event.track</field>
<field name="arch" type="xml">
<!--
Replace date with calendar events
-->
<field name="date" position="replace" />
<!-- <field name="date" position="replace" /> -->
<page name="speaker" position="before">
<page name="calendar_events" string="Dates">
<page name="calendar_events" string="Plages horaires">
<field name="calendar_event_ids" context="{'default_name':name}" colspan="2">
<tree default_order="start,stop">
<tree default_order="start,stop" editable="bottom">
<field name="name" string="Name" invisible="1" />
<field name="start" string="From" />
<field name="stop" string="To" />
<field name="description" />
</tree>
<form>
<!-- <form>
<group>
<field name="name" string="Name" invisible="True" />
<label for="start" string="Date"/>
@@ -29,7 +29,7 @@
</div>
<field name="description" />
</group>
</form>
</form> -->
</field>
</page>
</page>

View File

@@ -9,9 +9,10 @@
"author": "Elabore",
"website": "https://www.elabore.coop",
"category": "",
'summary': 'Event track calendar event adaptation when event_speaker module installed',
"depends": ["event_track_calendar_event","event_speaker"],
"data": [
'summary': 'Speaker management in calendar events of event tracks',
"depends": ["event_track_calendar_event"],
"data": [
"views/event_track_views.xml"
],
"installable": True,
"auto_install":True

View File

@@ -1 +1,2 @@
from . import event_track
from . import calendar_event

View File

@@ -0,0 +1,10 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import fields, models, api, Command
class CalendarEvent(models.Model):
_inherit = 'calendar.event'
speaker_ids = fields.Many2many(
'res.partner', "calendar_event_speaker_rel", "calendar_event_id", "speaker_id", string="Intervenants", domain="[('is_company','=',False)]"
)

View File

@@ -5,6 +5,19 @@ from odoo import fields, models, api, Command
class EventTrack(models.Model):
_inherit = "event.track"
speaker_ids = fields.Many2many(
'res.partner', string="Intervenants", compute="compute_speaker_ids"
)
def compute_speaker_ids(self):
"""set speaker_ids as concat of all speakers of all events"""
for track in self:
speaker_ids = set()
for event in track.calendar_event_ids:
speaker_ids.update(event.speaker_ids.ids)
track.speaker_ids = list(speaker_ids)
def get_calendar_event_partner_value(self):
"""Add speaker ids to calendar event partners
"""

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="ir.ui.view" id="view_event_track_form_event_track_calendar_event_event_speaker">
<field name="name">event.track.form.event.track.calendar.event.event.speaker</field>
<field name="inherit_id" ref="event_track_calendar_event.view_event_track_form_event_track_calendar_event" />
<field name="model">event.track</field>
<field name="arch" type="xml">
<xpath expr="//field[@name='calendar_event_ids']/tree/field[@name='description']" position="after">
<field name="speaker_ids" widget="many2many_tags"/>
</xpath>
<!-- <xpath expr="//field[@name='calendar_event_ids']/form//field[@name='description']" position="after">
<field name="speaker_ids" />
</xpath> -->
</field>
</record>
</odoo>

View File

@@ -17,15 +17,24 @@ class EventTrack(models.Model):
location_already_in_use = False
location_already_in_use_message = ""
already_found_other_calendar_event_ids = []
for calendar_event in track.calendar_event_ids:
if track.location_id and calendar_event.start:
#search if other calendar event exists for same day on same location
search_other_calendar_events = [('event_track_id.location_id','=',track.location_id.id),('start','>=',calendar_event.start.replace(hour=0,minute=0)),('start','<=',calendar_event.start.replace(hour=23,minute=59))]
#search only on other event tracks
if track.id or track.id.origin:
search_other_calendar_events.append(('event_track_id','!=',track.id or track.id.origin))
#search calendar events not already founded
if already_found_other_calendar_event_ids:
search_other_calendar_events.append(('id','not in',already_found_other_calendar_event_ids))
other_calendar_events = self.env["calendar.event"].search(search_other_calendar_events)
already_found_other_calendar_event_ids.extend(other_calendar_events.ids)
if other_calendar_events:
location_already_in_use = True

View File

@@ -0,0 +1 @@
from . import models

View File

@@ -0,0 +1,21 @@
# Copyright 2016-2020 Akretion France (<https://www.akretion.com>)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Event track copy",
"version": "16.0.1.0.0",
"license": "AGPL-3",
"author": "Elabore",
"website": "https://www.elabore.coop",
"category": "",
'summary': 'Copy website event tracks when copy event',
'description': """Copy website event tracks when copy event
""",
"depends": ["website_event_track"],
"data": [
],
"installable": True,
}

View File

@@ -0,0 +1,2 @@
from . import event_track
from . import event_event

View File

@@ -0,0 +1,9 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import fields, models, api, Command
import logging
_logger = logging.getLogger(__name__)
class EventEvent(models.Model):
_inherit = "event.event"
track_ids = fields.One2many(copy=True) #enable copy for event tracks

View File

@@ -0,0 +1,12 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import fields, models, api, Command
from datetime import timedelta
import logging
_logger = logging.getLogger(__name__)
class EventTrack(models.Model):
_inherit = "event.track"
event_id = fields.Many2one(ondelete='cascade') #delete event tracks when delete event