diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index aa48fc8477c..2986ed2650a 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -1,22 +1,27 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
{
- 'name' : 'Invoicing',
+ 'name' : 'Invoicing Management',
'version' : '1.1',
'summary': 'Send Invoices and Track Payments',
'sequence': 30,
'description': """
-Core mechanisms for the accounting modules. To display the menuitems, install the module account_invoicing.
+Invoicing & Payments
+====================
+The specific and easy-to-use Invoicing system in Odoo allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your vendors and customers.
+
+You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. This module also offers you an easy method of registering payments, without having to encode complete abstracts of account.
""",
- 'category': 'Accounting',
+ 'category': 'Invoicing Management',
'website': 'https://www.odoo.com/page/billing',
'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
- 'depends' : ['base_setup', 'product', 'analytic', 'portal'],
+ 'depends' : ['base_setup', 'product', 'analytic', 'portal', 'digest'],
'data': [
'security/account_security.xml',
'security/ir.model.access.csv',
'data/data_account_type.xml',
'data/account_data.xml',
+ 'data/digest_data.xml',
'views/account_menuitem.xml',
'views/account_payment_view.xml',
'wizard/account_reconcile_view.xml',
@@ -72,6 +77,7 @@ Core mechanisms for the accounting modules. To display the menuitems, install th
'views/account_incoterms_view.xml',
'data/account_incoterms_data.xml',
'views/res_company_view.xml',
+ 'views/digest_views.xml',
],
'demo': [
'demo/account_demo.xml',
@@ -83,7 +89,7 @@ Core mechanisms for the accounting modules. To display the menuitems, install th
"static/src/xml/account_dashboard_setup_bar.xml",
],
'installable': True,
- 'application': False,
+ 'application': True,
'auto_install': False,
'post_init_hook': '_auto_install_l10n',
}
diff --git a/addons/account_invoicing/data/digest_data.xml b/addons/account/data/digest_data.xml
similarity index 100%
rename from addons/account_invoicing/data/digest_data.xml
rename to addons/account/data/digest_data.xml
diff --git a/addons/account/models/__init__.py b/addons/account/models/__init__.py
index ce16eb3044d..144bc6bc2ba 100644
--- a/addons/account/models/__init__.py
+++ b/addons/account/models/__init__.py
@@ -18,3 +18,4 @@ from . import reconciliation_widget
from . import res_users
from . import res_company
from . import account_incoterms
+from . import digest
diff --git a/addons/account_invoicing/models/digest.py b/addons/account/models/digest.py
similarity index 100%
rename from addons/account_invoicing/models/digest.py
rename to addons/account/models/digest.py
diff --git a/addons/account_invoicing/static/description/account_sc_00.png b/addons/account/static/description/account_sc_00.png
similarity index 100%
rename from addons/account_invoicing/static/description/account_sc_00.png
rename to addons/account/static/description/account_sc_00.png
diff --git a/addons/account_invoicing/static/description/account_sc_01.png b/addons/account/static/description/account_sc_01.png
similarity index 100%
rename from addons/account_invoicing/static/description/account_sc_01.png
rename to addons/account/static/description/account_sc_01.png
diff --git a/addons/account_invoicing/static/description/account_sc_03.png b/addons/account/static/description/account_sc_03.png
similarity index 100%
rename from addons/account_invoicing/static/description/account_sc_03.png
rename to addons/account/static/description/account_sc_03.png
diff --git a/addons/account_invoicing/static/description/account_voucher.png b/addons/account/static/description/account_voucher.png
similarity index 100%
rename from addons/account_invoicing/static/description/account_voucher.png
rename to addons/account/static/description/account_voucher.png
diff --git a/addons/account_invoicing/static/description/analysis.png b/addons/account/static/description/analysis.png
similarity index 100%
rename from addons/account_invoicing/static/description/analysis.png
rename to addons/account/static/description/analysis.png
diff --git a/addons/account_invoicing/static/description/icon.png b/addons/account/static/description/icon.png
similarity index 100%
rename from addons/account_invoicing/static/description/icon.png
rename to addons/account/static/description/icon.png
diff --git a/addons/account_invoicing/static/description/index.html b/addons/account/static/description/index.html
similarity index 100%
rename from addons/account_invoicing/static/description/index.html
rename to addons/account/static/description/index.html
diff --git a/addons/account_invoicing/static/src/js/tour.js b/addons/account/static/src/js/tour.js
similarity index 87%
rename from addons/account_invoicing/static/src/js/tour.js
rename to addons/account/static/src/js/tour.js
index 2c76f936356..74b0dcda95b 100644
--- a/addons/account_invoicing/static/src/js/tour.js
+++ b/addons/account/static/src/js/tour.js
@@ -1,4 +1,4 @@
-odoo.define('account_invoicing.tour', function(require) {
+odoo.define('account.tour', function(require) {
"use strict";
var core = require('web.core');
@@ -6,7 +6,7 @@ var tour = require('web_tour.tour');
var _t = core._t;
-tour.register('account_invoicing_tour', {
+tour.register('account_tour', {
'skip_enabled': true,
}, [{
trigger: ".o_form_readonly .o_invoice_validate",
diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
index a6da2f17b5f..70d525890d1 100644
--- a/addons/account/views/account.xml
+++ b/addons/account/views/account.xml
@@ -25,6 +25,7 @@
+
diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 463c7f41823..3de92d67644 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -6,13 +6,9 @@
-
-
-
-
diff --git a/addons/account_invoicing/views/digest_views.xml b/addons/account/views/digest_views.xml
similarity index 95%
rename from addons/account_invoicing/views/digest_views.xml
rename to addons/account/views/digest_views.xml
index e8ccec68fe7..7398744d194 100644
--- a/addons/account_invoicing/views/digest_views.xml
+++ b/addons/account/views/digest_views.xml
@@ -1,7 +1,7 @@
- digest.digest.view.form.inherit.account.account_invoicing
+ digest.digest.view.form.inherit.account.accountdigest.digest
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 25749791a1f..ce18cf8ee7c 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -16,7 +16,7 @@
-