From a066bbf857dcb3935b6569c350594ded54d14f4e Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Thu, 25 Feb 2021 17:23:22 +0100 Subject: [PATCH] =?UTF-8?q?aggiunto=2014.0-mig-l10n=5Fit=5Ffatturapa=5Fexp?= =?UTF-8?q?ort=5Fzip=20**=20per=C3=B2=20vd.=20#2080=20**?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supermerge.sh | 4 ++++ 1 file changed, 4 insertions(+) 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