From 9879f538819bd6b66dba6c5ffc649d7e08704017 Mon Sep 17 00:00:00 2001
From: Florian du Garage Num <makayabou@gmail.com>
Date: Sun, 28 Jan 2024 21:42:04 +0100
Subject: [PATCH] delete hr.payroll.structure.type previous records

---
 gn_payroll/__manifest__.py                    |  1 -
 gn_payroll/data/gn_payroll_contract.xml       | 22 +++++++++++++++++++
 gn_payroll/data/gn_payroll_time.xml           |  4 +++-
 gn_payroll/data/init_flag.xml                 |  6 -----
 gn_payroll/models/__init__.py                 |  3 +--
 .../gn_payroll_contract_structure_type.py     | 14 ------------
 6 files changed, 26 insertions(+), 24 deletions(-)
 delete mode 100644 gn_payroll/data/init_flag.xml
 delete mode 100644 gn_payroll/models/gn_payroll_contract_structure_type.py

diff --git a/gn_payroll/__manifest__.py b/gn_payroll/__manifest__.py
index 1f25519..7bed82a 100644
--- a/gn_payroll/__manifest__.py
+++ b/gn_payroll/__manifest__.py
@@ -18,7 +18,6 @@
         "data/gn_payroll_time.xml",
         "data/gn_payroll_universal.xml",
         "data/gn_payroll_structure.xml",
-        "data/init_flag.xml",
         "views/gn_payroll_company.xml",
         "security/ir.model.access.csv"
     ],
diff --git a/gn_payroll/data/gn_payroll_contract.xml b/gn_payroll/data/gn_payroll_contract.xml
index 802b9fa..6d9782a 100644
--- a/gn_payroll/data/gn_payroll_contract.xml
+++ b/gn_payroll/data/gn_payroll_contract.xml
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <delete model="hr.payroll.structure.type" id="hr_contract.structure_type_employee"/>
+    <delete model="hr.payroll.structure.type" id="hr_contract.structure_type_worker"/>  
+    <record id="gn_payroll_structure_type_employe" model="hr.payroll.structure.type">
+        <field name="name">Employé(e)</field>
+        <field name="country_id" eval="False"/>
+    </record>
+    <record id="gn_payroll_structure_type_cadre" model="hr.payroll.structure.type">
+        <field name="name">Cadre</field>
+        <field name="country_id" eval="False"/>
+    </record>
+    <record id="gn_payroll_structure_type_service_civique" model="hr.payroll.structure.type">
+        <field name="name">Volontaire en Service civique</field>
+        <field name="country_id" eval="False"/>
+    </record>
+    <record id="gn_payroll_structure_type_intern" model="hr.payroll.structure.type">
+        <field name="name">Stagiaire</field>
+        <field name="country_id" eval="False"/>
+    </record>
+    <record id="payroll_structure_type_benevolent" model="hr.payroll.structure.type">
+        <field name="name">Administrateur bénévole</field>
+        <field name="country_id" eval="False"/>
+    </record>
     <record id="gn_payroll_contract_cae" model="hr.contract.type">
         <field name="name">PEC - CAE</field>
     </record>
diff --git a/gn_payroll/data/gn_payroll_time.xml b/gn_payroll/data/gn_payroll_time.xml
index 37d315a..504852b 100644
--- a/gn_payroll/data/gn_payroll_time.xml
+++ b/gn_payroll/data/gn_payroll_time.xml
@@ -30,7 +30,9 @@ if contract.struct_id.code == "VOLSERVCIV":
 else:
     dic_days = {0: 0, 1:0, 2: 0, 3: 0, 4:0}
     for x in contract.resource_calendar_id.attendance_ids:
-        dic_days[int(x.dayofweek)] += (x.hour_to - x.hour_from)
+        if ((not x.date_from) or ( payslip.date_from >= x.date_from )) and \
+            ((not x.date_to) or ( x.date_to >= payslip.date_to )):
+            dic_days[int(x.dayofweek)] += (x.hour_to - x.hour_from)
 
     # Calculating missed hours when payslip doesn't start / end at the beginning/ end of the month
 
diff --git a/gn_payroll/data/init_flag.xml b/gn_payroll/data/init_flag.xml
deleted file mode 100644
index 7e4392b..0000000
--- a/gn_payroll/data/init_flag.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<odoo>
-    <function model="ir.config_parameter" name="set_param">
-        <value eval="'gn_payroll.first_installation'" />
-        <value eval="'True'" />
-    </function>
-</odoo>
diff --git a/gn_payroll/models/__init__.py b/gn_payroll/models/__init__.py
index 2ac4b5b..7fb4736 100644
--- a/gn_payroll/models/__init__.py
+++ b/gn_payroll/models/__init__.py
@@ -3,5 +3,4 @@
 
 from . import gn_payroll_cc
 from . import gn_payroll_company
-from . import gn_payroll_employee
-#from . import gn_payroll_contract_structure_type
\ No newline at end of file
+from . import gn_payroll_employee
\ No newline at end of file
diff --git a/gn_payroll/models/gn_payroll_contract_structure_type.py b/gn_payroll/models/gn_payroll_contract_structure_type.py
deleted file mode 100644
index 5b720d3..0000000
--- a/gn_payroll/models/gn_payroll_contract_structure_type.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from odoo import models, api
-
-class HrPayrollStructureType(models.Model):
-    _name = 'hr.payroll.structure.type'
-
-    @api.model
-    def init(self):
-        super(HrPayrollStructureType, self).init()
-        first_install = self.env['ir.config_parameter'].sudo().get_param('gn_payroll.first_installation')
-        if first_install:
-            # Delete pre-existing records
-            self.env['hr.payroll.structure.type'].search([]).unlink()
-            # Reset the flag
-            self.env['ir.config_parameter'].sudo().set_param('gn_payroll.first_installation', 'False')
\ No newline at end of file