From e47c19d36162f0d596d2e7ccb2340b3cc071ab03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 10 Jan 2023 01:04:55 +0100
Subject: [PATCH] Re-order XML record definition

The records are grouped per model inside the parent XML file.

Closes #2722
---
 modules/purchase/invoice.xml  |  39 ++++++++
 modules/purchase/product.xml  |  11 +++
 modules/purchase/purchase.xml | 168 ++++++++++++++--------------------
 modules/purchase/stock.xml    | 125 +++++++++++--------------
 modules/purchase/tryton.cfg   |   1 +
 modules/sale/invoice.xml      |  38 ++++++++
 modules/sale/party.xml        |  32 +++----
 modules/sale/product.xml      |  11 +++
 modules/sale/sale.xml         | 131 +++++++-------------------
 modules/sale/stock.xml        |  27 ++++++
 modules/sale/tryton.cfg       |   1 +
 11 files changed, 300 insertions(+), 284 deletions(-)
 create mode 100644 modules/purchase/invoice.xml
 create mode 100644 modules/sale/invoice.xml

diff --git a/modules/purchase/invoice.xml b/modules/purchase/invoice.xml
new file mode 100644
index 0000000000..695b453481
--- /dev/null
+++ b/modules/purchase/invoice.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+        <record model="ir.action.act_window" id="act_invoice_form">
+            <field name="name">Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="context"></field>
+            <field name="domain"
+                eval="[('lines.origin.purchase.id', 'in', Eval('active_ids'), 'purchase.line')]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_invoice_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">purchase.purchase,-1</field>
+            <field name="action" ref="act_invoice_form"/>
+        </record>
+
+        <record model="ir.model.access" id="access_invoice_purchase">
+            <field name="model" search="[('model', '=', 'account.invoice')]"/>
+            <field name="group" ref="group_purchase"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
+        <record model="ir.model.access" id="access_invoice_line_purchase">
+            <field name="model" search="[('model', '=', 'account.invoice.line')]"/>
+            <field name="group" ref="group_purchase"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+    </data>
+</tryton>
diff --git a/modules/purchase/product.xml b/modules/purchase/product.xml
index d63e0d8e89..485a94ac8a 100644
--- a/modules/purchase/product.xml
+++ b/modules/purchase/product.xml
@@ -3,6 +3,17 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
+        <record model="ir.ui.view" id="template_view_form">
+            <field name="model">product.template</field>
+            <field name="inherit" ref="product.template_view_form"/>
+            <field name="name">template_form</field>
+        </record>
+        <record model="ir.ui.view" id="template_view_tree">
+            <field name="model">product.template</field>
+            <field name="inherit" ref="product.template_view_tree"/>
+            <field name="name">template_tree</field>
+        </record>
+
         <record model="ir.ui.view" id="product_view_list_purchase_line">
             <field name="model">product.product</field>
             <field name="type">tree</field>
diff --git a/modules/purchase/purchase.xml b/modules/purchase/purchase.xml
index e05b5133d4..24fdc9c280 100644
--- a/modules/purchase/purchase.xml
+++ b/modules/purchase/purchase.xml
@@ -57,47 +57,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">purchase_tree</field>
         </record>
 
-        <record model="ir.action.act_window" id="act_shipment_form">
-            <field name="name">Shipments</field>
-            <field name="res_model">stock.shipment.in</field>
-            <field name="domain"
-                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.keyword"
-                id="act_open_shipment_keyword1">
-            <field name="keyword">form_relate</field>
-            <field name="model">purchase.purchase,-1</field>
-            <field name="action" ref="act_shipment_form"/>
-        </record>
-        <record model="ir.action.act_window" id="act_return_form">
-            <field name="name">Returns</field>
-            <field name="res_model">stock.shipment.in.return</field>
-            <field name="domain"
-                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.keyword"
-            id="act_open_shipment_return_keyword1">
-            <field name="keyword">form_relate</field>
-            <field name="model">purchase.purchase,-1</field>
-            <field name="action" ref="act_return_form"/>
-        </record>
-        <record model="ir.action.act_window" id="act_invoice_form">
-            <field name="name">Invoices</field>
-            <field name="res_model">account.invoice</field>
-            <field name="context"></field>
-            <field name="domain"
-                eval="[('lines.origin.purchase.id', 'in', Eval('active_ids'), 'purchase.line')]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.keyword"
-                id="act_open_invoice_keyword1">
-            <field name="keyword">form_relate</field>
-            <field name="model">purchase.purchase,-1</field>
-            <field name="action" ref="act_invoice_form"/>
-        </record>
-
         <record model="ir.ui.view" id="handle_shipment_exception_ask_view_form">
             <field name="model">purchase.handle.shipment.exception.ask</field>
             <field name="type">form</field>
