[MERGE] Forward-port of branch 12.0 to 13.0

2021-05-04 16:31:06 +02:00
parent 4ba422d76f 25af2874cd
commit 8a6ad77935
3332 changed files with 40884 additions and 59758 deletions
@@ -0,0 +1,28 @@
+Index: addons/openacademy/models.py
+===================================================================
+--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
+@@ -20,9 +20,10 @@
+     _description = "OpenAcademy Sessions"
+ 
+     name = fields.Char(required=True)
+-    start_date = fields.Date()
+    start_date = fields.Date(default=fields.Date.today)
+     duration = fields.Float(digits=(6, 2), help="Duration in days")
+     seats = fields.Integer(string="Number of seats")
+    active = fields.Boolean(default=True)
+ 
+     instructor_id = fields.Many2one('res.partner', string="Instructor",
+         domain=['|', ('instructor', '=', True),
+Index: addons/openacademy/views/openacademy.xml
+===================================================================
+--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
+@@ -94,6 +94,7 @@
+                                 <field name="course_id"/>
+                                 <field name="name"/>
+                                 <field name="instructor_id"/>
+                                <field name="active"/>
+                             </group>
+                             <group string="Schedule">
+                                 <field name="start_date"/>