diff --git a/addons/crm/views/crm_team_views.xml b/addons/crm/views/crm_team_views.xml index 140e3922f8d..0d15737638f 100644 --- a/addons/crm/views/crm_team_views.xml +++ b/addons/crm/views/crm_team_views.xml @@ -1,30 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - Leads diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index dc9f349f00b..c85bf787320 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -149,7 +149,7 @@ - + delivery.price.rule.form diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py index e8e755008e9..3f1362350f6 100644 --- a/addons/event_sale/__manifest__.py +++ b/addons/event_sale/__manifest__.py @@ -18,7 +18,7 @@ that product, you will be able to choose an existing event of that category and when you confirm your sales order it will automatically create a registration for this event. """, - 'depends': ['event', 'sale_management'], + 'depends': ['event', 'sale'], 'data': [ 'views/event_views.xml', 'views/product_views.xml', diff --git a/addons/mrp_repair/__manifest__.py b/addons/mrp_repair/__manifest__.py index 8227b91cf3d..c059e8a8865 100644 --- a/addons/mrp_repair/__manifest__.py +++ b/addons/mrp_repair/__manifest__.py @@ -21,7 +21,7 @@ The following topics are covered by this module: * Repair quotation report * Notes for the technician and for the final customer """, - 'depends': ['stock', 'sale_management', 'account'], + 'depends': ['stock', 'sale', 'account'], 'website': 'https://www.odoo.com/page/manufacturing', 'data': [ 'security/ir.model.access.csv', diff --git a/addons/pos_sale/__manifest__.py b/addons/pos_sale/__manifest__.py index 74eff3a8bac..52c39542e88 100644 --- a/addons/pos_sale/__manifest__.py +++ b/addons/pos_sale/__manifest__.py @@ -14,7 +14,7 @@ This module adds a custom Sales Channel for the point of sale to be able to view and manage your point of sale sales with more ease. """, - 'depends': ['point_of_sale', 'sale_management'], + 'depends': ['point_of_sale', 'sale'], 'data': [ 'data/pos_sale_data.xml', 'security/pos_sale_security.xml', diff --git a/addons/report_intrastat/__manifest__.py b/addons/report_intrastat/__manifest__.py index a139939f2a1..fb94d392dff 100644 --- a/addons/report_intrastat/__manifest__.py +++ b/addons/report_intrastat/__manifest__.py @@ -10,7 +10,7 @@ A module that adds intrastat reports. This module gives the details of the goods traded between the countries of European Union.""", - 'depends': ['base', 'product', 'delivery', 'stock', 'sale_management', 'purchase'], + 'depends': ['base', 'product', 'delivery', 'stock', 'sale', 'purchase'], 'data': [ 'data/report_intrastat_data.xml', 'report/report_intrastat_invoice_template.xml', diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py index 30611258802..8ce49065d04 100644 --- a/addons/sale/__manifest__.py +++ b/addons/sale/__manifest__.py @@ -3,16 +3,49 @@ { 'name': 'Sales', - 'version': '1.1', + 'version': '1.0', 'category': 'Sales', - 'summary': 'Sales internal machinery', + 'sequence': 15, + 'summary': 'Quotations, Sales Orders, Invoicing', 'description': """ -This module contains all the common features of Sales Management and eCommerce. +Manage sales quotations and orders +================================== + +This application allows you to manage your sales goals in an effective and efficient manner by keeping track of all sales orders and history. + +It handles the full sales workflow: + +* **Quotation** -> **Sales order** -> **Invoice** + +Preferences (only with Warehouse Management installed) +------------------------------------------------------ + +If you also installed the Warehouse Management, you can deal with the following preferences: + +* Shipping: Choice of delivery at once or partial delivery +* Invoicing: choose how invoices will be paid +* Incoterms: International Commercial terms + +You can choose flexible invoicing methods: + +* *On Demand*: Invoices are created manually from Sales Orders when needed +* *On Delivery Order*: Invoices are generated from picking (delivery) +* *Before Delivery*: A Draft invoice is created and must be paid before delivery + +With this module you can personnalize the sales order and invoice report with +categories, subtotals or page-breaks. + +The Dashboard for the Sales Manager will include +------------------------------------------------ +* My Quotations +* Monthly Turnover (Graph) """, - 'depends': ['sales_team', 'account', 'procurement'], + 'website': 'https://www.odoo.com/page/crm', + 'depends': ['sales_team', 'account', 'procurement', 'web_tour'], 'data': [ 'data/ir_sequence_data.xml', 'data/sale_data.xml', + 'data/sale_tour.xml', 'report/sale_report.xml', 'data/mail_template_data.xml', 'report/sale_report_views.xml', @@ -35,4 +68,5 @@ This module contains all the common features of Sales Management and eCommerce. 'css': ['static/src/css/sale.css'], 'installable': True, 'auto_install': False, + 'application': True, } diff --git a/addons/sale_management/data/sale_management_tour.xml b/addons/sale/data/sale_tour.xml similarity index 100% rename from addons/sale_management/data/sale_management_tour.xml rename to addons/sale/data/sale_tour.xml diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml index 6016dd0e495..2a660a3616c 100644 --- a/addons/sale/report/sale_report_views.xml +++ b/addons/sale/report/sale_report_views.xml @@ -94,4 +94,6 @@ 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. + + diff --git a/addons/sale_management/static/description/icon.png b/addons/sale/static/description/icon.png similarity index 100% rename from addons/sale_management/static/description/icon.png rename to addons/sale/static/description/icon.png diff --git a/addons/sale_management/static/description/index.html b/addons/sale/static/description/index.html similarity index 100% rename from addons/sale_management/static/description/index.html rename to addons/sale/static/description/index.html diff --git a/addons/sale_management/static/description/sale_sc_00.png b/addons/sale/static/description/sale_sc_00.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_00.png rename to addons/sale/static/description/sale_sc_00.png diff --git a/addons/sale_management/static/description/sale_sc_01.png b/addons/sale/static/description/sale_sc_01.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_01.png rename to addons/sale/static/description/sale_sc_01.png diff --git a/addons/sale_management/static/description/sale_sc_02a.png b/addons/sale/static/description/sale_sc_02a.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_02a.png rename to addons/sale/static/description/sale_sc_02a.png diff --git a/addons/sale_management/static/description/sale_sc_02b.png b/addons/sale/static/description/sale_sc_02b.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_02b.png rename to addons/sale/static/description/sale_sc_02b.png diff --git a/addons/sale_management/static/description/sale_sc_02c.png b/addons/sale/static/description/sale_sc_02c.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_02c.png rename to addons/sale/static/description/sale_sc_02c.png diff --git a/addons/sale_management/static/description/sale_sc_03.png b/addons/sale/static/description/sale_sc_03.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_03.png rename to addons/sale/static/description/sale_sc_03.png diff --git a/addons/sale_management/static/description/sale_sc_05.png b/addons/sale/static/description/sale_sc_05.png similarity index 100% rename from addons/sale_management/static/description/sale_sc_05.png rename to addons/sale/static/description/sale_sc_05.png diff --git a/addons/sale_management/static/src/js/tour.js b/addons/sale/static/src/js/tour.js similarity index 99% rename from addons/sale_management/static/src/js/tour.js rename to addons/sale/static/src/js/tour.js index 29b7e328e57..8b46b2bc902 100644 --- a/addons/sale_management/static/src/js/tour.js +++ b/addons/sale/static/src/js/tour.js @@ -10,7 +10,7 @@ tour.register('sale_tour', { url: "/web", }, [tour.STEPS.MENU_MORE, { trigger: '.o_app[data-menu-xmlid="sales_team.menu_base_partner"], .oe_menu_toggler[data-menu-xmlid="sales_team.menu_base_partner"]', - content: _t('Organize your sales activities with the Sales Management app.'), + content: _t('Organize your sales activities with the Sales app.'), position: 'bottom', }, { trigger: ".oe_kanban_action_button", diff --git a/addons/sale/tests/__init__.py b/addons/sale/tests/__init__.py index 3aac8a509ba..c37b8ebd5a0 100644 --- a/addons/sale/tests/__init__.py +++ b/addons/sale/tests/__init__.py @@ -3,3 +3,4 @@ from . import test_sale_to_invoice from . import test_sale_order from . import test_product_id_change +from . import test_sale_ui diff --git a/addons/sale_management/tests/test_sale_ui.py b/addons/sale/tests/test_sale_ui.py similarity index 100% rename from addons/sale_management/tests/test_sale_ui.py rename to addons/sale/tests/test_sale_ui.py diff --git a/addons/sale/views/sale_layout_category_view.xml b/addons/sale/views/sale_layout_category_view.xml index 545346f1311..ecb0bbebb74 100644 --- a/addons/sale/views/sale_layout_category_view.xml +++ b/addons/sale/views/sale_layout_category_view.xml @@ -50,4 +50,12 @@ tree,form + diff --git a/addons/sale/views/sale_templates.xml b/addons/sale/views/sale_templates.xml index 103b2f6ad5b..5cfef351d60 100644 --- a/addons/sale/views/sale_templates.xml +++ b/addons/sale/views/sale_templates.xml @@ -4,6 +4,7 @@ diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 3af41ee3985..58cff62bab2 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -1,6 +1,36 @@ + + + + + + + + + + + + + + + + + + + + sale.order.calendar sale.order @@ -438,6 +468,10 @@ + + Orders to Invoice ir.actions.act_window @@ -456,6 +490,12 @@

+ + Orders to Upsell @@ -478,6 +518,9 @@

+ @@ -502,6 +545,10 @@ + + sale.order.line.tree sale.order.line diff --git a/addons/sale_crm/__manifest__.py b/addons/sale_crm/__manifest__.py index 4217c735064..6c06ceaface 100644 --- a/addons/sale_crm/__manifest__.py +++ b/addons/sale_crm/__manifest__.py @@ -17,7 +17,7 @@ We suggest you to install this module, if you installed both the sale and the cr modules. """, 'website': 'https://www.odoo.com/page/crm', - 'depends': ['sale_management', 'crm'], + 'depends': ['sale', 'crm'], 'data': [ 'security/ir.model.access.csv', 'views/partner_views.xml', diff --git a/addons/sale_expense/__manifest__.py b/addons/sale_expense/__manifest__.py index 69958e40f7c..8a60ee9b281 100644 --- a/addons/sale_expense/__manifest__.py +++ b/addons/sale_expense/__manifest__.py @@ -15,7 +15,7 @@ This module does not add any feature, despite a few demo data to test the features easily. """, 'website': 'https://www.odoo.com/page/warehouse', - 'depends': ['sale_management', 'hr_expense'], + 'depends': ['sale', 'hr_expense'], 'data': [ 'views/product_view.xml', ], diff --git a/addons/sale_management/__init__.py b/addons/sale_management/__init__.py deleted file mode 100644 index 67dee8c60db..00000000000 --- a/addons/sale_management/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py deleted file mode 100644 index 9f22b060c99..00000000000 --- a/addons/sale_management/__manifest__.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -{ - 'name': 'Sales Management', - 'version': '1.0', - 'category': 'Sales', - 'sequence': 15, - 'summary': 'Quotations, Sales Orders, Invoicing', - 'description': """ -Manage sales quotations and orders -================================== - -This application allows you to manage your sales goals in an effective and efficient manner by keeping track of all sales orders and history. - -It handles the full sales workflow: - -* **Quotation** -> **Sales order** -> **Invoice** - -Preferences (only with Warehouse Management installed) ------------------------------------------------------- - -If you also installed the Warehouse Management, you can deal with the following preferences: - -* Shipping: Choice of delivery at once or partial delivery -* Invoicing: choose how invoices will be paid -* Incoterms: International Commercial terms - -You can choose flexible invoicing methods: - -* *On Demand*: Invoices are created manually from Sales Orders when needed -* *On Delivery Order*: Invoices are generated from picking (delivery) -* *Before Delivery*: A Draft invoice is created and must be paid before delivery - -With this module you can personnalize the sales order and invoice report with -categories, subtotals or page-breaks. - -The Dashboard for the Sales Manager will include ------------------------------------------------- -* My Quotations -* Monthly Turnover (Graph) - """, - 'website': 'https://www.odoo.com/page/sales', - 'depends': ['sale'], - 'data': [ - 'data/sale_management_tour.xml', - 'views/sale_management_views.xml', - 'views/crm_team_views.xml', - 'views/sale_management_templates.xml', - ], - 'application': True, -} diff --git a/addons/sale_management/tests/__init__.py b/addons/sale_management/tests/__init__.py deleted file mode 100644 index ec46cdcd6ca..00000000000 --- a/addons/sale_management/tests/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import test_sale_ui diff --git a/addons/sale_management/views/crm_team_views.xml b/addons/sale_management/views/crm_team_views.xml deleted file mode 100644 index 7067f7bb124..00000000000 --- a/addons/sale_management/views/crm_team_views.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/sale_management/views/sale_management_templates.xml b/addons/sale_management/views/sale_management_templates.xml deleted file mode 100644 index 50517640187..00000000000 --- a/addons/sale_management/views/sale_management_templates.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 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 3169272db09..00000000000 --- a/addons/sale_management/views/sale_management_views.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/sale_margin/__manifest__.py b/addons/sale_margin/__manifest__.py index 4dbf1041738..2e901ec0f74 100644 --- a/addons/sale_margin/__manifest__.py +++ b/addons/sale_margin/__manifest__.py @@ -12,7 +12,7 @@ This module adds the 'Margin' on sales order. This gives the profitability by calculating the difference between the Unit Price and Cost Price. """, - 'depends': ['sale_management'], + 'depends':['sale'], 'demo':['data/sale_margin_demo.xml'], 'data':['security/ir.model.access.csv','views/sale_margin_view.xml'], 'uninstall_hook': "uninstall_hook", diff --git a/addons/sale_stock/__manifest__.py b/addons/sale_stock/__manifest__.py index fde12c1884f..8d63ed20dd8 100644 --- a/addons/sale_stock/__manifest__.py +++ b/addons/sale_stock/__manifest__.py @@ -25,7 +25,7 @@ You can choose flexible invoicing methods: * *Before Delivery*: A Draft invoice is created and must be paid before delivery """, 'website': 'https://www.odoo.com/page/warehouse', - 'depends': ['sale_management', 'stock_account'], + 'depends': ['sale', 'stock_account'], 'data': [ 'security/sale_stock_security.xml', 'security/ir.model.access.csv', diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py index 87a456b3e3e..89e5f4eb9cb 100644 --- a/addons/sale_timesheet/__manifest__.py +++ b/addons/sale_timesheet/__manifest__.py @@ -14,7 +14,7 @@ according to the order/contract you work on. This allows to have real delivered quantities in sales orders. """, 'website': 'https://www.odoo.com/page/warehouse', - 'depends': ['sale_management', 'hr_timesheet'], + 'depends': ['sale', 'hr_timesheet'], 'data': [ 'data/sale_timesheet_data.xml', 'views/account_invoice_views.xml', diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml index 757a5c9c465..a2d25ca0c38 100644 --- a/addons/sales_team/views/crm_team_views.xml +++ b/addons/sales_team/views/crm_team_views.xml @@ -2,31 +2,30 @@ - - - + - - + + - + + sequence="0" action="action_sale_config" groups="base.group_system"/> - - - - - - - - - - + + + + + + + + + + + @@ -161,7 +160,7 @@ - +