@@ -210,6 +169,58 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="act_purchase_invoice_relate"/>
         </record>
 
+        <record model="ir.action.act_window" id="act_purchase_shipments_relate">
+            <field name="name">Purchases</field>
+            <field name="res_model">purchase.purchase</field>
+            <field name="domain"
+                eval="[('shipments', 'in', Eval('active_ids'))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_purchase_shipments_relate_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="purchase_view_tree"/>
+            <field name="act_window" ref="act_purchase_shipments_relate"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_purchase_shipments_relate_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="purchase_view_form"/>
+            <field name="act_window" ref="act_purchase_shipments_relate"/>
+        </record>
+        <record model="ir.action.keyword"
+            id="act_purchase_shipments_relate_keyword">
+            <field name="keyword">form_relate</field>
+            <field name="model">stock.shipment.in,-1</field>
+            <field name="action" ref="act_purchase_shipments_relate"/>
+        </record>
+
+        <record model="ir.action.act_window" id="act_purchase_shipment_returns_relate">
+            <field name="name">Purchases</field>
+            <field name="res_model">purchase.purchase</field>
+            <field name="domain"
+                eval="[('shipment_returns', 'in', Eval('active_ids'))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_purchase_shipment_returns_relate_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="purchase_view_tree"/>
+            <field name="act_window" ref="act_purchase_shipment_returns_relate"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_purchase_shipment_returns_relate_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="purchase_view_form"/>
+            <field name="act_window" ref="act_purchase_shipment_returns_relate"/>
+        </record>
+        <record model="ir.action.keyword"
+            id="act_purchase_shipment_returns_relate_keyword">
+            <field name="keyword">form_relate</field>
+            <field name="model">stock.shipment.in.return,-1</field>
+            <field name="action" ref="act_purchase_shipment_returns_relate"/>
+        </record>
+
         <menuitem
             name="Reporting"
             parent="menu_purchase"
@@ -241,6 +252,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="False"/>
         </record>
 
+        <record model="ir.model.access" id="access_purchase_group_stock">
+            <field name="model" search="[('model', '=', 'purchase.purchase')]"/>
+            <field name="group" ref="stock.group_stock"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
         <record model="ir.model.button" id="purchase_cancel_button">
             <field name="name">cancel</field>
             <field name="string">Cancel</field>
@@ -387,6 +407,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">purchase_line_tree_sequence</field>
         </record>
 
+        <record model="ir.model.access" id="access_purchase_line_group_stock">
+            <field name="model" search="[('model', '=', 'purchase.line')]"/>
+            <field name="group" ref="stock.group_stock"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
         <record model="ir.ui.view" id="product_supplier_view_form">
             <field name="model">purchase.product_supplier</field>
             <field name="type">form</field>
@@ -488,17 +517,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="act_product_supplier_price_form"/>
         </record>
 
-        <record model="ir.ui.view" id="template_view_form">
-            <field name="model">product.template</field>
-            <field name="inherit" ref="product.template_view_form"/>
-            <field name="name">template_form</field>
-        </record>
-        <record model="ir.ui.view" id="template_view_tree">
-            <field name="model">product.template</field>
-            <field name="inherit" ref="product.template_view_tree"/>
-            <field name="name">template_tree</field>
-        </record>
-
         <record model="ir.ui.view" id="return_purchase_start_view_form">
             <field name="model">purchase.return_purchase.start</field>
             <field name="type">form</field>
