From 8ff3de38daa301829dfe0f73c2b2eb3aac655c28 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Thu, 10 Jun 2021 10:39:40 +0200
Subject: [PATCH] data and ref

---
 ...calendar.view_calendar_event_calendar_timeline.xml | 11 +++++++++++
 ...mint_system.hr_holidays.hr_leave_view_timeline.xml | 11 +++++++++++
 ...ays_calendar.hr_leave_report_calendar_timeline.xml | 11 +++++++++++
 enterprise                                            |  2 +-
 oca/crm                                               |  2 +-
 oca/openupgrade                                       |  2 +-
 oca/partner-contact                                   |  2 +-
 oca/timesheet                                         |  2 +-
 oca/web                                               |  2 +-
 odoo                                                  |  2 +-
 ...incoterm.view_partner_property_form.show_field.xml |  8 ++++++++
 task                                                  |  2 +-
 12 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 data/mint_system.calendar.view_calendar_event_calendar_timeline.xml
 create mode 100644 data/mint_system.hr_holidays.hr_leave_view_timeline.xml
 create mode 100644 data/mint_system.hr_holidays_calendar.hr_leave_report_calendar_timeline.xml
 create mode 100644 snippets/sale_partner_incoterm.view_partner_property_form.show_field.xml

diff --git a/data/mint_system.calendar.view_calendar_event_calendar_timeline.xml b/data/mint_system.calendar.view_calendar_event_calendar_timeline.xml
new file mode 100644
index 00000000..7c7963ce
--- /dev/null
+++ b/data/mint_system.calendar.view_calendar_event_calendar_timeline.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+  <record id="mint_system.calendar.view_calendar_event_calendar_timeline" model="ir.ui.view">
+    <field name="name">calendar.event.calendar.timeline</field>
+    <field name="model">calendar.event</field>
+    <field name="type">timeline</field>
+    <field name="arch" type="xml">
+      <timeline date_start="start" date_stop="stop" default_group_by="partner_id" event_open_popup="true" />
+    </field>
+  </record>
+</odoo>
\ No newline at end of file
diff --git a/data/mint_system.hr_holidays.hr_leave_view_timeline.xml b/data/mint_system.hr_holidays.hr_leave_view_timeline.xml
new file mode 100644
index 00000000..fbd79834
--- /dev/null
+++ b/data/mint_system.hr_holidays.hr_leave_view_timeline.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+  <record id="mint_system.hr_holidays.hr_leave_view_timeline" model="ir.ui.view">
+    <field name="name">hr.leave.view.timeline</field>
+    <field name="model">hr.leave</field>
+    <field name="type">timeline</field>
+    <field name="arch" type="xml">
+      <timeline date_start="date_from" date_stop="date_to" default_group_by="employee_id" event_open_popup="true" />
+    </field>
+  </record>
+</odoo>
\ No newline at end of file
diff --git a/data/mint_system.hr_holidays_calendar.hr_leave_report_calendar_timeline.xml b/data/mint_system.hr_holidays_calendar.hr_leave_report_calendar_timeline.xml
new file mode 100644
index 00000000..1a2f514e
--- /dev/null
+++ b/data/mint_system.hr_holidays_calendar.hr_leave_report_calendar_timeline.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+  <record id="mint_system.hr_holidays_calendar.hr_leave_report_calendar_timeline" model="ir.ui.view">
+    <field name="name">hr.leave.report.calendar.timeline</field>
+    <field name="model">hr.leave.report.calendar</field>
+    <field name="type">timeline</field>
+    <field name="arch" type="xml">
+      <timeline date_start="start_datetime" date_stop="stop_datetime" default_group_by="employee_id" event_open_popup="true" />
+    </field>
+  </record>
+</odoo>
\ No newline at end of file
diff --git a/enterprise b/enterprise
index 7aca5a4d..4fa795a8 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit 7aca5a4d8cc449a694ed6bca20a419c9954f1869
+Subproject commit 4fa795a80d994a94f89f7729433284bbb0f6c4bb
diff --git a/oca/crm b/oca/crm
index 99a13c19..8aded844 160000
--- a/oca/crm
+++ b/oca/crm
@@ -1 +1 @@
-Subproject commit 99a13c19aa480bd48646c609fd6a81d6ccbd34f1
+Subproject commit 8aded844272aa8bdeb68705dfeed21c120b658f4
diff --git a/oca/openupgrade b/oca/openupgrade
index 4e163f86..aba9430d 160000
--- a/oca/openupgrade
+++ b/oca/openupgrade
@@ -1 +1 @@
-Subproject commit 4e163f864ec3bfa3eaf3ed83e353b4d9dcc06196
+Subproject commit aba9430da25c68905fcf3b0b4e3e5cccf6e1e1a0
diff --git a/oca/partner-contact b/oca/partner-contact
index 56eed891..42d6a170 160000
--- a/oca/partner-contact
+++ b/oca/partner-contact
@@ -1 +1 @@
-Subproject commit 56eed89110a80ce117f952dc70dd826d718746a7
+Subproject commit 42d6a170a2b4efc4f36795ee0d6342ea269267da
diff --git a/oca/timesheet b/oca/timesheet
index f8ad8522..1130bad0 160000
--- a/oca/timesheet
+++ b/oca/timesheet
@@ -1 +1 @@
-Subproject commit f8ad85222b9f6f2b7f78cf5d4757c0b44b590c62
+Subproject commit 1130bad0965a57cdeb62145d50a94e3cb0e557eb
diff --git a/oca/web b/oca/web
index ecf2a9b4..0739c8e1 160000
--- a/oca/web
+++ b/oca/web
@@ -1 +1 @@
-Subproject commit ecf2a9b4375d13bfd5ad385fd44036878c0035ec
+Subproject commit 0739c8e166ac0a3a3363a15c3ba5c9a135a245e4
diff --git a/odoo b/odoo
index 4b609c59..6aa3dc60 160000
--- a/odoo
+++ b/odoo
@@ -1 +1 @@
-Subproject commit 4b609c59efd81a650d0cca22e3276817198f5afa
+Subproject commit 6aa3dc609cb13a469492b1a39a8fd9810040f079
diff --git a/snippets/sale_partner_incoterm.view_partner_property_form.show_field.xml b/snippets/sale_partner_incoterm.view_partner_property_form.show_field.xml
new file mode 100644
index 00000000..ae6a5fdb
--- /dev/null
+++ b/snippets/sale_partner_incoterm.view_partner_property_form.show_field.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_partner_incoterm.view_partner_property_form.">
+
+  <xpath expr="//field[@name='sale_incoterm_id']" position="replace">
+    <field name="sale_incoterm_id" string="Default Sales Incoterm" widget="selection" groups="sale_stock.group_display_incoterm"/>
+  </xpath>
+
+</data>
diff --git a/task b/task
index 8626e2e4..fab19b50 100755
--- a/task
+++ b/task
@@ -179,7 +179,7 @@ function checkout() {
     git submodule foreach git checkout $1
 
     # Sync files from last branch
-    git checkout $GIT_BRANCH README.md task task.md scripts snippets template
+    git checkout $GIT_BRANCH README.md task task.md scripts snippets template data
 }
 
 function release-module() {