Skip to content

Commit

Permalink
Merge pull request #2 from EmesaDEV/ERP-3048
Browse files Browse the repository at this point in the history
ERP-3048, merge upstream
  • Loading branch information
StefanRijnhart authored May 15, 2023
2 parents d58fbad + 5218126 commit 2874b2e
Show file tree
Hide file tree
Showing 333 changed files with 10,595 additions and 866 deletions.
3 changes: 2 additions & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.8.0
_commit: v1.14.2
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
github_enable_codecov: true
github_enable_makepot: true
github_enable_stale_action: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
pre-commit:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fi
done
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
name: ${{ matrix.name }}
strategy:
Expand Down
13 changes: 9 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ repos:
entry: found forbidden files; remove them
language: fail
files: "\\.rej$"
- id: en-po-files
name: en.po files cannot exist
entry: found a en.po file
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
hooks:
Expand Down Expand Up @@ -96,15 +101,15 @@ repos:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
args:
- --settings=.
exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo
rev: 2.6.0
rev: 3.1.8
hooks:
- id: setuptools-odoo-make-default
- id: setuptools-odoo-get-requirements
Expand All @@ -113,14 +118,14 @@ repos:
- requirements.txt
- --header
- "# generated from manifests external_dependencies"
- repo: https://gitlab.com/PyCQA/flake8
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.0
rev: 7.0.2
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
26 changes: 17 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,27 @@ addon | version | maintainers | summary
[email_template_qweb](email_template_qweb/) | 14.0.1.0.1 | | Use the QWeb templating mechanism for emails
[mail_activity_board](mail_activity_board/) | 14.0.1.1.0 | | Add Activity Boards
[mail_activity_creator](mail_activity_creator/) | 14.0.1.0.0 | | Show activities creator
[mail_activity_done](mail_activity_done/) | 14.0.1.0.1 | | Mail Activity Done
[mail_activity_done](mail_activity_done/) | 14.0.1.0.2 | | Mail Activity Done
[mail_activity_partner](mail_activity_partner/) | 14.0.1.0.0 | | Add Partner to Activities
[mail_activity_team](mail_activity_team/) | 14.0.1.1.0 | | Add Teams to Activities
[mail_allow_portal_internal_note](mail_allow_portal_internal_note/) | 14.0.1.0.1 | | Portal users can access internal messages related to own or other companies
[mail_activity_reply_creator](mail_activity_reply_creator/) | 14.0.1.0.1 | | Assign new to its creator
[mail_activity_team](mail_activity_team/) | 14.0.1.2.0 | | Add Teams to Activities
[mail_activity_unlink_log](mail_activity_unlink_log/) | 14.0.1.0.0 | | Leave a message when an activity is unlinked
[mail_allow_portal_internal_note](mail_allow_portal_internal_note/) | 14.0.1.0.2 | | Portal users can access internal messages related to own or other companies
[mail_attach_existing_attachment](mail_attach_existing_attachment/) | 14.0.1.0.0 | | Adding attachment on the object by sending this one
[mail_attach_existing_attachment_account](mail_attach_existing_attachment_account/) | 14.0.1.0.1 | | Module to use attach existing attachment for account module
[mail_autosubscribe](mail_autosubscribe/) | 14.0.1.0.0 | | Automatically subscribe partners to its company's business documents
[mail_debrand](mail_debrand/) | 14.0.2.2.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) [![joao-p-marques](https://github.com/joao-p-marques.png?size=30px)](https://github.com/joao-p-marques) | Remove Odoo branding in sent emails Removes anchor <a href odoo.com togheder with it's parent ( for powerd by) form all the templates removes any 'odoo' that are in tempalte texts > 20characters
[mail_drop_target](mail_drop_target/) | 14.0.1.0.1 | | Attach emails to Odoo by dragging them from your desktop
[mail_chatter_thread_colour](mail_chatter_thread_colour/) | 14.0.1.0.0 | | Allow to change the colour of threads
[mail_debrand](mail_debrand/) | 14.0.2.2.2 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) [![joao-p-marques](https://github.com/joao-p-marques.png?size=30px)](https://github.com/joao-p-marques) | Remove Odoo branding in sent emails Removes anchor <a href odoo.com togheder with it's parent ( for powerd by) form all the templates removes any 'odoo' that are in tempalte texts > 20characters
[mail_drop_target](mail_drop_target/) | 14.0.1.0.2 | | Attach emails to Odoo by dragging them from your desktop
[mail_filter_adressee_by_contact](mail_filter_adressee_by_contact/) | 14.0.1.1.0 | [![Kev-Roche](https://github.com/Kev-Roche.png?size=30px)](https://github.com/Kev-Roche) | Adresses filter by partner contacts and users
[mail_full_expand](mail_full_expand/) | 14.0.1.0.0 | | Expand mail in a big window
[mail_improved_tracking_value](mail_improved_tracking_value/) | 14.0.1.0.0 | | Improves tracking changed values for certain type of fields.Adds a user-friendly view to consult them.
[mail_inline_css](mail_inline_css/) | 14.0.1.0.0 | | Convert style tags in inline style in your mails
[mail_layout_force](mail_layout_force/) | 14.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Force a mail layout on selected email templates
[mail_layout_preview](mail_layout_preview/) | 14.0.1.0.1 | | Preview email templates in the browser
[mail_notification_custom_subject](mail_notification_custom_subject/) | 14.0.1.0.0 | [![joao-p-marques](https://github.com/joao-p-marques.png?size=30px)](https://github.com/joao-p-marques) | Apply a custom subject to mail notifications
[mail_notification_with_history](mail_notification_with_history/) | 14.0.1.0.0 | [![TDu](https://github.com/TDu.png?size=30px)](https://github.com/TDu) | Add the previous chatter discussion into new email notifications.
[mail_optional_autofollow](mail_optional_autofollow/) | 14.0.1.0.1 | | Choose if you want to automatically add new recipients as followers on mail.compose.message
[mail_optional_follower_notification](mail_optional_follower_notification/) | 14.0.1.0.0 | | Choose to notify followers on mail.compose.message
[mail_outbound_static](mail_outbound_static/) | 14.0.2.0.0 | | Allows you to configure the from header for a mail server.
[mail_partner_opt_out](mail_partner_opt_out/) | 14.0.1.0.0 | | Add the partner's email to the blackmailed list
Expand All @@ -49,10 +55,11 @@ addon | version | maintainers | summary
[mail_restrict_follower_selection](mail_restrict_follower_selection/) | 14.0.1.0.0 | | Define a domain from which followers can be selected
[mail_restrict_send_button](mail_restrict_send_button/) | 14.0.1.1.0 | | Security for Send Message Button on Chatter Area
[mail_send_copy](mail_send_copy/) | 14.0.1.0.1 | | Send to you a copy of each mail sent by Odoo
[mail_server_by_user](mail_server_by_user/) | 14.0.1.0.0 | [![ChrisOForgeFlow](https://github.com/ChrisOForgeFlow.png?size=30px)](https://github.com/ChrisOForgeFlow) | Email Server By User
[mail_show_follower](mail_show_follower/) | 14.0.1.1.0 | | Show CC document followers in mails.
[mail_tracking](mail_tracking/) | 14.0.2.0.3 | | Email tracking system for all mails sent
[mail_tracking_mailgun](mail_tracking_mailgun/) | 14.0.2.0.0 | | Mail tracking and Mailgun webhooks integration
[mail_tracking_mass_mailing](mail_tracking_mass_mailing/) | 14.0.1.0.1 | | Improve mass mailing email tracking
[mail_tracking](mail_tracking/) | 14.0.3.1.1 | | Email tracking system for all mails sent
[mail_tracking_mailgun](mail_tracking_mailgun/) | 14.0.2.1.0 | | Mail tracking and Mailgun webhooks integration
[mail_tracking_mass_mailing](mail_tracking_mass_mailing/) | 14.0.1.1.0 | | Improve mass mailing email tracking
[mass_mailing_company_newsletter](mass_mailing_company_newsletter/) | 14.0.1.0.1 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Easily manage partner's subscriptions to your main mailing list.
[mass_mailing_contact_partner](mass_mailing_contact_partner/) | 14.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Links mailing.contacts with res.partners.
[mass_mailing_custom_unsubscribe](mass_mailing_custom_unsubscribe/) | 14.0.1.0.0 | | Know and track (un)subscription reasons, GDPR compliant
Expand All @@ -61,8 +68,9 @@ addon | version | maintainers | summary
[mass_mailing_partner](mass_mailing_partner/) | 14.0.1.1.0 | | Link partners with mass-mailing
[mass_mailing_resend](mass_mailing_resend/) | 14.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Resend mass mailings
[mass_mailing_subscription_date](mass_mailing_subscription_date/) | 14.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Track contact's subscription date to mailing lists
[mass_mailing_subscription_email](mass_mailing_subscription_email/) | 14.0.1.0.2 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Send notification emails when contacts subscription changes.
[mass_mailing_subscription_email](mass_mailing_subscription_email/) | 14.0.1.0.3 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Send notification emails when contacts subscription changes.
[mass_mailing_unique](mass_mailing_unique/) | 14.0.1.0.0 | | Avoids duplicate mailing lists and contacts
[microsoft_outlook_single_tenant](microsoft_outlook_single_tenant/) | 14.0.2.0.0 | | Microsoft Outlook Single Tenant (DEPRECATED)
[website_mass_mailing_name](website_mass_mailing_name/) | 14.0.1.0.0 | | Ask for name when subscribing, and create and/or link partner

[//]: # (end addons)
Expand Down
13 changes: 7 additions & 6 deletions base_search_mail_content/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@ msgstr ""
"Project-Id-Version: Odoo Server 9.0c\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-18 03:39+0000\n"
"PO-Revision-Date: 2017-01-18 03:39+0000\n"
"Last-Translator: OCA Transbot <[email protected]>, 2017\n"
"PO-Revision-Date: 2023-03-30 14:25+0000\n"
"Last-Translator: mymage <[email protected]>\n"
"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.1\n"

#. module: base_search_mail_content
#: model:ir.model.fields,field_description:base_search_mail_content.field_mail_thread__display_name
#: model:ir.model.fields,field_description:base_search_mail_content.field_trgm_index__display_name
msgid "Display Name"
msgstr ""
msgstr "Nome visualizzato"

#. module: base_search_mail_content
#: model:ir.model,name:base_search_mail_content.model_mail_thread
Expand All @@ -38,13 +39,13 @@ msgstr ""
#: model:ir.model.fields,field_description:base_search_mail_content.field_mail_thread__id
#: model:ir.model.fields,field_description:base_search_mail_content.field_trgm_index__id
msgid "ID"
msgstr ""
msgstr "ID"

#. module: base_search_mail_content
#: model:ir.model.fields,field_description:base_search_mail_content.field_mail_thread____last_update
#: model:ir.model.fields,field_description:base_search_mail_content.field_trgm_index____last_update
msgid "Last Modified on"
msgstr ""
msgstr "Ultima modifica il"

#. module: base_search_mail_content
#: code:addons/base_search_mail_content/models/mail_thread.py:0
Expand Down
69 changes: 0 additions & 69 deletions email_template_qweb/i18n/en.po

This file was deleted.

2 changes: 1 addition & 1 deletion mail_activity_done/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
{
"name": "Mail Activity Done",
"version": "14.0.1.0.1",
"version": "14.0.1.0.2",
"author": "ForgeFlow, Odoo Community Association (OCA)",
"license": "LGPL-3",
"category": "Discuss",
Expand Down
4 changes: 2 additions & 2 deletions mail_activity_done/tests/test_mail_activity_done.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def setUp(self):

def test_mail_activity_done(self):
self.act1.done = True
self.assertEquals(self.act1.state, "done")
self.assertEqual(self.act1.state, "done")

def test_systray_get_activities(self):
act_count = self.employee.sudo(self.employee).systray_get_activities()
act_count = self.employee.with_user(self.employee).systray_get_activities()
self.assertEqual(
len(act_count), 1, "Number of activities should be equal to one"
)
93 changes: 93 additions & 0 deletions mail_activity_reply_creator/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
===========================
Mail Activity Reply Creator
===========================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
:target: https://github.com/OCA/social/tree/14.0/mail_activity_reply_creator
:alt: OCA/social
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_activity_reply_creator
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/205/14.0
:alt: Try me on Runbot

|badge1| |badge2| |badge3| |badge4| |badge5|

This module aims to facilitate back-and-forth activity assignment between users by
automatically selecting activity creator as the assignee of the followup activity when
using button "Done & schedule next". Use case:

Mitchell Admin assigns activity "to do" to Marc Demo >
Marc Demo clicks "done and schedule next" on the activity >
in new activity form, "assigned to" is set to Mitchell Admin (unless a different default
user is set for the selected activity type).

Furthermore, the module corrects a behavior that can induce user to assigning a new
activity to themselves instead of the previously selected user. Use case:

Mitchell Admin creates a new activity, selects "Marc Demo" as "assigned to", but then
changes activity type.

In standard behavior "assigned to" is reset to "Mitchell Admin";
with this module, the user selection is maintained when changing activity type (unless
a different default user is set for the selected activity type).

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_activity_reply_creator%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~

* Ilyas
* Ooops

Contributors
~~~~~~~~~~~~

* Ooops404 <https://ooops404.com>

* Ilyas <[email protected]>

Maintainers
~~~~~~~~~~~

This module is maintained by the OCA.

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

This module is part of the `OCA/social <https://github.com/OCA/social/tree/14.0/mail_activity_reply_creator>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
1 change: 1 addition & 0 deletions mail_activity_reply_creator/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
13 changes: 13 additions & 0 deletions mail_activity_reply_creator/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2023 Ooops404
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Mail Activity Reply Creator",
"summary": "Assign new to its creator",
"version": "14.0.1.0.1",
"category": "Social",
"website": "https://github.com/OCA/social",
"author": "Ilyas, Ooops, Odoo Community Association (OCA)",
"license": "AGPL-3",
"installable": True,
"depends": ["mail"],
}
Loading

0 comments on commit 2874b2e

Please sign in to comment.