@@ -552,51 +570,5 @@ this repository contains the full copyright notices and license terms. -->
                 pyson="1"/>
             <field name="rule_group" ref="rule_group_purchase_companies"/>
         </record>
-
-        <record model="ir.model.access" id="access_invoice_purchase">
-            <field name="model" search="[('model', '=', 'account.invoice')]"/>
-            <field name="group" ref="group_purchase"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_invoice_line_purchase">
-            <field name="model" search="[('model', '=', 'account.invoice.line')]"/>
-            <field name="group" ref="group_purchase"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_move_group_purchase">
-            <field name="model" search="[('model', '=', 'stock.move')]"/>
-            <field name="group" ref="group_purchase"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_shipment_in_group_purchase">
-            <field name="model" search="[('model', '=', 'stock.shipment.in')]"/>
-            <field name="group" ref="group_purchase"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_shipment_in_return_group_purchase">
-            <field name="model" search="[('model', '=', 'stock.shipment.in.return')]"/>
-            <field name="group" ref="group_purchase"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
     </data>
 </tryton>
diff --git a/modules/purchase/stock.xml b/modules/purchase/stock.xml
index 02d07897c7..383e8c1ada 100644
--- a/modules/purchase/stock.xml
+++ b/modules/purchase/stock.xml
@@ -10,6 +10,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">move_list_shipment</field>
         </record>
 
+        <record model="ir.model.access" id="access_move_group_purchase">
+            <field name="model" search="[('model', '=', 'stock.move')]"/>
+            <field name="group" ref="group_purchase"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
         <record model="ir.ui.view" id="location_view_form">
             <field name="model">stock.location</field>
             <field name="inherit" ref="stock.location_view_form"/>
@@ -22,76 +31,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">move_list_shipment_in</field>
         </record>
 
-        <record model="ir.model.access" id="access_purchase_group_stock">
-            <field name="model" search="[('model', '=', 'purchase.purchase')]"/>
-            <field name="group" ref="stock.group_stock"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_purchase_line_group_stock">
-            <field name="model" search="[('model', '=', 'purchase.line')]"/>
-            <field name="group" ref="stock.group_stock"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.action.act_window" id="act_purchase_shipments_relate">
-            <field name="name">Purchases</field>
-            <field name="res_model">purchase.purchase</field>
-            <field name="domain"
-                eval="[('shipments', 'in', Eval('active_ids'))]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_purchase_shipments_relate_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="purchase_view_tree"/>
-            <field name="act_window" ref="act_purchase_shipments_relate"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_purchase_shipments_relate_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="purchase_view_form"/>
-            <field name="act_window" ref="act_purchase_shipments_relate"/>
-        </record>
-        <record model="ir.action.keyword"
-            id="act_purchase_shipments_relate_keyword">
-            <field name="keyword">form_relate</field>
-            <field name="model">stock.shipment.in,-1</field>
-            <field name="action" ref="act_purchase_shipments_relate"/>
-        </record>
-
-        <record model="ir.action.act_window" id="act_purchase_shipment_returns_relate">
-            <field name="name">Purchases</field>
-            <field name="res_model">purchase.purchase</field>
-            <field name="domain"
-                eval="[('shipment_returns', 'in', Eval('active_ids'))]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_purchase_shipment_returns_relate_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="purchase_view_tree"/>
-            <field name="act_window" ref="act_purchase_shipment_returns_relate"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_purchase_shipment_returns_relate_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="purchase_view_form"/>
-            <field name="act_window" ref="act_purchase_shipment_returns_relate"/>
-        </record>
-        <record model="ir.action.keyword"
-            id="act_purchase_shipment_returns_relate_keyword">
-            <field name="keyword">form_relate</field>
-            <field name="model">stock.shipment.in.return,-1</field>
-            <field name="action" ref="act_purchase_shipment_returns_relate"/>
-        </record>
-
         <record model="ir.action.act_window" id="act_purchase_move_relate">
             <field name="name">Moves</field>
             <field name="res_model">stock.move</field>
