diff --git a/supermerge.sh b/supermerge.sh index 24ef9dc85f2c..6651eca1acea 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -37,7 +37,11 @@ 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/odoo-italia/l10n-italy 14.0-mig-l10n_it_fatturapa_import_zip