-
- Order #
- Quotation #
-
-
- Pro-Forma Invoice #
-
+ Pro-Forma Invoice #
+ Quotation #
+ Order #
-
+
Your Reference:
-
- Order Date:
-
-
-
- Quotation Date:
+
+
diff --git a/addons/sale/views/mail_activity_views.xml b/addons/sale/views/mail_activity_views.xml
index e0f453ae228..15b9f2de144 100644
--- a/addons/sale/views/mail_activity_views.xml
+++ b/addons/sale/views/mail_activity_views.xml
@@ -1,6 +1,6 @@
-
+
Activity Types
mail.activity.type
@@ -8,8 +8,5 @@
['|', ('res_model', '=', False), ('res_model', '=', 'sale.order')]
{'default_res_model': 'sale.order'}
-
-
\ No newline at end of file
+
+
diff --git a/addons/sale/views/payment_views.xml b/addons/sale/views/payment_views.xml
index c04e203528e..ef3b702d874 100644
--- a/addons/sale/views/payment_views.xml
+++ b/addons/sale/views/payment_views.xml
@@ -1,30 +1,30 @@
-
-
- payment.acquirer.form.inherit.sale.payment
- payment.acquirer
-
-
-
-
-
-
- payment.transaction.form.inherit.sale.payment
- payment.transaction
-
-
-
-
-
-
-
+
+ payment.acquirer.form.inherit.sale.payment
+ payment.acquirer
+
+
+
+
+
+
+
+ payment.transaction.form.inherit.sale.payment
+ payment.transaction
+
+
+
+
+
+
+
diff --git a/addons/sale/views/product_packaging_views.xml b/addons/sale/views/product_packaging_views.xml
index 23b395c90e7..7e5e6795759 100644
--- a/addons/sale/views/product_packaging_views.xml
+++ b/addons/sale/views/product_packaging_views.xml
@@ -1,13 +1,14 @@
+
product.packaging.form.view.sale
product.packaging
-
+
+
@@ -16,9 +17,10 @@
product.packaging
-
+
+
+
diff --git a/addons/sale/views/product_views.xml b/addons/sale/views/product_views.xml
index 82f52914589..2c3ee71f6c1 100644
--- a/addons/sale/views/product_views.xml
+++ b/addons/sale/views/product_views.xml
@@ -1,24 +1,121 @@
-
- product.template.sales
+
+ product.template.form.view.inherit.sale
product.template
-
+
0
-
+
+
+
+
+
-
-
+ Quotation Date:
+ Order Date:
-
+
+
-
+
@@ -170,7 +171,8 @@
-
- Sales Analysis
- sale.report
- pivot
-
-
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 1e623181231..7bb5546e9e4 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import tools
-from odoo import api, fields, models
+from odoo import api, fields, models, tools
class SaleReport(models.Model):
@@ -53,9 +52,9 @@ class SaleReport(models.Model):
discount = fields.Float('Discount %', readonly=True)
discount_amount = fields.Float('Discount Amount', readonly=True)
- campaign_id = fields.Many2one('utm.campaign', 'Campaign')
- medium_id = fields.Many2one('utm.medium', 'Medium')
- source_id = fields.Many2one('utm.source', 'Source')
+ campaign_id = fields.Many2one('utm.campaign', 'Campaign', readonly=True)
+ medium_id = fields.Many2one('utm.medium', 'Medium', readonly=True)
+ source_id = fields.Many2one('utm.source', 'Source', readonly=True)
order_id = fields.Many2one('sale.order', 'Order #', readonly=True)
@@ -157,17 +156,3 @@ class SaleReport(models.Model):
# self._table = sale_report
tools.drop_view_if_exists(self.env.cr, self._table)
self.env.cr.execute("""CREATE or REPLACE VIEW %s as (%s)""" % (self._table, self._query()))
-
-class SaleOrderReportProforma(models.AbstractModel):
- _name = 'report.sale.report_saleproforma'
- _description = 'Proforma Report'
-
- @api.model
- def _get_report_values(self, docids, data=None):
- docs = self.env['sale.order'].browse(docids)
- return {
- 'doc_ids': docs.ids,
- 'doc_model': 'sale.order',
- 'docs': docs,
- 'proforma': True
- }
diff --git a/addons/sale/report/sale_report.xml b/addons/sale/report/sale_report.xml
deleted file mode 100644
index e3160d14d83..00000000000
--- a/addons/sale/report/sale_report.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- Quotation / Order
- sale.order
- qweb-pdf
- sale.report_saleorder
- sale.report_saleorder
- (object.state in ('draft', 'sent') and 'Quotation - %s' % (object.name)) or 'Order - %s' % (object.name)
- report
-
-
-
- PRO-FORMA Invoice
- sale.order
- qweb-pdf
- sale.report_saleorder_pro_forma
- sale.report_saleorder_pro_forma
- 'PRO-FORMA - %s' % (object.name)
- report
-
-
-
diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml
index 33bfcdfe7b4..2300f7a4619 100644
--- a/addons/sale/report/sale_report_views.xml
+++ b/addons/sale/report/sale_report_views.xml
@@ -49,8 +49,8 @@
{'search_default_Sales':1, 'group_by_no_leaf':1,'group_by':[]}
This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
+
+
+ Sales Analysis
+ sale.report
+ pivot
+
+
+
+ Quotations Analysis
+ sale.report
+ graph
+ [('state','=','draft'),('team_id', '=', active_id)]
+ {'search_default_order_month':1}
+ This report performs analysis on your quotations. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
+
+
+
+ Sales Analysis
+ sale.report
+ graph
+ [('state','not in',('draft','cancel'))]
+ {
+ 'search_default_Sales': 1,
+ 'search_default_filter_date': 1,
+ 'search_default_team_id': [active_id]}
+ This report performs analysis on your sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
+
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index e6b7d46fcb9..2648ea4aa65 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -50,7 +50,6 @@ access_account_tax_sale_manager,account.tax sale manager,account.model_account_t
access_account_tax_group_sale_manager,account.tax.group sale manager,account.model_account_tax_group,sales_team.group_sale_salesman,1,0,0,0
access_account_account_sale_manager,account.account sale manager,account.model_account_account,sales_team.group_sale_manager,1,0,0,0
access_mail_activity_type_sale_manager,mail.activity.type.sale.manager,mail.model_mail_activity_type,sales_team.group_sale_manager,1,1,1,1
-access_report_all_channels_sales,access_report_all_channels_sales,model_report_all_channels_sales,sales_team.group_sale_manager,1,0,0,0
access_sale_payment_acquirer_onboarding_wizard,access.sale.payment.acquirer.onboarding.wizard,model_sale_payment_acquirer_onboarding_wizard,base.group_system,1,1,1,0
access_sale_advance_payment_inv,access.sale.advance.payment.inv,model_sale_advance_payment_inv,sales_team.group_sale_salesman,1,1,1,0
access_sale_order_cancel,access.sale.order.cancel,model_sale_order_cancel,sales_team.group_sale_salesman,1,1,1,0
diff --git a/addons/sale/views/account_views.xml b/addons/sale/views/account_views.xml
new file mode 100644
index 00000000000..0147296f53b
--- /dev/null
+++ b/addons/sale/views/account_views.xml
@@ -0,0 +1,94 @@
+
+
+
+
+ account.move.groupby
+ account.move
+
+
+
+
+
+
+
+
+
+ account.move.tree.inherit.sale
+ account.move
+
+
+
+
+
+
+
+ Account Invoice
+ account.move
+
+
+
+ product.group_discount_per_so_line
+
+
+
+
+
+
+
+
+
+
+
+
+ Invoices
+ account.move
+ tree,form,kanban
+ [
+ ('state', '=', 'posted'),
+ ('move_type', 'in', ['out_invoice', 'out_refund'])]
+ {
+ 'search_default_team_id': [active_id],
+ 'default_team_id': active_id,
+ 'default_move_type':'out_invoice',
+ 'move_type':'out_invoice',
+ 'journal_type': 'sale',
+ }
+
+
+
+
+
+
+ 1
+ tree
+
+
+
+ 2
+ form
+
+
+
diff --git a/addons/sale/views/crm_team_views.xml b/addons/sale/views/crm_team_views.xml
index e702e094449..d473b62cd2e 100644
--- a/addons/sale/views/crm_team_views.xml
+++ b/addons/sale/views/crm_team_views.xml
@@ -1,41 +1,30 @@
-
- crm.team.form
- crm.team
- 9
-
-
-
-
-
-
-
-
-
- account.invoice.report.search.inherit
- account.invoice.report
-
-
-
-
-
-
-
+
+
+ Quotations
+ ir.actions.act_window
+ sale.order
+ tree,form,calendar,graph,kanban,pivot
+ {
+ 'search_default_team_id': [active_id],
+ 'default_team_id': active_id,
+ 'show_address': 1,
+ }
+
+ []
+
+
+
-
New Quotation
sale.order
@@ -50,6 +39,64 @@
+
+ Sales Orders
+ ir.actions.act_window
+ sale.order
+ tree,form,calendar,graph,kanban,pivot
+ [('state','not in',('draft','sent','cancel'))]
+ {
+ 'search_default_team_id': [active_id],
+ 'default_team_id': active_id,
+ }
+
+
+
+
+
+
+ Sales Orders
+ ir.actions.act_window
+ sale.order
+ tree,form,calendar,graph,kanban,pivot
+ [('invoice_status','=','to invoice')]
+ {
+ 'search_default_team_id': [active_id],
+ 'default_team_id': active_id,
+ }
+
+
+
+
+
+
+ crm.team.form
+ crm.team
+ 9
+
+
+
+
+
+
+
crm.team.view.kanban.dashboard.inherit.sale
crm.team
@@ -118,7 +165,7 @@
-
Expiration:
@@ -111,14 +112,14 @@
- -
+
Fiscal Position Remark:
diff --git a/addons/sale/report/report_all_channels_sales.py b/addons/sale/report/report_all_channels_sales.py deleted file mode 100644 index b5355b4d776..00000000000 --- a/addons/sale/report/report_all_channels_sales.py +++ /dev/null @@ -1,87 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import api, fields, models, tools - - -class PosSaleReport(models.Model): - _name = "report.all.channels.sales" - _description = "Sales by Channel (All in One)" - _auto = False - - name = fields.Char('Order Reference', readonly=True) - partner_id = fields.Many2one('res.partner', 'Partner', readonly=True) - product_id = fields.Many2one('product.product', string='Product', readonly=True) - product_tmpl_id = fields.Many2one('product.template', 'Product Template', readonly=True) - date_order = fields.Datetime(string='Date Order', readonly=True) - user_id = fields.Many2one('res.users', 'Salesperson', readonly=True) - categ_id = fields.Many2one('product.category', 'Product Category', readonly=True) - company_id = fields.Many2one('res.company', 'Company', readonly=True) - price_total = fields.Float('Total', readonly=True) - pricelist_id = fields.Many2one('product.pricelist', 'Pricelist', readonly=True) - country_id = fields.Many2one('res.country', 'Partner Country', readonly=True) - price_subtotal = fields.Float(string='Price Subtotal', readonly=True) - product_qty = fields.Float('Product Quantity', readonly=True) - analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account', readonly=True) - team_id = fields.Many2one('crm.team', 'Sales Team', readonly=True) - - def _so(self): - so_str = """ - SELECT sol.id AS id, - so.name AS name, - so.partner_id AS partner_id, - sol.product_id AS product_id, - pro.product_tmpl_id AS product_tmpl_id, - so.date_order AS date_order, - so.user_id AS user_id, - pt.categ_id AS categ_id, - so.company_id AS company_id, - sol.price_total / CASE COALESCE(so.currency_rate, 0) WHEN 0 THEN 1.0 ELSE so.currency_rate END AS price_total, - so.pricelist_id AS pricelist_id, - rp.country_id AS country_id, - sol.price_subtotal / CASE COALESCE(so.currency_rate, 0) WHEN 0 THEN 1.0 ELSE so.currency_rate END AS price_subtotal, - (sol.product_uom_qty / u.factor * u2.factor) as product_qty, - so.analytic_account_id AS analytic_account_id, - so.team_id AS team_id - - FROM sale_order_line sol - JOIN sale_order so ON (sol.order_id = so.id) - LEFT JOIN product_product pro ON (sol.product_id = pro.id) - JOIN res_partner rp ON (so.partner_id = rp.id) - LEFT JOIN product_template pt ON (pro.product_tmpl_id = pt.id) - LEFT JOIN product_pricelist pp ON (so.pricelist_id = pp.id) - LEFT JOIN uom_uom u on (u.id=sol.product_uom) - LEFT JOIN uom_uom u2 on (u2.id=pt.uom_id) - WHERE so.state in ('sale','done') - """ - return so_str - - def _from(self): - return """(%s)""" % (self._so()) - - def _get_main_request(self): - request = """ - CREATE or REPLACE VIEW %s AS - SELECT id AS id, - name, - partner_id, - product_id, - product_tmpl_id, - date_order, - user_id, - categ_id, - company_id, - price_total, - pricelist_id, - analytic_account_id, - country_id, - team_id, - price_subtotal, - product_qty - FROM %s - AS foo""" % (self._table, self._from()) - return request - - def init(self): - tools.drop_view_if_exists(self.env.cr, self._table) - self.env.cr.execute(self._get_main_request()) diff --git a/addons/sale/report/report_all_channels_sales_views.xml b/addons/sale/report/report_all_channels_sales_views.xml deleted file mode 100644 index e6f3cc065ef..00000000000 --- a/addons/sale/report/report_all_channels_sales_views.xml +++ /dev/null @@ -1,8 +0,0 @@ - -+ Create a customer invoice +
+ Create invoices, register payments and keep track of the discussions with your customers. +
+
-
-
-
- + Create a new quotation, the first step of a new sale! +
+ Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
+
+ Create a new quotation, the first step of a new sale! +
+ Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
+
+
+
+
+
+
+
+
+
You can invoice them before they are delivered.
-
-
+
+
+ product.product.sale.order
+ product.product
+
+
+
+
+
+
+
+
+
+ product.template.sale.order.button
+ product.template
+
+
+
+
+
+
+
+
+
+ Products
+ ir.actions.act_window
+ product.template
+ kanban,tree,form,activity
+ {"search_default_filter_to_sell":1, "sale_multi_pricelist_product_template": 1}
+
+
+
+
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index bbf000397bb..c3ad55b67b1 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -8,7 +8,11 @@
-
Invoice after delivery, based on quantities delivered, not ordered.
+
+
+
+
+
+
+
+
+ + Create a new product +
+ You must define a product for everything you sell or purchase, + whether it's a storable product, a consumable or a service. +
+
+
Product Catalog
@@ -446,11 +450,4 @@
{'module' : 'sale_management', 'bin_size': False}
-
-
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index 9a283f83f99..048e2effe80 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -1,87 +1,91 @@
-
- Quotations and Sales
- sale.order
- tree,form,graph
- {'search_default_partner_id': active_id, 'default_partner_id': active_id}
-
-
-
-
-
- res.partner.kanban.saleorder.inherit
- res.partner
-
-
-
-
-
-
-
+
+ Quotations and Sales
+ sale.order
+ tree,form,graph
+ {'search_default_partner_id': active_id, 'default_partner_id': active_id}
+
+
+
-
- res.partner.view.buttons
- res.partner
-
-
-
-
-
+
+ res.partner.kanban.saleorder.inherit
+ res.partner
+
+
+
-
+
+
+
+
+
+
-
- res.partner.view.form.payment.defaultcreditcard
- res.partner
-
-
+
+
diff --git a/addons/sale/views/sale_menus.xml b/addons/sale/views/sale_menus.xml
new file mode 100644
index 00000000000..47699e5a74f
--- /dev/null
+++ b/addons/sale/views/sale_menus.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
diff --git a/addons/sale/views/sale_onboarding_views.xml b/addons/sale/views/sale_onboarding_views.xml
index b913649b966..55d6dc20826 100644
--- a/addons/sale/views/sale_onboarding_views.xml
+++ b/addons/sale/views/sale_onboarding_views.xml
@@ -23,7 +23,7 @@
Sample Quotation
Send a quotation to test the customer portal.
diff --git a/addons/sale/views/sale_order_line_views.xml b/addons/sale/views/sale_order_line_views.xml
new file mode 100644
index 00000000000..6852a63f2cd
--- /dev/null
+++ b/addons/sale/views/sale_order_line_views.xml
@@ -0,0 +1,111 @@
+
+
+
+
+ sale.order.line.tree
+ sale.order.line
+
+
+
+
+
+
+
+ sale.order.line.form.readonly
+ sale.order.line
+
+
+
+
+
+
+ sale.order.line.select
+ sale.order.line
+
+
+
+
+
+
+
+
+
+ sale.order.line.kanban
+ sale.order.line
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
new file mode 100644
index 00000000000..9aa0d5c72dd
--- /dev/null
+++ b/addons/sale/views/sale_order_views.xml
@@ -0,0 +1,903 @@
+
+
+
+
+
+
+ sale.order.activity
+ sale.order
+
+
+
+
+
+
+
+
+
+ sale.order.calendar
+ sale.order
+
+
+
+
+
+
+
+ sale.order.graph
+ sale.order
+
+
+
+
+
+
+
+ sale.order.pivot
+ sale.order
+
+
+
+
+
+
+
+ sale.order.kanban
+ sale.order
+
+
+
+
+
+
+
+
+
+
+
+
+ sale.order.tree
+ sale.order
+ 2
+
+
+
+
+
+
+
+ sale.order.tree
+ sale.order
+ 4
+
+
+
+
+
+
+
+ sale.order.tree
+ sale.order
+ primary
+
+
+ /sales/sale_quotation_onboarding_panel
+
+
+
+
+
+ sale.order.form
+ sale.order
+
+
+
+
+
+
+ sale.order.form
+ sale.order
+
+
+
+
+
+
+ sale.order.list.select
+ sale.order
+
+
+
+
+
+
+
+
+
+ sale.order.search.inherit.quotation
+ sale.order
+ primary
+
+
+
+
+
+
+
+ sale.order.search.inherit.sale
+ sale.order
+ primary
+
+
+
+
+
+
+
+
+
+ Sales Orders
+ ir.actions.act_window
+ sale.order
+ tree,kanban,form,calendar,pivot,graph,activity
+ {}
+ [('state', 'not in', ('draft', 'sent', 'cancel'))]
+
+
+
+
+
+ tree
+
+
+
+ kanban
+
+
+
+ form
+
+
+
+ calendar
+
+
+
+ pivot
+
+
+
+ graph
+
+
+
+ Quotations
+ ir.actions.act_window
+ sale.order
+ tree,kanban,form,calendar,pivot,graph,activity
+ {'search_default_my_quotation': 1}
+
+
+
+
+
+ Quotations
+ ir.actions.act_window
+ sale.order
+ tree,kanban,form,calendar,pivot,graph,activity
+ {'search_default_my_quotation': 1}
+
+
+
+
+
+ tree
+
+
+
+ kanban
+
+
+
+ form
+
+
+
+ calendar
+
+
+
+ pivot
+
+
+
+ graph
+
+
+
+ Orders to Invoice
+ ir.actions.act_window
+ sale.order
+ tree,form,calendar,graph,pivot,kanban,activity
+ {'create': False}
+ [('invoice_status','=','to invoice')]
+
+
+
+
+
+ Orders to Upsell
+ ir.actions.act_window
+ sale.order
+ tree,form,calendar,graph,pivot,kanban,activity
+ [('invoice_status','=','upselling')]
+ {'create': False}
+
+
+
+
+
+
+
+ Mark Quotation as Sent
+ form,list
+ code
+ action = records.action_quotation_sent()
+
+
+
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 30c7b3e9d1b..2ede5480e1c 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -40,9 +40,6 @@
Quotations
-
-
@@ -59,8 +56,10 @@
- Cancelled
- Expired
+
+ Cancelled
+
+ Expired
@@ -68,6 +67,7 @@
+
Sales Orders
-
-
@@ -109,6 +106,7 @@
+
-
@@ -208,9 +213,15 @@
@@ -231,9 +242,15 @@
-
-
@@ -425,7 +464,9 @@
Products
Quantity
- Unit Price
+
+ Unit Price
+
Disc.%
@@ -449,7 +490,9 @@
-
+
+
-
-
-
- Subtotal
-
-
-
-
+
+
+ Subtotal
+
+
+
@@ -526,7 +567,7 @@
-
+
@@ -539,7 +580,7 @@
-
+
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml deleted file mode 100644 index 8f3c246b2b0..00000000000 --- a/addons/sale/views/sale_views.xml +++ /dev/null @@ -1,1382 +0,0 @@ - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Products
- ir.actions.act_window
- product.template
- kanban,tree,form,activity
- {"search_default_filter_to_sell":1, "sale_multi_pricelist_product_template": 1}
-
-
-
-
-
- product.template.product.website.form
- product.template
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- sale.order.activity
- sale.order
-
-
-
-
-
-
-
-
-
- sale.order.calendar
- sale.order
-
-
-
-
-
-
- sale.order.graph
- sale.order
-
-
-
-
-
-
- sale.order.pivot
- sale.order
-
-
-
-
-
-
-
-
- sale.order.kanban
- sale.order
-
-
-
-
-
-
-
-
-
-
-
- sale.order.tree
- sale.order
- 2
-
-
-
-
-
-
-
- sale.order.tree
- sale.order
- 4
-
-
-
-
-
-
- sale.order.tree
- sale.order
- primary
-
-
- /sales/sale_quotation_onboarding_panel
-
-
-
-
-
- sale.order.form
- sale.order
-
-
-
-
-
-
- sale.order.form
- sale.order
-
-
-
-
-
-
-
-
-
- sale.order.list.select
- sale.order
-
-
-
-
-
-
-
-
-
- sale.order.search.inherit.quotation
- sale.order
- primary
-
-
-
-
-
-
-
- sale.order.search.inherit.sale
- sale.order
- primary
-
-
-
-
-
-
-
- Sales Orders
- ir.actions.act_window
- sale.order
- tree,kanban,form,calendar,pivot,graph,activity
- {}
- [('state', 'not in', ('draft', 'sent', 'cancel'))]
-
-
-
-
-
- Sales Order
- ir.actions.act_window
- sale.order
- form,tree,kanban,calendar,pivot,graph,activity
-
-
-
-
-
- tree
-
-
-
- kanban
-
-
-
- form
-
-
-
- calendar
-
-
-
- pivot
-
-
-
- graph
-
-
-
-
-
- Orders to Invoice
- ir.actions.act_window
- sale.order
- tree,form,calendar,graph,pivot,kanban,activity
- {'create': False}
- [('invoice_status','=','to invoice')]
-
-
-
-
-
- Mark Quotation as Sent
- form,list
- code
- action = records.action_quotation_sent()
-
-
-
- Accrued Revenue Entry
- ir.actions.act_window
- account.accrued.orders.wizard
- form
- new
-
-
-
-
-
-
-
- Orders to Upsell
- ir.actions.act_window
- sale.order
- tree,form,calendar,graph,pivot,kanban,activity
- [('invoice_status','=','upselling')]
- {'create': False}
-
-
-
-
-
-
-
- Quotations
- ir.actions.act_window
- sale.order
- tree,kanban,form,calendar,pivot,graph,activity
- {'search_default_my_quotation': 1}
-
-
-
-
-
- Quotations
- ir.actions.act_window
- sale.order
- tree,kanban,form,calendar,pivot,graph,activity
- {'search_default_my_quotation': 1}
-
-
-
-
-
- tree
-
-
-
- kanban
-
-
-
- form
-
-
-
- calendar
-
-
-
- pivot
-
-
-
- graph
-
-
-
-
-
- sale.order.line.tree
- sale.order.line
-
-
-
-
-
-
-
- sale.order.line.form.readonly
- sale.order.line
-
-
-
-
-
-
- sale.order.line.select
- sale.order.line
-
-
-
-
-
-
-
-
-
- sale.order.line.kanban
- sale.order.line
-
-
-
-
-
-
-
-
-
-
-
- product.product.sale.order
- product.product
-
-
-
-
-
-
-
-
-
- product.template.sale.order.button
- product.template
-
-
-
-
-
-
-
-
-
- product.template.invoice.policy
- product.template
- 15
-
-
-
-
-
-
-
-
-
-
- account.move.groupby
- account.move
-
-
-
-
-
-
-
-
-
- account.move.tree.inherit.sale
- account.move
-
-
-
-
-
-
-
-
- Account Invoice
- account.move
-
-
-
- product.group_discount_per_so_line
-
-
-
-
-
-
-
-
-
-
-
-
-
- account.invoice.report.view.tree.inherit.sale
- account.invoice.report
-
-
-
-
-
-
-
-
- Sales Orders
- ir.actions.act_window
- sale.order
- tree,form,calendar,graph,kanban,pivot
- [('state','not in',('draft','sent','cancel'))]
- {
- 'search_default_team_id': [active_id],
- 'default_team_id': active_id,
- }
-
-
-
-
-
- Sales Orders
- ir.actions.act_window
- sale.order
- tree,form,calendar,graph,kanban,pivot
- [('invoice_status','=','to invoice')]
- {
- 'search_default_team_id': [active_id],
- 'default_team_id': active_id,
- }
-
-
-
- Quotations
- ir.actions.act_window
- sale.order
- tree,form,calendar,graph,kanban,pivot
- {
- 'search_default_team_id': [active_id],
- 'default_team_id': active_id,
- 'show_address': 1,
- }
-
- []
-
-
-
-
- Invoices
- account.move
- tree,form,kanban
- [
- ('state', '=', 'posted'),
- ('move_type', 'in', ['out_invoice', 'out_refund'])]
- {
- 'search_default_team_id': [active_id],
- 'default_team_id': active_id,
- 'default_move_type':'out_invoice',
- 'move_type':'out_invoice',
- 'journal_type': 'sale',
- }
-
-
-
-
-
-
- 1
- tree
-
-
-
- 2
- form
-
-
-
- Quotations Analysis
- sale.report
- graph
- [('state','=','draft'),('team_id', '=', active_id)]
- {'search_default_order_month':1}
- This report performs analysis on your quotations. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
-
-
-
- Sales Analysis
- sale.report
- graph
- [('state','not in',('draft','cancel'))]
- {
- 'search_default_Sales': 1,
- 'search_default_filter_date': 1,
- 'search_default_team_id': [active_id]}
- This report performs analysis on your sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
-
-
-
- Invoices Analysis
- account.invoice.report
- graph
- [('state', 'not in', ['draft', 'cancel'])]
- {'search_default_month':1, 'search_default_team_id': [active_id]}
- From this report, you can have an overview of the amount invoiced to your customer. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs.
-
-
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 34ae33af786..d2b9385c1d2 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -4,6 +4,6 @@
from . import account_payment_register
from . import mail_compose_message
from . import payment_acquirer_onboarding_wizard
+from . import payment_link_wizard
from . import sale_make_invoice_advance
from . import sale_order_cancel
-from . import sale_payment_link
diff --git a/addons/sale/wizard/account_accrued_orders_wizard_views.xml b/addons/sale/wizard/account_accrued_orders_wizard_views.xml
new file mode 100644
index 00000000000..86fb34f6ef8
--- /dev/null
+++ b/addons/sale/wizard/account_accrued_orders_wizard_views.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ Accrued Revenue Entry
+ ir.actions.act_window
+ account.accrued.orders.wizard
+ form
+ new
+
+
+
diff --git a/addons/sale/wizard/sale_payment_link.py b/addons/sale/wizard/payment_link_wizard.py
similarity index 100%
rename from addons/sale/wizard/sale_payment_link.py
rename to addons/sale/wizard/payment_link_wizard.py
diff --git a/addons/sale/wizard/sale_payment_link_views.xml b/addons/sale/wizard/payment_link_wizard_views.xml
similarity index 100%
rename from addons/sale/wizard/sale_payment_link_views.xml
rename to addons/sale/wizard/payment_link_wizard_views.xml
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index ec9fd4ecb68..f53e83797a4 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -38,17 +38,24 @@ The Dashboard for the Sales Manager will include
'website': 'https://www.odoo.com/app/sales',
'depends': ['sale', 'digest'],
'data': [
- 'security/sale_management_security.xml',
+ # TODO VFE add data validation on manifest loading
+ # We were loading digest_data twice...
'data/digest_data.xml',
- 'views/sale_portal_templates.xml',
- 'views/sale_order_template_views.xml',
+
'security/ir.model.access.csv',
- 'views/res_config_settings_views.xml',
- 'data/digest_data.xml',
- 'views/sale_management_views.xml',
- 'views/digest_views.xml',
- 'views/sale_order_views.xml',
+ 'security/sale_management_security.xml',
+
'report/sale_report_templates.xml',
+
+ # Define SO template views & actions before their place of use
+ 'views/sale_order_template_views.xml',
+
+ 'views/digest_views.xml',
+ 'views/res_config_settings_views.xml',
+ 'views/sale_order_views.xml',
+ 'views/sale_portal_templates.xml',
+
+ 'views/sale_management_menus.xml',
],
'demo': [
'data/sale_order_template_demo.xml',
diff --git a/addons/sale_management/views/digest_views.xml b/addons/sale_management/views/digest_views.xml
index 15ec910aed2..23dd96166cd 100644
--- a/addons/sale_management/views/digest_views.xml
+++ b/addons/sale_management/views/digest_views.xml
@@ -1,18 +1,20 @@
+
digest.digest.view.form.inherit.sale.order
digest.digest
10
-
+
Sales
sales_team.group_sale_salesman_all_leads
-
-
+
+
+
+
diff --git a/addons/sale_management/views/res_config_settings_views.xml b/addons/sale_management/views/res_config_settings_views.xml
index 03c9d6d3e88..635e32e0551 100644
--- a/addons/sale_management/views/res_config_settings_views.xml
+++ b/addons/sale_management/views/res_config_settings_views.xml
@@ -47,4 +47,15 @@
+
+ res.config.settings.view.form.inherit.sale.management
+ res.config.settings
+
+
+ app_settings_block
+
+
+
+
diff --git a/addons/sale_management/views/sale_management_menus.xml b/addons/sale_management/views/sale_management_menus.xml
new file mode 100644
index 00000000000..dc9a2010733
--- /dev/null
+++ b/addons/sale_management/views/sale_management_menus.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale_management/views/sale_management_views.xml b/addons/sale_management/views/sale_management_views.xml
deleted file mode 100644
index a099504ed27..00000000000
--- a/addons/sale_management/views/sale_management_views.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- res.config.settings.view.form.inherit.sale.management
- res.config.settings
-
-
- app_settings_block
-
-
-
-
-
diff --git a/addons/sale_management/views/sale_order_template_views.xml b/addons/sale_management/views/sale_order_template_views.xml
index a27a12f2cef..cccbed28706 100644
--- a/addons/sale_management/views/sale_order_template_views.xml
+++ b/addons/sale_management/views/sale_order_template_views.xml
@@ -144,6 +144,4 @@
-
-
diff --git a/addons/sale_management/views/sale_order_views.xml b/addons/sale_management/views/sale_order_views.xml
index ddffddf1cf7..4b353512fdf 100644
--- a/addons/sale_management/views/sale_order_views.xml
+++ b/addons/sale_management/views/sale_order_views.xml
@@ -1,17 +1,20 @@
+
- sale.order.form.payment
+ sale.order.form.inherit.sale_management
sale.order
-
-
-
+
+
- Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
+ Create a new quotation, the first step of a new sale! +
+ Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Create a new quotation, the first step of a new sale! +
+ Once the quotation is confirmed, it becomes a sales order.
You will be able to create an invoice and collect the payment.
+
+ Create a new quotation, the first step of a new sale! +
+ Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
+
+ Create a new quotation, the first step of a new sale! +
+ Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
+
+ No orders to invoice found +
+ You can select all orders and invoice them in batch,
+ or check every order and invoice them one by one.
+
+ No orders to upsell found. +
+ An order is to upsell when delivered quantities are above initially + ordered quantities, and the invoicing policy is based on ordered quantities. +
+ As an example, if you sell pre-paid hours of services, Odoo recommends you + to sell extra hours when all ordered hours have been consumed. +
+There are currently no quotations for your account.
-There are currently no quotations for your account.
@@ -78,9 +78,6 @@There are currently no orders for your account.
-There are currently no orders for your account.
@@ -177,14 +175,21 @@Salesperson
+
+ Salesperson
+
- ![Contact]()
+ ![Contact]()
-
- Send message
+
+
+ Send message
+
By signing this proposal, I agree to the following terms:
-
-
- Accepted on the behalf of: -
- For an amount of: -
- With payment terms: +
- + Accepted on the behalf of: + +
- + For an amount of: + +
- + With payment terms: +
By paying this proposal, I agree to the following terms:
-
-
- Accepted on the behalf of: -
- For an amount of: -
- With payment terms: +
- + Accepted on the behalf of: + +
- + For an amount of: + +
- + With payment terms: +
@@ -265,8 +282,12 @@
@@ -276,8 +297,12 @@
Thank You!
-Your order has been confirmed.
- Your order has been signed but still needs to be paid to be confirmed.
+
+ Your order has been confirmed.
+
+
+ Your order has been signed but still needs to be paid to be confirmed.
+
Your order has been signed.
@@ -380,19 +405,29 @@
-
- Invoicing and Shipping Address:
- Invoicing Address:
-
+
+
+ Invoicing and Shipping Address:
+
+
+ Invoicing Address:
+
+
+
+
+
+
+ Shipping Address:
+
+
-
- Shipping Address:
-
-
-
Invoices
@@ -406,8 +441,12 @@
- Paid
- Waiting Payment
+
+ Paid
+
+
+ Waiting Payment
+
Date:
@@ -494,17 +537,15 @@
Terms & Conditions
Payment terms
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml deleted file mode 100644 index 8f3c246b2b0..00000000000 --- a/addons/sale/views/sale_views.xml +++ /dev/null @@ -1,1382 +0,0 @@ - -
- Create a new product -
- You must define a product for everything you sell or purchase, - whether it's a storable product, a consumable or a service. -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
- Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
- No orders to invoice found -
- You can select all orders and invoice them in batch,
- or check every order and invoice them one by one.
-
- No orders to upsell found. -
- An order is to upsell when delivered quantities are above initially - ordered quantities, and the invoicing policy is based on ordered quantities. -
- As an example, if you sell pre-paid hours of services, Odoo recommends you - to sell extra hours when all ordered hours have been consumed. -
-- Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
- Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
-
-
-
-
-
-
-
-
-
-
-
- - Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
- Create a new quotation, the first step of a new sale! -
- Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment.
-
- Create a customer invoice -
- Create invoices, register payments and keep track of the discussions with your customers. -
-