diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py index 3f1362350f6..e8e755008e9 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'], + 'depends': ['event', 'sale_management'], 'data': [ 'views/event_views.xml', 'views/product_views.xml', diff --git a/addons/mrp_repair/__manifest__.py b/addons/mrp_repair/__manifest__.py index c059e8a8865..8227b91cf3d 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', 'account'], + 'depends': ['stock', 'sale_management', '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 52c39542e88..74eff3a8bac 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'], + 'depends': ['point_of_sale', 'sale_management'], '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 fb94d392dff..a139939f2a1 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', 'purchase'], + 'depends': ['base', 'product', 'delivery', 'stock', 'sale_management', '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 8ce49065d04..8c92979cbff 100644 --- a/addons/sale/__manifest__.py +++ b/addons/sale/__manifest__.py @@ -3,49 +3,16 @@ { 'name': 'Sales', - 'version': '1.0', + 'version': '1.1', 'category': 'Sales', - 'sequence': 15, - 'summary': 'Quotations, Sales Orders, Invoicing', + 'summary': 'Sales internal machinery', '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) +This module contains all the common features of Sales Management and eCommerce. """, - 'website': 'https://www.odoo.com/page/crm', - 'depends': ['sales_team', 'account', 'procurement', 'web_tour'], + 'depends': ['sales_team', 'account', 'procurement'], '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', @@ -68,5 +35,4 @@ The Dashboard for the Sales Manager will include 'css': ['static/src/css/sale.css'], 'installable': True, 'auto_install': False, - 'application': True, -} +} \ No newline at end of file diff --git a/addons/sale/tests/__init__.py b/addons/sale/tests/__init__.py index c37b8ebd5a0..3aac8a509ba 100644 --- a/addons/sale/tests/__init__.py +++ b/addons/sale/tests/__init__.py @@ -3,4 +3,3 @@ 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/views/sale_templates.xml b/addons/sale/views/sale_templates.xml index 5cfef351d60..103b2f6ad5b 100644 --- a/addons/sale/views/sale_templates.xml +++ b/addons/sale/views/sale_templates.xml @@ -4,7 +4,6 @@ diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 58cff62bab2..6ae6bce2b4c 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -10,6 +10,10 @@ id="sales_team.menu_base_partner" web_icon="sale,static/description/icon.png"/> + + + + - diff --git a/addons/sale_crm/__manifest__.py b/addons/sale_crm/__manifest__.py index 6c06ceaface..4217c735064 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', 'crm'], + 'depends': ['sale_management', '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 8a60ee9b281..69958e40f7c 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', 'hr_expense'], + 'depends': ['sale_management', 'hr_expense'], 'data': [ 'views/product_view.xml', ], diff --git a/addons/sale_management/__init__.py b/addons/sale_management/__init__.py new file mode 100644 index 00000000000..67dee8c60db --- /dev/null +++ b/addons/sale_management/__init__.py @@ -0,0 +1,2 @@ +# -*- 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 new file mode 100644 index 00000000000..3d16dfbf00a --- /dev/null +++ b/addons/sale_management/__manifest__.py @@ -0,0 +1,51 @@ +# -*- 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/sale_management_templates.xml', + ], + 'application': True, +} diff --git a/addons/sale/data/sale_tour.xml b/addons/sale_management/data/sale_management_tour.xml similarity index 100% rename from addons/sale/data/sale_tour.xml rename to addons/sale_management/data/sale_management_tour.xml diff --git a/addons/sale/static/description/icon.png b/addons/sale_management/static/description/icon.png similarity index 100% rename from addons/sale/static/description/icon.png rename to addons/sale_management/static/description/icon.png diff --git a/addons/sale/static/description/index.html b/addons/sale_management/static/description/index.html similarity index 100% rename from addons/sale/static/description/index.html rename to addons/sale_management/static/description/index.html diff --git a/addons/sale/static/description/sale_sc_00.png b/addons/sale_management/static/description/sale_sc_00.png similarity index 100% rename from addons/sale/static/description/sale_sc_00.png rename to addons/sale_management/static/description/sale_sc_00.png diff --git a/addons/sale/static/description/sale_sc_01.png b/addons/sale_management/static/description/sale_sc_01.png similarity index 100% rename from addons/sale/static/description/sale_sc_01.png rename to addons/sale_management/static/description/sale_sc_01.png diff --git a/addons/sale/static/description/sale_sc_02a.png b/addons/sale_management/static/description/sale_sc_02a.png similarity index 100% rename from addons/sale/static/description/sale_sc_02a.png rename to addons/sale_management/static/description/sale_sc_02a.png diff --git a/addons/sale/static/description/sale_sc_02b.png b/addons/sale_management/static/description/sale_sc_02b.png similarity index 100% rename from addons/sale/static/description/sale_sc_02b.png rename to addons/sale_management/static/description/sale_sc_02b.png diff --git a/addons/sale/static/description/sale_sc_02c.png b/addons/sale_management/static/description/sale_sc_02c.png similarity index 100% rename from addons/sale/static/description/sale_sc_02c.png rename to addons/sale_management/static/description/sale_sc_02c.png diff --git a/addons/sale/static/description/sale_sc_03.png b/addons/sale_management/static/description/sale_sc_03.png similarity index 100% rename from addons/sale/static/description/sale_sc_03.png rename to addons/sale_management/static/description/sale_sc_03.png diff --git a/addons/sale/static/description/sale_sc_05.png b/addons/sale_management/static/description/sale_sc_05.png similarity index 100% rename from addons/sale/static/description/sale_sc_05.png rename to addons/sale_management/static/description/sale_sc_05.png diff --git a/addons/sale/static/src/js/tour.js b/addons/sale_management/static/src/js/tour.js similarity index 99% rename from addons/sale/static/src/js/tour.js rename to addons/sale_management/static/src/js/tour.js index 8b46b2bc902..29b7e328e57 100644 --- a/addons/sale/static/src/js/tour.js +++ b/addons/sale_management/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 app.'), + content: _t('Organize your sales activities with the Sales Management app.'), position: 'bottom', }, { trigger: ".oe_kanban_action_button", diff --git a/addons/sale_management/tests/__init__.py b/addons/sale_management/tests/__init__.py new file mode 100644 index 00000000000..ec46cdcd6ca --- /dev/null +++ b/addons/sale_management/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- 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/tests/test_sale_ui.py b/addons/sale_management/tests/test_sale_ui.py similarity index 100% rename from addons/sale/tests/test_sale_ui.py rename to addons/sale_management/tests/test_sale_ui.py diff --git a/addons/sale_management/views/sale_management_templates.xml b/addons/sale_management/views/sale_management_templates.xml new file mode 100644 index 00000000000..50517640187 --- /dev/null +++ b/addons/sale_management/views/sale_management_templates.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/addons/sale_management/views/sale_management_views.xml b/addons/sale_management/views/sale_management_views.xml new file mode 100644 index 00000000000..5dd359fb3bb --- /dev/null +++ b/addons/sale_management/views/sale_management_views.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/addons/sale_margin/__manifest__.py b/addons/sale_margin/__manifest__.py index 2e901ec0f74..7ead9ff4c02 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'], + 'depends':['sale_management'], '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 8d63ed20dd8..fde12c1884f 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', 'stock_account'], + 'depends': ['sale_management', '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 89e5f4eb9cb..87a456b3e3e 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', 'hr_timesheet'], + 'depends': ['sale_management', 'hr_timesheet'], 'data': [ 'data/sale_timesheet_data.xml', 'views/account_invoice_views.xml', diff --git a/addons/website_quote/__manifest__.py b/addons/website_quote/__manifest__.py index 6df6b4fbc1f..946a4b621dd 100644 --- a/addons/website_quote/__manifest__.py +++ b/addons/website_quote/__manifest__.py @@ -11,7 +11,7 @@ Odoo Sale Quote Roller ========================= """, - 'depends': ['website', 'sale', 'mail', 'payment', 'website_portal_sale', 'website_mail'], + 'depends': ['website', 'sale_management', 'mail', 'payment', 'website_portal_sale', 'website_mail'], 'data': [ 'data/website_quote_data.xml', 'report/sale_order_reports.xml',