merged OCA#1985 and OCA#1988

Author: TheMule71

supermerge.sh

@@ -28,10 +28,10 @@ git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1984/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1985/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1985/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2154/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1987/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1988/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1988/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1989/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1990/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2043/head