committed by
Martin Trigaux
parent
d574c82f91
commit
a578531ca3
+1
-1
@@ -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)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<input type="hidden" name="import_id"/>
|
||||
<div class="oe_import_box col-sm-9">
|
||||
<div class="col-sm-12">
|
||||
<p>Select a CSV or Excel file to import. <a href="https://www.odoo.com/documentation/user/10.0/general/base_import/import_faq.html" target="new" class="pull-right">Help</a></p>
|
||||
<p>Select a CSV or Excel file to import. <a href="https://www.odoo.com/documentation/user/11.0/general/base_import/import_faq.html" target="new" class="pull-right">Help</a></p>
|
||||
</div>
|
||||
<div class="col-sm-10">
|
||||
<div class="input-group">
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
<span>We would be delighted to assist you along the way. Contact us through our
|
||||
<a href="https://www.odoo.com/help">support form</a> if you have any question.
|
||||
You can also discover how to get the best out of Odoo CRM with our </span>
|
||||
<a target="_blank" href="https://www.odoo.com/documentation/user/10.0/crm.html">
|
||||
<a target="_blank" href="https://www.odoo.com/documentation/user/11.0/crm.html">
|
||||
<span style="text-decoration:underline;">User Documentation</span></a>
|
||||
</span><span> or with our </span>
|
||||
<a target="_blank" href="https://www.odoo.com/documentation">
|
||||
|
||||
@@ -456,7 +456,7 @@
|
||||
<span class="fa fa-lightbulb-o fa-lg"/>
|
||||
<strong>Tip:</strong> For developers, you can
|
||||
use our API to load data through scripts: read
|
||||
the <a href="https://www.odoo.com/documentation/9.0/api_integration.html" target="_blank">API documentation</a>
|
||||
the <a href="https://www.odoo.com/documentation/11.0/webservices/odoo.html" target="_blank">API documentation</a>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
@@ -505,7 +505,7 @@
|
||||
<strong>For complex imports</strong> (>5000 items, product variants, pictures, etc.):
|
||||
|
||||
<li>Online users: we do it for you! <a href="https://www.odoo.com/help" target="_blank"><i class="fa fa-envelope-o"/> Ask Our Experts</a></li>
|
||||
<li>Community & Enterprise users: <a href="https://www.odoo.com/documentation/9.0/api_integration.html" target="_blank">use Odoo API to import through scripts</a></li>
|
||||
<li>Community & Enterprise users: <a href="https://www.odoo.com/documentation/11.0/webservices/odoo.html" target="_blank">use Odoo API to import through scripts</a></li>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -572,7 +572,7 @@
|
||||
<li><a t-att-href="prepare_backend_url('sales_team.action_sale_config')" target="blank"> Select your pricing preference and allow discounts</a></li>
|
||||
<li><a t-att-href="prepare_backend_url('product.product_pricelist_action2')" target="blank"> Configure your pricelists</a></li>
|
||||
<li><a t-att-href="prepare_backend_url('account.action_account_config')" target="blank"> Apply multi-currencies</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/user/9.0/sales.html" target="blank"> Read the documentation about pricing & discounts</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/user/11.0/sales.html" target="blank"> Read the documentation about pricing & discounts</a></li>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@ msgid "\n"
|
||||
" <span>We would be delighted to assist you along the way. Contact us through our\n"
|
||||
" <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
|
||||
" You can also discover how to get the best out of Odoo CRM with our </span>\n"
|
||||
" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/10.0/crm.html\">\n"
|
||||
" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/11.0/crm.html\">\n"
|
||||
" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
|
||||
" </span><span> or with our </span>\n"
|
||||
" <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n"
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<t t-set="page_title">Expense Types</t>
|
||||
<p class="text-muted">
|
||||
The first step if to
|
||||
<a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-set-expense-types" target="blank">
|
||||
<a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-set-expense-types" target="blank">
|
||||
configure the expense types
|
||||
</a>
|
||||
that your company allows. Here are some examples:
|
||||
@@ -90,7 +90,7 @@
|
||||
<t t-set="page_title">Recording Mode</t>
|
||||
<p class="text-muted">
|
||||
As employees, there are
|
||||
<a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-record-expenses" target="_blank">2 ways to record expenses:</a>
|
||||
<a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-record-expenses" target="_blank">2 ways to record expenses:</a>
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
@@ -153,7 +153,7 @@
|
||||
<t t-set="page_title">Submit for Approval</t>
|
||||
<p class="text-muted">
|
||||
The next step is to settle an internal policy to
|
||||
<a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-submit-expenses-to-managers" target="_blank">submit expenses to managers
|
||||
<a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-submit-expenses-to-managers" target="_blank">submit expenses to managers
|
||||
</a>
|
||||
</p>
|
||||
<div class="row">
|
||||
@@ -191,7 +191,7 @@
|
||||
</div>
|
||||
<p class="text-muted">
|
||||
Depending on your company structure, the
|
||||
<a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-approve-expenses" target="_blank">approval process
|
||||
<a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-approve-expenses" target="_blank">approval process
|
||||
</a> can be:
|
||||
</p>
|
||||
<div class="row">
|
||||
@@ -245,7 +245,7 @@
|
||||
<t t-set="page_title">Reimbursement</t>
|
||||
<p class="text-muted">
|
||||
Once expense reports approved by managers, the accounting department checks accounts, products and taxes used. Then they
|
||||
<a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-post-expenses-in-accounting" target="_blank"> post them into the books</a> and <a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-reimburse-employees" target="blank">proceed with the employee reimbursement</a>.
|
||||
<a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-post-expenses-in-accounting" target="_blank"> post them into the books</a> and <a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-reimburse-employees" target="blank">proceed with the employee reimbursement</a>.
|
||||
</p>
|
||||
<p>
|
||||
To do:
|
||||
@@ -260,7 +260,7 @@
|
||||
<a t-att-href="prepare_backend_url('hr.open_view_employee_list_my', 'kanban')">Set Home Address to employees</a>(used for reimbursement)
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://www.odoo.com/documentation/user/10.0/accounting/payables.html" target="blank">See how to manage payables</a>
|
||||
<a href="https://www.odoo.com/documentation/user/11.0/accounting/payables.html" target="blank">See how to manage payables</a>
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
||||
@@ -269,7 +269,7 @@
|
||||
<t t-call="web_planner.page">
|
||||
<t t-set="page_title">Invoice Customers</t>
|
||||
<p class="text-muted">
|
||||
If you track expenses on customer projects, you can charge them <a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-reinvoice-expenses-to-your-customers" target="blank">back to your customers automatically</a>. Here are some advises to avoid conflictual situations:
|
||||
If you track expenses on customer projects, you can charge them <a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-re-invoice-expenses-to-your-customers" target="blank">back to your customers automatically</a>. Here are some advises to avoid conflictual situations:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Agree in advance with the customer:
|
||||
@@ -288,7 +288,7 @@
|
||||
<li><a t-att-href="prepare_backend_url('hr_expense.hr_expense_product', 'kanban')">Set invoicing method on expense products</a></li>
|
||||
<li><a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'sale')">Install Sales app</a></li>
|
||||
<li><a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'account_analytic_default')">Install Analytic Accounting add-on</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/user/10.0/expense/expense.html#how-to-reinvoice-expenses-to-your-customers" target="_blank">See how to invoice expenses</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/user/11.0/expense/expense.html#how-to-re-invoice-expenses-to-your-customers" target="_blank">See how to invoice expenses</a></li>
|
||||
</ul>
|
||||
</p>
|
||||
</t>
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
<div class="mt16">
|
||||
<field name="iface_tax_included" class="o_light_label" widget="radio"/>
|
||||
</div>
|
||||
<a attrs="{'invisible': [('iface_tax_included', '!=', 'total')]}" href="https://www.odoo.com/documentation/user/10.0/accounting/others/taxes/tax_included.html" target="_blank" class="oe-link"><i class="fa fa-fw fa-arrow-right"/>How to manage tax-included prices</a>
|
||||
<a attrs="{'invisible': [('iface_tax_included', '!=', 'total')]}" href="https://www.odoo.com/documentation/user/11.0/accounting/others/taxes/tax_included.html" target="_blank" class="oe-link"><i class="fa fa-fw fa-arrow-right"/>How to manage tax-included prices</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
<span>We would be delighted to assist you along the way. Contact us through our
|
||||
<a href="https://www.odoo.com/help">support form</a> if you have any question.
|
||||
You can also discover how to get the best out of Odoo Project with our </span>
|
||||
<a target="_blank" href="https://www.odoo.com/documentation/user/10.0/project.html">
|
||||
<a target="_blank" href="https://www.odoo.com/documentation/user/11.0/project.html">
|
||||
<span style="text-decoration:underline;">User Documentation</span></a>
|
||||
</span><span> or with our </span>
|
||||
<a target="_blank" href="https://www.odoo.com/documentation">
|
||||
|
||||
@@ -102,7 +102,7 @@ msgid "\n"
|
||||
" <span>We would be delighted to assist you along the way. Contact us through our\n"
|
||||
" <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
|
||||
" You can also discover how to get the best out of Odoo Project with our </span>\n"
|
||||
" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/10.0/project.html\">\n"
|
||||
" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/11.0/project.html\">\n"
|
||||
" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
|
||||
" </span><span> or with our </span>\n"
|
||||
" <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n"
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
</div>
|
||||
<div class="content-group" attrs="{'invisible': [('group_manage_vendor_price', '=', False)]}">
|
||||
<div class="mt16">
|
||||
<a class="btn-link fa fa-arrow-right" target="_blank" href="https://www.odoo.com/documentation/user/10.0/general/base_import/import_faq.html">
|
||||
<a class="btn-link fa fa-arrow-right" target="_blank" href="https://www.odoo.com/documentation/user/11.0/general/base_import/import_faq.html">
|
||||
How to import
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
<div class="alert alert-info">
|
||||
<span>If you are a developer <strong>you can use our
|
||||
API</strong> to load data automatically through
|
||||
scripts: take a look at our <a href="https://www.odoo.com/documentation/9.0/api_integration.html" target="_blank">API Documentation</a> for more
|
||||
scripts: take a look at our <a href="https://www.odoo.com/documentation/11.0/webservices/odoo.html" target="_blank">API Documentation</a> for more
|
||||
information.</span>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{# note: if odoo.com/page/docs sub-menu's structure change, these links have to change as well #}
|
||||
|
||||
<li><a href="http://www.odoo.com/documentation/user/10.0/index.html">User</a></li>
|
||||
<li><a href="http://www.odoo.com/documentation/10.0/index.html">Developer</a></li>
|
||||
<li><a href="http://www.odoo.com/documentation/10.0/api_integration.html">API</a></li>
|
||||
<li><a href="http://www.odoo.com/documentation/10.0/setup/install.html">Installation</a></li>
|
||||
<li><a href="http://www.odoo.com/page/odoo-white-paper">White Papers</a></li>
|
||||
<li><a href="http://www.odoo.com/page/legal">Legal</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/user/11.0/index.html">User</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/11.0/index.html">Developer</a></li>
|
||||
<li><a href="https://training.odoo.com/">Training center</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/11.0/webservices/odoo.html">API</a></li>
|
||||
<li><a href="https://www.odoo.com/documentation/11.0/setup/install.html">Installation</a></li>
|
||||
<li><a href="https://www.odoo.com/page/odoo-white-paper">White Papers</a></li>
|
||||
<li><a href="https://www.odoo.com/page/legal">Legal</a></li>
|
||||
|
||||
+1
-1
@@ -795,7 +795,7 @@ class HttpRequest(WebRequest):
|
||||
|
||||
Odoo URLs are CSRF-protected by default (when accessed with unsafe
|
||||
HTTP methods). See
|
||||
https://www.odoo.com/documentation/9.0/reference/http.html#csrf for
|
||||
https://www.odoo.com/documentation/11.0/reference/http.html#csrf for
|
||||
more details.
|
||||
|
||||
* if this endpoint is accessed through Odoo via py-QWeb form, embed a CSRF
|
||||
|
||||
Reference in New Issue
Block a user