Merge two overrides of Base into the same file. Just moving code to clean module, nothing changes functionally or technically. LINKS Task ID-2431217 COM PR odoo/odoo#67322 ENT PR odoo/enterprise#16876 UPG PR odoo/upgrade#2236