diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc5c856f649..5e2dc5dfb11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ TL;DR * If you [make a pull request](https://github.com/odoo/odoo/wiki/Contributing#making-pull-requests), do not create an issue! Use the PR description for that * Issues are handled with a much lower priority than pull requests -* Use this [template](https://github.com/odoo/odoo/tree/10.0/.github/ISSUE_TEMPLATE.md) +* Use this [template](https://github.com/odoo/odoo/tree/11.0/.github/ISSUE_TEMPLATE.md) when reporting issues. Please search for duplicates first! * Pull requests must be made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch) * There are restrictions on the kind of [changes allowed in stable series](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean) diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index 42fb892c60f..c9c4e8a5037 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -8,7 +8,7 @@
The first step if to
-
+
configure the expense types
that your company allows. Here are some examples:
@@ -90,7 +90,7 @@
As employees, there are - 2 ways to record expenses: + 2 ways to record expenses:
The next step is to settle an internal policy to - submit expenses to managers + submit expenses to managers
Depending on your company structure, the - approval process + approval process can be:
Once expense reports approved by managers, the accounting department checks accounts, products and taxes used. Then they - post them into the books and proceed with the employee reimbursement. + post them into the books and proceed with the employee reimbursement.
To do: @@ -260,7 +260,7 @@ Set Home Address to employees(used for reimbursement)
- If you track expenses on customer projects, you can charge them back to your customers automatically. Here are some advises to avoid conflictual situations: + If you track expenses on customer projects, you can charge them back to your customers automatically. Here are some advises to avoid conflictual situations: