[MERGE] forward port branch 9.0 up to e62e17d078

addons/hw_escpos/escpos/escpos.py

@@ -525,7 +525,7 @@ class Escpos:
             # https://github.com/python-escpos/python-escpos/pull/98/files#diff-a0b1df12c7c67e38915adbe469051e2dR444
             self._raw('\x00')
         else:
-            raise exception.BarcodeCodeError()
+            raise BarcodeCodeError()
 
     def receipt(self,xml):
         """

doc/reference/guidelines.rst

@@ -212,7 +212,6 @@ Use the following pattern :
   *concerned_group* is the short name of the concerned group ('user'
   for the 'model_name_group_user', 'public' for public user, 'company'
   for multi-company rules, ...).
-* For a group : :samp:`{<model_name>}_group_{<group_name>}` where *group_name* is the name of the group, generally 'user', 'manager', ...
 
 .. code-block:: xml
 

odoo/addons/base/ir/ir_translation.py

@@ -496,6 +496,7 @@ class IrTranslation(models.Model):
                             discarded += trans
                         else:
                             trans.write({'src': matches[0], 'state': trans.state})
+                            trans_src.append(matches[0])  # avoid reuse of term
                     else:
                         outdated += trans