diff --git a/account_reconcile_compassion/__manifest__.py b/account_reconcile_compassion/__manifest__.py
index 9d1eea13d..a5543a4df 100644
--- a/account_reconcile_compassion/__manifest__.py
+++ b/account_reconcile_compassion/__manifest__.py
@@ -47,6 +47,7 @@
     ]},
     "data": [
         "data/statement_operation.xml",
+        "data/queue_job.xml",
         "views/account_reconcile_compassion.xml",
         "views/reconcile_fund_wizard_view.xml",
         "views/reconcile_split_payment_wizard_view.xml",
diff --git a/account_reconcile_compassion/data/queue_job.xml b/account_reconcile_compassion/data/queue_job.xml
new file mode 100644
index 000000000..00f5478fe
--- /dev/null
+++ b/account_reconcile_compassion/data/queue_job.xml
@@ -0,0 +1,14 @@
+<odoo>
+    <!-- Channels -->
+    <record id="channel_reconcile" model="queue.job.channel">
+        <field name="name">reconcile_compassion</field>
+        <field name="parent_id" ref="queue_job.channel_root"/>
+    </record>
+
+    <!-- Job functions -->
+    <record id="process_reconcile_job" model="queue.job.function">
+        <field name="model_id" ref="model_account_bank_statement_line"/>
+        <field name="method">_process_reconciliation</field>
+        <field name="channel_id" ref="channel_reconcile"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/account_reconcile_compassion/models/bank_statement_line.py b/account_reconcile_compassion/models/bank_statement_line.py
index fb5932a7d..b25ec4ba8 100644
--- a/account_reconcile_compassion/models/bank_statement_line.py
+++ b/account_reconcile_compassion/models/bank_statement_line.py
@@ -18,7 +18,6 @@
 from odoo.exceptions import UserError
 from odoo.tools import mod10r
 from functools import reduce
-from odoo.addons.queue_job.job import job
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +60,6 @@ def get_statement_line_for_reconciliation_widget(self):
     ##########################################################################
 
     @api.multi
-    @job(default_channel="root.bank_reconciliation")
     def _process_reconciliation(
         self, counterpart_aml_dicts=None, payment_aml_rec=None, new_aml_dicts=None
     ):
diff --git a/crowdfunding_compassion/controllers/homepage_controller.py b/crowdfunding_compassion/controllers/homepage_controller.py
index 6c561e3b8..dff209990 100644
--- a/crowdfunding_compassion/controllers/homepage_controller.py
+++ b/crowdfunding_compassion/controllers/homepage_controller.py
@@ -49,26 +49,33 @@ def _compute_homepage_context():
         year = datetime.now().year
         project_obj = request.env["crowdfunding.project"].sudo()
         current_year_projects = project_obj.get_active_projects(year=year)
-        active_funds = current_year_projects.mapped("product_id")
+        funds_used = current_year_projects.mapped("product_id")
+        active_funds = funds_used.search([("activate_for_crowdfunding", "=", True)])
+        active_funds_data = []
         impact = {
             "sponsorship": sponsorship_card_content()
         }
-        for fund in active_funds:
+        for fund in funds_used:
             impact[fund.name] = {
                 "type": "fund",
                 "value": 0,
-                "name": fund.crowdfunding_impact_text_active,
+                # "name": fund.crowdfunding_impact_text_active,
                 "text": fund.crowdfunding_impact_text_passive_singular,
                 "description": fund.crowdfunding_description,
                 "icon_image": fund.image_medium or SPONSOR_ICON,
+            }
+        for fund in active_funds:
+            active_funds_data.append({
+                "name": fund.crowdfunding_impact_text_active,
+                "description": fund.crowdfunding_description,
+                "icon_image": fund.image_medium or SPONSOR_ICON,
                 # the header is a small image so we can compress it to save space
                 "header_image":
                     compress_big_images(
                         fund.image_large,
                         max_width=400
                     ) if fund.image_large else SPONSOR_HEADER,
-
-            }
+            })
 
         for project in current_year_projects:
             impact["sponsorship"]["value"] += project.number_sponsorships_reached
@@ -76,8 +83,13 @@ def _compute_homepage_context():
             if project_fund in impact:
                 impact[project_fund]["value"] += project.product_number_reached
 
-        for fund in active_funds:
-            if impact[fund.name]["value"] > 1:
+        for fund in funds_used:
+            impact_val = impact[fund.name]["value"]
+            large_impact = fund.impact_type == "large"
+            if large_impact and impact_val > 100:
+                impact[fund.name]["text"] = fund.crowdfunding_impact_text_passive_plural
+                impact[fund.name]["value"] = int(impact_val / 100)
+            elif not large_impact and impact_val > 1:
                 impact[fund.name]["text"] = fund.crowdfunding_impact_text_passive_plural
 
         if impact["sponsorship"]["value"] > 1:
@@ -88,6 +100,7 @@ def _compute_homepage_context():
         return {
             "projects": current_year_projects[:8],
             "impact": {k: v for k, v in impact.items() if v['value']},
+            "active_funds": active_funds_data,
             "base_url": request.website.domain,
             "subheading": subheading,
         }
diff --git a/crowdfunding_compassion/controllers/project_controller.py b/crowdfunding_compassion/controllers/project_controller.py
index f253e4754..39b59b20b 100644
--- a/crowdfunding_compassion/controllers/project_controller.py
+++ b/crowdfunding_compassion/controllers/project_controller.py
@@ -114,25 +114,27 @@ def get_sponsorships_and_donations(self, sponsorship_ids, invoice_line_ids):
             for sponsorship in sponsorship_ids
         ]
 
-        donations = [
-            {
+        donations = []
+        for donation in invoice_line_ids.filtered(lambda l: l.state == "paid"):
+            product = donation.product_id
+            quantity = donation.quantity
+            impact_text = product.crowdfunding_impact_text_passive_singular
+            if product.impact_type == "standard" and int(quantity) > 1:
+                impact_text = product.crowdfunding_impact_text_passive_plural
+            elif product.impact_type == "large" and quantity >= 100:
+                impact_text = product.crowdfunding_impact_text_passive_plural
+                quantity = int(quantity / 100)
+            donations.append({
                 "type": "donation",
                 "color": "grey",
-                "text": f"{int(donation.quantity)} "
-                f"{donation.product_id.crowdfunding_impact_text_passive_plural}"
-                if int(donation.quantity) > 1 else
-                f"{int(donation.quantity)} "
-                f"{donation.product_id.crowdfunding_impact_text_passive_singular}",
-                "image": donation.product_id.image_medium,
+                "text": f"{int(quantity)} {impact_text}",
+                "image": donation.product_id.image_small,
                 "benefactor": donation.invoice_id.partner_id.firstname,
                 "date": donation.invoice_id.create_date,
                 "time_ago": self.get_time_ago(donation.invoice_id.create_date),
                 "anonymous": donation.is_anonymous,
-                "quantity": int(donation.quantity)
-            }
-            for donation in invoice_line_ids.filtered(
-                lambda l: l.state == "paid")
-        ]
+                "quantity": int(quantity)
+            })
         return sponsorships, donations
 
     def get_impact(self, sponsorships, donations):
diff --git a/crowdfunding_compassion/forms/project_creation_form.py b/crowdfunding_compassion/forms/project_creation_form.py
index b3213ff3e..f0e7526b2 100644
--- a/crowdfunding_compassion/forms/project_creation_form.py
+++ b/crowdfunding_compassion/forms/project_creation_form.py
@@ -250,6 +250,10 @@ def form_before_create_or_update(self, values, extra_values):
 
         if not product_goal:
             values["product_id"] = False
+        if product_goal and values["product_id"]:
+            product = self.env["product.product"].sudo().browse(values["product_id"])
+            if product.impact_type == "large":
+                extra_values["participant_product_number_goal"] = product_goal * 100
         super().form_before_create_or_update(values, extra_values)
 
     def _form_create(self, values):
