merged OCA#2309 OCA#2373 OCA#2388 OCA#2203 OCA#2238, add OCA#2453 OCA…

…#2459
odoo-italia · Jun 29, 2022 · d9633dd · d9633dd
1 parent 88211a4
commit d9633dd
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -34,21 +34,19 @@ set -xe
 rebase_n_merge https://github.com/odoo-italia/l10n-italy 14.0-premerge 14.0-premerge
 # fixes
 # rebase_n_merge_pr 2285
-rebase_n_merge_pr 2309
 rebase_n_merge_pr 2327
 rebase_n_merge_pr 2344
 rebase_n_merge_pr 2346
-#rebase_n_merge_pr 2360
 rebase_n_merge_pr 2364
 rebase_n_merge_pr 2369
-rebase_n_merge_pr 2373
-rebase_n_merge_pr 2388
 rebase_n_merge_pr 2392
 rebase_n_merge_pr 2425
 rebase_n_merge_pr 2430
 rebase_n_merge_pr 2432
 rebase_n_merge_pr 2442
 rebase_n_merge_pr 2446
+rebase_n_merge_pr 2453
+rebase_n_merge_pr 2459
 # porting
 rebase_n_merge_pr 2310
 rebase_n_merge_pr 2138
@@ -58,11 +56,9 @@ rebase_n_merge_pr 2151
 rebase_n_merge_pr 2157
 rebase_n_merge_pr 2198
 rebase_n_merge_pr 2202
-rebase_n_merge_pr 2203
 rebase_n_merge_pr 2212
 rebase_n_merge_pr 2228
 rebase_n_merge_pr 2229
-rebase_n_merge_pr 2238
 rebase_n_merge_pr 2258
 rebase_n_merge_pr 2259
 rebase_n_merge_pr 2315