remove merged OCA#1987 OCA#2195, replace OCA#2200 with OCA#2203, add O…

…CA#2151 OCA#2212 OCA#2246 OCA#2238 OCA#2248

supermerge.sh

@@ -30,7 +30,7 @@ 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/1984/head
 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
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1987/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
 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
@@ -46,21 +46,26 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2139/h
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2140/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2141/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2149/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2151/head
 # merged # as #2210 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2153/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2156/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2157/head
 # closed, see #2258 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2166/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2195/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2195/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2198/head
 # closed, see #2230 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2199/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2200/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2202/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2203/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2205/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2212/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2220/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2225/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2228/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2229/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2230/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2234/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2238/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2246/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2248/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2258/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2259/head