[FIX] sale: forward port error

fix conflicts due to the new PR for the forward port created by the fw-bot

closes odoo/odoo#56121

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>

addons/sale/views/sale_views.xml

@@ -534,7 +534,6 @@
                                         string="Invoiced"
                                         attrs="{'column_invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
                                         optional="show"
-                                        decoration-info="(not display_type and invoice_status == 'to invoice')"
                                     />
                                     <field name="qty_to_invoice" invisible="1"/>
                                     <field name="product_uom_readonly" invisible="1"/>
@@ -678,12 +677,8 @@
                                 <group name="sale_shipping">
                                     <label for="commitment_date" string="Delivery Date"/>
                                     <div name="commitment_date_div" class="o_row">
-<<<<<<< HEAD
                                         <field name="commitment_date"/>
                                         <span name="expected_date_span" class="text-muted">Expected: <field name="expected_date" widget="date"/></span>
-=======
-                                        <field name="commitment_date"/> <field name="expected_date" invisible="1"/>
->>>>>>> d926c174b2c... temp
                                     </div>
                                 </group>
                                 <group string="Reporting" name="sale_reporting" groups="base.group_no_one">