add OCA#2138 OCA#2139 OCA#2140 OCA#2141

odoo-italia · Sep 3, 2021 · 31d58a5 · 31d58a5
1 parent e5fda80
commit 31d58a5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -24,7 +24,6 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/h
 git pull --no-ff --no-edit --quiet https://github.com/fredzamoabg/l10n-italy pull/2/head
 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
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1962/head
 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
@@ -37,11 +36,10 @@ git pull --no-ff --no-edit --quiet -X theirs https://github.com/OCA/l10n-italy p
 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
-#
-# NOTA: entrambi portano l10n_it_fatturapa_export_zip - sceglierne uno (finché non sono integrati)
 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/odoo-italia/l10n-italy 14.0-mig-l10n_it_fatturapa_export_zip
-#
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2128/head
-git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.0-mig-l10n_it_ricevute_bancarie
+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
+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
 git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.0-mig-l10n_it_fatturapa_import_zip