NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] *: typos, wording

Browse Source
This commit is contained in:
nKlapatch 2019-07-03 12:11:33 -05:00 committed by Martin Trigaux
parent 7663a3116d
commit be47d7c8bd
4 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -10,7 +10,7 @@ LESSOPTS =
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed; then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively, you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif
# Internal variables.
@ -27,15 +27,17 @@ _extensions/odoo/static/style.css: $(lessfiles)
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
# Displays list of commands
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " clean to delete the build"
@echo " html to make standalone HTML files"
@echo " i18nhtml to make standalone translated HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " htmlhelp to make HTML files and an HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@ -53,9 +55,11 @@ help:
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
# Deletes the build
clean:
rm -rf $(BUILDDIR)/*
# These commands are used to create files or run tests
html: _extensions/odoo/static/style.css
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@ -79,23 +83,23 @@ singlehtml:
pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
@echo "Build finished. Now you can process the pickle files."
json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
@echo "Build finished. Now you can process the JSON files."
htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
@echo "Build finished. Now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@echo "Build finished. Now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/UnderstandingAccountingForEntrepreneurs.qhcp"
@echo "To view the help file:"
@ -118,7 +122,7 @@ epub:
latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Build finished. The LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
@ -126,14 +130,14 @@ latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
@echo "pdflatex finished. The PDF files are in $(BUILDDIR)/latex."
cp $(BUILDDIR)/latex/*.pdf $(BUILDDIR)/html/
latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
@echo "pdflatex finished. The PDF files are in $(BUILDDIR)/latex."
text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@ -156,7 +160,7 @@ info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
@echo "makeinfo finished. The Info files are in $(BUILDDIR)/texinfo."
gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) locale/sources
@ -171,12 +175,12 @@ changes:
linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
@echo "Link check complete. Look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
@echo "Testing of doctests in the sources finished. Look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
xml:

60
accounting/payables/supplier_bills/manage.rst
View File

@ -34,7 +34,7 @@ Installing the Purchase and Inventory applications
--------------------------------------------------
From the **Apps** application, search for the **Purchase** module and
install it. Due to certain dependencies, Installing Purchase will
install it. Due to certain dependencies, installing Purchase will
automatically install the **Inventory** and **Accounting** applications.
Creating products
@ -42,13 +42,13 @@ Creating products
Creating products in Odoo is essential for quick and efficient
purchasing within Odoo. Simply navigate to the Products submenu under
Purchase, and click create.
Purchase and click create.
.. image:: ./media/manage01.png
:align: center
When creating the product, Pay attention to the **Product Type** field,
as it is important:
When creating the product, pay attention to the **Product Type** field,
since it is important:
- Products that are set as **Stockable or Consumable** will allow you
to keep track of their inventory levels. These options imply
@ -64,7 +64,7 @@ as it is important:
It is recommended that you create a **Miscellaneous** product for all purchases
that occur infrequently and do not require inventory valuation or management.
If you create such a product, it is recommend to set the product type to **Service**.
If you create such a product, it is recommended to set the product type to **Service**.
Managing your Vendor Bills
==========================
@ -90,14 +90,14 @@ Receiving Products
If you purchased any stockable products that you manage the inventory
of, you will need to receive the products from the Inventory application
after you confirm a Purchase Order. From the **Inventory dashboard**, you
after you confirm a purchase order. From the **Inventory dashboard**, you
should see a button linking you directly to the transfer of products.
This button is outlined in red below:
.. image:: ./media/manage03.png
:align: center
Navigating this route will take you to a list of all orders awaiting to
Navigating this route will take you to a list of all orders waiting to
be received.
.. image:: ./media/manage04.png
@ -105,8 +105,8 @@ be received.
If you have a lot of awaiting orders, apply a filter using the search
bar in the upper right. With this search bar, you may filter based on
the Vendor (Partner), the product, or the source document, also known as
the reference of your purchase order. You also have the capability to
the vendor (partner), the product, or the source document (also known as
the reference of your purchase order). You can also
group the orders by different criteria under **Group By**. Selecting an
item from this list will open the following screen where you then will
receive the products.
@ -119,7 +119,7 @@ Purchasing service products does not trigger a delivery order.
Managing Vendor Bills
---------------------
When you receive a Vendor Bill for a previous purchase, be sure to
When you receive a vendor bill for a previous purchase, be sure to
record it in the Purchases application under the **Control Menu**. You
need to create a new vendor bill even if you already registered a
purchase order.
@ -127,21 +127,21 @@ purchase order.
.. image:: ./media/manage06.png
:align: center
The first thing you will need to do upon creating a Vendor Bill is to
select the appropriate Vendor as this will also pull up any associated
The first thing you will need to do upon creating a vendor bill is to
select the appropriate vendor, since doing so will also pull up any associated
accounting or pricelist information. From there, you can choose to
specify any one or multiple Purchase Orders to populate the Vendor Bill
specify one or multiple Purchase Orders to populate the Vendor Bill
with. When you select a Purchase Order from the list, Odoo will pull any
uninvoiced products associated to that Purchase Order and automatically
populate that information below. If you are having a hard time finding
the appropriate Vendor bill, you may search through the list by
the appropriate vendor bill, you may search through the list by
inputting the vendor reference number or your internal purchase order
number.
.. image:: ./media/manage07.png
:align: center
While the invoice is in draft state, you can make any modifications you
While the invoice is in a draft state, you can make any modifications you
need (i.e. remove or add product lines, modify quantities, and change
prices).
@ -166,18 +166,18 @@ Vendor Bill Matching
What to do if your vendor bill does not match what you received
---------------------------------------------------------------
If the bill you receive from the vendor has different quantities than
what Odoo automatically populates as quantities, this could be due to
If the bill you receive from the vendor has quantities that do not match
the quantities automatically populated by Odoo, this could be due to
several reasons:
- the vendor is incorrectly charging you for products and/or services
that you have not ordered,
- The vendor is incorrectly charging you for products and/or services
that you have not ordered.
- the vendor is billing you for products that you might not have
- The vendor is billing you for products that you might not have
received yet, as the invoicing control may be based on ordered or
received quantities,
received quantities.
- or the vendor did not bill you for previously purchased products.
- The vendor did not bill you for previously purchased products.
In these instances it is recommended that you verify that the bill, and
any associated purchase order to the vendor, are accurate and that you
@ -186,13 +186,13 @@ understand what you have ordered and what you have already received.
If you are unable to find a purchase order related to a vendor bill,
this could be due to one of a few reasons:
- the vendor has already invoiced you for this purchase order,
therefore it is not going to appear anywhere in the selection,
- The vendor has already invoiced you for this purchase order;
therefore it is not going to appear anywhere in the selection.
- someone in the company forgot to record a purchase order for this
vendor,
- Someone in the company forgot to record a purchase order for this
vendor.
- or the vendor is charging you for something you did not order.
- The vendor is charging you for something you did not order.
@ -223,7 +223,7 @@ Batch Billing
-------------
When creating a vendor bill and selecting the appropriate purchase
order, you may continue to select additional purchase orders and Odoo
will add the additional line items from that purchase order.. If you
have not deleted the previous line items from the first purchase order
order, you may continue to select additional purchase orders. Odoo
will add the additional line items from the purchase orders you select. If you
have not deleted the previous line items from the first purchase order,
the bill will be linked to all the appropriate purchase orders.

22
crm/acquire_leads/generate_from_website.rst
View File

@ -13,7 +13,7 @@ You should first go to your website app.
|image0|\ |image1|
With the CRM app installed, you benefit from ready-to-use contact form
With the CRM app installed, you benefit from a ready-to-use contact form
on your Odoo website that will generate leads/opportunities
automatically.
@ -32,15 +32,15 @@ Create a custom contact form
============================
You may want to know more from your visitor when they use the contact form to
contact you. You will then need to build a custom contact form on your
website. Those contact forms can generate multiple types of records in
you will need to build a custom contact form on your
website. These contact forms can generate multiple types of records in
the system (emails, leads/opportunities, project tasks, helpdesk
tickets, etc...)
tickets, etc.)
Configuration
=============
You will need to install the free *Form Builder* module. Only
You will need to install the free *Form Builder* module, only
available in Odoo Enterprise.
.. image:: media/generate_from_website05.png
@ -49,25 +49,25 @@ available in Odoo Enterprise.
Create a custom contact form
----------------------------
From any page you want your contact form to be in, in edit mode, drag
the form builder in the page and you will be able to add all the fields
First, go to the page where you want to put your contact form. In edit mode, drag
the form builder onto the page, and you will be able to add all the fields
you wish.
.. image:: media/generate_from_website06.png
:align: center
By default any new contact form will send an email, you can switch to
By default, any new contact form will send an email. You can switch to
lead/opportunity generation in *Change Form Parameters*.
.. note::
If the same visitor uses the contact form twice, the second
information will be added to the first lead/opportunity in the chatter.
entry will be added to the first lead/opportunity in the chatter.
Generate leads instead of opportunities
=======================================
When using a contact form, it is advised to use a qualification step
before assigning to the right sales people. To do so, activate *Leads*
When using a contact form, you should use a qualification step
before assigning the form to the right sales people. To do so, activate *Leads*
in CRM settings and refer to :doc:`convert`.
.. |image0| image:: ./media/generate_from_website01.png

6
sales/send_quotations/deadline.rst
View File

@ -2,8 +2,8 @@
Stimulate customers with quotations deadline
============================================
As you send quotations, it is important to set a quotation deadline;
Both to entice your customer into action with the fear of missing out on
As you send quotations, it is important to set a quotation deadline,
both to entice your customer into action with the fear of missing out on
an offer and to protect yourself. You don't want to have to fulfill an
order at a price that is no longer cost effective for you.
@ -26,7 +26,7 @@ can find more info about quotation templates `here
.. image:: media/quotationsdeadline02.png
:align: center
On your customer side, they will see this.
On your customer side, they will see this:
.. image:: media/quotationsdeadline03.png
:align: center