diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index e7b23a61f1a..189dc41c6c6 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -13,7 +13,8 @@ This module contains all the common features of Sales Management and eCommerce.
'depends': ['sales_team', 'payment', 'portal', 'utm'],
'data': [
'security/ir.model.access.csv',
- 'security/sale_security.xml',
+ 'security/res_groups.xml',
+ 'security/ir_rules.xml',
'report/account_invoice_report_views.xml',
'report/ir_actions_report_templates.xml',
@@ -52,7 +53,7 @@ This module contains all the common features of Sales Management and eCommerce.
'views/sale_menus.xml', # Last because referencing actions defined in previous files
],
'demo': [
- 'data/product_product_demo.xml',
+ 'data/product_demo.xml',
'data/sale_demo.xml',
],
'installable': True,
diff --git a/addons/sale/data/ir_sequence_data.xml b/addons/sale/data/ir_sequence_data.xml
index 07379f90dda..39b662815bc 100644
--- a/addons/sale/data/ir_sequence_data.xml
+++ b/addons/sale/data/ir_sequence_data.xml
@@ -1,15 +1,12 @@
-
-
+
-
-
- Sales Order
- sale.order
- S
- 5
-
-
+
+ Sales Order
+ sale.order
+ S
+ 5
+
+
-
diff --git a/addons/sale/data/mail_templates.xml b/addons/sale/data/mail_templates.xml
index 8854ea30b83..a51640fce01 100644
--- a/addons/sale/data/mail_templates.xml
+++ b/addons/sale/data/mail_templates.xml
@@ -1,6 +1,9 @@
-
-
+
+
+
@@ -20,4 +23,5 @@
-
+
+
diff --git a/addons/sale/data/product_demo.xml b/addons/sale/data/product_demo.xml
new file mode 100644
index 00000000000..1ceb07a8c5a
--- /dev/null
+++ b/addons/sale/data/product_demo.xml
@@ -0,0 +1,253 @@
+
+
+
+
+ order
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ order
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ order
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ order
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+ delivery
+ cost
+
+
+
+ delivery
+
+
+
+ delivery
+
+
+
+
+ order
+ sales_price
+
+
+
+ delivery
+ cost
+
+
+
+ color
+
+
+ select
+
+
+
+ #FFFFFF
+
+
+ #000000
+
+
+
+ Custom
+
+ True
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DESK0005
+ 0.01
+
+
+
+ DESK0006
+ 0.01
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Deposit
+
+ service
+ 150.0
+ order
+ 100.0
+
+
+
+
+
+
+
+
diff --git a/addons/sale/data/product_product_demo.xml b/addons/sale/data/product_product_demo.xml
deleted file mode 100644
index ae030ceb96b..00000000000
--- a/addons/sale/data/product_product_demo.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
- order
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- order
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- order
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- order
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
-
-
-
- delivery
- cost
-
-
-
- delivery
-
-
-
- delivery
-
-
-
-
- order
- sales_price
-
-
-
- delivery
- cost
-
-
-
-
diff --git a/addons/sale/data/sale_data.xml b/addons/sale/data/sale_data.xml
index 8c7037993fb..ca713cb97fc 100644
--- a/addons/sale/data/sale_data.xml
+++ b/addons/sale/data/sale_data.xml
@@ -1,32 +1,21 @@
-
-
-
-
- Share
-
-
- form
- code
- action = records.action_share()
-
+
-
-
- sale.default_confirmation_template
-
-
+
+
+ sale.default_confirmation_template
+
+
-
- automatic invoicing: send ready invoice
-
- code
- model._cron_send_invoice()
-
- 1
- days
- -1
-
+
+ automatic invoicing: send ready invoice
+
+ code
+ model._cron_send_invoice()
+
+ 1
+ days
+ -1
+
-
diff --git a/addons/sale/data/sale_demo.xml b/addons/sale/data/sale_demo.xml
index 957f0e08f89..200e0df62e6 100644
--- a/addons/sale/data/sale_demo.xml
+++ b/addons/sale/data/sale_demo.xml
@@ -1,856 +1,742 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 250000
-
-
-
-
- 40000
-
-
-
- Sale Promotion 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
- 295.00
-
-
-
-
-
- 5
- 145.00
-
-
-
-
-
- 2
- 65.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 24
- 75.00
-
-
-
-
-
- 30
- 38.25
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 10
- 30.75
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 16
- 75.00
-
-
-
-
-
- 10
- 45.00
-
-
-
-
-
- 3
- 150.00
-
-
-
-
-
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 405.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 750.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 5
- 295.00
-
-
-
-
-
- 173.00
-
-
-
-
-
- 40.00
-
-
-
-
-
- 18.00
-
-
-
- Test/001
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
- 110.50
-
-
-
-
-
- 2
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
- 97.50
-
-
-
-
-
- 3
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
- 255.00
-
-
-
-
-
- 2
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
- 245.00
-
-
-
-
-
- 3
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 315.00
-
-
-
-
-
- 2
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 295.00
-
-
-
-
-
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4
- 275.00
-
-
-
-
-
- 4
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4
- 295.00
-
-
-
-
-
- 3
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
- 275.00
-
-
-
-
-
- 3
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
- 355.00
-
-
-
-
-
- 2
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
- 295.00
-
-
-
-
-
- 2
- 120.50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- sale.order
-
- Hi,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 250000
+
+
+
+
+ 40000
+
+
+
+ Sale Promotion 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ 295.00
+
+
+
+
+
+ 5
+ 145.00
+
+
+
+
+
+ 2
+ 65.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 24
+ 75.00
+
+
+
+
+
+ 30
+ 38.25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+ 30.75
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 16
+ 75.00
+
+
+
+
+
+ 10
+ 45.00
+
+
+
+
+
+ 3
+ 150.00
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 405.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 750.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ 295.00
+
+
+
+
+
+ 173.00
+
+
+
+
+
+ 40.00
+
+
+
+
+
+ 18.00
+
+
+
+ Test/001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ 110.50
+
+
+
+
+
+ 2
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ 97.50
+
+
+
+
+
+ 3
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ 255.00
+
+
+
+
+
+ 2
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ 245.00
+
+
+
+
+
+ 3
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 315.00
+
+
+
+
+
+ 2
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 295.00
+
+
+
+
+
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 275.00
+
+
+
+
+
+ 4
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 295.00
+
+
+
+
+
+ 3
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ 275.00
+
+
+
+
+
+ 3
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ 355.00
+
+
+
+
+
+ 2
+ 120.50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ 295.00
+
+
+
+
+
+ 2
+ 120.50
+
+
+
+
+
+
+
+
+ sent
+
+
+
+
+
+
+
+
+
+ 3
+ 295.00
+
+
+
+
+
+ 5
+ 145.00
+
+
+
+
+
+ 2
+ 65.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 24
+ 75.00
+
+
+
+
+
+ 30
+ 38.25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sale.order
+
+ Hi,
I have a question regarding services pricing: I heard of a possible discount for quantities exceeding 25 hours.
Could you confirm, please?
- comment
-
-
+ comment
+
+
-
- sale.order
-
-
- Hello,
+
+ sale.order
+
+
+ Hello,
Unfortunately that was a temporary discount that is not available anymore.
Do you still plan to confirm the order based on the quoted prices?
Thanks!
- comment
-
-
+ comment
+
+
-
- sale.order
-
-
- Alright, thanks for the clarification. I will confirm the order as soon as I get my manager's approval.
- comment
-
-
-
-
+
+ sale.order
+
+
+
+Alright, thanks for the clarification. I will confirm the order as soon as I get my manager's approval.
+
+ comment
+
+
-
- Deposit
-
- service
- 150.0
- order
- 100.0
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Answer questions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Check delivery requirements
+
+
+
+
+
+
+
+
+ Confirm Delivery
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Get quote confirmation
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- sent
-
-
-
-
-
-
-
-
-
- 3
- 295.00
-
-
-
-
-
- 5
- 145.00
-
-
-
-
-
- 2
- 65.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 24
- 75.00
-
-
-
-
-
- 30
- 38.25
-
-
-
- color
-
-
- select
-
-
-
- #FFFFFF
-
-
- #000000
-
-
-
-
-
-
-
-
-
-
- Custom
-
- True
- 3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DESK0005
- 0.01
-
-
-
- DESK0006
- 0.01
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Answer questions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Check delivery requirements
-
-
-
-
-
-
-
-
- Confirm Delivery
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Get quote confirmation
-
-
-
-
-
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/ir_rules.xml
similarity index 89%
rename from addons/sale/security/sale_security.xml
rename to addons/sale/security/ir_rules.xml
index bc79dfad330..20ffe21cd27 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/ir_rules.xml
@@ -1,45 +1,20 @@
-
+
-
- Lock Confirmed Sales
-
-
-
-
- A warning can be set on a product or a customer (Sale)
-
-
-
-
- Pro-forma Invoices
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Sales Order multi-company
[('company_id', 'in', company_ids)]
-
+
Sales Order Line multi-company
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
-
+
Sales Order Analysis multi-company
['|',('company_id','=',False),('company_id', 'in', company_ids)]
@@ -168,6 +143,7 @@
+
Personal Invoice Send and Print
@@ -182,7 +158,6 @@
-
Payment Acquier Onboarding Wizard Rule
@@ -200,5 +175,5 @@
[('create_uid', '=', user.id)]
-
+
diff --git a/addons/sale/security/res_groups.xml b/addons/sale/security/res_groups.xml
new file mode 100644
index 00000000000..932d3cec366
--- /dev/null
+++ b/addons/sale/security/res_groups.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ Lock Confirmed Sales
+
+
+
+
+ A warning can be set on a product or a customer (Sale)
+
+
+
+
+ Pro-forma Invoices
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/views/account_views.xml b/addons/sale/views/account_views.xml
index 0147296f53b..503ac00249d 100644
--- a/addons/sale/views/account_views.xml
+++ b/addons/sale/views/account_views.xml
@@ -31,24 +31,22 @@
account.move
-
-
- product.group_discount_per_so_line
-
-
-
-
-
-
-
-
-
-
-
-
+
+ product.group_discount_per_so_line
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/views/crm_team_views.xml b/addons/sale/views/crm_team_views.xml
index d473b62cd2e..df9eb34ac79 100644
--- a/addons/sale/views/crm_team_views.xml
+++ b/addons/sale/views/crm_team_views.xml
@@ -102,7 +102,6 @@
crm.team
-
@@ -182,8 +181,6 @@
-
-
diff --git a/addons/sale/views/product_views.xml b/addons/sale/views/product_views.xml
index 2c3ee71f6c1..fe533e1b95d 100644
--- a/addons/sale/views/product_views.xml
+++ b/addons/sale/views/product_views.xml
@@ -35,7 +35,7 @@
-
+
product.product.sale.order
product.product
@@ -68,7 +68,7 @@
-
+
product.template.sale.order.button
product.template
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index 048e2effe80..b9fe9b942de 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -16,7 +16,7 @@
-
+
res.partner.kanban.saleorder.inherit
res.partner
diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index 9aa0d5c72dd..40b1be8357b 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -900,4 +900,12 @@
action = records.action_quotation_sent()
+
+ Share
+
+
+ form
+ code
+ action = records.action_share()
+
diff --git a/addons/sale/views/utm_campaign_views.xml b/addons/sale/views/utm_campaign_views.xml
index 4de3a6389c1..854b15e013b 100644
--- a/addons/sale/views/utm_campaign_views.xml
+++ b/addons/sale/views/utm_campaign_views.xml
@@ -1,42 +1,43 @@
-
- utm.campaign.view.kanban
- utm.campaign
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- utm.campaign.view.form
- utm.campaign
-
-
-
-
-
-
-
-
+
+ utm.campaign.view.kanban
+ utm.campaign
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ utm.campaign.view.form
+ utm.campaign
+
+
+
+
+
+
+
+