[MOV] content/*: move resource files into their related page's directory
Since odoo/documentation#903, the guideline for the location of new resource (images, downloadable files, RST includes...) files is to place those inside the directory of the RST page that references them. For example, if `doc1.rst` has a reference to `image.png` and to `download.zip`, the file structure should look like this: ├── parent_doc/ │ └── doc1/ │ │ └── image.png │ │ └── download.zip │ └── doc1.rst │ └── doc2.rst ├── parent_doc.rst Before this commit, most of the resource files were still located inside 'media' directories holding all the resource files referenced by RST pages located at the same level as these directories. In the example above, a single 'media' directory would hold all the resource files referenced by both `doc1.rst` and `doc2.rst`. Doing so prevented us from figuring out easily which resource file was referenced by which RST page and, thus, lead to unused resource files piling up in the repository. It also made it more complicated to define codeowners regex rules because a team could not simply be assigned to `/some_page.*` but needed to be assigned to both `/some_page\.rst` and to the location of 'media'. In order to help new content writers figure out the guideline when taking examples from other RST pages, this commit retroactively applies the guideline to existing resource files and 'media' directories. The left-over resource files that are not referenced by any RST page are removed. task-2497965 Part-of: odoo/documentation#2068
@@ -20,17 +20,18 @@ Configuration
|
||||
The following modules needs to be installed to track cost. Enter the app
|
||||
module and install the following apps:
|
||||
|
||||
+---------------------------------+---------------------------------+---------------------------------+
|
||||
| .. image:: media/purchase01.png | .. image:: media/purchase02.png | .. image:: media/purchase03.png |
|
||||
+=================================+=================================+=================================+
|
||||
+---------------------------------+---------------------------------+---------------------------------+
|
||||
.. list-table::
|
||||
|
||||
- - .. image:: purchases_expenses/purchase01.png
|
||||
- .. image:: purchases_expenses/purchase02.png
|
||||
- .. image:: purchases_expenses/purchase03.png
|
||||
|
||||
Please note that the applications provided by these apps only allows us
|
||||
to **track** the costs. We won't be able to automatically re invoice
|
||||
those costs to our customers. To track and **re invoice costs** you
|
||||
should install the Sales management app as well.
|
||||
|
||||
.. image:: media/purchase04.png
|
||||
.. image:: purchases_expenses/purchase04.png
|
||||
:align: center
|
||||
|
||||
Enable Analytical accounting
|
||||
@@ -40,13 +41,13 @@ Next step is to activate the analytical accounting. In the accounting
|
||||
app, select :menuselection:`Configuration --> Settings` and thick the Analytic
|
||||
accounting box.
|
||||
|
||||
.. image:: media/purchase05.png
|
||||
.. image:: purchases_expenses/purchase05.png
|
||||
:align: center
|
||||
|
||||
Moreover, scroll down and tick the **Analytic accounting for purchases**
|
||||
box.
|
||||
|
||||
.. image:: media/purchase06.png
|
||||
.. image:: purchases_expenses/purchase06.png
|
||||
:align: center
|
||||
|
||||
Don't forget to save your changes.
|
||||
@@ -59,7 +60,7 @@ point all your expenses. Enter the accounting app, select
|
||||
:menuselection:`Configuration --> Analytic Accounts`. Create a new one. In this
|
||||
case we will call it "consulting pack" for our customer Smith&Co.
|
||||
|
||||
.. image:: media/purchase07.png
|
||||
.. image:: purchases_expenses/purchase07.png
|
||||
:align: center
|
||||
|
||||
We will point all our costs to this account to keep track of them.
|
||||
@@ -79,7 +80,7 @@ Click on :menuselection:`Configuration --> Expense Products`. Create a new produ
|
||||
called Train ticket and set the cost price to 15.50 euros. Make sure the **Can be
|
||||
expensed** box is ticked.
|
||||
|
||||
.. image:: media/purchase08.png
|
||||
.. image:: purchases_expenses/purchase08.png
|
||||
:align: center
|
||||
|
||||
Book the expense
|
||||
@@ -89,7 +90,7 @@ Enter the Expense module, click on :menuselection:`My expenses --> Create`. Sele
|
||||
Train ticket product and link it to the analytical account discussed
|
||||
above.
|
||||
|
||||
.. image:: media/purchase09.png
|
||||
.. image:: purchases_expenses/purchase09.png
|
||||
:align: center
|
||||
|
||||
Submit to manager and wait for the manager to approve and post the
|
||||
@@ -107,7 +108,7 @@ Within the line we can link the product's cost with the analytical
|
||||
account. Specify the order line and select the correct analytical
|
||||
account. Confirm the sale.
|
||||
|
||||
.. image:: media/purchase10.png
|
||||
.. image:: purchases_expenses/purchase10.png
|
||||
:align: center
|
||||
|
||||
Accept the delivery and enter the invoice. Once the invoice is entered the cost
|
||||
@@ -137,7 +138,7 @@ Enter the accounting module, click on :menuselection:`Advisers --> Analytic Acco
|
||||
Select "consulting pack - Smith" and click on the cost and revenue
|
||||
button to have an overview of all cost linked to the account.
|
||||
|
||||
.. image:: media/purchase11.png
|
||||
.. image:: purchases_expenses/purchase11.png
|
||||
:align: center
|
||||
|
||||
.. note::
|
||||
|
||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
@@ -19,20 +19,20 @@ First, install the three applications necessary to use this
|
||||
functionality, namely **Accounting**, **Sales** and **Timesheet**. Enter the apps
|
||||
module name and install them.
|
||||
|
||||
.. image:: media/timesheets14.png
|
||||
.. image:: timesheets/timesheets14.png
|
||||
:align: center
|
||||
|
||||
.. image:: media/timesheets05.png
|
||||
.. image:: timesheets/timesheets05.png
|
||||
:align: center
|
||||
|
||||
.. image:: media/timesheets11.png
|
||||
.. image:: timesheets/timesheets11.png
|
||||
:align: center
|
||||
|
||||
Next you will need to enable analytical accounting. To do so enter the
|
||||
**Accounting app**. Select :menuselection:`Configuration --> Settings` and tick the
|
||||
**Analytic accounting** option (see picture below)
|
||||
|
||||
.. image:: media/timesheets06.png
|
||||
.. image:: timesheets/timesheets06.png
|
||||
:align: center
|
||||
|
||||
Apply your changes.
|
||||
@@ -48,7 +48,7 @@ On the employee sheet enter the **HR settings** tab. Here you are able to
|
||||
specify the **Timesheet Cost** of your employee. In this case Harry has a
|
||||
cost of 18 euros / hours. We will thus fill in 18 in this field.
|
||||
|
||||
.. image:: media/timesheets07.png
|
||||
.. image:: timesheets/timesheets07.png
|
||||
:align: center
|
||||
|
||||
.. note::
|
||||
@@ -69,7 +69,7 @@ We thus need to create a **sales order** with a **service** product invoiced
|
||||
**based on time and material** and tracked by timesheets with **hours** as unit
|
||||
of measures.
|
||||
|
||||
.. image:: media/timesheets03.png
|
||||
.. image:: timesheets/timesheets03.png
|
||||
:align: center
|
||||
|
||||
For more information on how to create a sales order based on time and
|
||||
@@ -81,7 +81,7 @@ is confirmed. Our employees will have to point to that account (in this
|
||||
case **SO002-Smith&Co**) in order to be able to invoice their hours (see
|
||||
picture below).
|
||||
|
||||
.. image:: media/timesheets10.png
|
||||
.. image:: timesheets/timesheets10.png
|
||||
:align: center
|
||||
|
||||
Fill in timesheet
|
||||
@@ -94,7 +94,7 @@ Account** discussed above.
|
||||
|
||||
Harry worked three hours on a SWOT analysis for Smith&Co.
|
||||
|
||||
.. image:: media/timesheets01.png
|
||||
.. image:: timesheets/timesheets01.png
|
||||
:align: center
|
||||
|
||||
In the meantime, Cedric discussed businesses needs with the customer for
|
||||
@@ -104,7 +104,7 @@ well on the **Analytic Account**.
|
||||
In the **Sales Order** we notice that the delivered amounts of hours is
|
||||
automatically computed (see picture below).
|
||||
|
||||
.. image:: media/timesheets02.png
|
||||
.. image:: timesheets/timesheets02.png
|
||||
:align: center
|
||||
|
||||
Analytic accounting
|
||||
@@ -128,13 +128,13 @@ Note : you can specify a period for **Analysis**. If you want to open the
|
||||
current situation you should keep the fields empty. We can already note
|
||||
the credit and debit balance of the account.
|
||||
|
||||
.. image:: media/timesheets12.png
|
||||
.. image:: timesheets/timesheets12.png
|
||||
:align: center
|
||||
|
||||
If we click on the account a special button is provided to have the
|
||||
details of cost and revenues (see picture below).
|
||||
|
||||
.. image:: media/timesheets13.png
|
||||
.. image:: timesheets/timesheets13.png
|
||||
:align: center
|
||||
|
||||
Click the button **Cost/Revenue** to have an overview of cost and revenues with the
|
||||
@@ -152,18 +152,18 @@ In this menu we have several options to analyse the human resource cost.
|
||||
of the project. Add a custom **Filter** where the **Analytic Account**
|
||||
contains the **Sales Order** number.
|
||||
|
||||
.. image:: media/timesheets04.png
|
||||
.. image:: timesheets/timesheets04.png
|
||||
:align: center
|
||||
|
||||
In the results we see timesheets activities and invoiced lines with
|
||||
the corresponding costs and revenues.
|
||||
|
||||
.. image:: media/timesheets09.png
|
||||
.. image:: timesheets/timesheets09.png
|
||||
:align: center
|
||||
|
||||
2. We can group the different analytical accounts together and check
|
||||
their respective revenues. Simply group by **Analytic account** and
|
||||
select the **Graph view** to have a clear overview.
|
||||
|
||||
.. image:: media/timesheets08.png
|
||||
.. image:: timesheets/timesheets08.png
|
||||
:align: center
|
||||
|
||||
|
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
@@ -13,7 +13,7 @@ The analytic accounting can be used for several purposes:
|
||||
To manage analytic accounting, you have to activate it in
|
||||
:menuselection:`Configuration --> Settings`:
|
||||
|
||||
.. image:: media/usage01.png
|
||||
.. image:: usage/usage01.png
|
||||
:align: center
|
||||
|
||||
To illustrate analytic accounts clearly, you will follow three use
|
||||
@@ -88,7 +88,7 @@ The analytic representation by department enables you to investigate the
|
||||
costs allocated to each department in the company. The analytic chart of
|
||||
accounts shows the distribution of the company's costs using the example above:
|
||||
|
||||
.. image:: media/usage02.png
|
||||
.. image:: usage/usage02.png
|
||||
:align: center
|
||||
|
||||
In this example of a hierarchical structure in Odoo, you can analyse not
|
||||
@@ -97,7 +97,7 @@ production. A report that relates both general accounts and analytic
|
||||
accounts enables you to get a breakdown of costs within a given
|
||||
department.
|
||||
|
||||
.. image:: media/usage03.png
|
||||
.. image:: usage/usage03.png
|
||||
:align: center
|
||||
|
||||
The examples above are based on a breakdown of the costs of the company.
|
||||
|
||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |