Otis - Odoo Forward-Port Steward [bot]

@EmilioPascual @jco-odoo the next pull request (odoo/odoo#184214) is in conflict. You can merge the chain up to here by saying > @robodoo r+ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@EmilioPascual @jco-odoo this forward port of odoo/odoo#166499 is awaiting action (not merged or closed).

@EmilioPascual @jco-odoo this forward port of odoo/odoo#166499 is awaiting action (not merged or closed).

@EmilioPascual @jco-odoo this forward port of odoo/odoo#166499 is awaiting action (not merged or closed).

@EmilioPascual @jco-odoo this forward port of odoo/odoo#166499 is awaiting action (not merged or closed).

@EmilioPascual @jco-odoo this forward port of odoo/odoo#166499 is awaiting action (not merged or closed).

@EmilioPascual @jco-odoo this forward port of odoo/odoo#166499 is awaiting action (not merged or closed).

@mem-adhoc @jco-odoo cherrypicking of pull request odoo/odoo#168945 failed. stdout: ``` Auto-merging addons/l10n_ar_withholding/data/template/account.tax-ar_ex.csv CONFLICT (content): Merge conflict in addons/l10n_ar_withholding/data/template/account.tax-ar_ex.csv Auto-merging addons/l10n_ar_withholding/data/template/account.tax-ar_ri.csv CONFLICT (content): Merge conflict in addons/l10n_ar_withholding/data/template/account.tax-ar_ri.csv CONFLICT (modify/delete): addons/l10n_ar_withholding/data/template/account.tax.group-ar_ri.csv deleted...

@mem-adhoc @jco-odoo this forward port of odoo/odoo#168945 is awaiting action (not merged or closed).

@mem-adhoc @jco-odoo this forward port of odoo/odoo#168945 is awaiting action (not merged or closed).