diff --git a/crowdfunding_compassion/models/crowdfunding_project.py b/crowdfunding_compassion/models/crowdfunding_project.py
index 106e20854..c231d24e1 100644
--- a/crowdfunding_compassion/models/crowdfunding_project.py
+++ b/crowdfunding_compassion/models/crowdfunding_project.py
@@ -75,7 +75,7 @@ class CrowdfundingProject(models.Model):
     number_sponsorships_reached = fields.Integer(
         "Sponsorships reached", compute="_compute_number_sponsorships_reached")
     product_crowdfunding_impact = fields.Char(
-        related="product_id.crowdfunding_impact_text_passive_plural")
+        compute="_compute_impact_text")
     color_sponsorship = fields.Char(compute="_compute_color_sponsorship")
     color_product = fields.Char(compute="_compute_color_product")
     color = fields.Integer(
@@ -193,6 +193,14 @@ def _compute_number_participants(self):
         for project in self:
             project.number_participants = len(project.participant_ids)
 
+    def _compute_impact_text(self):
+        for project in self:
+            product = project.product_id
+            project.product_crowdfunding_impact = \
+                product.crowdfunding_impact_text_passive_singular \
+                if product.impact_type == "large"\
+                else product.crowdfunding_impact_text_passive_plural
+
     @api.model
     def create(self, vals):
         res = super().create(vals)
diff --git a/crowdfunding_compassion/models/product_template.py b/crowdfunding_compassion/models/product_template.py
index 4cf0c0765..d3eae01ff 100644
--- a/crowdfunding_compassion/models/product_template.py
+++ b/crowdfunding_compassion/models/product_template.py
@@ -8,23 +8,44 @@ class ProductTemplate(models.Model):
     _inherit = "product.template"
 
     activate_for_crowdfunding = fields.Boolean()
-    crowdfunding_description = fields.Text(translate=True)
-    crowdfunding_quantity_singular = fields.Char(translate=True, help="Ex: toilet")
-    crowdfunding_quantity_plural = fields.Char(translate=True, help="Ex: toilets")
+    impact_type = fields.Selection([
+        ("standard", "Standard"),
+        ("large", "Large impact project")
+    ],
+        help="Use large impact if the project goals should be displayed in terms "
+             "of percentage.",
+        default="standard"
+    )
+    crowdfunding_description = fields.Text(
+        translate=True,
+        help="Description of the fund visible on Homepage"
+    )
+    crowdfunding_quantity_singular = fields.Char(
+        translate=True,
+        help="Visible when choosing donation quantity 1 or when "
+             "displaying project goal equivalence for 1 quantity.")
+    crowdfunding_quantity_plural = fields.Char(
+        translate=True,
+        help="Visible when choosing donation quantity or setting project goal "
+             "for large impact projects.")
     crowdfunding_impact_text_active = fields.Char(
-        translate=True, help="Ex: buildling toilets"
+        translate=True, help="Fund title on TOGETHER"
     )
     crowdfunding_impact_text_passive_singular = fields.Char(
-        translate=True, help="Ex: toilet built"
+        translate=True,
+        help="Shown on barometers when impact is 1 or less."
     )
     crowdfunding_impact_text_passive_plural = fields.Char(
-        translate=True, help="Ex: toilets built"
+        translate=True,
+        help="Shown on barometers when impact is more than 1."
     )
     fund_selector_pre_description = fields.Char(
-        translate=True, help="Ex: I want to give access to toilets for"
+        translate=True,
+        help="Shown when setting the goal of a project, before the quantity field."
     )
     fund_selector_post_description = fields.Char(
-        translate=True, help="Ex: children"
+        translate=True,
+        help="Shown when setting the goal of a project, after the quantity field."
     )
     image_large = fields.Binary(
         "Large image", help="Image for header", attachment=True
diff --git a/crowdfunding_compassion/templates/crowdfunding_components.xml b/crowdfunding_compassion/templates/crowdfunding_components.xml
index fb66c43d8..4105dbce0 100644
--- a/crowdfunding_compassion/templates/crowdfunding_components.xml
+++ b/crowdfunding_compassion/templates/crowdfunding_components.xml
@@ -7,15 +7,21 @@
             <div class="goal-progress__text-tile">
                 <img class="goal-progress__icon" t-attf-src="data:image/png;base64, #{ goal_image }" t-if="isinstance(goal_image, bytes)"/>
                 <img class="goal-progress__icon" t-att-src="goal_image" t-if="isinstance(goal_image, str)"/>
+                <t t-if="impact_type == 'large' and goal_reached &gt; 100">
+                    <t t-set="goal_reached" t-value="int(goal_reached / 100)"/>
+                    <t t-set="goal_objective" t-value="int(goal_objective / 100)"/>
+                </t>
                 <div>
                     <span class="text--bold">
                         <t t-esc="goal_reached"/>
                         <t t-esc="goal_name"/>
                     </span>
-                    <span class="text--faded">
-                        out of
-                        <t t-esc="goal_objective"/>
-                    </span>
+                    <t t-if="impact_type != 'large'">
+                        <span class="text--faded">
+                            out of
+                            <t t-esc="goal_objective"/>
+                        </span>
+                    </t>
                 </div>
             </div>
             <div class="goal-progress__bar mb-3 mt-1">
@@ -50,12 +56,14 @@
                 <t t-set="goal_reached" t-value="project.number_sponsorships_reached"/>
                 <t t-set="goal_objective" t-value="project.number_sponsorships_goal"/>
                 <t t-set="goal_image" t-value="'/crowdfunding_compassion/static/src/img/icn_children.png'"/>
+                <t t-set="impact_type">sponsorship</t>
                 <t t-call="crowdfunding_compassion.goal_progress" t-if="goal_objective"/>
             </t>
 
             <!-- Setup data and display the fund progress -->
             <t t-if="project.product_id">
-                <t t-if="project.product_number_reached > 1">
+                <t t-set="impact_type" t-value="project.product_id.impact_type"/>
+                <t t-if="(impact_type == 'standard' and project.product_number_reached > 1) or project.product_number_reached > 100">
                     <t t-set="goal_name" t-value="project.product_id.crowdfunding_impact_text_passive_plural"/>
                 </t>
                 <t t-else="">
@@ -120,10 +128,12 @@
                         <t t-set="goal_reached" t-value="participant.number_sponsorships_reached"/>
                         <t t-set="goal_objective" t-value="participant.number_sponsorships_goal"/>
                         <t t-set="goal_image" t-value="'/crowdfunding_compassion/static/src/img/icn_children.png'"/>
+                        <t t-set="impact_type">sponsorship</t>
                         <t t-call="crowdfunding_compassion.goal_progress" t-if="goal_objective"/>
 
                         <!-- Setup data and display the fund progress -->
-                        <t t-if="project.product_number_reached > 1">
+                        <t t-set="impact_type" t-value="project.product_id.impact_type"/>
+                        <t t-if="(impact_type == 'standard' and project.product_number_reached > 1) or project.product_number_reached > 100">
                             <t t-set="goal_name" t-value="project.product_id.crowdfunding_impact_text_passive_plural"/>
                         </t>
                         <t t-else="">
@@ -315,19 +325,19 @@
         <!-- Displays a card with a possible donation, for example: 1 toilet - 25CHF -->
         <template id="fund_amount_example" name="Fund amount example">
             <!-- Compute value -->
-            <t t-set="current_value" t-value="project.product_id.standard_price * current_default_quantity"/>
-
+            <t t-set="product" t-value="project.product_id"/>
+            <t t-set="current_value" t-value="product.standard_price * current_default_quantity"/>
+            <t t-set="plural" t-values="current_default_quantity > 1 if product.impact_type == 'standard' else current_default_quantity > 100"/>
             <div class="col-6 col-lg-6 mb-3">
                 <label class="h-100 w-100">
                     <input type="radio" name="amount" t-att-value="current_value" class="card-input-element d-none" />
                     <div class="card h-100 d-flex justify-content-around align-items-center text-center">
-                        <img class="donation-type__card-icon" t-attf-src="data:image/png;base64, #{ project.product_id.image_medium }" t-if="isinstance(project.product_id.image_medium, bytes)"/>
+                        <img class="donation-type__card-icon" t-attf-src="data:image/png;base64, #{ product.image_medium }" t-if="isinstance(product.image_medium, bytes)"/>
                         <img class="donation-type__card-icon"
                              src="/crowdfunding_compassion/static/src/img/icn_children.png" t-else=""/>
                         <h3 class="blue">
                             <t t-esc="current_default_quantity"/>
-                            <t t-esc="project.product_id.crowdfunding_quantity_singular" t-if="current_default_quantity == 1" />
-                            <t t-esc="project.product_id.crowdfunding_quantity_plural" t-if="current_default_quantity > 1" />
+                            <t t-esc="product.crowdfunding_quantity_plural if plural else product.crowdfunding_quantity_singular"/>
                             <br/>
                             CHF
                             <t t-esc="str(int(current_value)) + '.-'"/>
diff --git a/crowdfunding_compassion/templates/homepage.xml b/crowdfunding_compassion/templates/homepage.xml
index ee5e1c033..8214ab0ea 100644
--- a/crowdfunding_compassion/templates/homepage.xml
+++ b/crowdfunding_compassion/templates/homepage.xml
@@ -143,11 +143,11 @@
 
                     <div class="container mb-5 pb-5">
                         <div class="row">
-                            <t t-foreach="impact" t-as="fund">
-                                <t t-set="fund_image" t-value="impact[fund]['header_image']"/>
-                                <t t-set="fund_icon" t-value="impact[fund]['icon_image']" />
-                                <t t-set="fund_name" t-value="impact[fund]['name']" />
-                                <t t-set="fund_description" t-value="impact[fund]['description']" />
+                            <t t-foreach="active_funds" t-as="fund">
+                                <t t-set="fund_image" t-value="fund['header_image']"/>
+                                <t t-set="fund_icon" t-value="fund['icon_image']" />
+                                <t t-set="fund_name" t-value="fund['name']" />
+                                <t t-set="fund_description" t-value="fund['description']" />
                                 <div class="col-sm-12 col-md-6 col-lg-4 mb-3">
                                     <t t-call="crowdfunding_compassion.fund_card"/>
                                 </div>
diff --git a/crowdfunding_compassion/templates/presentation_page.xml b/crowdfunding_compassion/templates/presentation_page.xml
index 97c924148..d1b99ee00 100644
--- a/crowdfunding_compassion/templates/presentation_page.xml
+++ b/crowdfunding_compassion/templates/presentation_page.xml
@@ -40,10 +40,12 @@
                                             <t t-set="goal_reached" t-value="participant.number_sponsorships_reached"/>
                                             <t t-set="goal_objective" t-value="participant.number_sponsorships_goal"/>
                                             <t t-set="goal_image" t-value="'/crowdfunding_compassion/static/src/img/icn_children.png'"/>
+                                            <t t-set="impact_type">sponsorship</t>
                                             <t t-call="crowdfunding_compassion.goal_progress" t-if="goal_objective"/>
 
                                             <!-- Setup data and display the fund progress -->
-                                            <t t-if="project.product_number_reached > 1">
+                                            <t t-set="impact_type" t-value="project.product_id.impact_type"/>
+                                            <t t-if="(impact_type == 'standard' and project.product_number_reached > 1) or project.product_number_reached > 100">
                                                 <t t-set="goal_name" t-value="project.product_id.crowdfunding_impact_text_passive_plural"/>
                                             </t>
                                             <t t-else="">
diff --git a/crowdfunding_compassion/templates/project_creation_page.xml b/crowdfunding_compassion/templates/project_creation_page.xml
index 1ab095fe4..8a3065f8d 100644
--- a/crowdfunding_compassion/templates/project_creation_page.xml
+++ b/crowdfunding_compassion/templates/project_creation_page.xml
@@ -152,9 +152,9 @@
                                                     </div>
                                                     <p class="card-text text-white">
                                                         <span class="white">Indicate the amount in the above box. 1</span>
-                                                        <t t-esc="fund.crowdfunding_quantity_singular" class="white"/>
+                                                        <t t-esc="fund.crowdfunding_quantity_singular if fund.impact_type == 'standard' else fund.crowdfunding_quantity_plural" class="white"/>
                                                         <span class="white">is equivalent to CHF</span>
-                                                        <t t-esc="int(fund.standard_price)" class="white"/>.-
+                                                        <t t-esc="int(fund.standard_price) * (1 if fund.impact_type == 'standard' else 100)" class="white"/>.-
                                                     </p>
                                                 </div>
                                             </div>
diff --git a/crowdfunding_compassion/views/product_view.xml b/crowdfunding_compassion/views/product_view.xml
index 31472ef51..789f2d737 100644
--- a/crowdfunding_compassion/views/product_view.xml
+++ b/crowdfunding_compassion/views/product_view.xml
@@ -11,6 +11,7 @@
                         <field name="activate_for_crowdfunding"/>
                     </group>
                     <group attrs="{'invisible': [('activate_for_crowdfunding', '=', False)]}">
+                        <field name="impact_type"/>
                         <field name="crowdfunding_description"/>
                         <field name="crowdfunding_quantity_singular"/>
                         <field name="crowdfunding_quantity_plural"/>
diff --git a/mass_mailing_switzerland/__manifest__.py b/mass_mailing_switzerland/__manifest__.py
index 8f70ff27a..8701ec6db 100644
--- a/mass_mailing_switzerland/__manifest__.py
+++ b/mass_mailing_switzerland/__manifest__.py
@@ -38,6 +38,7 @@
         "security/ir.model.access.csv",
         "security/access_rules.xml",
         "data/smart_tags.xml",
+        "data/queue_job.xml",
         "views/mass_mailing_view.xml",
         "views/mail_template_view.xml",
         "views/utm_view.xml",
diff --git a/mass_mailing_switzerland/data/queue_job.xml b/mass_mailing_switzerland/data/queue_job.xml
new file mode 100644
index 000000000..2cd8192d7
--- /dev/null
+++ b/mass_mailing_switzerland/data/queue_job.xml
@@ -0,0 +1,29 @@
+<odoo>
+    <!-- Channels -->
+    <record id="channel_mailchimp" model="queue.job.channel">
+        <field name="name">mailchimp</field>
+        <field name="parent_id" ref="queue_job.channel_root"/>
+    </record>
+
+    <!-- Job functions -->
+    <record id="export_job" model="queue.job.function">
+        <field name="model_id" ref="model_mail_mass_mailing_contact"/>
+        <field name="method">action_export_to_mailchimp</field>
+        <field name="channel_id" ref="channel_mailchimp"/>
+    </record>
+    <record id="update_job" model="queue.job.function">
+        <field name="model_id" ref="model_mail_mass_mailing_contact"/>
+        <field name="method">action_update_to_mailchimp</field>
+        <field name="channel_id" ref="channel_mailchimp"/>
+    </record>
+    <record id="archive_job" model="queue.job.function">
+        <field name="model_id" ref="model_mail_mass_mailing_contact"/>
+        <field name="method">action_archive_from_mailchimp</field>
+        <field name="channel_id" ref="channel_mailchimp"/>
+    </record>
+    <record id="unlink_job" model="queue.job.function">
+        <field name="model_id" ref="model_mail_mass_mailing_contact"/>
+        <field name="method">unlink</field>
+        <field name="channel_id" ref="channel_mailchimp"/>
+    </record>
+</odoo>
diff --git a/mass_mailing_switzerland/models/mass_mailing.py b/mass_mailing_switzerland/models/mass_mailing.py
index b57f53f2a..41c7fde61 100644
--- a/mass_mailing_switzerland/models/mass_mailing.py
+++ b/mass_mailing_switzerland/models/mass_mailing.py
@@ -59,8 +59,9 @@ def _onchange_model_and_list(self):
         self.mailing_domain = mailing_domain
 
     def send_now_mailchimp(self, account=False):
+        mailchimp_channel = self.env.ref("mass_mailing_switzerland.channel_mailchimp")
         queue_job = self.env["queue.job"].search([
-            ("channel", "=", "root.mass_mailing_switzerland.update_mailchimp"),
+            ("job_function_id.channel_id", "=", mailchimp_channel.id),
             ("state", "!=", "done")
         ], limit=1)
         if queue_job:
diff --git a/mass_mailing_switzerland/models/mass_mailing_contact.py b/mass_mailing_switzerland/models/mass_mailing_contact.py
index 07f966ef8..4a408e769 100644
--- a/mass_mailing_switzerland/models/mass_mailing_contact.py
+++ b/mass_mailing_switzerland/models/mass_mailing_contact.py
@@ -268,8 +268,9 @@ def process_mailchimp_update(self):
         if not self or self.env.context.get("skip_mailchimp"):
             return True
 
+        mailchimp_channel = self.env.ref("mass_mailing_switzerland.channel_mailchimp")
         queue_job = self.env["queue.job"].sudo().search([
-            ("channel", "=", "root.mass_mailing_switzerland.update_partner_mailchimp"),
+            ("job_function_id.channel_id", "=", mailchimp_channel.id),
             ("state", "!=", "done")
         ])
         to_update = self
@@ -284,7 +285,6 @@ def process_mailchimp_update(self):
         return True
 
     @api.multi
-    @job(default_channel="root.mass_mailing_switzerland.action_export_to_mailchimp")
     def action_export_to_mailchimp(self):
         """
         Filter opt_out partners
@@ -296,7 +296,6 @@ def action_export_to_mailchimp(self):
         ).action_export_to_mailchimp()
 
     @api.multi
-    @job(default_channel="root.mass_mailing_switzerland.action_update_to_mailchimp")
     def action_update_to_mailchimp(self):
         out = True
 
@@ -327,7 +326,6 @@ def action_update_to_mailchimp(self):
         return out
 
     @api.multi
-    @job(default_channel="root.mass_mailing_switzerland.action_archive_from_mailchimp")
     def action_archive_from_mailchimp(self):
         available_mailchimp_lists = self.env['mailchimp.lists'].search([])
         lists = available_mailchimp_lists.mapped('odoo_list_id').ids
@@ -348,12 +346,6 @@ def action_archive_from_mailchimp(self):
                             {}, method='DELETE')
         return True
 
-    @job(default_channel="root.mass_mailing_switzerland.delay_contact_unlink")
-    def delay_contact_unlink(self):
-        """Delay contact unlink to prevent potential issue if we removed it directly
-        on write."""
-        self.unlink()
-
     def _invalid_contact(self, bounced):
         for invalid_contact in self:
             ref_partner = invalid_contact.partner_id
@@ -385,4 +377,4 @@ def _invalid_contact(self, bounced):
                     subject=ref_partner.invalid_mail
                 )
             if not ref_partner or bounced:
-                invalid_contact.with_delay().delay_contact_unlink()
+                invalid_contact.with_delay().unlink()
diff --git a/muskathlon/__manifest__.py b/muskathlon/__manifest__.py
index 6d20c3026..163156019 100644
--- a/muskathlon/__manifest__.py
+++ b/muskathlon/__manifest__.py
@@ -47,6 +47,7 @@
         "data/event_registration_task.xml",
         "data/mail_template.xml",
         "data/order_material_mail_template.xml",
+        "data/queue_job.xml",
         "reports/muskathlon_view.xml",
         "views/event_compassion_view.xml",
         "views/partner_compassion_view.xml",
diff --git a/muskathlon/data/queue_job.xml b/muskathlon/data/queue_job.xml
new file mode 100644
index 000000000..c1bb66de7
--- /dev/null
+++ b/muskathlon/data/queue_job.xml
@@ -0,0 +1,19 @@
+<odoo>
+    <!-- Channels -->
+    <record id="channel_muskathlon" model="queue.job.channel">
+        <field name="name">muskathlon</field>
+        <field name="parent_id" ref="queue_job.channel_root"/>
+    </record>
+
+    <!-- Job functions -->
+    <record id="notify_new_registration_job" model="queue.job.function">
+        <field name="model_id" ref="model_event_registration"/>
+        <field name="method">notify_new_registration</field>
+        <field name="channel_id" ref="channel_muskathlon"/>
+    </record>
+    <record id="medical_survey_job" model="queue.job.function">
+        <field name="model_id" ref="model_event_registration"/>
+        <field name="method">muskathlon_medical_survey_done</field>
+        <field name="channel_id" ref="channel_muskathlon"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/muskathlon/forms/muskathlon_registration_form.py b/muskathlon/forms/muskathlon_registration_form.py
index 446358999..dc5703abe 100644
--- a/muskathlon/forms/muskathlon_registration_form.py
+++ b/muskathlon/forms/muskathlon_registration_form.py
@@ -21,6 +21,7 @@ class MuskathlonRegistrationForm(models.AbstractModel):
     _form_required_fields = [
         "partner_image",
         "ambassador_quote",
+        "sport_discipline_id",
         "sport_level",
         "sport_level_description",
         "gtc_accept",
diff --git a/muskathlon/models/__init__.py b/muskathlon/models/__init__.py
index e9431e041..dbf147405 100644
--- a/muskathlon/models/__init__.py
+++ b/muskathlon/models/__init__.py
@@ -15,7 +15,6 @@
 from . import res_partner
 from . import sport_discipline
 from . import staff_notification_settings
-from . import queue_job
 from . import payment_transaction
 from . import survey_user_input
 from . import privacy_statement
diff --git a/muskathlon/models/event_registration.py b/muskathlon/models/event_registration.py
index 16f264a61..4b4040053 100644
--- a/muskathlon/models/event_registration.py
+++ b/muskathlon/models/event_registration.py
@@ -8,7 +8,6 @@
 ##############################################################################
 
 from odoo import models, fields, api, _
-from odoo.addons.queue_job.job import job, related_action
 import datetime
 
 from odoo.exceptions import UserError
@@ -131,8 +130,6 @@ def onchange_sport_discipline(self):
                 }
             }
 
-    @job(default_channel="root.muskathlon")
-    @related_action("related_action_registration")
     def notify_new_registration(self):
         """Notify user for registration"""
         partners = self.mapped("user_id.partner_id") | self.event_id.mapped(
@@ -150,8 +147,6 @@ def notify_new_registration(self):
         )
         return True
 
-    @job(default_channel="root.muskathlon")
-    @related_action("related_action_registration")
     def muskathlon_medical_survey_done(self):
         for registration in self:
             user_input = self.env["survey.user_input"].search(
diff --git a/muskathlon/models/queue_job.py b/muskathlon/models/queue_job.py
deleted file mode 100644
index bd937c3ff..000000000
--- a/muskathlon/models/queue_job.py
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-#
-#    Copyright (C) 2017 Compassion CH (http://www.compassion.ch)
-#    Releasing children from poverty in Jesus' name
-#    @author: Emanuel Cino <ecino@compassion.ch>
-#
-#    The licence is in the file __manifest__.py
-#
-##############################################################################
-
-from odoo import api, models, _
-
-
-class QueueJob(models.Model):
-    _inherit = "queue.job"
-
-    @api.multi
-    def related_action_registration(self):
-        registration_id = self.record_ids[0]
-        action = {
-            "name": _("Muskathlon registration"),
-            "type": "ir.actions.act_window",
-            "res_model": "event.registration",
-            "res_id": registration_id,
-            "view_type": "form",
-            "view_mode": "form",
-        }
-        return action
-
-    @api.multi
-    def related_action_partner(self):
-        partner_id = self.record_ids[0]
-        action = {
-            "name": _("Partner"),
-            "type": "ir.actions.act_window",
-            "res_model": "res.partner",
-            "res_id": partner_id,
-            "view_type": "form",
-            "view_mode": "form",
-        }
-        return action
diff --git a/partner_communication_switzerland/__manifest__.py b/partner_communication_switzerland/__manifest__.py
index 482c70d87..c44d21c1d 100644
--- a/partner_communication_switzerland/__manifest__.py
+++ b/partner_communication_switzerland/__manifest__.py
@@ -69,6 +69,7 @@
         "data/depart_communications.xml",
         "data/ir.advanced.translation.csv",
         "data/label_print.xml",
+        "data/queue_job.xml",
         "data/sponsorship_action_rules.xml",
         "data/utm_data.xml",
         "report/onboarding_photo_by_post.xml",
diff --git a/partner_communication_switzerland/data/queue_job.xml b/partner_communication_switzerland/data/queue_job.xml
new file mode 100644
index 000000000..cdbec1346
--- /dev/null
+++ b/partner_communication_switzerland/data/queue_job.xml
@@ -0,0 +1,8 @@
+<odoo>
+    <!-- Job functions -->
+    <record id="ambassdor_receipt_job" model="queue.job.function">
+        <field name="model_id" ref="model_account_invoice_line"/>
+        <field name="method">send_receipt_to_ambassador</field>
+        <field name="channel_id" ref="thankyou_letters.channel_thankyou_letters"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/partner_communication_switzerland/data/sponsorship_action_rules.xml b/partner_communication_switzerland/data/sponsorship_action_rules.xml
index ebc55a0ee..92fffd364 100644
--- a/partner_communication_switzerland/data/sponsorship_action_rules.xml
+++ b/partner_communication_switzerland/data/sponsorship_action_rules.xml
@@ -47,6 +47,7 @@
         <field name="state">code</field>
         <field name="code">
 records.send_communication(env.ref('partner_communication_switzerland.planned_sub_dossier'), both=True)
+records.send_communication(env.ref('partner_communication_switzerland.config_onboarding_photo_by_post'), both=True)
         </field>
     </record>
 
diff --git a/partner_communication_switzerland/models/account_invoice.py b/partner_communication_switzerland/models/account_invoice.py
index b800d0e3e..bb6368684 100644
--- a/partner_communication_switzerland/models/account_invoice.py
+++ b/partner_communication_switzerland/models/account_invoice.py
@@ -14,7 +14,6 @@
 from dateutil.relativedelta import relativedelta
 
 from odoo import api, models
-from odoo.addons.queue_job.job import job, related_action
 
 logger = logging.getLogger(__name__)
 
@@ -133,12 +132,10 @@ def _filter_invoice_to_thank(self):
             )
         )
 
-    @job(default_channel="root.group_reconcile")
-    @related_action(action="related_action_invoices")
-    def group_or_split_reconcile(self):
+    def _group_or_split_reconcile(self):
         """Reconcile given invoices with partner open payments.
         """
-        super().group_or_split_reconcile()
+        super()._group_or_split_reconcile()
         # Find if a communication with payment slips is pending and
         # regenerate it.
         jobs = self.env["partner.communication.job"].search(
diff --git a/partner_communication_switzerland/models/account_invoice_line.py b/partner_communication_switzerland/models/account_invoice_line.py
index fe823f9fc..720016aa8 100644
--- a/partner_communication_switzerland/models/account_invoice_line.py
+++ b/partner_communication_switzerland/models/account_invoice_line.py
@@ -10,7 +10,6 @@
 
 from odoo import models, api
 from odoo.addons.sponsorship_compassion.models.product_names import GIFT_CATEGORY
-from odoo.addons.queue_job.job import job
 
 
 class AccountInvoiceLine(models.Model):
@@ -55,7 +54,6 @@ def get_donations(self):
         return total_string, res_name
 
     @api.multi
-    @job
     def generate_thank_you(self):
         """
         Do not group communications which have not same event linked.
@@ -84,7 +82,6 @@ def generate_thank_you(self):
         return res
 
     @api.multi
-    @job
     def send_receipt_to_ambassador(self):
         """
         Generates a receipt for the ambassador informing him or her that he or she
diff --git a/partner_communication_switzerland/models/contracts.py b/partner_communication_switzerland/models/contracts.py
index 2113931ab..fd457a235 100644
--- a/partner_communication_switzerland/models/contracts.py
+++ b/partner_communication_switzerland/models/contracts.py
@@ -650,10 +650,11 @@ def _send_new_dossier(self, correspondent=True):
         print_wrpr = self.env.ref(module + "sponsorship_dossier_wrpr")
         transfer = self.env.ref(module + "new_dossier_transfer")
         child_picture = self.env.ref(module + "config_onboarding_photo_by_post")
-        sub_accept = self.env.ref(module + "sponsorship_sub_accept")
         partner = self.correspondent_id if correspondent else self.partner_id
         if self.parent_id.sds_state == "sub":
-            configs = sub_accept + child_picture
+            # No automated communication in this case. The staff can manually send
+            # the SUB Accept communication when appropriate
+            return True
         elif self.origin_id.type == "transfer":
             configs = transfer
         elif not partner.email or \
diff --git a/partner_communication_switzerland/models/partner_communication.py b/partner_communication_switzerland/models/partner_communication.py
index 55a12f142..15a10e0b7 100644
--- a/partner_communication_switzerland/models/partner_communication.py
+++ b/partner_communication_switzerland/models/partner_communication.py
@@ -233,7 +233,6 @@ def get_family_slip_attachment(self):
             attachments = sponsorships.get_bvr_gift_attachment(family, background)
         return attachments
 
-
     def get_all_gift_bvr(self):
         """
         attach all 3 gifts slip with background for sending by e-mail
@@ -250,20 +249,21 @@ def get_all_gift_bvr(self):
         gifts_to = sponsorships[0].gift_partner_id
         if sponsorships and gifts_to == self.partner_id:
             attachments = sponsorships.filtered(
-                lambda x: x.state not in ("terminated", "cancelled")).get_bvr_gift_attachment(all_gifts, background)
+                lambda x: x.state not in ("terminated", "cancelled")
+            ).get_bvr_gift_attachment(all_gifts, background)
         return attachments
 
-    def get_christmas_fund_bvr(self):
+    def get_fund_bvr(self):
         """
-        attach christmas fund slip with background for sending by e-mail
+        attach any fund slip with background for sending by e-mail
         :return: dict {attachment_name: [report_name, pdf_data]}
         """
         self.ensure_one()
         background = self.send_mode and "physical" not in self.send_mode
-        product_id = self.env["product.product"].search([("default_code", "=", "noel")])
+        product = self.config_id.product_id
         data = {
-            "product_id": product_id.id,
-            "product_ids": product_id.ids,
+            "product_id": product.id,
+            "product_ids": product.ids,
             "background": background,
             "doc_ids": self.partner_id.ids
         }
@@ -271,7 +271,7 @@ def get_christmas_fund_bvr(self):
         pdf = self._get_pdf_from_data(
             data, self.env.ref("report_compassion.report_bvr_fund")
         )
-        return {_("christmas fund.pdf"): [report_name, pdf]}
+        return {product.name + ".pdf": [report_name, pdf]}
 
     def get_reminder_bvr(self):
         """
@@ -387,7 +387,8 @@ def get_child_picture_attachment(self):
         else:
             children = self.get_objects().mapped("child_id")
         pdf = self._get_pdf_from_data(
-            {"doc_ids": children.ids}, self.env.ref("partner_communication_switzerland.report_child_picture")
+            {"doc_ids": children.ids}, self.env.ref(
+                "partner_communication_switzerland.report_child_picture")
         )
         name = children.get_list("local_id", 1, _("pictures")) + ".pdf"
         res[name] = ("partner_communication_switzerland.child_picture", pdf)
@@ -517,7 +518,6 @@ def get_tax_receipt(self):
     @api.multi
     def send(self):
         """
-        - Prevent sending communication when invoices are being reconciled
         - Mark B2S correspondence as read when printed.
         - Postpone no money holds when reminders sent.
         - Update donor tag
@@ -530,13 +530,14 @@ def send(self):
         sms_jobs = self.filtered(lambda j: j.send_mode == "sms")
         sms_jobs.send_by_sms()
         other_jobs = self - sms_jobs
+        contract_channel = self.env.ref("recurring_contract.channel_recurring_contract")
         for job in other_jobs.filtered(
                 lambda j: j.model in ("recurring.contract", "account.invoice")
         ):
-            queue_job = self.env["queue.job"].search(
-                [("channel", "=", "root.group_reconcile"), ("state", "!=", "done"), ],
-                limit=1,
-            )
+            queue_job = self.env["queue.job"].search([
+                ("job_function_id.channel_id", "=", contract_channel.id),
+                ("state", "!=", "done")
+            ], limit=1)
             if queue_job:
                 invoices = self.env["account.invoice"].browse(queue_job.record_ids)
                 if job.partner_id in invoices.mapped("partner_id"):
diff --git a/partner_communication_switzerland/models/partner_communication_config.py b/partner_communication_switzerland/models/partner_communication_config.py
index 8910d6138..b77197862 100644
--- a/partner_communication_switzerland/models/partner_communication_config.py
+++ b/partner_communication_switzerland/models/partner_communication_config.py
@@ -8,16 +8,26 @@
 #
 ##############################################################################
 import random
-import itertools
 
-from odoo import api, models
+from odoo import api, models, fields
 
 
 class PartnerCommunication(models.Model):
     _inherit = "partner.communication.config"
 
+    product_id = fields.Many2one(
+        "product.template", "Fund Bill attachment",
+        domain=[("categ_id.name", "=", "Fund")])
+
+    @api.onchange("product_id")
+    def onchange_product(self):
+        if self.product_id:
+            self.attachments_function = "get_fund_bvr"
+
     @api.multi
-    def generate_test_cases_by_language_family_case(self, lang="de_DE", family_case="single", send_mode="digital"):
+    def generate_test_cases_by_language_family_case(self, lang="de_DE",
+                                                    family_case="single",
+                                                    send_mode="digital"):
         """
         Generates example communications for our multiple cases in CH
         depending on the language and the family case
diff --git a/partner_communication_switzerland/static/html/signature.html b/partner_communication_switzerland/static/html/signature.html
index e6cee1f81..74e5cef64 100644
--- a/partner_communication_switzerland/static/html/signature.html
+++ b/partner_communication_switzerland/static/html/signature.html
@@ -37,8 +37,7 @@
                                                     src="https://img.newoldstamp.com/i/ib/005eb8/icon105/phone.png?t=2e"
                                                     alt="" valign="middle" style="display:block" height="14"></td>
                                             <td style="margin:0.1px;font-family:Arial">
-                                                <a href="{phone_link}" style="text-decoration:none;color:#000000;font-size:13px" target="_blank">{phone}</a>
-                                                <span style="text-decoration:none;color:#000000;font-size:13px"> {office_hours}</span></td>
+                                                <a href="{phone_link}" style="text-decoration:none;color:#000000;font-size:13px" target="_blank">{phone}</a></td>
                                             <td class="work_mobile" style="margin:0.1px;padding:0 5px;font-family:Arial">|</td>
                                             <td class="work_mobile" style="margin:0.1px;padding:0 5px 0 0"><img
                                                     src="https://img.newoldstamp.com/i/ib/005eb8/icon105/phone.png?t=2e"
@@ -47,6 +46,9 @@
                                                                                           style="text-decoration:none;color:#000000;font-size:13px"
                                                                                           target="_blank">{mobile}</a></td>
                                         </tr>
+                                        <tr>
+                                            <td colspan="5" style="padding-left: 20px; text-decoration:none;color:#000000;font-size:13px">{office_hours}</td>
+                                        </tr>
                                         </tbody>
                                     </table>
                                 </td>
diff --git a/partner_communication_switzerland/views/communication_test_case_view.xml b/partner_communication_switzerland/views/communication_test_case_view.xml
index 8826a4ab2..43aefc711 100644
--- a/partner_communication_switzerland/views/communication_test_case_view.xml
+++ b/partner_communication_switzerland/views/communication_test_case_view.xml
@@ -75,6 +75,9 @@
             <xpath expr="//div[@name='button_box']/button[1]" position="before">
                 <button name="open_test_case_wizard" type="object" icon="fa-edit" string="Test cases"/>
             </xpath>
+            <field name="attachments_function" position="before">
+                <field name="product_id"/>
+            </field>
         </field>
     </record>
 </odoo>
diff --git a/partner_communication_switzerland/wizards/generate_communication_wizard.py b/partner_communication_switzerland/wizards/generate_communication_wizard.py
index b5bc837b0..b130f57aa 100644
--- a/partner_communication_switzerland/wizards/generate_communication_wizard.py
+++ b/partner_communication_switzerland/wizards/generate_communication_wizard.py
@@ -13,7 +13,6 @@
 
 from odoo import models, api, fields
 from odoo.tools.safe_eval import safe_eval
-from odoo.addons.queue_job.job import job
 
 SMS_CHAR_LIMIT = 160
 SMS_COST = 0.08
@@ -157,7 +156,6 @@ def get_preview(self):
             GenerateCommunicationWizard, self.with_context(object_ids=object_ids)
         ).get_preview()
 
-    @job
     def generate_communications(self, async_mode=True):
         """ Create the communication records """
         wizard = self.with_context(
diff --git a/partner_compassion/models/match_partner.py b/partner_compassion/models/match_partner.py
index 37da60660..7c52aa8cc 100644
--- a/partner_compassion/models/match_partner.py
+++ b/partner_compassion/models/match_partner.py
@@ -9,7 +9,7 @@
 ##############################################################################
 
 from odoo import api, models
-from odoo.addons.queue_job.job import job
+
 
 class MatchPartner(models.AbstractModel):
     """
@@ -38,7 +38,6 @@ def match_after_match(self, partner, new_partner, infos, opt):
                 partner.write({"active": True, "contact_id": False})
         return super().match_after_match(partner, new_partner, infos, opt)
 
-    @job
     @api.model
     def match_update(self, partner, infos, options=None):
         """
diff --git a/partner_compassion/views/notification_settings_view.xml b/partner_compassion/views/notification_settings_view.xml
index 9f230633f..ce97633c8 100644
--- a/partner_compassion/views/notification_settings_view.xml
+++ b/partner_compassion/views/notification_settings_view.xml
@@ -35,15 +35,6 @@
                     </div>
                 </div>
             </xpath>
-            <xpath expr="//div[@name='compassion_settings']">
-                <h2>NAS Settings</h2>
-                <div name="nas_settings" class="o_setting_right_pane">
-                    <label for="share_on_nas" class="o_right_label"/>
-                    <field name="share_on_nas"/>
-                    <label for="store_path" class="o_right_label"/>
-                    <field name="store_path"/>
-                </div>
-            </xpath>
         </field>
     </record>
 </odoo>
diff --git a/partner_compassion/wizards/staff_notification_settings.py b/partner_compassion/wizards/staff_notification_settings.py
index 7958854ce..ecd1c0567 100644
--- a/partner_compassion/wizards/staff_notification_settings.py
+++ b/partner_compassion/wizards/staff_notification_settings.py
@@ -41,8 +41,6 @@ class StaffNotificationSettings(models.TransientModel):
         domain=[("user_ids", "!=", False), ("user_ids.share", "=", False), ],
         readonly=False,
     )
-    share_on_nas = fields.Text()
-    store_path = fields.Text()
     potential_advocate_fr = fields.Many2one(
         "res.users", "Potential advocate FR", domain=[("share", "=", False)]
     )
@@ -88,12 +86,6 @@ def set_values(self):
                 else 1
             ),
         )
-        self.env["ir.config_parameter"].sudo().set_param(
-            "partner_compassion.share_on_nas", self.share_on_nas
-        )
-        self.env["ir.config_parameter"].sudo().set_param(
-            "partner_compassion.store_path", self.store_path
-        )
         self.env["ir.config_parameter"].set_param(
             "partner_communication_switzerland.potential_advocate_fr",
             str(self.potential_advocate_fr.id or 0))
@@ -138,12 +130,6 @@ def get_values(self):
                     or 0
                 )
                 or False,
-                "share_on_nas": str(
-                    param_obj.get_param("partner_compassion.share_on_nas", "")
-                ),
-                "store_path": str(
-                    param_obj.get_param("partner_compassion.store_path", "")
-                ),
             }
         )
         user_fr = self.env["ir.config_parameter"].get_param(
diff --git a/report_compassion/models/partner_communication.py b/report_compassion/models/partner_communication.py
index 190fb6ecb..607d7a61b 100644
--- a/report_compassion/models/partner_communication.py
+++ b/report_compassion/models/partner_communication.py
@@ -1,13 +1,12 @@
 ##############################################################################
 #
-#    Copyright (C) 2016 Compassion CH (http://www.compassion.ch)
+#    Copyright (C) 2016-2022 Compassion CH (http://www.compassion.ch)
 #    Releasing children from poverty in Jesus' name
 #    @author: Emanuel Cino <ecino@compassion.ch>
 #
 #    The licence is in the file __manifest__.py
 #
 ##############################################################################
-import base64
 from odoo import api, models, fields
 
 
@@ -15,12 +14,8 @@ class PartnerCommunication(models.Model):
     """ Add fields for retrieving values for communications.
     Send a communication when a major revision is received.
     """
-
     _inherit = "partner.communication.job"
 
-    ##########################################################################
-    #                                 FIELDS                                 #
-    ##########################################################################
     product_id = fields.Many2one("product.product", "QR Bill for fund", readonly=False)
     display_pp = fields.Boolean(
         string="Display PP",
@@ -28,71 +23,6 @@ class PartnerCommunication(models.Model):
         default=True,
     )
 
-    ##########################################################################
-    #                             PUBLIC METHODS                             #
-    ##########################################################################
-    @api.multi
-    def send(self):
-        """
-        Change the report for communications to print with BVR
-        Update the count of succes story prints when sending a receipt.
-        :return: True
-        """
-        bvr_to_send = self.filtered(lambda j: j.send_mode == "digital" and j.product_id)
-        bvr_to_print = self.filtered(
-            lambda j: j.send_mode == "physical" and j.product_id
-        )
-        bvr_both = self.filtered(lambda j: j.send_mode == "both" and j.product_id)
-
-        if bvr_both and self.env.context.get("origin") == "both_email":
-            for bvr in bvr_both:
-                # email part
-                self._put_bvr_in_attachments(bvr)
-
-            super(PartnerCommunication, bvr_both).send()
-
-        if bvr_to_send:
-            for bvr in bvr_to_send:
-                self._put_bvr_in_attachments(bvr)
-            super(PartnerCommunication, bvr_to_send).send()
-
-        if bvr_to_print:
-            super(PartnerCommunication, bvr_to_print).send()
-
-        return super(
-            PartnerCommunication, self - bvr_both - bvr_to_print - bvr_to_send
-        ).send()
-
-    def _put_bvr_in_attachments(self, bvr):
-        pdf_download = self._generate_pdf_data(bvr)
-        return self._create_and_add_attachment(bvr, pdf_download)
-
-    def _create_and_add_attachment(self, bvr, datas):
-        attachment = self.env["ir.attachment"].create(
-            {"name": bvr.report_id.name, "type": "binary", "datas": datas}
-        )
-        comm_attachment = self.env["partner.communication.attachment"].create(
-            {
-                "name": bvr.report_id.name,
-                "report_name": "report_compassion.partner_communication",
-                "communication_id": bvr.id,
-                "attachment_id": attachment.id,
-            }
-        )
-        bvr.write({"attachment_ids": [(4, comm_attachment.id)]})
-        return bvr
-
-    def _generate_pdf_data(self, bvr):
-        data = {
-            "doc_ids": bvr.id,
-            "product_id": bvr.product_id.id,
-        }
-        report_ref = self.env.ref("report_compassion.report_compassion_qr_slip")
-        pdf_data = report_ref.with_context(
-            must_skip_send_to_printer=True
-        ).render_qweb_pdf(bvr.id, data=data)[0]
-        return base64.encodebytes(pdf_data)
-
     @api.model
     def _get_default_vals(self, vals, default_vals=None):
         if default_vals is None:
diff --git a/report_compassion/report/bvr_fund.xml b/report_compassion/report/bvr_fund.xml
index 6ec0aad2f..0820a5951 100644
--- a/report_compassion/report/bvr_fund.xml
+++ b/report_compassion/report/bvr_fund.xml
@@ -7,7 +7,7 @@
         menu="False"
     />
     <record id="report_bvr_fund" model="ir.actions.report">
-        <field name="paperformat_id" ref="l10n_ch.paperformat_euro_no_margin"/>
+        <field name="paperformat_id" ref="paperformat_single_bvr_sponsorship"/>
     </record>
 
     <template id="bvr_fund">
@@ -17,6 +17,7 @@
                 <t t-set="report_header_style">display: none;</t>
                 <t t-call="report_compassion.style"/>
                 <t t-foreach="docs" t-as="doc">
+                    <t t-set="disable_scissors" t-value="True"/>
                     <t t-call="report_compassion.report_bvr_fund_document" t-lang="doc.lang"/>
                 </t>
             </t>
diff --git a/report_compassion/report/bvr_sponsorship.xml b/report_compassion/report/bvr_sponsorship.xml
index 7f74267c8..3a6a08dae 100644
--- a/report_compassion/report/bvr_sponsorship.xml
+++ b/report_compassion/report/bvr_sponsorship.xml
@@ -40,7 +40,7 @@
             name="report_compassion.bvr_due"
     />
     <record id="report_bvr_due" model="ir.actions.report">
-        <field name="paperformat_id" ref="l10n_ch.paperformat_euro_no_margin"/>
+        <field name="paperformat_id" ref="paperformat_single_bvr_sponsorship"/>
     </record>
 
     <template id="bvr_sponsorship">
diff --git a/sbc_switzerland/models/import_letters_history.py b/sbc_switzerland/models/import_letters_history.py
index 7d2ce0938..406b3ecb4 100644
--- a/sbc_switzerland/models/import_letters_history.py
+++ b/sbc_switzerland/models/import_letters_history.py
@@ -21,7 +21,6 @@
 from odoo import fields, models, api, _
 from odoo.exceptions import UserError
 from odoo.tools.config import config
-from odoo.addons.queue_job.job import job, related_action
 
 logger = logging.getLogger(__name__)
 
@@ -162,8 +161,6 @@ def sftp_generator(self):
             logger.error("Could not establish connection with sftp server")
             return
 
-    @job(default_channel="root.sbc_compassion")
-    @related_action(action="related_action_s2b_imports")
     def run_analyze(self):
         """
         Redefine the run_analyze function to handle both the manual import case and the sftp import case
diff --git a/sms_939/__manifest__.py b/sms_939/__manifest__.py
index 747aafed3..084878e8f 100644
--- a/sms_939/__manifest__.py
+++ b/sms_939/__manifest__.py
@@ -42,6 +42,7 @@
     ],
     "data": [
         "security/ir.model.access.csv",
+        "data/queue_job.xml",
         "data/sms_hook.xml",
         "data/sms_provider.xml",
         "data/sms_cron.xml",
diff --git a/sms_939/data/queue_job.xml b/sms_939/data/queue_job.xml
new file mode 100644
index 000000000..c8be25eba
--- /dev/null
+++ b/sms_939/data/queue_job.xml
@@ -0,0 +1,18 @@
+<odoo>
+    <!-- Job functions -->
+    <record id="update_hold_expiration_job" model="queue.job.function">
+        <field name="model_id" ref="model_compassion_hold"/>
+        <field name="method">update_expiration_date</field>
+        <field name="channel_id" ref="child_compassion.channel_global_pool"/>
+    </record>
+    <record id="reserve_children_from_childpool_job" model="queue.job.function">
+        <field name="model_id" ref="model_sms_child_request"/>
+        <field name="method">get_children_from_global_pool_for_website</field>
+        <field name="channel_id" ref="child_compassion.channel_global_pool"/>
+    </record>
+    <record id="sms_notification_job" model="queue.job.function">
+        <field name="model_id" ref="model_sms_notification"/>
+        <field name="method">send_sms_answer</field>
+        <field name="channel_id" ref="sms_sponsorship.channel_sms_sponsorship"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sms_939/models/compassion_hold.py b/sms_939/models/compassion_hold.py
index d3944b9c5..0a69cc3cd 100644
--- a/sms_939/models/compassion_hold.py
+++ b/sms_939/models/compassion_hold.py
@@ -8,12 +8,10 @@
 #
 ##############################################################################
 from odoo import models
-from odoo.addons.queue_job.job import job
 
 
 class Hold(models.Model):
     _inherit = "compassion.hold"
 
-    @job(default_channel="root.global_pool")
     def update_expiration_date(self, new_date):
         self.write({"expiration_date": new_date})
diff --git a/sms_939/models/sms_child_request.py b/sms_939/models/sms_child_request.py
index 783ec03c1..54b0151f6 100644
--- a/sms_939/models/sms_child_request.py
+++ b/sms_939/models/sms_child_request.py
@@ -13,7 +13,6 @@
 
 from random import randint
 from odoo import api, models, fields, _
-from odoo.addons.queue_job.job import job, related_action
 
 
 class SmsRequest(models.Model):
@@ -44,8 +43,6 @@ def send_step1_reminder(self):
             )
         super().send_step1_reminder()
 
