diff --git a/stock_request_picking_type/README.rst b/stock_request_picking_type/README.rst
index eef754900..98358fdf7 100644
--- a/stock_request_picking_type/README.rst
+++ b/stock_request_picking_type/README.rst
@@ -14,13 +14,13 @@ Stock Request Picking Type
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_request_picking_type
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_request_picking_type
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_request_picking_type
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_request_picking_type
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/12.0
+    :target: https://runbot.odoo-community.org/runbot/153/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -45,7 +45,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_request_picking_type%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_request_picking_type%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -61,6 +61,8 @@ Contributors
 ~~~~~~~~~~~~
 
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
+* Raphael Lee <rlee@opensourceintegrators.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -83,6 +85,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_request_picking_type>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_request_picking_type>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_request_picking_type/__manifest__.py b/stock_request_picking_type/__manifest__.py
index fd70e5e8e..f7ee2f6b4 100644
--- a/stock_request_picking_type/__manifest__.py
+++ b/stock_request_picking_type/__manifest__.py
@@ -7,9 +7,9 @@
     "version": "13.0.1.0.0",
     "license": "LGPL-3",
     "website": "https://github.com/stock-logistics-warehouse",
-    "author": "Open Source Integrators, " "Odoo Community Association (OCA)",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "category": "Warehouse",
-    "depends": ["stock_request_submit"],
+    "depends": ["stock_request"],
     "data": [
         "data/stock_picking_type.xml",
         "views/stock_request_order_views.xml",
diff --git a/stock_request_picking_type/data/stock_picking_type.xml b/stock_request_picking_type/data/stock_picking_type.xml
index 8351114ea..136e087d2 100644
--- a/stock_request_picking_type/data/stock_picking_type.xml
+++ b/stock_request_picking_type/data/stock_picking_type.xml
@@ -3,6 +3,6 @@
         <field name="name">Stock Requests</field>
         <field name="sequence_id" ref="stock_request.seq_stock_request_order" />
         <field name="code">stock_request_order</field>
-        <field name="sequence">0</field>
+        <field name="sequence_code">SRO</field>
     </record>
 </odoo>
diff --git a/stock_request_picking_type/i18n/es.po b/stock_request_picking_type/i18n/es.po
index 13d0f00c4..1512248f6 100644
--- a/stock_request_picking_type/i18n/es.po
+++ b/stock_request_picking_type/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* stock_request_picking_type
+# 	* stock_request_picking_type
 #
 msgid ""
 msgstr ""
@@ -18,10 +18,12 @@ msgstr ""
 
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-msgid "<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title=\"Manage\"/>"
+msgid ""
+"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title="
+"\"Manage\"/>"
 msgstr ""
-"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Gestionar\" title=\""
-"Gestionar\"/>"
+"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Gestionar\" title="
+"\"Gestionar\"/>"
 
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
@@ -38,63 +40,26 @@ msgstr "<span>Ver</span>"
 msgid "All"
 msgstr "Todo"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Customers"
-msgstr "Clientes"
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Done"
 msgstr "Hecho"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date"
-msgstr "Fecha Esperada"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date by Month"
-msgstr "Fecha Esperada por Mes"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Group By..."
-msgstr "Agrupar por..."
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_open
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "In Progress"
 msgstr "En Progreso"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Internal"
-msgstr "Interno"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_late
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Late"
 msgstr "Tarde"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Late Stock Requests"
-msgstr "Solicitudes de Stock Tardías"
-
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Manufacturing Operation"
-msgstr "Operación de Fabricación"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_request_order__picking_type_id
+#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_order_search
 msgid "Operation Type"
 msgstr "Tipo de Operación"
 
@@ -103,25 +68,15 @@ msgstr "Tipo de Operación"
 msgid "Picking Type"
 msgstr "Tipo de Picking"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Search Stock Request Orders"
-msgstr "Buscar Pedidos de Solicitud de Stock"
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
 msgid "Settings"
 msgstr "Configuración"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "State"
-msgstr "Estado"
-
 #. module: stock_request_picking_type
 #: model:ir.model,name:stock_request_picking_type.model_stock_request_order
+#: model:ir.model.fields.selection,name:stock_request_picking_type.selection__stock_picking_type__code__stock_request_order
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: selection:stock.picking.type,code:0
 msgid "Stock Request Order"
 msgstr "Pedido de Solicitud de Stock"
 
@@ -137,20 +92,9 @@ msgstr "Pedidos de Solicitud de Stock"
 msgid "Stock Requests"
 msgstr "Solicitudes de Stock"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests To Do."
-msgstr "Solicitudes de acciones para hacer."
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests in Progress."
-msgstr "Solicitudes de stock en curso."
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_todo
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "To Do"
 msgstr "Por Hacer"
 
@@ -164,7 +108,38 @@ msgstr "A Procesar"
 msgid "Type of Operation"
 msgstr "Tipo de Operación"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Vendors"
-msgstr "Proveedores"
+#~ msgid "Customers"
+#~ msgstr "Clientes"
+
+#~ msgid "Expected Date"
+#~ msgstr "Fecha Esperada"
+
+#~ msgid "Expected Date by Month"
+#~ msgstr "Fecha Esperada por Mes"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupar por..."
+
+#~ msgid "Internal"
+#~ msgstr "Interno"
+
+#~ msgid "Late Stock Requests"
+#~ msgstr "Solicitudes de Stock Tardías"
+
+#~ msgid "Manufacturing Operation"
+#~ msgstr "Operación de Fabricación"
+
+#~ msgid "Search Stock Request Orders"
+#~ msgstr "Buscar Pedidos de Solicitud de Stock"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Stock Requests To Do."
+#~ msgstr "Solicitudes de acciones para hacer."
+
+#~ msgid "Stock Requests in Progress."
+#~ msgstr "Solicitudes de stock en curso."
+
+#~ msgid "Vendors"
+#~ msgstr "Proveedores"
diff --git a/stock_request_picking_type/i18n/pt_BR.po b/stock_request_picking_type/i18n/pt_BR.po
index d75a87421..941a27a78 100644
--- a/stock_request_picking_type/i18n/pt_BR.po
+++ b/stock_request_picking_type/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* stock_request_picking_type
+# 	* stock_request_picking_type
 #
 msgid ""
 msgstr ""
@@ -18,10 +18,12 @@ msgstr ""
 
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-msgid "<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title=\"Manage\"/>"
+msgid ""
+"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title="
+"\"Manage\"/>"
 msgstr ""
-"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title=\""
-"Manage\"/>"
+"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title="
+"\"Manage\"/>"
 
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
@@ -38,63 +40,26 @@ msgstr "<span>Visualizar</span>"
 msgid "All"
 msgstr "Tudo"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Customers"
-msgstr "Clientes"
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Done"
 msgstr "Concluído"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date"
-msgstr "Data Prevista"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date by Month"
-msgstr "Data Prevista por Mês"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Group By..."
-msgstr "Agrupar por..."
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_open
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "In Progress"
 msgstr "Em Andamento"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Internal"
-msgstr "Interno"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_late
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Late"
 msgstr "Atrasado"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Late Stock Requests"
-msgstr "Requisições de Estoque em Atrasado"
-
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Manufacturing Operation"
-msgstr "Operação de Fabricação"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_request_order__picking_type_id
+#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_order_search
 msgid "Operation Type"
 msgstr "Tipo da Operação"
 
@@ -103,25 +68,15 @@ msgstr "Tipo da Operação"
 msgid "Picking Type"
 msgstr "Tipo de Separação"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Search Stock Request Orders"
-msgstr "Pesquisar Ordens de Requisição de Estoque"
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
 msgid "Settings"
 msgstr "Configurações"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "State"
-msgstr "Estado"
-
 #. module: stock_request_picking_type
 #: model:ir.model,name:stock_request_picking_type.model_stock_request_order
+#: model:ir.model.fields.selection,name:stock_request_picking_type.selection__stock_picking_type__code__stock_request_order
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: selection:stock.picking.type,code:0
 msgid "Stock Request Order"
 msgstr "Ordens de Requisição de Estoque"
 
@@ -137,20 +92,9 @@ msgstr "Ordens de Requisição de Estoque"
 msgid "Stock Requests"
 msgstr "Requisições de Estoque"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests To Do."
-msgstr "Requisições de Estoque A Fazer."
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests in Progress."
-msgstr "Requisições de Estoque em Andamento."
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_todo
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "To Do"
 msgstr "A Fazer"
 
@@ -164,7 +108,38 @@ msgstr "Para Processar"
 msgid "Type of Operation"
 msgstr "Tipo de Operação"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Vendors"
-msgstr "Fornecedores"
+#~ msgid "Customers"
+#~ msgstr "Clientes"
+
+#~ msgid "Expected Date"
+#~ msgstr "Data Prevista"
+
+#~ msgid "Expected Date by Month"
+#~ msgstr "Data Prevista por Mês"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupar por..."
+
+#~ msgid "Internal"
+#~ msgstr "Interno"
+
+#~ msgid "Late Stock Requests"
+#~ msgstr "Requisições de Estoque em Atrasado"
+
+#~ msgid "Manufacturing Operation"
+#~ msgstr "Operação de Fabricação"
+
+#~ msgid "Search Stock Request Orders"
+#~ msgstr "Pesquisar Ordens de Requisição de Estoque"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Stock Requests To Do."
+#~ msgstr "Requisições de Estoque A Fazer."
+
+#~ msgid "Stock Requests in Progress."
+#~ msgstr "Requisições de Estoque em Andamento."
+
+#~ msgid "Vendors"
+#~ msgstr "Fornecedores"
diff --git a/stock_request_picking_type/i18n/stock_request_picking_type.pot b/stock_request_picking_type/i18n/stock_request_picking_type.pot
index 589537703..76f24941a 100644
--- a/stock_request_picking_type/i18n/stock_request_picking_type.pot
+++ b/stock_request_picking_type/i18n/stock_request_picking_type.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* stock_request_picking_type
+# 	* stock_request_picking_type
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,63 +33,26 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Customers"
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Done"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date"
-msgstr ""
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date by Month"
-msgstr ""
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Group By..."
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_open
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "In Progress"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Internal"
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_late
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Late"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Late Stock Requests"
-msgstr ""
-
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Manufacturing Operation"
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_request_order__picking_type_id
+#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_order_search
 msgid "Operation Type"
 msgstr ""
 
@@ -98,25 +61,15 @@ msgstr ""
 msgid "Picking Type"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Search Stock Request Orders"
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
 msgid "Settings"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "State"
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model:ir.model,name:stock_request_picking_type.model_stock_request_order
+#: model:ir.model.fields.selection,name:stock_request_picking_type.selection__stock_picking_type__code__stock_request_order
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: selection:stock.picking.type,code:0
 msgid "Stock Request Order"
 msgstr ""
 
@@ -132,20 +85,9 @@ msgstr ""
 msgid "Stock Requests"
 msgstr ""
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests To Do."
-msgstr ""
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests in Progress."
-msgstr ""
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_todo
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "To Do"
 msgstr ""
 
@@ -158,9 +100,3 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__code
 msgid "Type of Operation"
 msgstr ""
-
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Vendors"
-msgstr ""
-
diff --git a/stock_request_picking_type/i18n/zh_CN.po b/stock_request_picking_type/i18n/zh_CN.po
index d4dc37a8e..9251dd865 100644
--- a/stock_request_picking_type/i18n/zh_CN.po
+++ b/stock_request_picking_type/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* stock_request_picking_type
+# 	* stock_request_picking_type
 #
 msgid ""
 msgstr ""
@@ -18,9 +18,12 @@ msgstr ""
 
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-msgid "<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title=\"Manage\"/>"
+msgid ""
+"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title="
+"\"Manage\"/>"
 msgstr ""
-"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"管理\" title=\"管理\"/>"
+"<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"管理\" title=\"管理"
+"\"/>"
 
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
@@ -37,63 +40,26 @@ msgstr "<span>视图</span>"
 msgid "All"
 msgstr "所有"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Customers"
-msgstr "客户"
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Done"
 msgstr "完成"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date"
-msgstr "预计日期"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Expected Date by Month"
-msgstr "每月预期日期"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Group By..."
-msgstr "分组..."
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_open
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "In Progress"
 msgstr "进行中"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Internal"
-msgstr "内部"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_late
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "Late"
 msgstr "迟到"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Late Stock Requests"
-msgstr "迟到的库存请求"
-
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Manufacturing Operation"
-msgstr "制造作业"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_request_order__picking_type_id
+#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_order_search
 msgid "Operation Type"
 msgstr "作业类型"
 
@@ -102,25 +68,15 @@ msgstr "作业类型"
 msgid "Picking Type"
 msgstr "拣货类型"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Search Stock Request Orders"
-msgstr "搜索库存请求单"
-
 #. module: stock_request_picking_type
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
 msgid "Settings"
 msgstr "设置"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "State"
-msgstr "状态"
-
 #. module: stock_request_picking_type
 #: model:ir.model,name:stock_request_picking_type.model_stock_request_order
+#: model:ir.model.fields.selection,name:stock_request_picking_type.selection__stock_picking_type__code__stock_request_order
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: selection:stock.picking.type,code:0
 msgid "Stock Request Order"
 msgstr "库存请求单"
 
@@ -136,20 +92,9 @@ msgstr "库存请求单"
 msgid "Stock Requests"
 msgstr "库存请求"
 
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests To Do."
-msgstr "库存请求去做。"
-
-#. module: stock_request_picking_type
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
-msgid "Stock Requests in Progress."
-msgstr "库存请求正在进行中。"
-
 #. module: stock_request_picking_type
 #: model:ir.model.fields,field_description:stock_request_picking_type.field_stock_picking_type__count_sr_todo
 #: model_terms:ir.ui.view,arch_db:stock_request_picking_type.stock_request_type_kanban
-#: model_terms:ir.ui.view,arch_db:stock_request_picking_type.view_stock_request_order_filter
 msgid "To Do"
 msgstr "去做"
 
@@ -163,7 +108,38 @@ msgstr "处理"
 msgid "Type of Operation"
 msgstr "作业的类型"
 
-#. module: stock_request_picking_type
-#: selection:stock.picking.type,code:0
-msgid "Vendors"
-msgstr "供应商"
+#~ msgid "Customers"
+#~ msgstr "客户"
+
+#~ msgid "Expected Date"
+#~ msgstr "预计日期"
+
+#~ msgid "Expected Date by Month"
+#~ msgstr "每月预期日期"
+
+#~ msgid "Group By..."
+#~ msgstr "分组..."
+
+#~ msgid "Internal"
+#~ msgstr "内部"
+
+#~ msgid "Late Stock Requests"
+#~ msgstr "迟到的库存请求"
+
+#~ msgid "Manufacturing Operation"
+#~ msgstr "制造作业"
+
+#~ msgid "Search Stock Request Orders"
+#~ msgstr "搜索库存请求单"
+
+#~ msgid "State"
+#~ msgstr "状态"
+
+#~ msgid "Stock Requests To Do."
+#~ msgstr "库存请求去做。"
+
+#~ msgid "Stock Requests in Progress."
+#~ msgstr "库存请求正在进行中。"
+
+#~ msgid "Vendors"
+#~ msgstr "供应商"
diff --git a/stock_request_picking_type/models/stock_picking_type.py b/stock_request_picking_type/models/stock_picking_type.py
index 3e118f19c..f1067c24c 100644
--- a/stock_request_picking_type/models/stock_picking_type.py
+++ b/stock_request_picking_type/models/stock_picking_type.py
@@ -15,9 +15,6 @@ class StockPickingType(models.Model):
     count_sr_late = fields.Integer(string="Late", compute="_compute_sr_count")
 
     def _compute_sr_count(self):
-        types = self.filtered(lambda picking: picking.code == "stock_request_order")
-        if not types:
-            return
         domains = {
             "count_sr_todo": [("state", "=", "submitted")],
             "count_sr_open": [("state", "=", "open")],
@@ -41,7 +38,7 @@ class StockPickingType(models.Model):
                 and x["picking_type_id"][0]: x["picking_type_id_count"]
                 for x in data
             }
-            for record in types:
+            for record in self:
                 record[field] = count.get(record.id, 0)
 
     def get_stock_request_order_picking_type_action(self):
diff --git a/stock_request_picking_type/models/stock_request_order.py b/stock_request_picking_type/models/stock_request_order.py
index f1e11a91d..366ec32ff 100644
--- a/stock_request_picking_type/models/stock_request_order.py
+++ b/stock_request_picking_type/models/stock_request_order.py
@@ -9,21 +9,16 @@ class StockRequestOrder(models.Model):
 
     @api.model
     def _get_default_picking_type(self):
+        companies = self._context.get("allowed_company_ids", []).copy()
+        companies.append(False)
         return (
             self.env["stock.picking.type"]
             .search(
                 [
                     ("code", "=", "stock_request_order"),
-                    (
-                        "warehouse_id.company_id",
-                        "in",
-                        [
-                            self.env.context.get(
-                                "company_id", self.env.user.company_id.id
-                            ),
-                            False,
-                        ],
-                    ),
+                    "|",
+                    ("warehouse_id.company_id", "in", companies),
+                    ("warehouse_id", "=", False),
                 ],
                 limit=1,
             )
@@ -31,8 +26,8 @@ class StockRequestOrder(models.Model):
         )
 
     picking_type_id = fields.Many2one(
-        "stock.picking.type",
-        "Operation Type",
+        comodel_name="stock.picking.type",
+        string="Operation Type",
         default=_get_default_picking_type,
         required=True,
     )
diff --git a/stock_request_picking_type/readme/CONTRIBUTORS.rst b/stock_request_picking_type/readme/CONTRIBUTORS.rst
index ab792860d..e2a84a062 100644
--- a/stock_request_picking_type/readme/CONTRIBUTORS.rst
+++ b/stock_request_picking_type/readme/CONTRIBUTORS.rst
@@ -1 +1,3 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
+* Raphael Lee <rlee@opensourceintegrators.com>
diff --git a/stock_request_picking_type/static/description/icon.png b/stock_request_picking_type/static/description/icon.png
index c31ecfd9f..d4f6a65ac 100644
Binary files a/stock_request_picking_type/static/description/icon.png and b/stock_request_picking_type/static/description/icon.png differ
diff --git a/stock_request_picking_type/static/description/index.html b/stock_request_picking_type/static/description/index.html
index d09b4d05d..13822a105 100644
--- a/stock_request_picking_type/static/description/index.html
+++ b/stock_request_picking_type/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_request_picking_type"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_request_picking_type"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_request_picking_type"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_request_picking_type"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module adds stock request orders within the Inventory app with a new operation type.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -395,7 +395,7 @@ ul.auto-toc {
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_request_picking_type%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_request_picking_type%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -410,6 +410,8 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Pimolnat Suntian &lt;<a class="reference external" href="mailto:pimolnats&#64;ecosoft.co.th">pimolnats&#64;ecosoft.co.th</a>&gt;</li>
+<li>Raphael Lee &lt;<a class="reference external" href="mailto:rlee&#64;opensourceintegrators.com">rlee&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -421,7 +423,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_request_picking_type">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_request_picking_type">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/stock_request_picking_type/views/stock_request_order_views.xml b/stock_request_picking_type/views/stock_request_order_views.xml
index ab8fcbedf..93105b7b9 100644
--- a/stock_request_picking_type/views/stock_request_order_views.xml
+++ b/stock_request_picking_type/views/stock_request_order_views.xml
@@ -1,55 +1,41 @@
 <odoo>
-    <record id="view_stock_request_order_filter" model="ir.ui.view">
-        <field name="name">stock.request.order.select</field>
+    <record model="ir.ui.view" id="stock_request_order_search">
+        <field name="name">stock.request.order.search</field>
         <field name="model">stock.request.order</field>
+        <field name="inherit_id" ref="stock_request.stock_request_order_search" />
         <field name="arch" type="xml">
-            <search string="Search Stock Request Orders">
-                <field name="name" />
+            <xpath expr='//filter[@name="location"]' position="after">
                 <filter
-                    string="To Do"
-                    name="todo"
-                    domain="[('state','=', 'submitted')]"
-                    help="Stock Requests To Do."
+                    string="Operation Type"
+                    name="picking_type_id"
+                    domain="[]"
+                    context="{'group_by': 'picking_type_id'}"
                 />
-                <filter
-                    string="In Progress"
-                    name="inprogress"
-                    domain="[('state', '=', 'open')]"
-                    help="Stock Requests in Progress."
+            </xpath>
+        </field>
+    </record>
+    <record id="stock_request_order_form_picking_type" model="ir.ui.view">
+        <field name="name">stock.request.order.form.picking.type</field>
+        <field name="model">stock.request.order</field>
+        <field name="inherit_id" ref="stock_request.stock_request_order_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='warehouse_id']" position="after">
+                <field
+                    name="picking_type_id"
+                    domain="[('code', '=', 'stock_request_order')]"
+                    context="{'default_code': 'stock_request_order'}"
+                    attrs="{'readonly': [('state', '!=', 'draft')]}"
                 />
-                <filter
-                    string="Late"
-                    domain="['&amp;', ('expected_date', '&lt;', current_date), ('state', 'in', ('submitted', 'open'))]"
-                    name="late"
-                    help="Late Stock Requests"
-                />
-                <filter string="Done" name="done" domain="[('state', '=', 'done')]" />
-                <group expand="0" string="Group By...">
-                    <filter
-                        string="Expected Date"
-                        name="expected_date"
-                        domain="[]"
-                        context="{'group_by': 'expected_date'}"
-                        help="Expected Date by Month"
-                    />
-                    <filter
-                        string="State"
-                        name="state"
-                        domain="[]"
-                        context="{'group_by': 'state'}"
-                    />
-                </group>
-            </search>
+            </xpath>
         </field>
     </record>
     <record id="action_picking_dashboard" model="ir.actions.act_window">
         <field name="name">Stock Request Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.request.order</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" eval="False" />
-        <field name="search_view_id" ref="view_stock_request_order_filter" />
+        <field name="search_view_id" ref="stock_request_order_search" />
         <field name="domain">[('picking_type_id', '=', active_id)]</field>
         <field name="context">{'default_picking_type_id': active_id}</field>
     </record>
@@ -57,7 +43,6 @@
         <field name="name">Stock Request Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.request.order</field>
-        <field name="view_type">form</field>
         <field name="view_mode">form</field>
     </record>
     <menuitem