@@ -115,5 +54,51 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">purchase.purchase,-1</field>
             <field name="action" ref="act_purchase_move_relate"/>
         </record>
+
+        <record model="ir.action.act_window" id="act_shipment_form">
+            <field name="name">Shipments</field>
+            <field name="res_model">stock.shipment.in</field>
+            <field name="domain"
+                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_shipment_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">purchase.purchase,-1</field>
+            <field name="action" ref="act_shipment_form"/>
+        </record>
+
+        <record model="ir.model.access" id="access_shipment_in_group_purchase">
+            <field name="model" search="[('model', '=', 'stock.shipment.in')]"/>
+            <field name="group" ref="group_purchase"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
+        <record model="ir.action.act_window" id="act_return_form">
+            <field name="name">Returns</field>
+            <field name="res_model">stock.shipment.in.return</field>
+            <field name="domain"
+                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+            id="act_open_shipment_return_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">purchase.purchase,-1</field>
+            <field name="action" ref="act_return_form"/>
+        </record>
+
+        <record model="ir.model.access" id="access_shipment_in_return_group_purchase">
+            <field name="model" search="[('model', '=', 'stock.shipment.in.return')]"/>
+            <field name="group" ref="group_purchase"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
     </data>
 </tryton>
diff --git a/modules/purchase/tryton.cfg b/modules/purchase/tryton.cfg
index e20c23cbf1..19025e9df9 100644
--- a/modules/purchase/tryton.cfg
+++ b/modules/purchase/tryton.cfg
@@ -19,4 +19,5 @@ xml:
     party.xml
     stock.xml
     product.xml
+    invoice.xml
     message.xml
diff --git a/modules/sale/invoice.xml b/modules/sale/invoice.xml
new file mode 100644
index 0000000000..958e81be84
--- /dev/null
+++ b/modules/sale/invoice.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+        <record model="ir.action.act_window" id="act_invoice_form">
+            <field name="name">Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="domain"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('lines.origin.sale.id', '=', Eval('active_id'), 'sale.line'), ('lines.origin.sale.id', 'in', Eval('active_ids'), 'sale.line'))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_invoice_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">sale.sale,-1</field>
+            <field name="action" ref="act_invoice_form"/>
+        </record>
+
+        <record model="ir.model.access" id="access_invoice_sale">
+            <field name="model" search="[('model', '=', 'account.invoice')]"/>
+            <field name="group" ref="group_sale"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
+        <record model="ir.model.access" id="access_invoice_line_sale">
+            <field name="model" search="[('model', '=', 'account.invoice.line')]"/>
+            <field name="group" ref="group_sale"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+    </data>
+</tryton>
diff --git a/modules/sale/party.xml b/modules/sale/party.xml
index 23475514bd..87cfb22ddd 100644
--- a/modules/sale/party.xml
+++ b/modules/sale/party.xml
@@ -3,25 +3,23 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-        <record model="ir.action.act_window" id="act_sale_form2">
-            <field name="name">Sales</field>
-            <field name="res_model">sale.sale</field>
-            <field name="domain"
-                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
-                pyson="1"/>
-            <field name="search_value" eval="[('state', 'not in', ['done', 'cancelled'])]" pyson="1"/>
+        <record model="ir.ui.view" id="party_view_form">
+            <field name="model">party.party</field>
+            <field name="inherit" ref="party.party_view_form"/>
+            <field name="name">party_form</field>
         </record>
-        <record model="ir.action.keyword"
-                id="act_open_sale_keyword1">
-            <field name="keyword">form_relate</field>
-            <field name="model">party.party,-1</field>
-            <field name="action" ref="act_sale_form2"/>
-        </record>
-        <record model="ir.action-res.group"
-            id="act_sale_form2-group_sale">
-            <field name="action" ref="act_sale_form2"/>
-            <field name="group" ref="group_sale"/>
+
+        <record model="ir.action.wizard" id="act_open_customer">
+            <field name="name">Parties associated to Sales</field>
+            <field name="wiz_name">sale.open_customer</field>
         </record>
