diff --git a/hair_salon/__manifest__.py b/hair_salon/__manifest__.py
index f02a78c51..d50ee2444 100644
--- a/hair_salon/__manifest__.py
+++ b/hair_salon/__manifest__.py
@@ -9,6 +9,7 @@
'depends': [
'account_edi_ubl_cii',
'base_geolocalize',
+ "base_automation",
'hr_hourly_cost',
'knowledge',
'pos_loyalty',
@@ -17,11 +18,14 @@
'sales_team',
'website_appointment',
'theme_orchid',
- "base_automation",
"web_studio",
],
'data': [
'data/res_config_settings.xml',
+ 'data/ir_model_fields.xml',
+ 'data/ir_ui_view.xml',
+ 'data/ir_actions_server.xml',
+ 'data/base_automation.xml',
'data/project_task_type.xml',
'data/product_template.xml',
'data/product_attribute.xml',
@@ -34,11 +38,8 @@
'data/knowledge_article.xml',
'data/knowledge_article_favorite.xml',
'data/mail_message.xml',
- 'data/ir_model_fields.xml',
'data/appointment_type.xml',
- 'data/ir_ui_view.xml',
- 'data/ir_actions_server.xml',
- 'data/base_automation.xml',
+
],
'demo': [
'demo/website.xml',
diff --git a/hair_salon/data/appointment_type.xml b/hair_salon/data/appointment_type.xml
index 557d8332d..281af33d7 100644
--- a/hair_salon/data/appointment_type.xml
+++ b/hair_salon/data/appointment_type.xml
@@ -1,45 +1,38 @@
+ Haircut & Brushing
-
- recurring
-
-
+ 11
-
show
- Haircut & Brushing
- 11
+ 1.0
+
+
+ Haircut & Color & Brushing
- recurring
- 3.0
-
-
-
+ 12
-
show
+
+ 3.0
+
1.0
2.0
-
- Haircut & Color & Brushing
- 12
+
+ Brushing
- recurring
- 0.5
-
-
-
+ 10
-
show
- Brushing
+ 0.5
+
+
diff --git a/hair_salon/data/base_automation.xml b/hair_salon/data/base_automation.xml
index 259c5a91e..f6c4cf9e4 100644
--- a/hair_salon/data/base_automation.xml
+++ b/hair_salon/data/base_automation.xml
@@ -1,24 +1,24 @@
- Break Booking Automation
+ Delte Main Event
on_unlink
[("appointment_type_id", "!=", False)]
- Delete Main Appointment
+ Break Appointment
on_create_or_write
- ["&", ("name", "not ilike", "PART 1"), ("name", "not ilike", "PART 2"), ("user_id", "!=", False)]
+ [("name", "not ilike", "PART 1"), ("name", "not ilike", "PART 2"), ("user_id", "!=", False)]
Delete Sub Appointment
on_unlink
- ["&", ("name", "ilike", "PART 1"), ("user_id", "!=", False)]
+ [("name", "ilike", "PART 1"), ("user_id", "!=", False)]
diff --git a/hair_salon/data/ir_actions_server.xml b/hair_salon/data/ir_actions_server.xml
index 77c6b9b9d..0a57685aa 100644
--- a/hair_salon/data/ir_actions_server.xml
+++ b/hair_salon/data/ir_actions_server.xml
@@ -1,20 +1,20 @@
-
+
code
Execute Code
-
code
@@ -34,7 +34,7 @@ if x_break_end > 0 and x_break_start > 0 :
'stop': start_time + datetime.timedelta(hours=x_break_start),
'allday': record.allday,
'user_id': record.user_id.id,
- 'x_linked_to': record.id,
+ 'x_parent_id': record.id,
'alarm_ids' : [],
'partner_ids': [record.partner_ids[0].id],
'appointment_type_id':record.appointment_type_id.id,
@@ -50,7 +50,7 @@ if x_break_end > 0 and x_break_start > 0 :
'allday': record.allday,
'user_id': record.user_id.id,
'partner_ids': [record.partner_ids[0].id],
- 'x_linked_to': record.id,
+ 'x_parent_id': record.id,
'alarm_ids' : [],
'appointment_type_id':record.appointment_type_id.id,
}
diff --git a/hair_salon/data/ir_model_fields.xml b/hair_salon/data/ir_model_fields.xml
index 895d6268a..201ea074f 100644
--- a/hair_salon/data/ir_model_fields.xml
+++ b/hair_salon/data/ir_model_fields.xml
@@ -5,20 +5,18 @@
Break End
x_break_end_appointment
-
float
Break Start
x_break_start_appointment
-
-
+
many2one
Linked to
- x_linked_to
+ x_parent_id
calendar.event
@@ -40,9 +38,6 @@
Break End
x_break_end
-
-
-
appointment_type_id.x_break_end_appointment
@@ -50,9 +45,6 @@
Break Start
x_break_start
-
-
-
appointment_type_id.x_break_start_appointment
diff --git a/hair_salon/data/ir_ui_view.xml b/hair_salon/data/ir_ui_view.xml
index a0b3f4c34..27df955d4 100644
--- a/hair_salon/data/ir_ui_view.xml
+++ b/hair_salon/data/ir_ui_view.xml
@@ -14,12 +14,10 @@
-
-
-
+
+
-
@@ -36,34 +34,30 @@
-
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
+
0
False
-
diff --git a/hair_salon/demo/hr_employee.xml b/hair_salon/demo/hr_employee.xml
index 776bdbce7..fc61d5e1d 100644
--- a/hair_salon/demo/hr_employee.xml
+++ b/hair_salon/demo/hr_employee.xml
@@ -9,7 +9,6 @@
- Europe/Brussels
Grace Turner
@@ -20,7 +19,6 @@
- Europe/Brussels
Lily Joe
@@ -31,6 +29,5 @@
- Europe/Brussels