change OCA#1959 to OCA#2234, merge OCA#1942 OCA#1974 OCA#1975 OCA#2077

OCA#2141
odoo-italia · Jul 9, 2021 · 003a60d · 003a60d
1 parent d59aa06
commit 003a60d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -20,13 +20,13 @@ 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/1931/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1938/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1939/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/fredzamoabg/l10n-italy pull/5/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1950/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head
+# closed, see #2234 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1973/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head
-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/1974/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head
 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
@@ -37,14 +37,14 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1990/h
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2043/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2044/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2079/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2077/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2077/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2080/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2128/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/TheMule71/l10n-italy 14.0-mig-l10n_it_reverse_charge
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2138/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2139/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2140/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2141/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
 # 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
@@ -60,3 +60,4 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2225/h
 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
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2234/head