Corretti conflitti

Fix conflitti

Virgola separatrice tra autori

https://www.odoo.com/documentation/10.0/howtos/backend.html#model-constraints

Currently translated at 100.0% (14 of 14 strings)

Translation: l10n-italy-11.0/l10n-italy-11.0-l10n_it_codici_carica
Translate-URL: https://translation.odoo-community.org/projects/l10n-italy-11-0/l10n-italy-11-0-l10n_it_codici_carica/it/

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

Currently translated at 71.4% (10 of 14 strings)

Translation: l10n-italy-11.0/l10n-italy-11.0-l10n_it_codici_carica
Translate-URL: https://translation.odoo-community.org/projects/l10n-italy-11-0/l10n-italy-11-0-l10n_it_codici_carica/it/

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-italy-12.0/l10n-italy-12.0-l10n_it_codici_carica
Translate-URL: https://translation.odoo-community.org/projects/l10n-italy-12-0/l10n-italy-12-0-l10n_it_codici_carica/

Currently translated at 100.0% (13 of 13 strings)

Translation: l10n-italy-12.0/l10n-italy-12.0-l10n_it_codici_carica
Translate-URL: https://translation.odoo-community.org/projects/l10n-italy-12-0/l10n-italy-12-0-l10n_it_codici_carica/it/

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-italy-12.0/l10n-italy-12.0-l10n_it_codici_carica
Translate-URL: https://translation.odoo-community.org/projects/l10n-italy-12-0/l10n-italy-12-0-l10n_it_codici_carica/

Rename cannot be perfomed with hook as OCA#2220 (comment)
Also note:

* merge_modules = True is not needed when we simply rename modules
* rename_xmlids has to be executed as first to build menus_by_module properly otherwise we get:
test-l10n_it_codici_carica=# select id ,name, menus_by_module from ir_module_module where name like '%appointment%';
 id  |           name           |                   menus_by_module
-----+--------------------------+------------------------------------------------------
 488 | l10n_it_appointment_code | Invoicing/Configuration/Accounting/Appointment Codes+
     |                          | Invoicing/Configuration/Accounting/Role Codes