From 2ba6be20040a7b27d8cd8d95e089007a7a2edf78 Mon Sep 17 00:00:00 2001
From: Yenthe666 <yenthevg@gmail.com>
Date: Mon, 4 Feb 2019 13:27:01 +0000
Subject: [PATCH 1/2] [DOC] reports: add documentation for custom fonts

closes odoo/odoo#30813
---
 doc/reference/reports.rst | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/reference/reports.rst b/doc/reference/reports.rst
index e324b132ae0..64920f41f8e 100644
--- a/doc/reference/reports.rst
+++ b/doc/reference/reports.rst
@@ -301,6 +301,38 @@ the function ``render_html`` and pass objects in the ``docargs`` dictionary:
             }
             return report_obj.render('module.report_name', docargs)
 
+.. _reference/reports/custom_fonts:
+
+Custom fonts
+============
+If you want to use custom fonts you will need to add your custom font and the related less/CSS to the ``web.reports_assets_common`` assets bundle. 
+Adding your custom font(s) to ``web.assets_common`` or ``web.assets_backend`` will not make your font available in QWeb reports.
+
+Example::
+
+    <template id="report_assets_common_custom_fonts" name="Custom QWeb fonts" inherit_id="web.report_assets_common">
+        <xpath expr="." position="inside">
+            <link href="/your_module/static/src/less/fonts.less" rel="stylesheet" type="text/less"/>
+        </xpath>
+    </template>
+
+You will need to define your ``@font-face`` within this less file, even if you've used in another assets bundle (other than ``web.reports_assets_common``).
+
+Example::
+
+    @font-face {
+        font-family: 'MonixBold';
+        src: local('MonixBold'), local('MonixBold'), url(/your_module/static/src/fonts/MonixBold-Regular.otf) format('opentype');
+    }
+
+    .h1-title-big {
+        font-family: MonixBold;
+        font-size: 60px;
+        color: #3399cc;
+    }
+
+After you've added the less into your assets bundle you can use the classes - in this example ``h1-title-big`` - in your custom QWeb report.
+
 Reports are web pages
 =====================
 

From 6cf4f4924b0e18343ee68503403e9d249558e101 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 14 Feb 2019 20:25:55 +0000
Subject: [PATCH 2/2] [FIX] stock: remove domain on stock.location of picking
 types

There is no `company_id` field on `stock.picking.type`.

Partially revert f221936f8b9e64d371c2593210797b36ef6d032c (#30952)

closes odoo/odoo#31121
---
 addons/stock/views/stock_picking_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 4cf829796d4..5cbcd0c76f3 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -55,8 +55,8 @@
                                 <field name="use_existing_lots" groups="stock.group_production_lot"/>
                             </group>
                             <group string="Locations">
-                                <field name="default_location_src_id" attrs="{'required': [('code', '=', 'internal')]}" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
-                                <field name="default_location_dest_id" attrs="{'required': [('code', 'in', ('internal', 'incoming'))]}" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
+                                <field name="default_location_src_id" attrs="{'required': [('code', '=', 'internal')]}"/>
+                                <field name="default_location_dest_id" attrs="{'required': [('code', 'in', ('internal', 'incoming'))]}"/>
                             </group>
                         </group>
                     </sheet>