-    @job(default_channel="root.sms_request")
-    @related_action(action="related_action_sms_request")
     def reserve_child(self):
         self.ensure_one()
         if not self.event_id:
@@ -89,8 +86,6 @@ def cancel_request(self):
             })
         return super().cancel_request()
 
-    @job(default_channel="root.sms_request")
-    @related_action(action="related_action_sms_request")
     def get_children_from_global_pool_for_website(self, take=1):
         company_id = self.env.user.company_id.id
         child_env = self.env["compassion.child"]
diff --git a/sms_939/models/sms_notification.py b/sms_939/models/sms_notification.py
index 439b6cc03..f91aad52f 100644
--- a/sms_939/models/sms_notification.py
+++ b/sms_939/models/sms_notification.py
@@ -13,7 +13,6 @@
 
 
 from odoo import models, api, fields, tools, _
-from odoo.addons.queue_job.job import job
 
 logger = logging.getLogger(__name__)
 testing = tools.config.get("test_enable")
@@ -163,7 +162,6 @@ def test_service(self):
     def test_service_error(self):
         raise Exception
 
-    @job(default_channel="root")
     def send_sms_answer(self, parameters):
         """Job for sending the SMS reply to a SMS child request.
         :param parameters: SMS parameters received from 939 API.
diff --git a/sponsorship_switzerland/models/account_invoice.py b/sponsorship_switzerland/models/account_invoice.py
index 470a7ded0..740d15929 100644
--- a/sponsorship_switzerland/models/account_invoice.py
+++ b/sponsorship_switzerland/models/account_invoice.py
@@ -11,7 +11,6 @@
 from odoo import api, models, fields, _
 from odoo.exceptions import UserError
 from odoo.tools import mod10r
-from odoo.addons.queue_job.job import job, related_action
 from odoo.addons.sponsorship_compassion.models.product_names import (
     GIFT_CATEGORY,
     SPONSORSHIP_CATEGORY,
@@ -87,13 +86,6 @@ def show_move_lines(self):
 
         return action
 
-    @job(default_channel="root.group_reconcile")
-    @related_action(action="related_action_invoices")
-    def group_or_split_reconcile(self):
-        """Reconcile given invoices with partner open payments.
-        """
-        return self._group_or_split_reconcile()
-
     def action_invoice_open(self):
         for invoice in self:
             condition = [
diff --git a/sponsorship_switzerland/models/contracts.py b/sponsorship_switzerland/models/contracts.py
index 966985b94..bf6723f50 100644
--- a/sponsorship_switzerland/models/contracts.py
+++ b/sponsorship_switzerland/models/contracts.py
@@ -436,4 +436,4 @@ def _reconcile_open_amount(self):
             invoices = invoices[:number]
             delay = datetime.datetime.now() + relativedelta(seconds=15)
             if invoices:
-                invoices.with_delay(eta=delay).group_or_split_reconcile()
+                invoices.with_delay(eta=delay)._group_or_split_reconcile()
diff --git a/website_compassion/__manifest__.py b/website_compassion/__manifest__.py
index 57276635c..845b6a3d6 100644
--- a/website_compassion/__manifest__.py
+++ b/website_compassion/__manifest__.py
@@ -53,7 +53,6 @@
     "depends": [
         "theme_compassion",
         "partner_communication_switzerland",
-        "mobile_app_connector",
         "password_security",
     ],
     "demo": [],
diff --git a/website_compassion/controllers/my_account.py b/website_compassion/controllers/my_account.py
index c28b58ae2..8cd037804 100644
--- a/website_compassion/controllers/my_account.py
+++ b/website_compassion/controllers/my_account.py
@@ -18,7 +18,6 @@
 from zipfile import ZipFile
 from urllib.request import urlretrieve, urlopen
 from math import ceil
-from dateutil.relativedelta import relativedelta
 import secrets
 from passlib.context import CryptContext
 
@@ -47,11 +46,6 @@ def _get_user_children(state=None):
     """
     env = request.env
     partner = env.user.partner_id
