16.0 pre release fix, corresponding to tag v0.10.1 of seintinelles-zato #1

Merged
b0g merged 4 commits from 16.0-pre-release-fix into 16.0 2025-07-23 07:41:03 +00:00
2 changed files with 57 additions and 22 deletions
Showing only changes of commit 3b1800a6bf - Show all commits

View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from odoo import api, fields, models, _ from odoo import api, fields, models
from odoo import osv
from odoo.exceptions import UserError
class StudyQuestionnaire(models.Model): class StudyQuestionnaire(models.Model):
@@ -35,11 +33,34 @@ class StudyQuestionnaire(models.Model):
copyright = fields.Text("Copyright") copyright = fields.Text("Copyright")
copyright_label = fields.Char("Propriétaire et année du copyright") copyright_label = fields.Char("Propriétaire et année du copyright")
created = fields.Datetime("Created") created = fields.Datetime("Created", compute="_compute_created", readonly=True)
date = fields.Datetime("Date") date = fields.Datetime("Date", compute="_compute_updated", readonly=True)
@api.depends("create_date")
def _compute_created(self):
for record in self:
if not record.created:
record.created = record.create_date
@api.depends("write_date")
def _compute_updated(self):
for record in self:
record.date = record.write_date
active = fields.Boolean("Actif", default=True) active = fields.Boolean("Actif", default=True)
def copy(self, default=None): def copy(self, default=None):
default = dict(default or {}, identifier_primary_id=None) default = dict(default or {}, identifier_primary_id=None)
return super().copy(default) return super().copy(default)
@api.depends("title", "name")
def name_get(self):
result = []
for questionnaire in self:
if not questionnaire.name:
result.append((questionnaire.id, questionnaire.title))
else:
result.append(
(questionnaire.id, f"[{questionnaire.name}] {questionnaire.title}")
)
return result

View File

@@ -3,13 +3,13 @@
<!-- TREE VIEW --> <!-- TREE VIEW -->
<record id="view_study_questionnaire_tree" model="ir.ui.view"> <record id="view_study_questionnaire_tree" model="ir.ui.view">
<field name="name">study.questionnaire.tree</field> <field name="name">study.questionnaire.tree</field>
<field name="model">study.questionnaire</field> <field name="model">study.questionnaire</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Questionnaires"> <tree string="Questionnaires">
<field name="title"/> <field name="title"/>
<field name="name"/> <field name="name"/>
<field name="effective_period_start"/> <field name="effective_period_start"/>
<field name="effective_period_end"/> <field name="effective_period_end"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -17,7 +17,7 @@
<!-- FORM VIEW --> <!-- FORM VIEW -->
<record id="view_study_questionnaire_form" model="ir.ui.view"> <record id="view_study_questionnaire_form" model="ir.ui.view">
<field name="name">study.questionnaire.form</field> <field name="name">study.questionnaire.form</field>
<field name="model">study.questionnaire</field> <field name="model">study.questionnaire</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Questionnaire"> <form string="Questionnaire">
<header> <header>
@@ -27,7 +27,7 @@
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
<!-- big buttons --> <!-- big buttons -->
</div> </div>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<label for="title" string="Nom du questionnaire" /><field name="title" /> <label for="title" string="Nom du questionnaire" /><field name="title" />
@@ -49,7 +49,7 @@
<group name="description" string="Description"> <group name="description" string="Description">
<group name="description_left"> <group name="description_left">
<field name="purpose" /> <field name="purpose" />
<field name="subject_type" widget="many2many_tags" /> <field name="subject_type" widget="many2many_tags" />
</group> </group>
<group name="description_right"> <group name="description_right">
<field name="description" /> <field name="description" />
@@ -66,29 +66,43 @@
</group> </group>
<group name="technique_right"> <group name="technique_right">
<field name="identifier_primary_id" /> <field name="identifier_primary_id" />
<field name="create_date" /> <field name="created" />
<field name="write_date" /> <field name="date" />
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Copyright" name="copyright"> <page string="Copyright" name="copyright">
<group name="copyright"> <group name="copyright">
<field name="copyright" /> <field name="copyright" />
<field name="copyright_label" /> <field name="copyright_label" />
</group> </group>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
</form> </form>
</field> </field>
</record> </record>
<!-- ACTIONS --> <!-- ACTIONS -->
<record id="action_study_questionnaire" model="ir.actions.act_window"> <record id="action_study_questionnaire" model="ir.actions.act_window">
<field name="name">Questionnaires</field> <field name="name">Questionnaires</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">study.questionnaire</field> <field name="res_model">study.questionnaire</field>
</record>
<!-- SEARCH VIEW -->
<record id="view_study_questionnaire_search" model="ir.ui.view">
<field name="name">study.questionnaire.search</field>
<field name="model">study.questionnaire</field>
<field name="arch" type="xml">
<search string="Questionnaires">
<field name="title" string="Nom"/>
<field name="name" string="Acronyme"/>
<field name="identifier_primary_id" string="Seintinelles ID"/>
<field name="effective_period_start" string="Effective Start"/>
<field name="effective_period_end" string="Effective End"/>
</search>
</field>
</record> </record>
</odoo> </odoo>