[MIG]hr_holidays_validity_date from 13.0 to 15.0

ForgeFlow · Oct 29, 2021 · bed8e4c · bed8e4c
1 parent 5a718f1
commit bed8e4c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/hr_holidays_validity_date/__manifest__.py b/hr_holidays_validity_date/__manifest__.py
@@ -7,9 +7,10 @@
     "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/hr-holidays",
     "category": "Human Resources",
-    "version": "13.0.1.0.0",
+    "version": "15.0.1.0.0",
     "license": "AGPL-3",
     "depends": ["hr_holidays"],
     "data": ["views/hr_holidays_view.xml"],
+    "development_status": "Production/Stable",
     "installable": True,
 }
diff --git a/hr_holidays_validity_date/models/hr_leave.py b/hr_holidays_validity_date/models/hr_leave.py
@@ -40,4 +40,4 @@ def _compute_warning_range(self):
     def _check_leave_type_validity(self):
         if not self.env.context.get("compute_warning_range", False):
             self = self.filtered("restrict_dates")
-        super(HolidaysRequest, self)._check_leave_type_validity()
+        return super(HolidaysRequest, self)._check_leave_type_validity()
diff --git a/hr_holidays_validity_date/views/hr_holidays_view.xml b/hr_holidays_validity_date/views/hr_holidays_view.xml
@@ -5,7 +5,7 @@
         <field name="model">hr.leave.type</field>
         <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form" />
         <field name="arch" type="xml">
-            <field name="validity_stop" position="after">
+            <field name="company_id" position="after">
                 <field name="restrict_dates" />
             </field>
         </field>

diff --git a/setup/hr_holidays_validity_date/odoo/addons/hr_holidays_validity_date b/setup/hr_holidays_validity_date/odoo/addons/hr_holidays_validity_date
@@ -0,0 +1 @@
+../../../../hr_holidays_validity_date
diff --git a/setup/hr_holidays_validity_date/setup.py b/setup/hr_holidays_validity_date/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)