From 79ca063f7e7ccd44dc247c94fac86c59f211e384 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 19 Jun 2023 21:58:43 +0000
Subject: [PATCH 1/2] [FIX] connector_opencart: remove SOL fix that is not
 needed anymore

---
 connector_opencart/models/sale_order/common.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/connector_opencart/models/sale_order/common.py b/connector_opencart/models/sale_order/common.py
index fbe2dcde..eb0481f7 100644
--- a/connector_opencart/models/sale_order/common.py
+++ b/connector_opencart/models/sale_order/common.py
@@ -84,14 +84,6 @@ class SaleOrderLine(models.Model):
         inverse_name='odoo_id',
         string="Opencart Bindings",
     )
-    
-    def _get_display_price(self):
-        # WARNING do NOT remove the line to read the currency_id
-        # in 16.0 as of 2023-03-13
-        # this fixes a res.currency bug on computing price
-        # the statement has very little effect other than that
-        self.read(['currency_id'])
-        return super()._get_display_price()
 
 
 class SaleOrderAdapter(Component):

From 9867afcc0bceeaf92dc9d7af583a06954c5b973e Mon Sep 17 00:00:00 2001
From: Juan Pablo Ticse <juanpablo@hibou.pe>
Date: Tue, 11 Jul 2023 23:17:34 +0000
Subject: [PATCH 2/2] [FIX] stock_delivery_route: fix delivery planner views

H7527
---
 stock_delivery_route/views/partner_views.xml | 2 +-
 stock_delivery_route/views/stock_views.xml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/stock_delivery_route/views/partner_views.xml b/stock_delivery_route/views/partner_views.xml
index 2583db73..866fed80 100644
--- a/stock_delivery_route/views/partner_views.xml
+++ b/stock_delivery_route/views/partner_views.xml
@@ -8,7 +8,7 @@
             <xpath expr="//group[@name='container_row_2']" position="after">
                 <group name="container_row_delivery_routes">
                     <group string="Delivery Routes" name="delivery_routes">
-                        <field name="delivery_route_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
+                        <field name="delivery_route_ids" widget="many2many_tags" colspan="2" nolabel="1" options="{'no_create': True}"/>
                     </group>
                 </group>
             </xpath>
diff --git a/stock_delivery_route/views/stock_views.xml b/stock_delivery_route/views/stock_views.xml
index cd8aa8d1..e268434f 100644
--- a/stock_delivery_route/views/stock_views.xml
+++ b/stock_delivery_route/views/stock_views.xml
@@ -7,10 +7,10 @@
         <field name="inherit_id" ref="stock.view_warehouse" />
         <field name="arch" type="xml">
             <xpath expr="//page[1]" position="after">
-                <page string="Delivery Routes" colspan="4">
-                    <group colspan="4">
+                <page string="Delivery Routes">
+                    <group>
                         <field name="id" invisible="1"/>
-                        <field name="delivery_route_ids" context="{'default_warehouse_id': id}" nolabel="1">
+                        <field name="delivery_route_ids" context="{'default_warehouse_id': id}" colspan="2" nolabel="1">
                             <tree>
                                 <field name="name"/>
                             </tree>