-    only_correspondent = partner.app_displayed_sponsorships == "correspondent"
-
-    limit_date_active = datetime.now() - relativedelta(months=2)
-    limit_date_for_writing = datetime.now() - relativedelta(months=3)
-
     end_reason_child_depart = env.ref("sponsorship_compassion.end_reason_depart")
 
     def filter_sponsorships(sponsorship):
@@ -59,39 +53,30 @@ def filter_sponsorships(sponsorship):
         is_active = sponsorship.state not in ["draft", "cancelled", "terminated"]
         is_recent_terminated = (
                 sponsorship.state == "terminated"
-                and sponsorship.end_date
-                and sponsorship.end_date >= limit_date_active
+                and sponsorship.can_write_letter
                 and sponsorship.end_reason_id == end_reason_child_depart
         )
-        can_still_write = (
-                is_active
-                or sponsorship.state == "terminated"
-                and sponsorship.end_date
-                and sponsorship.end_date >= limit_date_for_writing
-        )
         exit_communication_sent = (
                 sponsorship.state == "terminated"
                 and sponsorship.sds_state != "sub_waiting"
         )
 
-        if only_correspondent:
-            can_show = sponsorship.correspondent_id == partner
         if state == "active":
-            can_show &= (
-                    is_active
-                    or is_recent_terminated
-                    or (not exit_communication_sent and can_still_write)
+            can_show = (
+                is_active or is_recent_terminated
+                and not exit_communication_sent
             )
         elif state == "terminated":
-            can_show &= (
+            can_show = (
                 sponsorship.state == "terminated"
-                and not (is_recent_terminated or (exit_communication_sent and
-                                                  can_still_write))
+                and not is_recent_terminated or exit_communication_sent
             )
+        elif state == "write":
+            can_show = sponsorship.can_write_letter
 
         return can_show
 
-    return partner.sponsorship_ids.filtered(filter_sponsorships).mapped(
+    return partner.get_portal_sponsorships().filtered(filter_sponsorships).mapped(
         "child_id").sorted("preferred_name")
 
 
@@ -170,18 +155,19 @@ def _download_image(child_id, obj_id):
     :return: A response for the user to download a single image or an archive
     containing multiples
     """
-    children = _get_user_children()
-
     # All children, all images
-    if children and child_id < 0 and obj_id < 0:
+    if child_id < 0 and obj_id < 0:
         images = []
-        for child in children:
+        for child in _get_user_children():
             images += _fetch_images_from_child(child)
         filename = f"my_children_pictures.zip"
         return _create_archive(images, filename)
 
+    if child_id < 0:
+        return False
+
     # One child
-    child = children.filtered(lambda c: c.id == child_id)
+    child = request.env["compassion.child"].browse(child_id)
 
     # All images from a child
     if child and obj_id < 0:
@@ -306,7 +292,7 @@ def my_letter(self, child_id=None, template_id=None, **kwargs):
         :param kwargs: additional arguments (optional)
         :return: a redirection to a webpage
         """
-        children = _get_user_children("active")
+        children = _get_user_children("write")
         if len(children) == 0:
             return request.render("website_compassion.sponsor_a_child", {})
 
@@ -391,8 +377,9 @@ def my_child(self, state="active", child_id=None, **kwargs):
         correspondence_obj = request.env["correspondence"]
         correspondent = partner
 
-        if partner.app_displayed_sponsorships == "all_info":
-            correspondent |= child.sponsorship_ids.filtered(lambda x: x.is_active).mapped("correspondent_id")
+        if partner.portal_sponsorships == "all_info":
+            correspondent |= child.sponsorship_ids.filtered(
+                lambda x: x.is_active).mapped("correspondent_id")
             correspondence_obj = correspondence_obj.sudo()
 
         letters = correspondence_obj.search([
@@ -704,10 +691,8 @@ def _get_required_param(key, params):
 
         elif source == "labels":
             child_id = _get_required_param("child_id", kw)
-            actives = _get_user_children("active")
-            child = actives.filtered(lambda c: c.id == int(child_id))
+            child = request.env["compassion.child"].browse(int(child_id))
             sponsorships = child.sponsorship_ids[0]
-            attachments = dict()
             label_print = request.env["label.print"].search(
                 [("name", "=", "Sponsorship Label")], limit=1
             )
diff --git a/website_compassion/template/my_account_my_children.xml b/website_compassion/template/my_account_my_children.xml
index d3b9f5cc9..d446c8b1a 100644
--- a/website_compassion/template/my_account_my_children.xml
+++ b/website_compassion/template/my_account_my_children.xml
@@ -146,9 +146,10 @@
                             <t t-call="website_compassion.fill_key_value">Hobbies</t>
 
                             <!-- Education level -->
-                            <t t-set="value" t-value="child_id.translate('education_level')"/>
-                            <t t-call="website_compassion.fill_key_value">Education level</t>
-
+                            <t t-if="child_id.education_level and child_id.education_level != 'Not Enrolled'">
+                                <t t-set="value" t-value="child_id.translate('education_level')"/>
+                                <t t-call="website_compassion.fill_key_value">Education level</t>
+                            </t>
                             <br/>
                         </t>
                     </div>
diff --git a/website_event_compassion/__manifest__.py b/website_event_compassion/__manifest__.py
index 19c039b0a..072d08f99 100644
--- a/website_event_compassion/__manifest__.py
+++ b/website_event_compassion/__manifest__.py
@@ -51,6 +51,7 @@
         "data/product.xml",
         "data/group_visit_emails.xml",
         "data/communication_config.xml",
+        "data/queue_job.xml",
         "data/survey.xml",
         "data/action_rule_past_event.xml",
         "data/event_message_subtype.xml",
diff --git a/website_event_compassion/data/queue_job.xml b/website_event_compassion/data/queue_job.xml
new file mode 100644
index 000000000..9ceb5dd51
--- /dev/null
+++ b/website_event_compassion/data/queue_job.xml
@@ -0,0 +1,13 @@
+<odoo>
+    <!-- Job functions -->
+    <record id="modify_open_invoice_job" model="queue.job.function">
+        <field name="model_id" ref="model_account_invoice"/>
+        <field name="method">modify_open_invoice</field>
+        <field name="channel_id" ref="cms_form_compassion.channel_cms_form_compassion"/>
+    </record>
+    <record id="event_mail_run_job" model="queue.job.function">
+        <field name="model_id" ref="model_event_mail"/>
+        <field name="method">run</field>
+        <field name="channel_id" ref="cms_form_compassion.channel_cms_form_compassion"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/website_event_compassion/models/account_invoice.py b/website_event_compassion/models/account_invoice.py
index 66d42074f..087de697f 100644
--- a/website_event_compassion/models/account_invoice.py
+++ b/website_event_compassion/models/account_invoice.py
@@ -8,14 +8,12 @@
 ##############################################################################
 
 from odoo import api, models
-from odoo.addons.queue_job.job import job
 
 
 class AccountInvoice(models.Model):
     _inherit = "account.invoice"
 
     @api.multi
-    @job
     def modify_open_invoice(self, vals):
         """
         Job for changing an open invoice with new values. It will put it back
diff --git a/website_event_compassion/models/event_email.py b/website_event_compassion/models/event_email.py
index 5774873df..a1f34e242 100644
--- a/website_event_compassion/models/event_email.py
+++ b/website_event_compassion/models/event_email.py
@@ -8,7 +8,6 @@
 ##############################################################################
 from odoo import api, models, fields
 from odoo.addons.event.models.event_mail import _INTERVALS
-from odoo.addons.queue_job.job import job
 
 
 class EventMail(models.Model):
@@ -84,12 +83,6 @@ def execute(self):
                 scheduler.write({"mail_sent": True})
         return True
 
-    @job
-    @api.model
-    def run_job(self):
-        # Run the event mail scheduler cron in asynchronous job
-        return self.run()
-
 
 class EventMailRegistration(models.Model):
     _inherit = "event.mail.registration"
diff --git a/website_event_compassion/models/event_registration.py b/website_event_compassion/models/event_registration.py
index c63489447..e7ca50eed 100644
--- a/website_event_compassion/models/event_registration.py
+++ b/website_event_compassion/models/event_registration.py
@@ -16,7 +16,6 @@
 from odoo.addons.website.models.website import slugify as slug
 from odoo.tools import file_open
 
-from odoo.addons.queue_job.job import job
 from odoo.addons.partner_compassion.models.partner_compassion import get_file_type
 
 _logger = logging.getLogger(__name__)
@@ -548,11 +547,6 @@ def button_reg_cancel(self):
             }
         )
 
-    @job
-    def cancel_registration(self):
-        """Cancel registration"""
-        return self.button_reg_cancel()
-
     @api.multi
     def get_event_registration_survey(self):
         event = self.event_id
@@ -613,7 +607,7 @@ def next_stage(self):
             ):
                 registration.prepare_medical_survey()
         # Send potential communications after stage transition
-        self.env["event.mail"].with_delay().run_job()
+        self.env["event.mail"].with_delay().run()
         return True
 
     def prepare_down_payment(self):
diff --git a/wordpress_connector/__manifest__.py b/wordpress_connector/__manifest__.py
index e06be37e8..ffd5ea426 100644
--- a/wordpress_connector/__manifest__.py
+++ b/wordpress_connector/__manifest__.py
@@ -34,7 +34,10 @@
     "author": "Emanuel Cino",
     "license": "AGPL-3",
     "website": "http://www.compassion.ch",
-    "data": ["views/request.xml", ],
+    "data": [
+        "data/queue_job.xml",
+        "views/request.xml",
+    ],
     "depends": [
         "advanced_translation",
         "mass_mailing_switzerland",
diff --git a/wordpress_connector/data/queue_job.xml b/wordpress_connector/data/queue_job.xml
new file mode 100644
index 000000000..9e6f3683a
--- /dev/null
+++ b/wordpress_connector/data/queue_job.xml
@@ -0,0 +1,13 @@
+<odoo>
+    <record id="channel_worpdress_connector" model="queue.job.channel">
+        <field name="name">wordpress_connector</field>
+        <field name="parent_id" ref="queue_job.channel_root"/>
+    </record>
+
+    <!-- Job functions -->
+    <record id="create_sponsorship_job" model="queue.job.function">
+        <field name="model_id" ref="model_recurring_contract"/>
+        <field name="method">create_sponsorship_job</field>
+        <field name="channel_id" ref="channel_worpdress_connector"/>
+    </record>
+</odoo>
diff --git a/wordpress_connector/models/account_invoice.py b/wordpress_connector/models/account_invoice.py
index ed7155f3b..51ecbc9b5 100644
--- a/wordpress_connector/models/account_invoice.py
+++ b/wordpress_connector/models/account_invoice.py
@@ -161,14 +161,15 @@ def create_from_wordpress(
         internet_id = self.env.ref("utm.utm_medium_website").id
         payment_term_id = self.env.ref("account.account_payment_term_immediate").id
         account = self.env["account.account"].search([("code", "=", "1050")])
+        date_invoice = fields.Datetime.from_string(time)
         invoice = self.create(
             {
                 "partner_id": partner_id,
                 "payment_mode_id": payment_mode.id,
                 "origin": origin,
                 "reference": str(pf_payid),
-                "date_invoice": fields.Date.from_string(time),
-                "auto_cancel_date": time + timedelta(minutes=30),
+                "date_invoice": date_invoice.date(),
+                "auto_cancel_date": date_invoice + timedelta(minutes=30),
                 "currency_id": 6,  # Always in CHF
                 "account_id": account.id,
                 "name": "Postfinance payment " + str(pf_payid) + " for " + wp_origin,
diff --git a/wordpress_connector/models/contracts.py b/wordpress_connector/models/contracts.py
index bcb699b6f..b7fec8e5b 100644
--- a/wordpress_connector/models/contracts.py
+++ b/wordpress_connector/models/contracts.py
@@ -10,8 +10,6 @@
 import logging
 import re
 
-from odoo.addons.queue_job.job import job, related_action
-
 from odoo import api, models, fields, _
 from odoo.tools import config
 from werkzeug.utils import escape
@@ -244,8 +242,6 @@ def create_sponsorship(
     #                             PRIVATE METHODS                            #
     ##########################################################################
     @api.model
-    @job(default_channel="root.child_sync_wp")
-    @related_action(action="related_action_contract")
     def create_sponsorship_job(self, values, form_data):
         """
         Creates the wordpress sponsorship.