+        <menuitem
+            name="Associated to Sales"
+            parent="party.menu_party_form"
+            action="act_open_customer"
+            sequence="50"
+            id="menu_customer"
+            icon="tryton-list"/>
 
         <record model="ir.model.field.access" id="access_party_sale_invoice_method">
             <field name="field" search="[('model.model', '=', 'party.party'), ('name', '=', 'sale_invoice_method')]"/>
diff --git a/modules/sale/product.xml b/modules/sale/product.xml
index 26a2e5d77b..bd39a1776a 100644
--- a/modules/sale/product.xml
+++ b/modules/sale/product.xml
@@ -3,6 +3,17 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
+        <record model="ir.ui.view" id="template_view_form">
+            <field name="model">product.template</field>
+            <field name="inherit" ref="product.template_view_form"/>
+            <field name="name">template_form</field>
+        </record>
+        <record model="ir.ui.view" id="template_view_tree">
+            <field name="model">product.template</field>
+            <field name="inherit" ref="product.template_view_tree"/>
+            <field name="name">template_tree</field>
+        </record>
+
         <record model="ir.ui.view" id="product_view_list_sale_line">
             <field name="model">product.product</field>
             <field name="type">tree</field>
diff --git a/modules/sale/sale.xml b/modules/sale/sale.xml
index 1a56ee32fb..d677893379 100644
--- a/modules/sale/sale.xml
+++ b/modules/sale/sale.xml
@@ -94,19 +94,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">sale.sale,-1</field>
             <field name="action" ref="act_return_form"/>
         </record>
-        <record model="ir.action.act_window" id="act_invoice_form">
-            <field name="name">Invoices</field>
-            <field name="res_model">account.invoice</field>
-            <field name="domain"
-                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('lines.origin.sale.id', '=', Eval('active_id'), 'sale.line'), ('lines.origin.sale.id', 'in', Eval('active_ids'), 'sale.line'))]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.keyword"
-                id="act_open_invoice_keyword1">
-            <field name="keyword">form_relate</field>
-            <field name="model">sale.sale,-1</field>
-            <field name="action" ref="act_invoice_form"/>
-        </record>
 
         <record model="ir.action.act_window" id="act_sale_form">
             <field name="name">Sales</field>
@@ -263,6 +250,26 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="act_sale_shipment_returns_relate"/>
         </record>
 
+        <record model="ir.action.act_window" id="act_sale_form2">
+            <field name="name">Sales</field>
+            <field name="res_model">sale.sale</field>
+            <field name="domain"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
+                pyson="1"/>
+            <field name="search_value" eval="[('state', 'not in', ['done', 'cancelled'])]" pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_sale_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">party.party,-1</field>
+            <field name="action" ref="act_sale_form2"/>
+        </record>
+        <record model="ir.action-res.group"
+            id="act_sale_form2-group_sale">
+            <field name="action" ref="act_sale_form2"/>
+            <field name="group" ref="group_sale"/>
+        </record>
+
         <record model="ir.model.access" id="access_sale">
             <field name="model" search="[('model', '=', 'sale.sale')]"/>
             <field name="perm_read" eval="False"/>
@@ -279,6 +286,18 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
+        <record model="ir.rule.group" id="rule_group_sale_companies">
+            <field name="name">User in companies</field>
+            <field name="model" search="[('model', '=', 'sale.sale')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_sale_companies">
+            <field name="domain"
+                eval="[('company', 'in', Eval('companies', []))]"
+                pyson="1"/>
+            <field name="rule_group" ref="rule_group_sale_companies"/>
+        </record>
+
         <record model="ir.model.button" id="sale_cancel_button">
             <field name="name">cancel</field>
             <field name="string">Cancel</field>
@@ -411,34 +430,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">sale_line_tree_sequence</field>
         </record>
 
