From 11fb681d2b40e6d68127366d4615e1c7377bdf6b Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 23 Jul 2019 12:30:22 +0000
Subject: [PATCH 1/4] [FIX] point_of_sale: list in Sale Details wizard

On mobile devices, by default Odoo will uses a kanban view instead of a
list view if avaiable.

In the case of "Point of Sale > Reporting > Sale Details", we can select
the list of point of sale configs. It works fine on desktop, but on
mobile we had the kanban view that does not allow to remove selected
configs (and there is "New Session", "Resume" and so on buttons that
make little to no sense).

With this changeset we force in the case usage of the list view.

opw-2040954
closes #35104

Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
---
 addons/point_of_sale/wizard/pos_details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 6e1eb5f5ae3..3226f42cb11 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -10,7 +10,7 @@
                         <field name="end_date"/>
                     </group>
                     <group>
-                        <field name="pos_config_ids" colspan="4" nolabel="1" />
+                        <field name="pos_config_ids" mode="tree" colspan="4" nolabel="1" />
                     </group>
                     <footer>
                         <button name="generate_report" string="Print" type="object" class="btn-primary"/>

From d91b1e5bd56373f869bdc0db2215818e9ce11cbc Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Tue, 6 Aug 2019 08:01:29 +0000
Subject: [PATCH 2/4] [FIX] account: payment cancel resets name

Make a transfer payment from bank to cash
validate, check the journal entries
You see that there are two moves, each with the name
given by their journal's sequence (one in bank, one in cash)

Now, unreconcile, and cancel the payment
set it to draft, re-confirm it

Before this commit, the entries created had the same name which was
the name of the previous journal entry
This was because, at cancel time, the move_name of the payment was not reset

After this commit, the move name is reset on cancel, and both
journal entries have a new sequence based name when
confirming the payment the second time

OPW 2046412

closes odoo/odoo#35478

Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
---
 addons/account/models/account_payment.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index 1d654be0652..a192c0c8989 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -473,7 +473,10 @@ class account_payment(models.Model):
                     move.line_ids.remove_move_reconcile()
                 move.button_cancel()
                 move.unlink()
-            rec.state = 'cancelled'
+            rec.write({
+                'state': 'cancelled',
+                'move_name': False,
+            })
 
     @api.multi
     def unlink(self):

From f93fcaffb5287bc6ff52e33e3cc9edecb50058c4 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 1 Aug 2019 13:52:31 +0000
Subject: [PATCH 3/4] [FIX] stock_dropshipping: Updating dropship product

Steps to reproduce the bug:
- Install stock_dropshipping module and enable Routes on SO lines
- Create a storable product P with a supplier S
- Create a SO with P and set this line with the route dropship
- Confirm the SO ( a PO has been created to S with P)
- Change P on the SO with an other product

Bug:

The product P stayed on the PO.
So a product linked to a PO line cannot be changed on a SO.

Do not forward-port in 12.0 and upper

opw:2040249

closes odoo/odoo#35454

Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
---
 addons/stock_dropshipping/__manifest__.py     |  2 +-
 .../views/sale_order_views.xml                | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 addons/stock_dropshipping/views/sale_order_views.xml

diff --git a/addons/stock_dropshipping/__manifest__.py b/addons/stock_dropshipping/__manifest__.py
index c00b3985a63..5c917c2d67b 100644
--- a/addons/stock_dropshipping/__manifest__.py
+++ b/addons/stock_dropshipping/__manifest__.py
@@ -22,7 +22,7 @@ internal transfer document is needed.
 """,
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['purchase', 'sale_stock'],
-    'data': ['data/stock_data.xml'],
+    'data': ['data/stock_data.xml', 'views/sale_order_views.xml'],
     'test': [
         '../account/test/account_minimal_test.xml',
         '../stock_account/test/stock_valuation_account.xml',
diff --git a/addons/stock_dropshipping/views/sale_order_views.xml b/addons/stock_dropshipping/views/sale_order_views.xml
new file mode 100644
index 00000000000..8d684e365bf
--- /dev/null
+++ b/addons/stock_dropshipping/views/sale_order_views.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <!-- Do not forward-port in 12.0 and upper -->
+        <record id="view_order_form_inherit_sale_stock" model="ir.ui.view">
+            <field name="name">sale.order.form.sale.dropshipping</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page/field[@name='order_line']/form//field[@name='product_updatable']" position="after">
+                    <field name="purchase_line_ids" invisible="1"/>
+                </xpath>
+                <xpath expr="//page/field[@name='order_line']/form//field[@name='product_id']" position="attributes">
+                   <attribute name="attrs">{'readonly': ['|', ('product_updatable', '=', False), ('purchase_line_ids', '!=', [])]}</attribute>
+                </xpath>
+                <xpath expr="//page/field[@name='order_line']/tree/field[@name='product_updatable']" position="after">
+                    <field name="purchase_line_ids" invisible="1"/>
+                </xpath>
+                <xpath expr="//page/field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
+                    <attribute name="attrs">{'readonly': ['|', ('product_updatable', '=', False), ('purchase_line_ids', '!=', [])]}</attribute>
+                </xpath>
+           </field>
+        </record>
+    </data>
+</odoo>

From dff2e242a5e5288cb3c8408a9b635a4c85034e83 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 30 Jan 2019 12:50:27 +0000
Subject: [PATCH 4/4] [FIX] document: PDF indexing

Backport from 12.0, commit : 1b753b0d53744a6e95467c6bd128ead0edb273cc
note: there was also report of PDF content blocking that when indexed
blocked an instance worker indefinitely

Since PyPDF2 gives bad results for PDF indexing, stop using it since it
raises more issues than it helps users.

opw-2044679

closes odoo/odoo#35310

closes odoo/odoo#35525

Signed-off-by: Jorge Pinna Puissant (jpp) <jpp@odoo.com>
---
 addons/document/models/ir_attachment.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/document/models/ir_attachment.py b/addons/document/models/ir_attachment.py
index 2bc6aee234d..bdc4559e893 100644
--- a/addons/document/models/ir_attachment.py
+++ b/addons/document/models/ir_attachment.py
@@ -9,7 +9,7 @@ import zipfile
 from odoo import api, models
 
 _logger = logging.getLogger(__name__)
-FTYPES = ['docx', 'pptx', 'xlsx', 'opendoc', 'pdf']
+FTYPES = ['docx', 'pptx', 'xlsx', 'opendoc']
 
 def textToString(element):
     buff = u""
@@ -92,6 +92,9 @@ class IrAttachment(models.Model):
     def _index_pdf(self, bin_data):
         '''Index PDF documents'''
 
+        # extractText gives very bad results for indexing, hence we don't index PDF anymore. A
+        # better alternative is probably PDFMiner.six, but not for stable.
+        # See POC at https://github.com/odoo/odoo/pull/27568.
         buf = u""
         if bin_data.startswith(b'%PDF-'):
             f = io.BytesIO(bin_data)