[MERGE] Forward port of 11.0 up to c894f6aab9

2018-01-03 14:19:14 +01:00
parent 2acad399d8 c894f6aab9
commit 8ee1d05cb0
146 changed files with 11229 additions and 7049 deletions
@@ -31,11 +31,6 @@ management** feature
 .. image:: media/budget02.png
   :align: center

-If we want to be precise and point specific invoices and vendors bills
-to our budget, you should enable the Analytic accounting as well. If we
-don't we will only be able to budget the total amount of general
-accounts.
-
 Budgetary Positions
 -------------------

@@ -73,8 +68,7 @@ case select the relevant income accounts.
 Analytical account
 ------------------

-If you wish to point specific invoices or vendor bills to your budget
-you need to use analytical accounting. Odoo needs to know which costs or
+Odoo needs to know which costs or
 expenses are relevant to a specified budget. To do so we need to link
 our invoices and expenses to a defined analytical account. Create an
 analytical account by entering the Accounting module and clicking