From f69fa0af6347994dd473d4f509a30e1f144466ee Mon Sep 17 00:00:00 2001
From: Swapnesh Shah <swapneshshah111@gmail.com>
Date: Sat, 28 Dec 2019 20:55:51 +0000
Subject: [PATCH] [FIX] base: paperformat_id is required on settings

Not setting a value for paperformat_id on 'Company Document Layout'
will also make paperformat_id False on the company but it is required
in the settings.

Without this commit, you can get in the weird situation of being able
to set a value on the document layout but having an error in the
general settings as a required field is missing.

Apply the same logic as in the other views

closes odoo/odoo#45527

X-original-commit: e518063e48936a3f8f9f921950cdae209e67ab47
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
 odoo/addons/base/tests/test_base_document_layout.py    | 5 +++++
 odoo/addons/base/wizard/base_document_layout_views.xml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/odoo/addons/base/tests/test_base_document_layout.py b/odoo/addons/base/tests/test_base_document_layout.py
index 4c21f4f6f16..3f292388425 100644
--- a/odoo/addons/base/tests/test_base_document_layout.py
+++ b/odoo/addons/base/tests/test_base_document_layout.py
@@ -118,6 +118,7 @@ class TestBaseDocumentLayout(TestBaseDocumentLayoutHelpers):
             'secondary_color': False,
             'logo': False,
             'external_report_layout_id': self.env.ref('base.layout_template1').id,
+            'paperformat_id': self.env.ref('base.paperformat_us').id,
         })
         default_colors = self.default_colors
         with Form(self.env['base.document.layout']) as doc_layout:
@@ -138,6 +139,7 @@ class TestBaseDocumentLayout(TestBaseDocumentLayoutHelpers):
             'primary_color': '#ff0080',
             'secondary_color': '#00ff00',
             'logo': self.company_imgs['overwatch']['img'],
+            'paperformat_id': self.env.ref('base.paperformat_us').id,
         })
 
         with Form(self.env['base.document.layout']) as doc_layout:
@@ -151,6 +153,7 @@ class TestBaseDocumentLayout(TestBaseDocumentLayoutHelpers):
             'primary_color': '#ff0080',
             'secondary_color': '#00ff00',
             'logo': False,
+            'paperformat_id': self.env.ref('base.paperformat_us').id,
         })
 
         with Form(self.env['base.document.layout']) as doc_layout:
@@ -166,6 +169,7 @@ class TestBaseDocumentLayout(TestBaseDocumentLayoutHelpers):
             'primary_color': '#ff0080',
             'secondary_color': '#00ff00',
             'logo': self.company_imgs['overwatch']['img'],
+            'paperformat_id': self.env.ref('base.paperformat_us').id,
         })
 
         with Form(self.env['base.document.layout']) as doc_layout:
@@ -181,6 +185,7 @@ class TestBaseDocumentLayout(TestBaseDocumentLayoutHelpers):
             'primary_color': '#ff0080',
             'secondary_color': '#00ff00',
             'logo': self.company_imgs['overwatch']['img'],
+            'paperformat_id': self.env.ref('base.paperformat_us').id,
         })
 
         with Form(self.env['base.document.layout']) as doc_layout:
diff --git a/odoo/addons/base/wizard/base_document_layout_views.xml b/odoo/addons/base/wizard/base_document_layout_views.xml
index 53f76eb34be..4b5431c2231 100644
--- a/odoo/addons/base/wizard/base_document_layout_views.xml
+++ b/odoo/addons/base/wizard/base_document_layout_views.xml
@@ -26,7 +26,7 @@
                             <field name="font" widget="font" class="mb-4" />
                             <field name="report_header" widget="char" placeholder="e.g. Global Business Solutions" />
                             <field name="report_footer" string="Footer" placeholder="e.g. Opening hours, bank accounts (one per line)" />
-                            <field name="paperformat_id" />
+                            <field name="paperformat_id" required="1" />
                         </group>
                         <div class="o_document_layout_preview">
                             <field name="preview_logo" widget="image" readonly="1" nolabel="1" class="o_document_layout_preview_logo" />