8000 [MERGE] Forward-port 10.0 up to 60ab3ab · rsecar/documentation-user@a53349e · GitHub
[go: up one dir, main page]
Skip to content

Commit a53349e

Browse files
tivissetivisse
committed
[MERGE] Forward-port 10.0 up to 60ab3ab 
2 parents 37d98c3 + 60ab3ab commit a53349e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2362
-2855
lines changed

‎accounting/bank/reconciliation/use_cases.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ to do is install the accounting app.
2525
.. image:: media/use01.png
2626
:align: center
2727

28-
User cases
29-
==========
28+
Use cases
29+
=========
3030

3131
Case 1: Payments registration
3232
-----------------------------

‎accounting/others/taxes/tax_included.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ How to set tax-included prices
33
==============================
44

55
In most countries, B2C prices are tax-included. To do that in Odoo, check
6-
*Included in Price* for your sales taxes in
7-
:menuselection:`Accounting --> Configuration --> Taxes`.
6+
*Included in Price* for each of your sales taxes in
7+
:menuselection:`Accounting --> Configuration --> Accounting --> Taxes`.
88

99
.. image:: media/tax_included.png
1010
:align: center

‎crm/salesteam/setup/create_team.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
=========================
2-
How to create a new team?
3-
=========================
1+
============================
2+
How to create a new channel?
3+
============================
44

5-
In the Sales module, your sales teams are accessible from the
5+
In the Sales module, your sales channels are accessible from the
66
**Dashboard** menu. If you start from a new instance, you will find a
7-
sales team installed by default : Direct sales. You can either start
8-
using that default sales team and edit it (refer to the section
7+
sales channel installed by default : Direct sales. You can either start
8+
using that default sales channel and edit it (refer to the section
99
*Create and Organize your stages* from the page :doc:`organize_pipeline`)
1010
or create a new one from scratch.
1111

12-
To create a new team, go to :menuselection:`Configuration --> Sales Teams` and
12+
To create a new channel, go to :menuselection:`Configuration --> Sales Channels` and
1313
click on **Create**.
1414

1515
.. image:: ./media/create01.png
1616
:align: center
1717

1818
Fill in the fields :
1919

20-
- Enter the name of your team
20+
- Enter the name of your channel
2121

22-
- Select your team leader
22+
- Select your channel leader
2323

2424
- Select your team members
2525

2626
Don't forget to tick the "Opportunities" box if you want to manage
2727
opportunities from it and to click on SAVE when you're done. Your can
28-
now access your new team from your Dashboard.
28+
now access your new channel from your Dashboard.
2929

3030
.. image:: ./media/create02.png
3131
:align: center

‎db_management/db_premise.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ Solutions
7878
effortlessly for your and for us.
7979

8080

81-
Too much users error message
82-
----------------------------
81+
Error message due to too many users
82+
-----------------------------------
8383

8484
If you have more users in your local database than provisionned in your
8585
Odoo Enterprise subscription, you may encounter this message:

‎inventory/barcode/setup/software.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ sure that your products are encoded in Odoo along with their barcodes.
3030
If this is not already done, you can fill in the products barcodes
3131
through a handy interface. Go to
3232
:menuselection:`Inventory --> Configuration --> Settings`
33-
and click the **Configure Product Barcodes** button. This
34-
interface can also be accessed via the planner.
33+
and click :menuselection:`Operations --> Barcode Scanner`.
34+
Click Save, and go back into the previous screen to click Configure
35+
Product Barcodes. This interface can also be accessed via the planner.
36+
3537

3638
.. note::
3739
Product variants: be careful to add barcodes directly on the

‎inventory/management/incoming/two_steps.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ This has completed the Receipt Step and the move refered with **WH/IN**.
7777
The product has been moved from the **Vendor** to the **WH/Input** location,
7878
which makes the product available for the next step.
7979

80-
How to to transfer the receipt to your stock ?
81-
-----------------------------------------------
80+
How to transfer the receipt to your stock ?
81+
--------------------------------------------
8282

8383
Go back to the **Inventory** dashboard. The waiting transfer is now
8484
ready. Click on the **# TRANSFERS** in the **Internal Transfers** to process
@@ -95,4 +95,4 @@ The receipt has been moved to your stock.
9595

9696
.. seealso::
9797
* :doc:`../delivery/inventory_flow`
98-
* :doc:`three_steps`
98+
* :doc:`three_steps`

‎inventory/management/misc/scrap.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ When you install inventory management, odoo automatically creates one
2828
default scrap location, namely **Virtual location/Scrapped**.
2929

3030
To create an extra scrap location, Go to
31-
:menuselection:`Inventory --> Configuration --> Setting`
31+
:menuselection:`Inventory --> Configuration --> Settings`
3232
and check **Manage several locations per warehouse**,
3333
then click on **Apply**.
3434

@@ -82,7 +82,7 @@ scrap products button on stock move in initial demand tab.
8282
----------------------------------------------------------
8383

8484
To scrap product from internal transfer, Go to
85-
:menuselection:`Inventory --> Dashboard --> Receipts`
85+
:menuselection:`Inventory --> Dashboard --> Internal Transfers`
8686

8787
.. image:: media/scrap05.png
8888
:align: center
@@ -103,4 +103,4 @@ quantity of products, and specify the scrap location, then click on
103103
.. note::
104104
To allow change scrap location on wizard, you have to select
105105
**Manage several location per warehouse** in the settings at
106-
:menuselection:`Inventory --> Configuration --> Setting`
106+
:menuselection:`Inventory --> Configuration --> Settings`

0 commit comments

Comments
 (0)
0