diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py
index 8925f6044b5..fb8d23caf0e 100644
--- a/odoo/addons/base/models/res_company.py
+++ b/odoo/addons/base/models/res_company.py
@@ -248,19 +248,15 @@ class Company(models.Model):
         return self.env['res.config.settings'].open_company()
 
     @api.multi
-    def write_company_and_print_report(self, values):
-        res = self.write(values)
-
-        report_name = values.get('default_report_name')
-        active_ids = values.get('active_ids')
-        active_model = values.get('active_model')
+    def write_company_and_print_report(self):
+        context = self.env.context
+        report_name = context.get('default_report_name')
+        active_ids = context.get('active_ids')
+        active_model = context.get('active_model')
         if report_name and active_ids and active_model:
             docids = self.env[active_model].browse(active_ids)
             return (self.env['ir.actions.report'].search([('report_name', '=', report_name)], limit=1)
-                        .with_context(values)
                         .report_action(docids))
-        else:
-            return res
 
     @api.model
     def action_open_base_onboarding_company(self):
diff --git a/odoo/addons/base/views/res_company_views.xml b/odoo/addons/base/views/res_company_views.xml
index 8a0773e98da..db4664ae7b8 100644
--- a/odoo/addons/base/views/res_company_views.xml
+++ b/odoo/addons/base/views/res_company_views.xml
@@ -147,7 +147,7 @@
                         }"/>
                     </div>
                     <footer>
-                        <button string="Save" type="object" class="oe_highlight" name="write"/>
+                        <button string="Save" type="object" class="oe_highlight" special="save"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
                 </xpath>
@@ -161,7 +161,7 @@
             <field name="inherit_id" ref="base.view_company_report_form" />
             <field name="priority">1024</field>
             <field name="arch" type="xml">
-                <xpath expr="//button[@name='write']" position="before" >
+                <xpath expr="//button[@special='save']" position="before" >
                     <button string="Save and Print" type="object" class="oe_highlight" name="write_company_and_print_report"/>
                 </xpath>
             </field>