diff --git a/beesdoo_shift/__manifest__.py b/beesdoo_shift/__manifest__.py
index 3205305..d56e5cf 100644
--- a/beesdoo_shift/__manifest__.py
+++ b/beesdoo_shift/__manifest__.py
@@ -38,8 +38,6 @@
"wizard/temporary_exemption.xml",
],
'demo': [
- "demo/cooperators.xml",
- "demo/workers.xml",
"demo/templates.xml",
]
}
diff --git a/beesdoo_shift/demo/cooperators.xml b/beesdoo_shift/demo/cooperators.xml
deleted file mode 100644
index 8f1ebfd..0000000
--- a/beesdoo_shift/demo/cooperators.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
- Fernand Peso
-
-
- fernand_peso@demo.net
- Avenue des Bas-de-Callanques, 15
- Etterbeek
- 1040
-
- regular
-
-
-
-
- Dupont Dupont
-
-
- d_dupont@demo.net
- Rue des sables, 20
- Bruxelles
- 10000
-
- irregular
-
-
-
-
- Ronan Le Gall
-
-
- ronan_gall@demo.net
- Rue des pecheurs, 23
- Landudec
- 29710
-
- regular
-
-
-
-
- Elouan Bees
-
-
- elouan_bees@demo.net
- Rue Wéry, 15
- Ixelles
- 1050
-
- irregular
-
-
-
-
- Anne de Marchalo
-
-
- anne_marchalo@demo.net
- Rue du Wels, 6
- Nantes
- 44000
-
- regular
-
-
-
-
- Jean Beaumont
-
-
- jean_beaumont@demo.net
- Rue de la Jungle, 8
- St-Gilles
- 1060
-
- regular
-
-
-
diff --git a/beesdoo_shift/demo/templates.xml b/beesdoo_shift/demo/templates.xml
index fd88cea..a78c101 100644
--- a/beesdoo_shift/demo/templates.xml
+++ b/beesdoo_shift/demo/templates.xml
@@ -65,43 +65,4 @@
Semaine A
-
- A_LUN_7:00-9:30
-
-
-
- 7
- 9.5
- 2.5
- 12
-
-
-
-
-
- A_MAR_12:00-14:30
-
-
-
- 12
- 14.5
- 2.5
- 9
-
-
-
-
-
- A_VEN_7:00-9:30
-
-
-
- 7
- 9.5
- 2.5
- 7
-
-
-
-
diff --git a/beesdoo_shift_attendance/__manifest__.py b/beesdoo_shift_attendance/__manifest__.py
index 2b260c4..e40ec55 100644
--- a/beesdoo_shift_attendance/__manifest__.py
+++ b/beesdoo_shift_attendance/__manifest__.py
@@ -21,6 +21,7 @@
'version': '12.0.1.0.0',
'depends': [
+ 'beesdoo_base',
'beesdoo_shift',
'beesdoo_worker_status',
'mail',
@@ -39,6 +40,8 @@
"views/attendance_sheet.xml",
],
'demo': [
+ "demo/tasks.xml",
+ "demo/workers.xml",
"demo/users.xml",
]
}
diff --git a/beesdoo_shift_attendance/demo/tasks.xml b/beesdoo_shift_attendance/demo/tasks.xml
new file mode 100644
index 0000000..064a610
--- /dev/null
+++ b/beesdoo_shift_attendance/demo/tasks.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+ A_LUN_7:00-9:30
+
+
+
+ 7
+ 9.5
+ 2.5
+ 12
+
+
+
+
+ A_MAR_12:00-14:30
+
+
+
+ 12
+ 14.5
+ 2.5
+ 9
+
+
+
+
+
+ A_VEN_7:00-9:30
+
+
+
+ 7
+ 9.5
+ 2.5
+ 7
+
+
+
+
+
diff --git a/beesdoo_shift/demo/workers.xml b/beesdoo_shift_attendance/demo/workers.xml
similarity index 78%
rename from beesdoo_shift/demo/workers.xml
rename to beesdoo_shift_attendance/demo/workers.xml
index 989577b..c0684fc 100644
--- a/beesdoo_shift/demo/workers.xml
+++ b/beesdoo_shift_attendance/demo/workers.xml
@@ -5,7 +5,7 @@
-->
-
+
@@ -14,7 +14,7 @@
-
+
2
irregular
@@ -22,7 +22,7 @@
-
+
2
@@ -30,20 +30,20 @@
-
+
2
irregular
-
+
2
regular
-
+
2
diff --git a/beesdoo_shift_attendance/tests/test_beesdoo_shift.py b/beesdoo_shift_attendance/tests/test_beesdoo_shift.py
index 030e62c..5ccca63 100644
--- a/beesdoo_shift_attendance/tests/test_beesdoo_shift.py
+++ b/beesdoo_shift_attendance/tests/test_beesdoo_shift.py
@@ -38,32 +38,35 @@ class TestBeesdooShift(TransactionCase):
)
self.worker_regular_1 = self.env.ref(
- "beesdoo_shift.res_partner_cooperator_6_demo"
+ "beesdoo_base.res_partner_cooperator_6_demo"
)
self.worker_regular_2 = self.env.ref(
- "beesdoo_shift.res_partner_cooperator_5_demo"
+ "beesdoo_base.res_partner_cooperator_5_demo"
)
self.worker_regular_3 = self.env.ref(
- "beesdoo_shift.res_partner_cooperator_3_demo"
+ "beesdoo_base.res_partner_cooperator_3_demo"
)
self.worker_regular_super_1 = self.env.ref(
- "beesdoo_shift.res_partner_cooperator_1_demo"
+ "beesdoo_base.res_partner_cooperator_1_demo"
)
self.worker_irregular_1 = self.env.ref(
- "beesdoo_shift.res_partner_cooperator_2_demo"
+ "beesdoo_base.res_partner_cooperator_2_demo"
)
self.worker_irregular_2 = self.env.ref(
- "beesdoo_shift.res_partner_cooperator_4_demo"
+ "beesdoo_base.res_partner_cooperator_4_demo"
)
self.task_type_1 = self.env.ref(
- "beesdoo_shift.beesdoo_shift_task_type_1_demo"
+ "beesdoo_shift_attendance"
+ ".beesdoo_shift_attendance_task_type_1_demo"
)
self.task_type_2 = self.env.ref(
- "beesdoo_shift.beesdoo_shift_task_type_2_demo"
+ "beesdoo_shift_attendance"
+ ".beesdoo_shift_attendance_task_type_2_demo"
)
self.task_type_3 = self.env.ref(
- "beesdoo_shift.beesdoo_shift_task_type_3_demo"
+ "beesdoo_shift_attendance"
+ ".beesdoo_shift_attendance_task_type_3_demo"
)
self.task_template_1 = self.env.ref(