-        <record model="ir.ui.view" id="template_view_form">
-            <field name="model">product.template</field>
-            <field name="inherit" ref="product.template_view_form"/>
-            <field name="name">template_form</field>
-        </record>
-        <record model="ir.ui.view" id="template_view_tree">
-            <field name="model">product.template</field>
-            <field name="inherit" ref="product.template_view_tree"/>
-            <field name="name">template_tree</field>
-        </record>
-
-        <record model="ir.ui.view" id="party_view_form">
-            <field name="model">party.party</field>
-            <field name="inherit" ref="party.party_view_form"/>
-            <field name="name">party_form</field>
-        </record>
-        <record model="ir.action.wizard" id="act_open_customer">
-            <field name="name">Parties associated to Sales</field>
-            <field name="wiz_name">sale.open_customer</field>
-        </record>
-        <menuitem
-            name="Associated to Sales"
-            parent="party.menu_party_form"
-            action="act_open_customer"
-            sequence="50"
-            id="menu_customer"
-            icon="tryton-list"/>
-
         <record model="ir.ui.view" id="return_sale_start_view_form">
             <field name="model">sale.return_sale.start</field>
             <field name="type">form</field>
@@ -469,63 +460,5 @@ this repository contains the full copyright notices and license terms. -->
                 eval="Eval('context', {}).get('modify_header', False)"
                 pyson="1"/>
         </record>
-
-        <record model="ir.rule.group" id="rule_group_sale_companies">
-            <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.sale')]"/>
-            <field name="global_p" eval="True"/>
-        </record>
-        <record model="ir.rule" id="rule_sale_companies">
-            <field name="domain"
-                eval="[('company', 'in', Eval('companies', []))]"
-                pyson="1"/>
-            <field name="rule_group" ref="rule_group_sale_companies"/>
-        </record>
-
-        <record model="ir.model.access" id="access_invoice_sale">
-            <field name="model" search="[('model', '=', 'account.invoice')]"/>
-            <field name="group" ref="group_sale"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_invoice_line_sale">
-            <field name="model" search="[('model', '=', 'account.invoice.line')]"/>
-            <field name="group" ref="group_sale"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_move_group_sale">
-            <field name="model" search="[('model', '=', 'stock.move')]"/>
-            <field name="group" ref="group_sale"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_shipment_out_group_sale">
-            <field name="model" search="[('model', '=', 'stock.shipment.out')]"/>
-            <field name="group" ref="group_sale"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
-        <record model="ir.model.access" id="access_shipment_out_return_group_sale">
-            <field name="model" search="[('model', '=', 'stock.shipment.out.return')]"/>
-            <field name="group" ref="group_sale"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-
     </data>
 </tryton>
diff --git a/modules/sale/stock.xml b/modules/sale/stock.xml
index 5b2cd70f34..a075f01b62 100644
--- a/modules/sale/stock.xml
+++ b/modules/sale/stock.xml
@@ -10,6 +10,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">move_list_shipment</field>
         </record>
 
+        <record model="ir.model.access" id="access_move_group_sale">
+            <field name="model" search="[('model', '=', 'stock.move')]"/>
+            <field name="group" ref="group_sale"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
         <record model="ir.action.act_window" id="act_sale_move_relate">
             <field name="name">Moves</field>
             <field name="res_model">stock.move</field>
@@ -33,5 +42,23 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">sale.sale,-1</field>
             <field name="action" ref="act_sale_move_relate"/>
         </record>
+
+        <record model="ir.model.access" id="access_shipment_out_group_sale">
+            <field name="model" search="[('model', '=', 'stock.shipment.out')]"/>
+            <field name="group" ref="group_sale"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+
+        <record model="ir.model.access" id="access_shipment_out_return_group_sale">
+            <field name="model" search="[('model', '=', 'stock.shipment.out.return')]"/>
+            <field name="group" ref="group_sale"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
     </data>
 </tryton>
diff --git a/modules/sale/tryton.cfg b/modules/sale/tryton.cfg
index 8efde8f247..1d7d972006 100644
--- a/modules/sale/tryton.cfg
+++ b/modules/sale/tryton.cfg
@@ -20,4 +20,5 @@ xml:
     party.xml
     stock.xml
     product.xml
+    invoice.xml
     message.xml