diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 000019b32..50dba6224 100644 --- a/_extensions/odoo/layout.html +++ b/_extensions/odoo/layout.html @@ -242,7 +242,7 @@ {% endif %} -
+
{% endif %} {% block body %} {% endblock %} {% if pagename != master_doc %}
diff --git a/_extensions/odoo/translator.py b/_extensions/odoo/translator.py index 48c5e901f..bc78ae418 100644 --- a/_extensions/odoo/translator.py +++ b/_extensions/odoo/translator.py @@ -472,6 +472,20 @@ class BootstrapTranslator(nodes.NodeVisitor, object): self.body.append(self.starttag(node, 'a', **attrs)) def depart_reference(self, node): self.body.append(u'') + def visit_download_reference(self, node): + # type: (nodes.Node) -> None + if node.hasattr('filename'): + self.body.append( + '' % + posixpath.join(self.builder.dlpath, node['filename'])) + self.body.append(node.astext()) + self.body.append('') + raise nodes.SkipNode + else: + self.context.append('') + def depart_download_reference(self, node): + # type: (nodes.Node) -> None + self.body.append(self.context.pop()) def visit_target(self, node): pass def depart_target(self, node): pass def visit_footnote(self, node): diff --git a/_static/banners/odoo-sh.jpg b/_static/banners/odoo-sh.jpg new file mode 100644 index 000000000..baaaf533a Binary files /dev/null and b/_static/banners/odoo-sh.jpg differ diff --git a/_static/banners/pdf.svg b/_static/banners/pdf.svg new file mode 100644 index 000000000..4e617c554 --- /dev/null +++ b/_static/banners/pdf.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_static/banners/txt.svg b/_static/banners/txt.svg new file mode 100644 index 000000000..8fbf23b04 --- /dev/null +++ b/_static/banners/txt.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_static/latex/odoo.sty b/_static/latex/odoo.sty index 3ca242b8c..3f313460b 100644 --- a/_static/latex/odoo.sty +++ b/_static/latex/odoo.sty @@ -2,7 +2,6 @@ %\usepackage[default]{lato} \usepackage{inconsolata} \usepackage{fancyhdr} -\usepackage[usenames,dvipsnames]{xcolor} \usepackage{graphicx} % fancy titlepage @@ -82,12 +81,32 @@ \renewcommand{\headrulewidth}{0.1pt} \renewcommand{\footrulewidth}{0.1pt} +\renewcommand{\maketitle}{% + \noindent\rule{\textwidth}{1pt}\ifsphinxpdfoutput\newline\null\fi\par + \ifsphinxpdfoutput + \begingroup + %\pdfstringdefDisableCommands{\def\\{, }\def\endgraf{ }\def\and{, }}% + %\hypersetup{pdfauthor={\@author}, pdftitle={\@title}}% + \endgroup + \fi + \begin{flushright} + \sphinxlogo + \py@HeaderFamily + {\Huge \@title }\par + \end{flushright} + \@thanks + \setcounter{footnote}{0} + \let\thanks\relax\let\maketitle\relax + %\gdef\@thanks{}\gdef\@author{}\gdef\@title{} +} + + \newcommand{\makeodootitleold}{% \begin{titlepage} \titlepagedecoration \begin{center} \vspace{3cm} - \includegraphics{_static/banners/odoo_logo} + \sphinxlogo \end{center} \vspace{2cm} diff --git a/accounting/localizations/media/mexico33.png b/accounting/localizations/media/mexico33.png new file mode 100644 index 000000000..16f416562 Binary files /dev/null and b/accounting/localizations/media/mexico33.png differ diff --git a/accounting/localizations/mexico.rst b/accounting/localizations/mexico.rst index acad31078..bf6acab35 100644 --- a/accounting/localizations/mexico.rst +++ b/accounting/localizations/mexico.rst @@ -177,6 +177,19 @@ and then enter your PAC username and PAC password. - `Certificate Key`_ - **Password :** 12345678a +7. Configure the tag in sales taxes +----------------------------------- + +This tag is used to set the tax type code, transferred or withhold, applicable +to the concept in the CFDI. +So, if the tax is a sale tax the "Tag" field should be "IVA", "ISR" or "IEPS". + +.. image:: media/mexico33.png + :align: center + +Note that the default taxes already has a tag assigned, but when you create a +new tax you should choose a tag. + Usage and testing ~~~~~~~~~~~~~~~~~ @@ -488,7 +501,7 @@ debug mode enabled). - Click on button "Create Contextual Action" - Go to the company form :menuselection:`Settings --> Users&Companies --> Companies` - Open any company you have. -- Click on "Action" and then on "Dowload XSD file to CFDI". +- Click on "Action" and then on "Download XSD file to CFDI". .. image:: media/mexico18.png :align: center @@ -497,6 +510,23 @@ Now you can make an invoice with any error (for example a product without code which is pretty common) and an explicit error will be shown instead a generic one with no explanation. +.. note:: + If you see an error like this: + + The cfdi generated is not valid + + attribute decl. 'TipoRelacion', attribute 'type': The QName value + '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does + not resolve to a(n) simple type definition., line 36 + + This can be caused because of a database backup restored in anothe server, + or when the XSD files are not correctly downloaded. Follow the same steps + as above but: + + - Go to the company in which the error occurs. + - Click on "Action" and then on "Download XSD file to CFDI". + + FAQ ~~~ @@ -586,9 +616,8 @@ FAQ .. image:: media/mexico13.png :align: center - .. _SAT: http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf -.. _Finkok: https://facturacion.finkok.com/cuentas/registrar/ +.. _Finkok: https://www.finkok.com/contacto.html .. _`Solución Factible`: https://solucionfactible.com/sf/v3/timbrado.jsp .. _`SAT resolution`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Paginas/Anexo_20_version3.3.aspx .. _`given by the SAT`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Documents/GuiaAnexo20DPA.pdf diff --git a/conf.py b/conf.py index 39a7ee556..65c6d834c 100644 --- a/conf.py +++ b/conf.py @@ -50,7 +50,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Odoo Business' +project = u'Odoo' copyright = u'2015-TODAY, Odoo S.A.' # The version info for the project you're documenting, acts as replacement for @@ -58,8 +58,8 @@ copyright = u'2015-TODAY, Odoo S.A.' # built documents. # # The full version, including alpha/beta/rc tags. -release = '0.1' -version = '10.0' +release = '11.0' +version = '11.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -211,9 +211,6 @@ latex_elements = { # output manually in latex docs 'releasename': '', -'release': '', -'date': '', - } latex_additional_files = ['_static/latex/odoo.sty'] @@ -222,11 +219,23 @@ latex_additional_files = ['_static/latex/odoo.sty'] # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement_v5.tex', 'Odoo Enterprise Subscription Agreement', '', 'howto'), - ('legal/terms/i18n/enterprise_tex_fr', 'odoo_enterprise_agreement_v5_fr.tex', 'Odoo Enterprise Subscription Agreement (FR)', '', 'howto'), - ('legal/terms/partnership_tex', 'odoo_partnership_agreement_v5.tex', 'Odoo Partnership Agreement', '', 'howto'), - ('legal/terms/terms_of_sale', 'terms_of_sale_v1.tex', 'Odoo Terms of Sale', '', 'howto'), - ('legal/terms/i18n/terms_of_sale_fr', 'terms_of_sale_v1_fr.tex', u'Conditions Générales de Vente Odoo', '', 'howto'), + ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement.tex', 'Odoo Enterprise Subscription Agreement', '', 'howto'), + ('legal/terms/partnership_tex', 'odoo_partnership_agreement.tex', 'Odoo Partnership Agreement', '', 'howto'), + ('legal/terms/terms_of_sale', 'terms_of_sale.tex', 'Odoo Terms of Sale', '', 'howto'), + + ('legal/terms/i18n/enterprise_tex_fr', 'odoo_enterprise_agreement_fr.tex', 'Odoo Enterprise Subscription Agreement (FR)', '', 'howto'), + ('legal/terms/i18n/partnership_tex_fr', 'odoo_partnership_agreement_fr.tex', 'Odoo Partnership Agreement (FR)', '', 'howto'), + ('legal/terms/i18n/terms_of_sale_fr', 'terms_of_sale_fr.tex', u'Conditions Générales de Vente Odoo', '', 'howto'), + + #('legal/terms/i18n/enterprise_tex_nl', 'odoo_enterprise_agreement_nl.tex', 'Odoo Enterprise Subscription Agreement (NL)', '', 'howto'), + #('legal/terms/i18n/partnership_tex_nl', 'odoo_partnership_agreement_nl.tex', 'Odoo Partnership Agreement (NL)', '', 'howto'), + + ('legal/terms/i18n/enterprise_tex_de', 'odoo_enterprise_agreement_de.tex', 'Odoo Enterprise Subscription Agreement (DE)', '', 'howto'), + #('legal/terms/i18n/partnership_tex_de', 'odoo_partnership_agreement_de.tex', 'Odoo Partnership Agreement (DE)', '', 'howto'), + + #('legal/terms/i18n/enterprise_tex_es', 'odoo_enterprise_agreement_es.tex', 'Odoo Enterprise Subscription Agreement (ES)', '', 'howto'), + ('legal/terms/i18n/partnership_tex_es', 'odoo_partnership_agreement_es.tex', 'Odoo Partnership Agreement (ES)', '', 'howto'), + #('index', 'UnderstandingAccountingForEntrepreneurs.tex', u'Understanding Accounting For Entrepreneurs Documentation', u'fp, xmo', 'manual'), ] diff --git a/crm.rst b/crm.rst index 9c1c72e06..557017290 100644 --- a/crm.rst +++ b/crm.rst @@ -7,8 +7,8 @@ CRM .. toctree:: :titlesonly: - crm/overview - crm/salesteam - crm/leads - crm/reporting - crm/calendar \ No newline at end of file + crm/pipeline + crm/acquire_leads + crm/track_leads + crm/performance + crm/optimize diff --git a/crm/acquire_leads.rst b/crm/acquire_leads.rst new file mode 100644 index 000000000..afa3636db --- /dev/null +++ b/crm/acquire_leads.rst @@ -0,0 +1,11 @@ +============= +Acquire Leads +============= + +.. toctree:: + :titlesonly: + + acquire_leads/convert + acquire_leads/generate_from_email + acquire_leads/generate_from_website + acquire_leads/send_quotes diff --git a/crm/acquire_leads/convert.rst b/crm/acquire_leads/convert.rst new file mode 100644 index 000000000..463ca70c2 --- /dev/null +++ b/crm/acquire_leads/convert.rst @@ -0,0 +1,40 @@ +================================ +Convert leads into opportunities +================================ + +The system can generate leads instead of opportunities, in order to add +a qualification step before converting a *Lead* into an +*Opportunity* and assigning to the right sales people. You can +activate this mode from the CRM Settings. It applies to all your sales +channels by default. But you can make it specific for specific channels +from their configuration form. + +Configuration +============= + +For this feature to work, go to :menuselection:`CRM --> Configuration --> Settings` +and activate the *Leads* feature. + +.. image:: media/convert01.png + :align: center + +You will now have a new submenu *Leads* under *Pipeline* where they +will aggregate. + +.. image:: media/convert02.png + :align: center + +Convert a lead into an opportunity +================================== + +When you click on a *Lead* you will have the option to convert it to +an opportunity and decide if it should still be assigned to the same +channel/person and if you need to create a new customer. + +.. image:: media/convert03.png + :align: center + +If you already have an opportunity with that customer Odoo will +automatically offer you to merge with that opportunity. In the same +manner, Odoo will automatically offer you to link to an existing +customer if that customer already exists. diff --git a/crm/acquire_leads/generate_from_email.rst b/crm/acquire_leads/generate_from_email.rst new file mode 100644 index 000000000..5a341c372 --- /dev/null +++ b/crm/acquire_leads/generate_from_email.rst @@ -0,0 +1,20 @@ +======================================== +Generate leads/opportunities from emails +======================================== + +Automating the lead/opportunity generation will considerably improve +your efficiency. By default, any email sent to +*sales@database\_domain.ext* will create an opportunity in the +pipeline of the default sales channel. + +Configure email aliases +======================= + +Each sales channel can have its own email alias, to generate +leads/opportunities automatically assigned to it. It is useful if you +manage several sales teams with specific business processes. You will +find the configuration of sales channels under +:menuselection:`Configuration --> Sales Channels`. + +.. image:: media/generate_from_email01.png + :align: center diff --git a/crm/acquire_leads/generate_from_website.rst b/crm/acquire_leads/generate_from_website.rst new file mode 100644 index 000000000..2ab9ee7f0 --- /dev/null +++ b/crm/acquire_leads/generate_from_website.rst @@ -0,0 +1,78 @@ +=========================================================== +Generate leads/opportunities from your website contact page +=========================================================== + +Automating the lead/opportunity generation will considerably improve +your efficiency. Any visitor using the contact form on your website will +create a lead/opportunity in the pipeline. + +Use the contact us on your website +================================== + +You should first go to your website app. + +|image0|\ |image1| + +With the CRM app installed, you benefit from ready-to-use contact form +on your Odoo website that will generate leads/opportunities +automatically. + +.. image:: media/generate_from_website03.png + :align: center + +To change to a specific sales channel, go to :menuselection:`Website +--> Configuration --> Settings` under *Communication* you will find the +Contact Form info and where to change the *Sales Channel* or +*Salesperson*. + +.. image:: media/generate_from_website04.png + :align: center + +Create a custom contact form +============================ + +You may want to know more from your visitor when they use they want 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 +the system (emails, leads/opportunities, project tasks, helpdesk +tickets, etc...) + +Configuration +============= + +You will need to install the free *Form Builder* module. Only +available in Odoo Enterprise. + +.. image:: media/generate_from_website05.png + :align: center + +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 +you wish. + +.. image:: media/generate_from_website06.png + :align: center + +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 visitors uses the contact form twice, the second + information 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* +in CRM settings and refer to :doc:`convert`. + +.. |image0| image:: ./media/generate_from_website01.png + :width: 1.04401in + :height: 1.16146in +.. |image1| image:: ./media/generate_from_website02.png + :width: 1.43229in + :height: 1.16244in diff --git a/crm/acquire_leads/media/convert01.png b/crm/acquire_leads/media/convert01.png new file mode 100644 index 000000000..7e038a351 Binary files /dev/null and b/crm/acquire_leads/media/convert01.png differ diff --git a/crm/acquire_leads/media/convert02.png b/crm/acquire_leads/media/convert02.png new file mode 100644 index 000000000..5fb3038b7 Binary files /dev/null and b/crm/acquire_leads/media/convert02.png differ diff --git a/crm/acquire_leads/media/convert03.png b/crm/acquire_leads/media/convert03.png new file mode 100644 index 000000000..c0f7db20a Binary files /dev/null and b/crm/acquire_leads/media/convert03.png differ diff --git a/crm/acquire_leads/media/generate_from_email01.png b/crm/acquire_leads/media/generate_from_email01.png new file mode 100644 index 000000000..923533221 Binary files /dev/null and b/crm/acquire_leads/media/generate_from_email01.png differ diff --git a/crm/acquire_leads/media/generate_from_website01.png b/crm/acquire_leads/media/generate_from_website01.png new file mode 100644 index 000000000..697fad3fb Binary files /dev/null and b/crm/acquire_leads/media/generate_from_website01.png differ diff --git a/crm/acquire_leads/media/generate_from_website02.png b/crm/acquire_leads/media/generate_from_website02.png new file mode 100644 index 000000000..163142cb4 Binary files /dev/null and b/crm/acquire_leads/media/generate_from_website02.png differ diff --git a/crm/acquire_leads/media/generate_from_website03.png b/crm/acquire_leads/media/generate_from_website03.png new file mode 100644 index 000000000..293114b4a Binary files /dev/null and b/crm/acquire_leads/media/generate_from_website03.png differ diff --git a/crm/acquire_leads/media/generate_from_website04.png b/crm/acquire_leads/media/generate_from_website04.png new file mode 100644 index 000000000..6269b659f Binary files /dev/null and b/crm/acquire_leads/media/generate_from_website04.png differ diff --git a/crm/acquire_leads/media/generate_from_website05.png b/crm/acquire_leads/media/generate_from_website05.png new file mode 100644 index 000000000..e5dbc5d7e Binary files /dev/null and b/crm/acquire_leads/media/generate_from_website05.png differ diff --git a/crm/acquire_leads/media/generate_from_website06.png b/crm/acquire_leads/media/generate_from_website06.png new file mode 100644 index 000000000..77efe2957 Binary files /dev/null and b/crm/acquire_leads/media/generate_from_website06.png differ diff --git a/crm/acquire_leads/media/send_quotes01.png b/crm/acquire_leads/media/send_quotes01.png new file mode 100644 index 000000000..dbea47de4 Binary files /dev/null and b/crm/acquire_leads/media/send_quotes01.png differ diff --git a/crm/acquire_leads/media/send_quotes02.png b/crm/acquire_leads/media/send_quotes02.png new file mode 100644 index 000000000..d00cd8292 Binary files /dev/null and b/crm/acquire_leads/media/send_quotes02.png differ diff --git a/crm/acquire_leads/media/send_quotes03.png b/crm/acquire_leads/media/send_quotes03.png new file mode 100644 index 000000000..5158b88a4 Binary files /dev/null and b/crm/acquire_leads/media/send_quotes03.png differ diff --git a/crm/acquire_leads/send_quotes.rst b/crm/acquire_leads/send_quotes.rst new file mode 100644 index 000000000..09e697983 --- /dev/null +++ b/crm/acquire_leads/send_quotes.rst @@ -0,0 +1,35 @@ +=============== +Send quotations +=============== + +When you qualified one of your lead into an opportunity you will most +likely need to them send a quotation. You can directly do this in the +CRM App with Odoo. + +.. image:: media/send_quotes01.png + :align: center + +Create a new quotation +====================== + +By clicking on any opportunity or lead, you will see a *New Quotation* +button, it will bring you into a new menu where you can manage your +quote. + +.. image:: media/send_quotes02.png + :align: center + +You will find all your quotes to that specific opportunity under the +*Quotations* menu on that page. + +.. image:: media/send_quotes03.png + :align: center + +Mark them won/lost +================== + +Now you will need to mark your opportunity as won or lost to move the +process along. + +If you mark them as won, they will move to your *Won* column in your +Kanban view. If you however mark them as *Lost* they will be archived. diff --git a/crm/calendar.rst b/crm/calendar.rst deleted file mode 100644 index db075abcb..000000000 --- a/crm/calendar.rst +++ /dev/null @@ -1,8 +0,0 @@ -======== -Calendar -======== - -.. toctree:: - :titlesonly: - - calendar/google_calendar_credentials diff --git a/crm/leads.rst b/crm/leads.rst deleted file mode 100644 index d31543ab3..000000000 --- a/crm/leads.rst +++ /dev/null @@ -1,10 +0,0 @@ -===== -Leads -===== - -.. toctree:: - :titlesonly: - - leads/generate - leads/manage - leads/voip \ No newline at end of file diff --git a/crm/leads/generate.rst b/crm/leads/generate.rst deleted file mode 100644 index a13d0a53c..000000000 --- a/crm/leads/generate.rst +++ /dev/null @@ -1,11 +0,0 @@ -============== -Generate leads -============== - -.. toctree:: - :titlesonly: - - generate/manual - generate/import - generate/emails - generate/website diff --git a/crm/leads/generate/emails.rst b/crm/leads/generate/emails.rst deleted file mode 100644 index 402a4584c..000000000 --- a/crm/leads/generate/emails.rst +++ /dev/null @@ -1,69 +0,0 @@ -=========================================== -How to generate leads from incoming emails? -=========================================== - -There are several ways for your company to :doc:`generate leads with Odoo CRM `. -One of them is using your company's generic email address as a trigger -to create a new lead in the system. In Odoo, each one of your sales -teams is linked to its own email address from which prospects can reach -them. For example, if the personal email address of your Direct team is -**direct@mycompany.example.com**, every email sent will automatically create a new -opportunity into the sales team. - -Configuration -============= - -The first thing you need to do is to configure your **outgoing email -servers** and **incoming email gateway** from the :menuselection:`Settings module --> General Settings`. - -Then set up your alias domain from the field shown here below and -click on **Apply**. - -.. image:: ./media/emails01.jpg - :align: center - -Set up team alias -================= - -Go on the Sales module and click on **Dashboard**. You will see that the -activation of your domain alias has generated a default email alias for -your existing sales teams. - -.. image:: ./media/emails02.jpg - :align: center - -You can easily personalize your sales teams aliases. Click on the More -button from the sales team of your choice, then on **Settings** to access -the sales team form. Into the **Email Alias** field, enter your email -alias and click on **Save**. Make sure to allow receiving emails from -everyone. - -From there, each email sent to this email address will generate a new -lead into the related sales team. - -.. image:: ./media/emails03.jpg - :align: center - -Set up catch-all email domain -============================= - -Additionally to your sales team aliases, you can also create a generic -email alias (e.g. *contact@* or *info@* ) that will also generate a new -contact in Odoo CRM. Still from the Sales module, go to -:menuselection:`Configuration --> Settings` and set up your catch-all email domain. - -.. tip:: - - You can choose whether the contacts generated from your catch-all email - become leads or opportunities using the radio buttons that you see on the - screenshot here below. Note that, by default, the lead stage is not - activated in Odoo CRM. - -.. image:: ./media/emails04.jpg - :align: center - -.. seealso:: - - * :doc:`manual` - * :doc:`import` - * :doc:`website` diff --git a/crm/leads/generate/import.rst b/crm/leads/generate/import.rst deleted file mode 100644 index c7972e5b6..000000000 --- a/crm/leads/generate/import.rst +++ /dev/null @@ -1,91 +0,0 @@ -================================== -How to import contacts to the CRM? -================================== - -In Odoo CRM, you can import a database of potential customers, for -instance for a cold emailing or cold calling campaign, through a CSV -file. You may be wondering if the best option is to import your contacts -as leads or opportunities. It depends on your business specificities and -workflow: - -- Some companies may decide to not use leads, but instead to keep all - information directly in an opportunity. For some companies, leads - are merely an extra step in the sales process. You could call - this extended (start from lead) versus simplified (start from - opportunity) customer relationship management. - -- Odoo perfectly allows for either one of these approaches to be - chosen. If your company handles its sales from a pre - qualification step, feel free to activate first the lead stage as - described below in order to import your database as leads - -Activate the lead stage -======================= - -By default, the lead stage is not activated in Odoo CRM. If you want to -import your contacts as leads rather than opportunities, go to -:menuselection:`Configuration --> Settings`, select the option **use leads -if…** as shown below and click on **Apply**. - -.. image:: ./media/import01.jpg - :align: center - -This activation will create a new submenu :menuselection:`Sales --> Leads` -from which you will be able to import your contacts from the -**Import** button (if you want to create a lead manually, :doc:`click here `) - -.. image:: ./media/import02.jpg - :align: center - -Import your CSV file -==================== - -On the new submenu :menuselection:`Sales --> Leads`, click on **Import** and select your -Excel file to import from the **Choose File** button. Make sure its -extension is **.csv** and don't forget to set up the correct File format -options (**Encoding** and **Separator**) to match your local -settings and display your columns properly. - -.. note:: - If your prospects database is provided in another format than CSV, you can - easily convert it to the CSV format using Microsoft Excel, OpenOffice / - LibreOffice Calc, Google Docs, etc. - -.. image:: ./media/import03.jpg - :align: center - -Select rows to import -===================== - -Odoo will automatically map the column headers from your CSV file to the -corresponding fields if you tick *The first row of the file contains the -label of the column* option. This makes imports easier especially when -the file has many columns. Of course, you can remap the column headers -to describe the property you are importing data into (First Name, Last -Name, Email, etc.). - -.. image:: ./media/import04.jpg - :align: center - -.. tip:: - - If you want to import your contacts as opportunities rather than leads, make - sure to add the *Type* column to your csv. This column is used to indicate - whether your import will be flagged as a Lead (type = Lead) or as an - opportunity (type = Opportunity). - -Click the **Validate** button if you want to let Odoo verify that -everything seems okay before importing. Otherwise, you can directly -click the Import button: the same validations will be done. - -.. note:: - - For additional technical information on how to import contacts into Odoo CRM, - read the **Frequently Asked Questions** section located below the Import tool - on the same window. - -.. seealso:: - - - :doc:`manual` - - :doc:`emails` - - :doc:`website` diff --git a/crm/leads/generate/manual.rst b/crm/leads/generate/manual.rst deleted file mode 100644 index f31db7a91..000000000 --- a/crm/leads/generate/manual.rst +++ /dev/null @@ -1,71 +0,0 @@ -====================================== -How to create a contact into Odoo CRM? -====================================== - -Odoo CRM allows you to manually add contacts into your pipeline. It can -be either a lead or an opportunity. - -Activate the lead stage -======================= - -By default, the lead stage is not activated in Odoo CRM. To activate it, -go to :menuselection:`Sales --> Configuration --> Settings`, select the option ""use leads -if…** as shown below and click on **Apply**. - -.. image:: ./media/manual01.jpg - :align: center - -This activation will create a new submenu **Leads** under -**Sales** that gives you access to a list of all your leads from -which you will be able to create a new contact. - -.. image:: ./media/manual02.jpg - :align: center - -Create a new lead -================= - -Go to :menuselection:`Sales --> Leads` and click the **Create** button. - -.. image:: ./media/manual03.jpg - :align: center - -From the contact form, provide all the details in your possession -(contact name, email, phone, address, etc.) as well as some additional -information in the **Internal notes** field. - -.. note:: - - your lead can be directly handed over to specific sales team and salesperson - by clicking on **Convert to Opportunity** on the upper left corner of the screen. - -Create a new opportunity -======================== - -You can also directly add a contact into a specific sales team without -having to convert the lead first. On the Sales module, go to your -dashboard and click on the **Pipeline** button of the desired sales -team. If you don't have any sales team yet, :doc:`you need to create one first <../../salesteam/setup/create_team>`. -Then, click on **Create** and fill in the contact details as shown here -above. By default, the newly created opportunity will appear on the -first stage of your sales pipeline. - -Another way to create an opportunity is by adding it directly on a -specific stage. For example, if you have have spoken to Mr. Smith at a -meeting and you want to send him a quotation right away, you can add his -contact details on the fly directly into the **Proposition** stage. From -the Kanban view of your sales team, just click on the **+** icon -at the right of your stage to create the contact. The new opportunity -will then pop up into the corresponding stage and you can then fill in -the contact details by clicking on it. - -.. image:: ./media/manual04.png - :align: center - -.. seealso:: - - * :doc:`import` - - * :doc:`emails` - - * :doc:`website` diff --git a/crm/leads/generate/media/emails01.jpg b/crm/leads/generate/media/emails01.jpg deleted file mode 100644 index b3bb70ce7..000000000 Binary files a/crm/leads/generate/media/emails01.jpg and /dev/null differ diff --git a/crm/leads/generate/media/emails02.jpg b/crm/leads/generate/media/emails02.jpg deleted file mode 100644 index b4e008c87..000000000 Binary files a/crm/leads/generate/media/emails02.jpg and /dev/null differ diff --git a/crm/leads/generate/media/emails03.jpg b/crm/leads/generate/media/emails03.jpg deleted file mode 100644 index b2c75a201..000000000 Binary files a/crm/leads/generate/media/emails03.jpg and /dev/null differ diff --git a/crm/leads/generate/media/emails04.jpg b/crm/leads/generate/media/emails04.jpg deleted file mode 100644 index 18e054e97..000000000 Binary files a/crm/leads/generate/media/emails04.jpg and /dev/null differ diff --git a/crm/leads/generate/media/import01.jpg b/crm/leads/generate/media/import01.jpg deleted file mode 100644 index 113fccb0d..000000000 Binary files a/crm/leads/generate/media/import01.jpg and /dev/null differ diff --git a/crm/leads/generate/media/import02.jpg b/crm/leads/generate/media/import02.jpg deleted file mode 100644 index 8499af5e0..000000000 Binary files a/crm/leads/generate/media/import02.jpg and /dev/null differ diff --git a/crm/leads/generate/media/import03.jpg b/crm/leads/generate/media/import03.jpg deleted file mode 100644 index 9de819ab0..000000000 Binary files a/crm/leads/generate/media/import03.jpg and /dev/null differ diff --git a/crm/leads/generate/media/import04.jpg b/crm/leads/generate/media/import04.jpg deleted file mode 100644 index 2fb278caa..000000000 Binary files a/crm/leads/generate/media/import04.jpg and /dev/null differ diff --git a/crm/leads/generate/media/manual01.jpg b/crm/leads/generate/media/manual01.jpg deleted file mode 100644 index 113fccb0d..000000000 Binary files a/crm/leads/generate/media/manual01.jpg and /dev/null differ diff --git a/crm/leads/generate/media/manual02.jpg b/crm/leads/generate/media/manual02.jpg deleted file mode 100644 index 731b114ca..000000000 Binary files a/crm/leads/generate/media/manual02.jpg and /dev/null differ diff --git a/crm/leads/generate/media/manual03.jpg b/crm/leads/generate/media/manual03.jpg deleted file mode 100644 index afb50075d..000000000 Binary files a/crm/leads/generate/media/manual03.jpg and /dev/null differ diff --git a/crm/leads/generate/media/manual04.png b/crm/leads/generate/media/manual04.png deleted file mode 100644 index 92341b71b..000000000 Binary files a/crm/leads/generate/media/manual04.png and /dev/null differ diff --git a/crm/leads/generate/media/website01.jpg b/crm/leads/generate/media/website01.jpg deleted file mode 100644 index 113fccb0d..000000000 Binary files a/crm/leads/generate/media/website01.jpg and /dev/null differ diff --git a/crm/leads/generate/media/website02.png b/crm/leads/generate/media/website02.png deleted file mode 100644 index 2cf399ade..000000000 Binary files a/crm/leads/generate/media/website02.png and /dev/null differ diff --git a/crm/leads/generate/media/website03.png b/crm/leads/generate/media/website03.png deleted file mode 100644 index 0d5dbf3b5..000000000 Binary files a/crm/leads/generate/media/website03.png and /dev/null differ diff --git a/crm/leads/generate/media/website04.jpg b/crm/leads/generate/media/website04.jpg deleted file mode 100644 index 68697f290..000000000 Binary files a/crm/leads/generate/media/website04.jpg and /dev/null differ diff --git a/crm/leads/generate/media/website05.jpg b/crm/leads/generate/media/website05.jpg deleted file mode 100644 index c0e0cb5c0..000000000 Binary files a/crm/leads/generate/media/website05.jpg and /dev/null differ diff --git a/crm/leads/generate/media/website06.png b/crm/leads/generate/media/website06.png deleted file mode 100644 index ac6950981..000000000 Binary files a/crm/leads/generate/media/website06.png and /dev/null differ diff --git a/crm/leads/generate/media/website07.png b/crm/leads/generate/media/website07.png deleted file mode 100644 index 766ac8b20..000000000 Binary files a/crm/leads/generate/media/website07.png and /dev/null differ diff --git a/crm/leads/generate/media/website08.png b/crm/leads/generate/media/website08.png deleted file mode 100644 index 2d4562984..000000000 Binary files a/crm/leads/generate/media/website08.png and /dev/null differ diff --git a/crm/leads/generate/media/website09.png b/crm/leads/generate/media/website09.png deleted file mode 100644 index fdc9b3f78..000000000 Binary files a/crm/leads/generate/media/website09.png and /dev/null differ diff --git a/crm/leads/generate/website.rst b/crm/leads/generate/website.rst deleted file mode 100644 index 993849530..000000000 --- a/crm/leads/generate/website.rst +++ /dev/null @@ -1,196 +0,0 @@ -====================================== -How to generate leads from my website? -====================================== - -Your website should be your company's first lead generation tool. With -your website being the central hub of your online marketing campaigns, -you will naturally drive qualified traffic to feed your pipeline. When a -prospect lands on your website, your objective is to capture his -information in order to be able to stay in touch with him and to push -him further down the sales funnel. - -This is how a typical online lead generation process work : - -- Your website visitor clicks on a call-to action (CTA) from one of - your marketing materials (e.g. an email newsletter, a social - media message or a blog post) - -- The CTA leads your visitor to a landing page including a form used to - collect his personal information (e.g. his name, his email - address, his phone number) - -- The visitor submits the form and automatically generates a lead into - Odoo CRM - -.. tip:: - - Your calls-to-action, landing pages and forms are the key pieces of the lead - generation process. With Odoo Website, you can easily create and optimize - those critical elements without having to code or to use third-party - applications. Learn more `here `__. - -In Odoo, the Website and CRM modules are fully integrated, meaning that -you can easily generate leads from various ways through your website. -However, even if you are hosting your website on another CMS, it is -still possible to fill Odoo CRM with leads generated from your website. - -Activate the lead stage -======================= - -By default, the lead stage is not activated in Odoo CRM. Therefore, new -leads automatically become opportunities. You can easily activate the -option of adding the lead step. If you want to import your contacts as -leads rather than opportunities, from the Sales module go to -:menuselection:`Configuration --> Settings`, select the option **use leads -if…** as shown below and click on **Apply**. - -.. image:: ./media/website01.jpg - :align: center - -Note that even without activating this step, the information that -follows is still applicable - the lead generated will land in the -opportunities dashboard. - -From an Odoo Website -==================== - -Let's assume that you want to get as much information as possible about -your website visitors. But how could you make sure that every person who -wants to know more about your company's products and services is -actually leaving his information somewhere? Thanks to Odoo's integration -between its CRM and Website modules, you can easily automate your lead -acquisition process thanks to the **contact form** and the **form builder** -modules - -.. note:: - - another great way to generate leads from your Odoo Website is by collecting - your visitors email addresses thanks to the Newsletter or Newsletter Popup - CTAs. These snippets will create new contacts in your Email Marketing's - mailing list. Learn more `here `__. - -Configuration -------------- - -Start by installing the Website builder module. From the main dashboard, -click on **Apps**, enter "**Website**" in the search bar and click on **Install**. -You will be automatically redirected to the web interface. - -.. image:: ./media/website02.png - :align: center - -.. tip:: - - A tutorial popup will appear on your screen if this is the first time you - use Odoo Website. It will help you get started with the tool and you'll be - able to use it in minutes. Therefore, we strongly recommend you to use it. - -Create a lead by using the Contact Form module ----------------------------------------------- - -You can effortlessly generate leads via a contact form on your **Contact -us** page. To do so, you first need to install the Contact Form module. -It will add a contact form in your **Contact us** page and automatically -generate a lead from forms submissions. - -To install it, go back to the backend using the square icon on the -upper-left corner of your screen. Then, click on **Apps**, enter -"**Contact Form**" in the search bar (don't forget to remove the **Apps** tag -otherwise you will not see the module appearing) and click on **Install**. - -.. image:: ./media/website03.png - :align: center - -Once the module is installed, the below contact form will be integrated -to your "Contact us" page. This form is linked to Odoo CRM, meaning that -all data entered through the form will be captured by the CRM and will -create a new lead. - -.. image:: ./media/website04.jpg - :align: center - -Every lead created through the contact form is accessible in the Sales -module, by clicking on :menuselection:`Sales --> Leads`. The name of the lead corresponds -to the "Subject" field on the contact form and all the other information -is stored in the corresponding fields within the CRM. As a salesperson, -you can add additional information, convert the lead into an opportunity -or even directly mark it as Won or Lost. - -.. image:: ./media/website05.jpg - :align: center - -Create a lead using the Form builder module -------------------------------------------- - -You can create fully-editable custom forms on any landing page on your -website with the Form Builder snippet. As for the Contact Form module, -the Form Builder will automatically generate a lead after the visitor -has completed the form and clicked on the button **Send**. - -From the backend, go to Settings and install the -"**Website Form Builder**" module (don't forget to remove the **Apps** tag -otherwise you will not see the modules appearing). Then, back on the -website, go to your desired landing page and click on Edit to access -the available snippets. The Form Builder snippet lays under the -**Feature** section. - -.. image:: ./media/website06.png - :align: center - -As soon as you have dropped the snippet where you want the form to -appear on your page, a **Form Parameters** window will pop up. From the -**Action** drop-down list, select **Create a lead** to automatically -create a lead in Odoo CRM. On the **Thank You** field, select the URL of -the page you want to redirect your visitor after the form being -submitted (if you don't add any URL, the message "The form has been -sent successfully" will confirm the submission). - -.. image:: ./media/website07.png - :align: center - -You can then start creating your custom form. To add new fields, click -on **Select container block** and then on the blue **Customize** button. 3 -options will appear: - -.. image:: ./media/website08.png - :align: center - -- **Change Form Parameters**: allows you to go back to the Form - Parameters and change the configuration - -- **Add a model field**: allows you to add a field already existing in - Odoo CRM from a drop-down list. For example, if you select the - Field *Country*, the value entered by the lead will appear under - the *Country* field in the CRM - even if you change the name of - the field on the form. - -- **Add a custom field**: allows you to add extra fields that don't exist - by default in Odoo CRM. The values entered will be added under - "Notes" within the CRM. You can create any field type : checkbox, - radio button, text, decimal number, etc. - -Any submitted form will create a lead in the backend. - -From another CMS -================= - -If you use Odoo CRM but not Odoo Website, you can still automate your -online lead generation process using email gateways by editing the -"Submit" button of any form and replacing the hyperlink by a mailto -corresponding to your email alias (learn how to create your sales alias -:doc:`here `). - -For example if the alias of your company is -**salesEMEA@mycompany.com**, add -``mailto:salesEMEA@mycompany.com`` -into the regular hyperlink code (CTRL+K) to generate a lead into the -related sales team in Odoo CRM. - -.. image:: ./media/website09.png - :align: center - -.. seealso:: - - - :doc:`manual` - - :doc:`import` - - :doc:`emails` diff --git a/crm/leads/manage.rst b/crm/leads/manage.rst deleted file mode 100644 index cbc69aff4..000000000 --- a/crm/leads/manage.rst +++ /dev/null @@ -1,9 +0,0 @@ -============ -Manage leads -============ - -.. toctree:: - :titlesonly: - - manage/automatic_assignation - manage/lead_scoring diff --git a/crm/leads/manage/automatic_assignation.rst b/crm/leads/manage/automatic_assignation.rst deleted file mode 100644 index 53a6c72f7..000000000 --- a/crm/leads/manage/automatic_assignation.rst +++ /dev/null @@ -1,100 +0,0 @@ -================================================================ -Automate lead assignation to specific sales teams or salespeople -================================================================ - -Depending on your business workflow and needs, you may need to dispatch -your incoming leads to different sales team or even to specific -salespeople. Here are a few example: - -- Your company has several offices based on different geographical - regions. You will want to assign leads based on the region; - -- One of your sales teams is dedicated to treat opportunities from - large companies while another one is specialized for SMEs. You - will want to assign leads based on the company size; - -- One of your sales representatives is the only one to speak foreign - languages while the rest of the team speaks English only. - Therefore you will want to assign to that person all the leads - from non-native English-speaking countries. - -As you can imagine, manually assigning new leads to specific individuals -can be tedious and time consuming - especially if your company generates -a high volume of leads every day. Fortunately, Odoo CRM allows you to -automate the process of lead assignation based on specific criteria such -as location, interests, company size, etc. With specific workflows and -precise rules, you will be able to distribute all your opportunities -automatically to the right sales teams and/or salesman. - -Configuration -============= - -If you have just started with Odoo CRM and haven't set up your sales -team nor registered your salespeople, :doc:`read this documentation first <../../overview/started/setup>`. - -.. note:: - You have to install the module **Lead Scoring**. Go to - :menuselection:`Apps` and install it if it's not the case already. - -Define rules for a sales team -============================= - -From the sales module, go to your dashboard and click on the **More** -button of the desired sales team, then on **Settings**. If you don't -have any sales team yet, :doc:`you need to create one first <../../salesteam/setup/create_team>`. - -.. image:: ./media/automatic01.jpg - :align: center - - -On your sales team menu, use in the **Domain** field a specific domain -rule (for technical details on the domain refer on the -`Building a Module tutorial `__ -or `Syntax reference guide `__) -which will allow only the leads matching the team domain. - -For example, if you want your *Direct Sales* team to only receive leads -coming from United States and Canada, your domain will be as following : - -``[[country_id, 'in', ['United States', 'Canada']]]`` - -.. image:: ./media/automatic02.jpg - :align: center - -.. note:: - - you can also base your automatic assignment on the score attributed to your - leads. For example, we can imagine that you want all the leads with a score - under 100 to be assigned to a sales team trained for lighter projects and - the leads over 100 to a more experienced sales team. Read more on :doc:`how to score leads here `. - -Define rules for a salesperson -============================== - -You can go one step further in your assignment rules and decide to -assign leads within a sales team to a specific salesperson. For example, -if I want Toni Buchanan from the *Direct Sales* team to receive only -leads coming from Canada, I can create a rule that will automatically -assign him leads from that country. - -Still from the sales team menu (see here above), click on the -salesperson of your choice under the assignment submenu. Then, enter -your rule in the *Domain* field. - -.. image:: ./media/automatic03.jpg - :align: center - -.. note:: - - In Odoo, a lead is always assigned to a sales team before to be assigned to - a salesperson. Therefore, you need to make sure that the assignment rule of - your salesperson is a child of the assignment rule of the sales team. - -.. seealso:: - - * :doc:`../../overview/started/setup` - - .. todo:: * How to assign sales activities into multiple sales teams? - - .. todo:: * How to make sure my salespeople work on the most promising leads? - diff --git a/crm/leads/manage/lead_scoring.rst b/crm/leads/manage/lead_scoring.rst deleted file mode 100644 index 0d53452cc..000000000 --- a/crm/leads/manage/lead_scoring.rst +++ /dev/null @@ -1,110 +0,0 @@ -================================= -How to do efficient Lead Scoring? -================================= - -Odoo's Lead Scoring module allows you to give a score to your leads -based on specific criteria - the higher the value, the more likely the -prospect is "ready for sales". Therefore, the best leads are -automatically assigned to your salespeople so their pipe are not -polluted with poor-quality opportunities. - -.. note:: - Lead scoring is a critical component of an effective lead - management strategy. By helping your sales representative - determine which leads to engage with in order of priority, - you will increase their overall conversion rate and your - sales team's efficiency. - -Configuration -============= - -Install the Lead Scoring module -------------------------------- - -Start by installing the **Lead Scoring** module. - -Once the module is installed, you should see a new menu -:menuselection:`Sales --> Leads Management --> Scoring Rules` - -.. image:: media/lead_scoring02.png - :align: center - -Create scoring rules --------------------- - -Leads scoring allows you to assign a positive or negative score to your -prospects based on any demographic or behavioral criteria that you have -set (country or origin, pages visited, type of industry, role, etc.). To -do so you'll first need to create rules that will assign a score to a -given criteria. - - -.. tip:: - In order to assign the right score to your various rules, you can use these two methods: - - - Establish a list of assets that your ideal customer might possess to interest your company. - For example, if you run a local business in California, a prospect coming from - San Francisco should have a higher score than a prospect coming from New York. - - - Dig into your data to uncover characteristics shared by your closed opportunities - and most important clients. - - Please note that this is not an exact science, so you'll need time - and feedback from your sales teams to adapt and fine tune your rules - until getting the desired result. - -In the **Scoring Rules** menu, click on **Create** to write your first rule. - -.. image:: media/lead_scoring01.png - :align: center - -First name your rule, then enter a value and a domain (refer on the -`official python documentation `__ -for more information). For example, if you want to assign 8 points to all the -leads coming from **Belgium**, you'll need to give ``8`` as a **value** and -``[['country\_id',=,'Belgium']]`` as a domain. - -.. tip:: - Here are some criteria you can use to build a scoring rule : - - - country of origin : ``'country_id'`` - - - stage in the sales cycle : ``'stage_id'`` - - - email address (e.g. if you want to score the professional email addresses) : ``'email_from'`` - - - page visited : ``'score_pageview_ids.url'`` - - - name of a marketing campaign : ``'campaign_id'`` - -After having activated your rules, Odoo will give a value to all your -new incoming leads. This value can be found directly on your lead's form -view. - -.. image:: media/lead_scoring04.png - :align: center - -Assign high scoring leads to your sales teams -============================================= - -The next step is now to automatically convert your best leads into -opportunities. In order to do so, you need to decide what is the minimum -score a lead should have to be handed over to a given sales team. Go to -your **sales dashboard** and click on the **More** button of your desired sales -team, then on **Settings**. Enter your value under the **Minimum score** -field. - -.. image:: media/lead_scoring03.png - :align: center - -From the example above, the **Direct Sales** team will only receive -opportunities with a minimum score of ``50``. The prospects with a lower -score can either stay in the lead stage or be assigned to another sales -team which has set up a different minimum score. - -.. tip:: - Organize a meeting between your **Marketing** and **Sales** teams in order - to align your objectives and agree on what minimum score makes a sales-ready lead. - -.. seealso:: - * :doc:`automatic_assignation` diff --git a/crm/leads/manage/media/automatic01.jpg b/crm/leads/manage/media/automatic01.jpg deleted file mode 100644 index da0557832..000000000 Binary files a/crm/leads/manage/media/automatic01.jpg and /dev/null differ diff --git a/crm/leads/manage/media/automatic02.jpg b/crm/leads/manage/media/automatic02.jpg deleted file mode 100644 index 75994f297..000000000 Binary files a/crm/leads/manage/media/automatic02.jpg and /dev/null differ diff --git a/crm/leads/manage/media/automatic03.jpg b/crm/leads/manage/media/automatic03.jpg deleted file mode 100644 index e2c1603fd..000000000 Binary files a/crm/leads/manage/media/automatic03.jpg and /dev/null differ diff --git a/crm/leads/manage/media/lead_scoring01.png b/crm/leads/manage/media/lead_scoring01.png deleted file mode 100644 index a7d396827..000000000 Binary files a/crm/leads/manage/media/lead_scoring01.png and /dev/null differ diff --git a/crm/leads/manage/media/lead_scoring02.png b/crm/leads/manage/media/lead_scoring02.png deleted file mode 100644 index 29c3d2fc1..000000000 Binary files a/crm/leads/manage/media/lead_scoring02.png and /dev/null differ diff --git a/crm/leads/manage/media/lead_scoring03.png b/crm/leads/manage/media/lead_scoring03.png deleted file mode 100644 index 69fc4ff8d..000000000 Binary files a/crm/leads/manage/media/lead_scoring03.png and /dev/null differ diff --git a/crm/leads/manage/media/lead_scoring04.png b/crm/leads/manage/media/lead_scoring04.png deleted file mode 100644 index c6ac32dfc..000000000 Binary files a/crm/leads/manage/media/lead_scoring04.png and /dev/null differ diff --git a/crm/leads/voip.rst b/crm/leads/voip.rst deleted file mode 100644 index a61095ba1..000000000 --- a/crm/leads/voip.rst +++ /dev/null @@ -1,9 +0,0 @@ -========= -Odoo VOIP -========= - -.. toctree:: - :titlesonly: - - voip/setup - voip/onsip diff --git a/crm/optimize.rst b/crm/optimize.rst new file mode 100644 index 000000000..f9e24f585 --- /dev/null +++ b/crm/optimize.rst @@ -0,0 +1,10 @@ +============================= +Optimize your Day-to-Day work +============================= + +.. toctree:: + :titlesonly: + + optimize/google_calendar_credentials + optimize/onsip + optimize/setup diff --git a/crm/calendar/google_calendar_credentials.rst b/crm/optimize/google_calendar_credentials.rst similarity index 94% rename from crm/calendar/google_calendar_credentials.rst rename to crm/optimize/google_calendar_credentials.rst index cc25eec18..cad6eb6d5 100644 --- a/crm/calendar/google_calendar_credentials.rst +++ b/crm/optimize/google_calendar_credentials.rst @@ -1,6 +1,6 @@ -========================================================== -How to synchronize your Odoo Calendar with Google Calendar -========================================================== +===================================== +Synchronize Google Calendar with Odoo +===================================== Odoo is perfectly integrated with Google Calendar so that you can see & manage your meetings from both platforms diff --git a/crm/calendar/media/google_calendar_credentials00.png b/crm/optimize/media/google_calendar_credentials00.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials00.png rename to crm/optimize/media/google_calendar_credentials00.png diff --git a/crm/calendar/media/google_calendar_credentials01.png b/crm/optimize/media/google_calendar_credentials01.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials01.png rename to crm/optimize/media/google_calendar_credentials01.png diff --git a/crm/calendar/media/google_calendar_credentials02.png b/crm/optimize/media/google_calendar_credentials02.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials02.png rename to crm/optimize/media/google_calendar_credentials02.png diff --git a/crm/calendar/media/google_calendar_credentials03.png b/crm/optimize/media/google_calendar_credentials03.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials03.png rename to crm/optimize/media/google_calendar_credentials03.png diff --git a/crm/calendar/media/google_calendar_credentials04.png b/crm/optimize/media/google_calendar_credentials04.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials04.png rename to crm/optimize/media/google_calendar_credentials04.png diff --git a/crm/calendar/media/google_calendar_credentials05.png b/crm/optimize/media/google_calendar_credentials05.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials05.png rename to crm/optimize/media/google_calendar_credentials05.png diff --git a/crm/calendar/media/google_calendar_credentials06.png b/crm/optimize/media/google_calendar_credentials06.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials06.png rename to crm/optimize/media/google_calendar_credentials06.png diff --git a/crm/calendar/media/google_calendar_credentials07.png b/crm/optimize/media/google_calendar_credentials07.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials07.png rename to crm/optimize/media/google_calendar_credentials07.png diff --git a/crm/calendar/media/google_calendar_credentials08.png b/crm/optimize/media/google_calendar_credentials08.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials08.png rename to crm/optimize/media/google_calendar_credentials08.png diff --git a/crm/calendar/media/google_calendar_credentials09.png b/crm/optimize/media/google_calendar_credentials09.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials09.png rename to crm/optimize/media/google_calendar_credentials09.png diff --git a/crm/calendar/media/google_calendar_credentials10.png b/crm/optimize/media/google_calendar_credentials10.png similarity index 100% rename from crm/calendar/media/google_calendar_credentials10.png rename to crm/optimize/media/google_calendar_credentials10.png diff --git a/crm/leads/voip/media/onsip01.png b/crm/optimize/media/onsip01.png similarity index 100% rename from crm/leads/voip/media/onsip01.png rename to crm/optimize/media/onsip01.png diff --git a/crm/leads/voip/media/onsip02.png b/crm/optimize/media/onsip02.png similarity index 100% rename from crm/leads/voip/media/onsip02.png rename to crm/optimize/media/onsip02.png diff --git a/crm/leads/voip/media/onsip03.png b/crm/optimize/media/onsip03.png similarity index 100% rename from crm/leads/voip/media/onsip03.png rename to crm/optimize/media/onsip03.png diff --git a/crm/leads/voip/media/onsip04.png b/crm/optimize/media/onsip04.png similarity index 100% rename from crm/leads/voip/media/onsip04.png rename to crm/optimize/media/onsip04.png diff --git a/crm/leads/voip/media/onsip05.png b/crm/optimize/media/onsip05.png similarity index 100% rename from crm/leads/voip/media/onsip05.png rename to crm/optimize/media/onsip05.png diff --git a/crm/leads/voip/media/onsip06.png b/crm/optimize/media/onsip06.png similarity index 100% rename from crm/leads/voip/media/onsip06.png rename to crm/optimize/media/onsip06.png diff --git a/crm/leads/voip/onsip.rst b/crm/optimize/onsip.rst similarity index 75% rename from crm/leads/voip/onsip.rst rename to crm/optimize/onsip.rst index 41acdf0f8..e25a222bd 100644 --- a/crm/leads/voip/onsip.rst +++ b/crm/optimize/onsip.rst @@ -1,6 +1,6 @@ -=================== -OnSIP Configuration -=================== +==================================== +Use VOIP services in Odoo with OnSIP +==================================== Introduction ============ @@ -64,14 +64,15 @@ OnSIP on Your Cell Phone In order to make and receive phone calls when you are not in front of your computer, you can use a softphone app on your cell phone in parallel of Odoo VoIP. This is useful for on-the-go calls, but also to make sure to hear incoming calls, or simply for convenience. Any SIP softphone will work. -On Android, OnSIP has been successfully tested with `Zoiper `_. You will have to configure it as follows: +On Android and iOS, OnSIP has been successfully tested with `Grandstream Wave `_. When creating an account, select OnSIP in the list of carriers. You will then have to configure it as follows: - **Account name**: OnSIP -- **Host**: the OnSIP 'Domain' -- **Username**: the OnSIP 'Username' +- **SIP Server**: the OnSIP 'Domain' +- **SIP User ID**: the OnSIP 'Username' +- **SIP Authentication ID**: the OnSIP 'Auth Username' - **Password**: the OnSIP 'SIP Password' -- **Authentication user**: the OnSIP 'Auth Username' -- **Outbound proxy**: sip.onsip.com + +Aside from initiating calls from Grandstream Wave on your phone, you can also initiate calls by clicking phone numbers in your browser on your PC. This will make Grandstream Wave ring and route the call via your phone to the other party. This approach is useful to avoid wasting time dialing phone numbers. In order to do so, you will need the Chrome extension `OnSIP Call Assistant `_. .. warning:: diff --git a/crm/leads/voip/setup.rst b/crm/optimize/setup.rst similarity index 98% rename from crm/leads/voip/setup.rst rename to crm/optimize/setup.rst index 02dab99ee..930f54dc1 100644 --- a/crm/leads/voip/setup.rst +++ b/crm/optimize/setup.rst @@ -1,6 +1,6 @@ -====================== -Installation and Setup -====================== +============================================ +Configure your VOIP Asterisk server for Odoo +============================================ Installing Asterisk server ========================== diff --git a/crm/overview.rst b/crm/overview.rst deleted file mode 100644 index 6077d2459..000000000 --- a/crm/overview.rst +++ /dev/null @@ -1,10 +0,0 @@ -======== -Overview -======== - -.. toctree:: - :titlesonly: - - overview/started - overview/process - overview/main_concepts \ No newline at end of file diff --git a/crm/overview/main_concepts.rst b/crm/overview/main_concepts.rst deleted file mode 100644 index cf07c523d..000000000 --- a/crm/overview/main_concepts.rst +++ /dev/null @@ -1,9 +0,0 @@ -============== -Main Concepts -============== - -.. toctree:: - :titlesonly: - - main_concepts/introduction - main_concepts/terminologies diff --git a/crm/overview/main_concepts/introduction.rst b/crm/overview/main_concepts/introduction.rst deleted file mode 100644 index 02e2ab671..000000000 --- a/crm/overview/main_concepts/introduction.rst +++ /dev/null @@ -1,115 +0,0 @@ -======================== -Introduction to Odoo CRM -======================== - -.. youtube:: fgdz8MH2YHY - :align: right - :width: 700 - :height: 394 - -Transcript -========== - -Hi, my name is Nicholas, I'm a business manager in the -textile industry. I sell accessories to retailers. Do you -know the difference between a good salesperson and an -excellent salesperson? The key is to be productive and -organized to do the job. That's where Odoo comes in. Thanks -to a well structured organization you'll change a good -team into an exceptional team. - -With Odoo CRM, the job is much easier for me and my entire -team. When I log in into Odoo CRM, I have a direct overview -of my ongoing performance. But also the activity of the next -7 days and the performance of the last month. I see that I -overachieved last month when compared to my invoicing target -of $200,000. I have a structured approach of my performance. - -If I want to have a deeper look into the details, I click -on next actions and I can see that today I have planned a -call with Think Big Systems. Once I have done my daily -review, I usually go to my pipeline. The process is the -same for everyone in the team. Our job is to find resellers -and before closing any deal we have to go through different -stages. We usually have a first contact to qualify the -opportunity, then move into offer & negotiation stage, and -closing by a 'won'..Well, that's if all goes well. - -The user interface is really smooth, I can drag and drop -any business opportunity from one stage to another in just -a few clicks. - -Now I'd like to go further with an interesting contact: -a department store. I highlighted their file by changing -the color. For each contact, I have a form view where I can -access to all necessary information about the contact. I see -here my opportunity Macy's has an estimated revenue of $50,000 -and a success rate of 10%. I need to discuss about this -partnership, so I will schedule a meeting straight from the -contact form: Macy's partnership meeting. It's super easy -to create a new meeting with any contact. I can as well send -an email straight from the opportunity form and the answer -from the prospect will simply pop up in the system too. Now, -let's assume that the meeting took place, therefore I can -mark it as done. And the system automatically suggests a -next activity. Actually, we configured Odoo with a set of -typical activities we follow for every opportunity, and it's -great to have a thorough followup. The next activity will -be a follow-up email. Browsing from one screen to the other -is really simple and adapting to the view too! I can see my -opportunitities as a to-do list of next activities for example. - -With Odoo CRM I have a sales management tool that is really -efficient and me and my team can be well organized. I have -a clear overview of my sales pipeline, meetings, revenues, -and more. - -I go back to my pipeline. Macy's got qualified successfully, -which mean I can move their file to the next step and I will -dapt the expected revenue as discussed. Once I have performed -the qualification process, I will create a new quotation -based on the feedback I received from my contact. For my -existing customers, I can as well quickly discover the activity -around them for any Odoo module I use, and continue to -discuss about them. It's that simple. - -We have seen how I can manage my daily job as business -manager or salesperson. At the end of the journey I would -like to have a concrete view of my customer relationships -and expected revenues. If I go into the reports in Odoo -CRM, I have the possibility to know exactly what's the -evolution of the leads over the past months, or have a look -at the potential revenues and the performance of the -different teams in terms of conversions from leads to -opportunities for instance. So with Odoo I can have a -clear reporting of every activity based on predefined -metrics or favorites. I can search for other filters -too and adapt the view. If I want to go in the details, -I choose the list view and can click on any item - -Odoo CRM is not only a powerful tool to achieve our sales -goals with structured activities, performance dashboard, -next acitivities and more, but also allows me to: - -- Use leads to get in the system unqualified but targeted - contacts I may have gathered in a conference or through - a contact form on my website. Those leads can then be - converted into opportunities. - -- Manage phone calls from Odoo CRM by using the VoIP app. - Call customers, manage a call queue, log calls, schedule - calls and next actions to perform. - -- Integrate with Odoo Sales to create beautiful online or - PDF quotations and turn them into sales orders. - -- Use email marketing for marketing campaigns to my customers - and prospects. - -- Manage my business seamlessly, even on the go. Indeed, - Odoo offers a mobile app that lets every business - organize key sales activities from leads to quotes. - -Odoo CRM is a powerful, yet easy-to-use app. I firstly used -the sales planner to clearly state my objectives and set up -our CRM. It will help you getting started quickly too. diff --git a/crm/overview/main_concepts/terminologies.rst b/crm/overview/main_concepts/terminologies.rst deleted file mode 100644 index abfc87bfe..000000000 --- a/crm/overview/main_concepts/terminologies.rst +++ /dev/null @@ -1,77 +0,0 @@ -====================== -Odoo CRM Terminologies -====================== - -- **CRM (Customer relationship management)**: - System for managing a - company's interactions with current and future customers. It - often involves using technology to organize, automate, and - synchronize sales, marketing, customer service, and technical - support. - -- **Sales cycle** : - Sequence of phases used by a company to convert a - prospect into a customer. - -- **Pipeline :** - Visual representation of your sales process, from the - first contact to the final sale. It refers to the process by - which you generate, qualify and close leads through your sales - cycle. - -- **Sales stage** : - In Odoo CRM, a stage defines where an opportunity - is in your sales cycle and its probability to close a sale. - -- **Lead :** - Someone who becomes aware of your company or someone who - you decide to pursue for a sale, even if they don't know about - your company yet. - -- **Opportunity :** - A lead that has shown an interest in knowing more - about your products/services and therefore has been handed over - to a sales representative - -- **Customer :** - In Odoo CRM, a customer refers to any contact within - your database, whether it is a lead, an opportunity, a client or - a company. - -- **Key Performance Indicator (KPI)** : - A KPI is a measurable value - that demonstrates how effectively a company is achieving key - business objectives. Organizations use KPIs to evaluate their - success at reaching targets. - -- **Lead scoring** : - System assigning a positive or negative score to - prospects according to their web activity and personal - informations in order to determine whether they are "ready for - sales" or not. - -- **Kanban view :** - In Odoo, the Kanban view is a workflow - visualisation tool halfway between a `list - view `__ - and a non-editable `form - view `__ - and displaying records as "cards". Records may be grouped in - columns for use in workflow visualisation or manipulation (e.g. - tasks or work-progress management), or ungrouped (used simply to - visualize records). - -- **List view :** - View allowing you to see your objects (contacts, - companies, tasks, etc.) listed in a table. - -- **Lead generation:** - Process by which a company collects relevant - datas about potential customers in order to enable a relationship - and to push them further down the sales cycle. - -- **Campaign:** - Coordinated set of actions sent via various channels to - a target audience and whose goal is to generate leads. In Odoo - CRM, you can link a lead to the campaign which he comes from in - order to measure its efficiency. \ No newline at end of file diff --git a/crm/overview/process.rst b/crm/overview/process.rst deleted file mode 100644 index ce002fa34..000000000 --- a/crm/overview/process.rst +++ /dev/null @@ -1,8 +0,0 @@ -================ -Process Overview -================ - -.. toctree:: - :titlesonly: - - process/generate_leads diff --git a/crm/overview/process/generate_leads.rst b/crm/overview/process/generate_leads.rst deleted file mode 100644 index 64c156f8e..000000000 --- a/crm/overview/process/generate_leads.rst +++ /dev/null @@ -1,59 +0,0 @@ -============================== -Generating leads with Odoo CRM -============================== - -What is lead generation? -======================== - -Lead generation is the process by which a company acquires leads and -collects relevant datas about potential customers in order to enable a -relationship and to turn them into customers. - -For example, a website visitor who fills in your contact form to know -more about your products and services becomes a lead for your company. -Typically, a Customer Relationship Management tool such as Odoo CRM is -used to centralize, track and manage leads. - -Why is lead generation important for my business? -================================================= - -Generating a constant flow of high-quality leads is one of the most -important responsibility of a marketing team. Actually, a well-managed -lead generation process is like the fuel that will allow your company to -deliver great performances - leads bring meetings, meetings bring sales, -sales bring revenue and more work. - -How to generate leads with Odoo CRM? -==================================== - -Leads can be captured through many sources - marketing campaigns, -exhibitions and trade shows, external databases, etc. The most common -challenge is to successfully gather all the data and to track any lead -activity. Storing leads information in a central place such as Odoo CRM -will release you of these worries and will help you to better automate -your lead generation process, share information with your teams and -analyze your sales processes easily. - -Odoo CRM provides you with several methods to generate leads: - -* :doc:`../../leads/generate/emails` - - An inquiry email sent to one of your company's generic email addresses - can automatically generate a lead or an opportunity. - -* :doc:`../../leads/generate/manual` - - You may want to follow up with a prospective customer met briefly at an - exhibition who gave you his business card. You can manually create a new - lead and enter all the needed information. - -* :doc:`../../leads/generate/website` - - A website visitor who fills in a form automatically generates a lead or - an opportunity in Odoo CRM. - -* :doc:`../../leads/generate/import` - - You can provide your salespeople lists of prospects - for example for a - cold emailing or a cold calling campaign - by importing them from any - CSV file. diff --git a/crm/overview/started.rst b/crm/overview/started.rst deleted file mode 100644 index 9986b44d6..000000000 --- a/crm/overview/started.rst +++ /dev/null @@ -1,8 +0,0 @@ -=============== -Getting started -=============== - -.. toctree:: - :titlesonly: - - started/setup diff --git a/crm/overview/started/media/image03.png b/crm/overview/started/media/image03.png deleted file mode 100644 index 9a7392bae..000000000 Binary files a/crm/overview/started/media/image03.png and /dev/null differ diff --git a/crm/overview/started/media/image04.png b/crm/overview/started/media/image04.png deleted file mode 100644 index bdb3e595f..000000000 Binary files a/crm/overview/started/media/image04.png and /dev/null differ diff --git a/crm/overview/started/media/image05.png b/crm/overview/started/media/image05.png deleted file mode 100644 index 3dc7279b0..000000000 Binary files a/crm/overview/started/media/image05.png and /dev/null differ diff --git a/crm/overview/started/media/setup01.png b/crm/overview/started/media/setup01.png deleted file mode 100644 index 69ade55fe..000000000 Binary files a/crm/overview/started/media/setup01.png and /dev/null differ diff --git a/crm/overview/started/media/setup02.png b/crm/overview/started/media/setup02.png deleted file mode 100644 index 9a3e0c1cc..000000000 Binary files a/crm/overview/started/media/setup02.png and /dev/null differ diff --git a/crm/overview/started/media/setup03.png b/crm/overview/started/media/setup03.png deleted file mode 100644 index ba696c5eb..000000000 Binary files a/crm/overview/started/media/setup03.png and /dev/null differ diff --git a/crm/overview/started/setup.rst b/crm/overview/started/setup.rst deleted file mode 100644 index 0c0a7c65c..000000000 --- a/crm/overview/started/setup.rst +++ /dev/null @@ -1,122 +0,0 @@ -====================================================== -How to setup your teams, sales process and objectives? -====================================================== - -This quick step-by-step guide will lead you through Odoo CRM and help -you handle your sales funnel easily and constantly manage your sales -funnel from lead to customer. - -Configuration -============= - -Create your database from `www.odoo.com/start `__, select the CRM -icon as first app to install, fill in the form and click on *Create -now*. You will automatically be directed to the module when the database -is ready. - -.. image:: media/setup01.png - :align: center - -.. tip:: - - You will notice that the installation of the CRM module has created the - submodules Chat, Calendar and Contacts. They are mandatory so that every - feature of the app is running smoothly. - -Introduction to the Sales Planner -================================= - -The Sales Planner is a useful step-by-step guide created to help you -implement your sales funnel and define your sales objectives easier. We -strongly recommend you to go through every step of the tool the first -time you use Odoo CRM and to follow the requirements. Your input are -strictly personal and intended as a personal guide and mentor into your -work. As it does not interact with the backend, you are free to adapt -any detail whenever you feel it is needed. - -You can reach the Sales Planner from anywhere within the CRM module by -clicking on the progress bar located on the upper-right side of your -screen. It will show you how far you are in the use of the Sales -Planner. - -.. image:: ./media/setup02.png - :align: center - -Set up your first sales team -============================ - -Create a new team ------------------ - -A Direct Sales team is created by default on your instance. You can -either use it or create a new one. Refer to the page :doc:`../../salesteam/setup/create_team` -for more information. - -Assign salespeople to your sales team -------------------------------------- - -When your sales teams are created, the next step is to link your -salespeople to their team so they will be able to work on the -opportunities they are supposed to receive. For example, if within your -company Tim is selling products and John is selling maintenance -contracts, they will be assigned to different teams and will only -receive opportunities that make sense to them. - -In Odoo CRM, you can create a new user on the fly and assign it directly -to a sales team. From the **Dashboard**, click on the button **More** of -your selected sales team, then on **Settings**. Then, under the -**Assignation** section, click on **Create** to add a new salesperson to -the team. - -From the **Create: salesman** pop up window (see screenshot below), -you can assign someone on your team: - -- Either your salesperson already exists in the system and you will - just need to click on it from the drop-down list and it will be - assigned to the team -- Or you want to assign a new salesperson that doesn't exist into the - system yet - you can do it by creating a new user on the fly from - the sales team. Just enter the name of your new salesperson and - click on Create (see below) to create a new user into the system - and directly assign it to your team. The new user will receive an - invite email to set his password and log into the system. Refer - to :doc:`../../salesteam/manage/create_salesperson` - for more information about that process - -.. image:: ./media/setup03.png - :align: center - -Set up your pipeline --------------------- - -Now that your sales team is created and your salespeople are linked to -it, you will need to set up your pipeline -create the process by which -your team will generate, qualify and close opportunities through your -sales cycle. Refer to the document :doc:`../../salesteam/setup/organize_pipeline` -to define the stages of your pipeline. - -Set up incoming email to generate opportunities ------------------------------------------------ - -In Odoo CRM, one way to generate opportunities into your sales team is -to create a generic email address as a trigger. For example, if the -personal email address of your Direct team is -`direct@mycompany.example.com `__\, -every email sent will automatically create a new opportunity into the -sales team. - -Refer to the page :doc:`../../leads/generate/emails` to set it up. - -Automate lead assignation -------------------------- - -If your company generates a high volume of leads every day, it could -be useful to automate the assignation so the system will distribute -all your opportunities automatically to the right department. - -Refer to the document :doc:`../../leads/manage/automatic_assignation` for more information. - -.. todo:: - - Related topics - - CRM onboarding video diff --git a/crm/performance.rst b/crm/performance.rst new file mode 100644 index 000000000..f17ada509 --- /dev/null +++ b/crm/performance.rst @@ -0,0 +1,9 @@ +=================== +Analyze performance +=================== + +.. toctree:: + :titlesonly: + + performance/win_loss + performance/turnover diff --git a/crm/performance/media/turnover01.png b/crm/performance/media/turnover01.png new file mode 100644 index 000000000..192612f52 Binary files /dev/null and b/crm/performance/media/turnover01.png differ diff --git a/crm/performance/media/turnover02.png b/crm/performance/media/turnover02.png new file mode 100644 index 000000000..81d48429d Binary files /dev/null and b/crm/performance/media/turnover02.png differ diff --git a/crm/performance/media/turnover03.png b/crm/performance/media/turnover03.png new file mode 100644 index 000000000..f098f7b1f Binary files /dev/null and b/crm/performance/media/turnover03.png differ diff --git a/crm/performance/media/turnover04.png b/crm/performance/media/turnover04.png new file mode 100644 index 000000000..d4883d4da Binary files /dev/null and b/crm/performance/media/turnover04.png differ diff --git a/crm/performance/media/turnover05.png b/crm/performance/media/turnover05.png new file mode 100644 index 000000000..89000c4ae Binary files /dev/null and b/crm/performance/media/turnover05.png differ diff --git a/crm/performance/media/turnover06.png b/crm/performance/media/turnover06.png new file mode 100644 index 000000000..837fe9c21 Binary files /dev/null and b/crm/performance/media/turnover06.png differ diff --git a/crm/performance/media/win_loss01.png b/crm/performance/media/win_loss01.png new file mode 100644 index 000000000..54b990b15 Binary files /dev/null and b/crm/performance/media/win_loss01.png differ diff --git a/crm/performance/media/win_loss02.png b/crm/performance/media/win_loss02.png new file mode 100644 index 000000000..3fb9a9d44 Binary files /dev/null and b/crm/performance/media/win_loss02.png differ diff --git a/crm/performance/media/win_loss03.png b/crm/performance/media/win_loss03.png new file mode 100644 index 000000000..6c69d2442 Binary files /dev/null and b/crm/performance/media/win_loss03.png differ diff --git a/crm/performance/turnover.rst b/crm/performance/turnover.rst new file mode 100644 index 000000000..1e290383b --- /dev/null +++ b/crm/performance/turnover.rst @@ -0,0 +1,69 @@ +================================= +Get an accurate probable turnover +================================= + +As you progress in your sales cycle, and move from one stage to another, +you can expect to have more precise information about a given +opportunity giving you an better idea of the probability of closing it, +this is important to see your expected turnover in your various reports. + +Configure your kanban stages +============================ + +By default, Odoo Kanban view has four stages: New, Qualified, +Proposition, Won. Respectively with a 10, 30, 70 and 100% probability of +success. You can add stages as well as edit them. By refining default +probability of success for your business on stages, you can make your +probable turnover more and more accurate. + +.. image:: media/turnover01.png + :align: center + +.. image:: media/turnover02.png + :align: center + +Every one of your opportunities will have the probability set by default +but you can modify them manually of course. + +Set your opportunity expected revenue & closing date +==================================================== + +When you get information on a prospect, it is important to set an +expected revenue and expected closing date. This will let you see your +total expected revenue by stage as well as give a more accurate probable +turnover. + +.. image:: media/turnover03.png + :align: center + +See the overdue or closing soon opportunities +============================================= + +In your pipeline, you can filter opportunities by how soon they will be +closing, letting you prioritize. + +.. image:: media/turnover04.png + :align: center + +As a sales manager, this tool can also help you see potential ways to +improve your sale process, for example a lot of opportunities in early +stages but with near closing date might indicate an issue. + +View your total expected revenue and probable turnover +====================================================== + +While in your Kanban view you can see the expected revenue for each of +your stages. This is based on each opportunity expected revenue that you +set. + +.. image:: media/turnover05.png + :align: center + +As a manager you can go to :menuselection:`CRM --> Reporting --> Pipeline Analysis` +by default *Probable Turnover* is set as a measure. This report will take +into account the revenue you set on each opportunity but also the +probability they will close. This gives you a much better idea of your +expected revenue allowing you to make plans and set targets. + +.. image:: media/turnover06.png + :align: center diff --git a/crm/performance/win_loss.rst b/crm/performance/win_loss.rst new file mode 100644 index 000000000..833fd948f --- /dev/null +++ b/crm/performance/win_loss.rst @@ -0,0 +1,26 @@ +========================= +Check your Win/Loss Ratio +========================= + +To see how well you are doing with your pipeline, take a look at +the Win/Loss ratio. + +To access this report, go to your *Pipeline* view under the +*Reporting* tab. + +From there you can filter to which opportunities you wish to see, yours, +the ones from your sales channel, your whole company, etc. You can then +click on filter and check Won/Lost. + +.. image:: media/win_loss01.png + :align: center + +You can also change the *Measures* to *Total Revenue*. + +.. image:: media/win_loss02.png + :align: center + +You also have the ability to switch to a pie chart view. + +.. image:: media/win_loss03.png + :align: center diff --git a/crm/pipeline.rst b/crm/pipeline.rst new file mode 100644 index 000000000..5e99465bb --- /dev/null +++ b/crm/pipeline.rst @@ -0,0 +1,10 @@ +===================== +Organize the pipeline +===================== + +.. toctree:: + :titlesonly: + + ../discuss/plan_activities + pipeline/lost_opportunities + pipeline/multi_sales_team diff --git a/crm/pipeline/lost_opportunities.rst b/crm/pipeline/lost_opportunities.rst new file mode 100644 index 000000000..2a54cdd02 --- /dev/null +++ b/crm/pipeline/lost_opportunities.rst @@ -0,0 +1,78 @@ +========================= +Manage lost opportunities +========================= + +While working with your opportunities, you might lose some of them. You +will want to keep track of the reasons you lost them and also which ways +Odoo can help you recover them in the future. + +Mark a lead as lost +=================== + +While in your pipeline, select any opportunity you want and you will see +a *Mark Lost* button. + +You can then select an existing *Lost Reason* or create a new one +right there. + +.. image:: media/lost_opportunities01.png + :align: center + +Manage & create lost reasons +---------------------------- + +You will find your *Lost Reasons* under :menuselection:`Configuration --> Lost Reasons`. + +You can select & rename any of them as well as create a new one from +there. + +Retrieve lost opportunities +=========================== + +To retrieve lost opportunities and do actions on them (send an email, +make a feedback call, etc.), select the *Lost* filter in the search +bar. + +.. image:: media/lost_opportunities02.png + :align: center + +You will then see all your lost opportunities. + +If you want to refine them further, you can add a filter on the *Lost +Reason*. + +For Example, *Too Expensive*. + +.. image:: media/lost_opportunities03.png + :align: center + +Restore lost opportunities +========================== + +From the Kanban view with the filter(s) in place, you can select any +opportunity you wish and work on it as usual. You can also restore it by +clicking on *Archived*. + +.. image:: media/lost_opportunities04.png + :align: center + +You can also restore items in batch from the Kanban view when they +belong to the same stage. Select *Restore Records* in the column +options. You can also archive the same way. + +.. image:: media/lost_opportunities05.png + :align: center + +To select specific opportunities, you should switch to the list view. + +.. image:: media/lost_opportunities06.png + :align: center + +Then you can select as many or all opportunities and select the actions +you want to take. + +.. image:: media/lost_opportunities07.png + :align: center + +.. seealso:: + * :doc:`../performance/win_loss` diff --git a/crm/pipeline/media/lost_opportunities01.png b/crm/pipeline/media/lost_opportunities01.png new file mode 100644 index 000000000..c50bcca55 Binary files /dev/null and b/crm/pipeline/media/lost_opportunities01.png differ diff --git a/crm/pipeline/media/lost_opportunities02.png b/crm/pipeline/media/lost_opportunities02.png new file mode 100644 index 000000000..3f4e766a3 Binary files /dev/null and b/crm/pipeline/media/lost_opportunities02.png differ diff --git a/crm/pipeline/media/lost_opportunities03.png b/crm/pipeline/media/lost_opportunities03.png new file mode 100644 index 000000000..98b53c78f Binary files /dev/null and b/crm/pipeline/media/lost_opportunities03.png differ diff --git a/crm/pipeline/media/lost_opportunities04.png b/crm/pipeline/media/lost_opportunities04.png new file mode 100644 index 000000000..9a03c2eee Binary files /dev/null and b/crm/pipeline/media/lost_opportunities04.png differ diff --git a/crm/pipeline/media/lost_opportunities05.png b/crm/pipeline/media/lost_opportunities05.png new file mode 100644 index 000000000..d6b9df328 Binary files /dev/null and b/crm/pipeline/media/lost_opportunities05.png differ diff --git a/crm/pipeline/media/lost_opportunities06.png b/crm/pipeline/media/lost_opportunities06.png new file mode 100644 index 000000000..0e9d5fcf5 Binary files /dev/null and b/crm/pipeline/media/lost_opportunities06.png differ diff --git a/crm/pipeline/media/lost_opportunities07.png b/crm/pipeline/media/lost_opportunities07.png new file mode 100644 index 000000000..96d4722a4 Binary files /dev/null and b/crm/pipeline/media/lost_opportunities07.png differ diff --git a/crm/pipeline/media/multi_sales_team01.png b/crm/pipeline/media/multi_sales_team01.png new file mode 100644 index 000000000..9d71b8b5e Binary files /dev/null and b/crm/pipeline/media/multi_sales_team01.png differ diff --git a/crm/pipeline/media/multi_sales_team02.png b/crm/pipeline/media/multi_sales_team02.png new file mode 100644 index 000000000..7b5108e5d Binary files /dev/null and b/crm/pipeline/media/multi_sales_team02.png differ diff --git a/crm/pipeline/media/multi_sales_team03.png b/crm/pipeline/media/multi_sales_team03.png new file mode 100644 index 000000000..eef8468fb Binary files /dev/null and b/crm/pipeline/media/multi_sales_team03.png differ diff --git a/crm/pipeline/media/multi_sales_team04.png b/crm/pipeline/media/multi_sales_team04.png new file mode 100644 index 000000000..f21f58002 Binary files /dev/null and b/crm/pipeline/media/multi_sales_team04.png differ diff --git a/crm/pipeline/multi_sales_team.rst b/crm/pipeline/multi_sales_team.rst new file mode 100644 index 000000000..aea11adce --- /dev/null +++ b/crm/pipeline/multi_sales_team.rst @@ -0,0 +1,47 @@ +=========================== +Manage multiple sales teams +=========================== + +In Odoo, you can manage several sales teams, departments or channels +with specific sales processes. To do so, we use the concept of *Sales +Channel*. + +Create a new sales channel +========================== + +To create a new *Sales Channel*, go to :menuselection:`Configuration --> Sales Channels`. + +There you can set an email alias to it. Every message sent to that email +address will create a lead/opportunity. + +.. image:: media/multi_sales_team01.png + :align: center + +Add members to your sales channel +--------------------------------- + +You can add members to any channel; that way those members will see the +pipeline structure of the sales channel when opening it. Any +lead/opportunity assigned to them will link to the sales channel. +Therefore, you can only be a member of one channel. + +This will ease the process review of the team manager. + +.. image:: media/multi_sales_team02.png + :align: center + +If you now filter on this specific channel in your pipeline, you will +find all of its opportunities. + +.. image:: media/multi_sales_team03.png + :align: center + +Sales channel dashboard +======================= + +To see the operations and results of any sales channel at a glance, the +sales manager also has access to the *Sales Channel Dashboard* under +*Reporting*. + +It is shared with the whole ecosystem so every revenue stream is +included in it: Sales, eCommerce, PoS, etc. diff --git a/crm/reporting.rst b/crm/reporting.rst deleted file mode 100644 index 504384006..000000000 --- a/crm/reporting.rst +++ /dev/null @@ -1,9 +0,0 @@ -=========== -Reporting -=========== - -.. toctree:: - :titlesonly: - - reporting/analysis - reporting/review \ No newline at end of file diff --git a/crm/reporting/analysis.rst b/crm/reporting/analysis.rst deleted file mode 100644 index 64ba4bc58..000000000 --- a/crm/reporting/analysis.rst +++ /dev/null @@ -1,126 +0,0 @@ -=========================================================================== -How to analyze the sales performance of your team and get customize reports -=========================================================================== - -As a manager, you need to constantly monitor your team's performance -in order to help you take accurate and relevant decisions for the -company. Therefore, the **Reporting** section of **Odoo Sales** represents a -very important tool that helps you get a better understanding of where -your company's strengths, weaknesses and opportunities are, showing -you trends and forecasts for key metrics such as the number of -opportunities and their expected revenue over time , the close rate by -team or the length of sales cycle for a given product or service. - -Beyond these obvious tracking sales funnel metrics, there are some -other KPIs that can be very valuable to your company when it comes to -judging sales funnel success. - -Review pipelines -================= - -You will have access to your sales funnel performance from the **Sales** -module, by clicking on :menuselection:`Sales --> Reports --> Pipeline analysis`. -By default, the report groups all your opportunities by stage (learn more on how to -create and customize stage by reading :doc:`../salesteam/setup/organize_pipeline`) -and expected revenues for the current month. This report is perfect for -the **Sales Manager** to periodically review the sales pipeline with the -relevant sales teams. Simply by accessing this basic report, you can get -a quick overview of your actual sales performance. - -You can add a lot of extra data to your report by clicking on the -**measures** icon, such as : - -- Expected revenue. - -- overpassed deadline. - -- Delay to assign (the average time between lead creation and lead - assignment). - -- Delay to close (average time between lead assignment and close). - -- the number of interactions per opportunity. - -- etc. - -.. image:: media/analysis02.png - :align: center - -.. tip:: - By clicking on the **+** and **-** icons, you can drill up and down your report - in order to change the way your information is displayed. For example, if I - want to see the expected revenues of my **Direct Sales** team, I need to click - on the **+** icon on the vertical axis then on **Sales Team**. - -Depending on the data you want to highlight, you may need to display -your reports in a more visual view. Odoo **CRM** allows you to transform -your report in just a click thanks to 3 graph views : **Pie Chart**, **Bar -Chart** and **Line Chart**. These views are accessible through the icons -highlighted on the screenshot below. - -.. image:: media/analysis03.png - :align: center - -Customize reports -================= - -You can easily customize your analysis reports depending on the -**KPIs** (see :doc:`../overview/main_concepts/terminologies`) -you want to access. To do so, use the **Advanced search view** located in -the right hand side of your screen, by clicking on the magnifying glass -icon at the end of the search bar button. This function allows you to -highlight only selected data on your report. The **filters** option is -very useful in order to display some categories of opportunities, while -the **Group by** option improves the readability of your reports according -to your needs. Note that you can filter and group by any existing field -from your CRM, making your customization very flexible and powerful. - -.. image:: media/analysis01.png - :align: center - -.. tip:: - You can save and reuse any customized filter by clicking on - **Favorites** from the **Advanced search view** and then on - **Save current search**. The saved filter will then be accessible - from the **Favorites** menu. - -Here are a few examples of customized reports that you can use to -monitor your sales' performances : - -Evaluate the current pipeline of each of your salespeople ---------------------------------------------------------- - -From your pipeline analysis report, make sure first that the -**Expected revenue** option is selected under the **Measures** drop-down -list. Then, use the **+** and **-** icons and add **Salesperson** and -**Stage** to your vertical axis, and filter your desired salesperson. Then -click on the **graph view** icon to display a visual representation of -your salespeople by stage. This custom report allows you to easily -overview the sales activities of your salespeople. - -.. image:: media/analysis05.png - :align: center - -Forecast monthly revenue by sales team --------------------------------------- - -In order to predict monthly revenue and to estimate the short-term -performances of your teams, you need to play with two important metrics : -the **expected revenue** and the **expected closing**. - -From your pipeline analysis report, make sure first that the -**Expected revenue** option is selected under the **Measures** drop-down -list. Then click on the **+** icon from the vertical axis and select -**Sales team**. Then, on the horizontal axis, click on the **+** icon and -select **Expected closing.** - -.. image:: media/analysis04.png - :align: center - -.. tip:: - In order to keep your forecasts accurate and relevant, - make sure your salespeople correctly set up the expected closing - and the expected revenue for each one of their opportunities - -.. seealso:: - * :doc:`../salesteam/setup/organize_pipeline` diff --git a/crm/reporting/media/analysis01.png b/crm/reporting/media/analysis01.png deleted file mode 100644 index 6640ec0ee..000000000 Binary files a/crm/reporting/media/analysis01.png and /dev/null differ diff --git a/crm/reporting/media/analysis02.png b/crm/reporting/media/analysis02.png deleted file mode 100644 index 05ddd3507..000000000 Binary files a/crm/reporting/media/analysis02.png and /dev/null differ diff --git a/crm/reporting/media/analysis03.png b/crm/reporting/media/analysis03.png deleted file mode 100644 index 955678bc8..000000000 Binary files a/crm/reporting/media/analysis03.png and /dev/null differ diff --git a/crm/reporting/media/analysis04.png b/crm/reporting/media/analysis04.png deleted file mode 100644 index 2c9f61727..000000000 Binary files a/crm/reporting/media/analysis04.png and /dev/null differ diff --git a/crm/reporting/media/analysis05.png b/crm/reporting/media/analysis05.png deleted file mode 100644 index 29143b602..000000000 Binary files a/crm/reporting/media/analysis05.png and /dev/null differ diff --git a/crm/reporting/media/review01.png b/crm/reporting/media/review01.png deleted file mode 100644 index 4d2489cc4..000000000 Binary files a/crm/reporting/media/review01.png and /dev/null differ diff --git a/crm/reporting/media/review02.png b/crm/reporting/media/review02.png deleted file mode 100644 index d1f4e0012..000000000 Binary files a/crm/reporting/media/review02.png and /dev/null differ diff --git a/crm/reporting/media/review03.png b/crm/reporting/media/review03.png deleted file mode 100644 index 2d1662944..000000000 Binary files a/crm/reporting/media/review03.png and /dev/null differ diff --git a/crm/reporting/media/review04.png b/crm/reporting/media/review04.png deleted file mode 100644 index 53c8d98a5..000000000 Binary files a/crm/reporting/media/review04.png and /dev/null differ diff --git a/crm/reporting/media/review05.png b/crm/reporting/media/review05.png deleted file mode 100644 index 4c11f8ae7..000000000 Binary files a/crm/reporting/media/review05.png and /dev/null differ diff --git a/crm/reporting/media/review06.png b/crm/reporting/media/review06.png deleted file mode 100644 index e9a5a18e5..000000000 Binary files a/crm/reporting/media/review06.png and /dev/null differ diff --git a/crm/reporting/media/review07.png b/crm/reporting/media/review07.png deleted file mode 100644 index c8dc7eb73..000000000 Binary files a/crm/reporting/media/review07.png and /dev/null differ diff --git a/crm/reporting/media/review08.png b/crm/reporting/media/review08.png deleted file mode 100644 index cece0e32c..000000000 Binary files a/crm/reporting/media/review08.png and /dev/null differ diff --git a/crm/reporting/media/review09.png b/crm/reporting/media/review09.png deleted file mode 100644 index 30d245e7d..000000000 Binary files a/crm/reporting/media/review09.png and /dev/null differ diff --git a/crm/reporting/review.rst b/crm/reporting/review.rst deleted file mode 100644 index e89513b15..000000000 --- a/crm/reporting/review.rst +++ /dev/null @@ -1,132 +0,0 @@ -================================================================= -How to review my personal sales activities (new sales dashboard) -================================================================= - -Sales professionals are struggling everyday to hit their target and -follow up on sales activities. They need to access anytime some -important metrics in order to know how they are performing and better -organize their daily work. - -Within the Odoo CRM module, every team member has access to a -personalized and individual dashboard with a real-time overview of: - -- Top priorities: they instantly see their scheduled meetings and - next actions - -- Sales performances : they know exactly how they perform compared - to their monthly targets and last month activities. - -.. image:: media/review01.png - :align: center - -Configuration -============= - -Install the CRM application ---------------------------- - -In order to manage your sales funnel and track your opportunities, you -need to install the CRM module, from the **Apps** icon. - -.. image:: media/review02.png - :align: center - -Create opportunities --------------------- - -If your pipeline is empty, your sales dashboard will look like the -screenshot below. You will need to create a few opportunities to -activate your dashboard (read the related documentation -:doc:`../leads/generate/manual` to learn more). - -.. image:: media/review03.png - :align: center - -Your dashboard will update in real-time based on the informations you -will log into the CRM. - -.. tip:: - you can click anywhere on the dashboard to get a detailed - analysis of your activities. Then, you can easily create - favourite reports and export to excel. - -Daily tasks to process -====================== - -The left part of the sales dashboard (labelled **To Do**) displays the -number of meetings and next actions (for example if you need to call a -prospect or to follow-up by email) scheduled for the next 7 days. - -.. image:: media/review04.png - :align: center - -Meetings --------- - -In the example here above, I see that I have no meeting scheduled for -today and 3 meeting scheduled for the next 7 days. I just have to -click on the **meeting** button to access my calendar and have a view on -my upcoming appointments. - -.. image:: media/review05.png - :align: center - -Next actions ------------- - -Back on the above example, I have 1 activity requiring an action from -me. If I click on the **Next action** green button, I will be redirected -to the contact form of the corresponding opportunity. - -.. image:: media/review06.png - :align: center - -Under the **next activity** field, I see that I had planned to send a -brochure by email today. -As soon as the activity is completed, I can click on **done** (or -**cancel**) in order to remove this opportunity from my next actions. - -.. note:: - When one of your next activities is overdue, it will appear - in orange in your dashboard. - -Performances -============ - -The right part of your sales dashboard is about my sales performances. I -will be able to evaluate how I am performing compared to my targets -(which have been set up by my sales manager) and my activities of the -last month. - -.. image:: media/review07.png - :align: center - -Activities done ---------------- - -The **activities done** correspond to the next actions that have been -completed (meaning that you have clicked on **done** under the **next -activity** field). When I click on it, I will access a detailed reporting -regarding the activities that I have completed. - -.. image:: media/review08.png - :align: center - -Won in opportunities --------------------- - -This section will sum up the expected revenue of all the opportunities -within my pipeline with a stage **Won**. - -.. image:: media/review09.png - :align: center - -Quantity invoiced ------------------ - -This section will sum up the amount invoiced to my opportunities. For -more information about the invoicing process, refer to the related -documentation: :doc:`../../accounting/receivables/customer_invoices/overview` - -.. seealso:: - * :doc:`analysis` \ No newline at end of file diff --git a/crm/salesteam.rst b/crm/salesteam.rst deleted file mode 100644 index 6790c9759..000000000 --- a/crm/salesteam.rst +++ /dev/null @@ -1,9 +0,0 @@ -========== -Sales Team -========== - -.. toctree:: - :titlesonly: - - salesteam/setup - salesteam/manage diff --git a/crm/salesteam/manage.rst b/crm/salesteam/manage.rst deleted file mode 100644 index 5e35ebfba..000000000 --- a/crm/salesteam/manage.rst +++ /dev/null @@ -1,9 +0,0 @@ -================== -Manage salespeople -================== - -.. toctree:: - :titlesonly: - - manage/create_salesperson - manage/reward \ No newline at end of file diff --git a/crm/salesteam/manage/create_salesperson.rst b/crm/salesteam/manage/create_salesperson.rst deleted file mode 100644 index b4a9b27fb..000000000 --- a/crm/salesteam/manage/create_salesperson.rst +++ /dev/null @@ -1,69 +0,0 @@ -================================ -How to create a new salesperson? -================================ - -Create a new user -================= - -From the Settings module, go to the submenu :menuselection:`Users --> Users` and click on -**Create**. Add first the name of your new salesperson and his -professional email address - the one he will use to log in to his Odoo -instance - and a picture. - -.. image:: ./media/create01.png - :align: center - -Under "Access Rights", you can choose which applications your user can -access and use. Different levels of rights are available depending on -the app. For the Sales application, you can choose between three levels: - -- **See own leads**: the user will be able to access his own data only - -- **See all leads**: the user will be able to access all records of every - salesman in the sales module - -- **Manager**: the user will be able to access the sales configuration as - well as the statistics reports - -When you're done editing the page and have clicked on **Save**, an -invitation email will automatically be sent to the user, from which he -will be able to log into his personal account. - -.. image:: ./media/create02.png - :align: center - -Register your user into his sales team -====================================== - -Your user is now registered in Odoo and can log in to his own session. -You can also add him to the sales team of your choice. From the sales -module, go to your dashboard and click on the **More** button of the -desired sales team, then on **Settings**. - -.. image:: ./media/create03.jpg - :align: center - - -.. note:: - - If you need to create a new sales team first, refer to the page :doc:`../setup/create_team` - -Then, under "Team Members", click on **Add** and select the name of your -salesman from the list. The salesperson is now successfully added to -your sales team. - -.. image:: ./media/create04.png - :align: center - -.. tip:: - - You can also add a new salesperson on the fly from your sales team even before he is registered as an Odoo user. - From the above screenshot, click on "Create" to add your salesperson and enter his name and email address. - After saving, the salesperson will receive an invite containing a link to set his password. - You will then be able to define his accesses rights under the :menuselection:`Settings --> Users` menu. - -.. seealso:: - - * :doc:`../../overview/started/setup` - - * :doc:`../setup/create_team` diff --git a/crm/salesteam/manage/media/create01.png b/crm/salesteam/manage/media/create01.png deleted file mode 100644 index c9c614ac6..000000000 Binary files a/crm/salesteam/manage/media/create01.png and /dev/null differ diff --git a/crm/salesteam/manage/media/create02.png b/crm/salesteam/manage/media/create02.png deleted file mode 100644 index 2975011d9..000000000 Binary files a/crm/salesteam/manage/media/create02.png and /dev/null differ diff --git a/crm/salesteam/manage/media/create03.jpg b/crm/salesteam/manage/media/create03.jpg deleted file mode 100644 index da0557832..000000000 Binary files a/crm/salesteam/manage/media/create03.jpg and /dev/null differ diff --git a/crm/salesteam/manage/media/create04.png b/crm/salesteam/manage/media/create04.png deleted file mode 100644 index eacc3da3f..000000000 Binary files a/crm/salesteam/manage/media/create04.png and /dev/null differ diff --git a/crm/salesteam/manage/media/reward01.png b/crm/salesteam/manage/media/reward01.png deleted file mode 100644 index 19b84baa6..000000000 Binary files a/crm/salesteam/manage/media/reward01.png and /dev/null differ diff --git a/crm/salesteam/manage/media/reward02.png b/crm/salesteam/manage/media/reward02.png deleted file mode 100644 index e6c7eccb5..000000000 Binary files a/crm/salesteam/manage/media/reward02.png and /dev/null differ diff --git a/crm/salesteam/manage/media/reward03.png b/crm/salesteam/manage/media/reward03.png deleted file mode 100644 index 1af8f53e2..000000000 Binary files a/crm/salesteam/manage/media/reward03.png and /dev/null differ diff --git a/crm/salesteam/manage/media/reward04.png b/crm/salesteam/manage/media/reward04.png deleted file mode 100644 index ecd84869f..000000000 Binary files a/crm/salesteam/manage/media/reward04.png and /dev/null differ diff --git a/crm/salesteam/manage/media/reward05.png b/crm/salesteam/manage/media/reward05.png deleted file mode 100644 index 16eb54390..000000000 Binary files a/crm/salesteam/manage/media/reward05.png and /dev/null differ diff --git a/crm/salesteam/manage/reward.rst b/crm/salesteam/manage/reward.rst deleted file mode 100644 index d63038641..000000000 --- a/crm/salesteam/manage/reward.rst +++ /dev/null @@ -1,106 +0,0 @@ -========================================== -How to motivate and reward my salespeople? -========================================== - -Challenging your employees to reach specific targets with goals and -rewards is an excellent way to reinforce good habits and improve your -salespeople productivity. The **Gamification** app of Odoo gives you simple -and creative ways to motivate and evaluate your employees with real-time -recognition and badges inspired by game mechanics. - -Configuration -============= - -From the **Apps** menu, search and install the **Gamification** module. -You can also install the **CRM gamification** app, which will add some -useful data (goals and challenges) that can be used related to the -usage of the **CRM/Sale** modules. - -.. image:: media/reward01.png - :align: center - -Create a challenge -================== - -You will now be able to create your first challenge from the menu -:menuselection:`Settings --> Gamification Tools --> Challenges`. - -.. note:: - As the gamification tool is a one-time technical setup, - you will need to activate the technical features in order - to access the configuration. In order to do so, click on - the interrogation mark available from any app (upper-right) - and click on **About** and then **Activate the developer mode**. - -.. image:: media/reward02.png - :align: center - -A challenge is a mission that you will send to your salespeople. It can -include one or several goals and is set up for a specific period of -time. Configure your challenge as follows: - -- Assign the salespeople to be challenged - -- Assign a responsible - -- Set up the periodicity along with the start and the end date - -- Select your goals - -- Set up your rewards (badges) - -.. note:: - Badges are granted when a challenge is finished. This is either - at the end of a running period (eg: end of the month for a - monthly challenge), at the end date of a challenge - (if no periodicity is set) or when the challenge is manually closed. - -For example, on the screenshot below, I have challenged 2 employees with -a **Monthly Sales Target**. The challenge will be based on 2 goals: the -total amount invoiced and the number of new leads generated. At the end -of the month, the winner will be granted with a badge. - -.. image:: media/reward03.png - :align: center - -Set up goals ------------- - -The users can be evaluated using goals and numerical objectives to -reach. **Goals** are assigned through **challenges** to evaluate (see -here above) and compare members of a team with each others and through -time. - -You can create a new goal on the fly from a **Challenge**, by clicking on -**Add new item** under **Goals**. You can select any -business object as a goal, according to your company's needs, such as : - -- number of new leads, - -- time to qualify a lead or - -- total amount invoiced in a specific week, month or any other time - frame based on your management preferences. - -.. image:: media/reward04.png - :align: center - -.. note:: - Goals may include your database setup as well (e.g. set your - company data and a timezone, create new users, etc.). - -Set up rewards --------------- - -For non-numerical achievements, **badges** can be granted to users. -From a simple *thank you* to an exceptional achievement, a badge is an -easy way to exprimate gratitude to a user for their good work. - -You can easily create a grant badges to your employees based on their -performance under :menuselection:`Gamification Tools --> Badges`. - -.. image:: media/reward05.png - :align: center - -.. seealso:: - * :doc:`../../reporting/analysis` \ No newline at end of file diff --git a/crm/salesteam/setup.rst b/crm/salesteam/setup.rst deleted file mode 100644 index 20e0f0853..000000000 --- a/crm/salesteam/setup.rst +++ /dev/null @@ -1,9 +0,0 @@ -========== -Sales Team -========== - -.. toctree:: - :titlesonly: - - setup/create_team - setup/organize_pipeline diff --git a/crm/salesteam/setup/create_team.rst b/crm/salesteam/setup/create_team.rst deleted file mode 100644 index 18a466d47..000000000 --- a/crm/salesteam/setup/create_team.rst +++ /dev/null @@ -1,35 +0,0 @@ -============================ -How to create a new channel? -============================ - -In the Sales module, your sales channels are accessible from the -**Dashboard** menu. If you start from a new instance, you will find a -sales channel installed by default : Direct sales. You can either start -using that default sales channel and edit it (refer to the section -*Create and Organize your stages* from the page :doc:`organize_pipeline`) -or create a new one from scratch. - -To create a new channel, go to :menuselection:`Configuration --> Sales Channels` and -click on **Create**. - -.. image:: ./media/create01.png - :align: center - -Fill in the fields : - -- Enter the name of your channel - -- Select your channel leader - -- Select your team members - -Don't forget to tick the "Opportunities" box if you want to manage -opportunities from it and to click on SAVE when you're done. Your can -now access your new channel from your Dashboard. - -.. image:: ./media/create02.png - :align: center - -.. note:: - - If you started to work on an empty database and didn't create new users, refer to the page :doc:`../manage/create_salesperson`. diff --git a/crm/salesteam/setup/media/add_column.png b/crm/salesteam/setup/media/add_column.png deleted file mode 100644 index 1c241e9f2..000000000 Binary files a/crm/salesteam/setup/media/add_column.png and /dev/null differ diff --git a/crm/salesteam/setup/media/create01.png b/crm/salesteam/setup/media/create01.png deleted file mode 100644 index 3d7d84973..000000000 Binary files a/crm/salesteam/setup/media/create01.png and /dev/null differ diff --git a/crm/salesteam/setup/media/create02.png b/crm/salesteam/setup/media/create02.png deleted file mode 100644 index f71e09808..000000000 Binary files a/crm/salesteam/setup/media/create02.png and /dev/null differ diff --git a/crm/salesteam/setup/media/image01.jpg b/crm/salesteam/setup/media/image01.jpg deleted file mode 100644 index 113fccb0d..000000000 Binary files a/crm/salesteam/setup/media/image01.jpg and /dev/null differ diff --git a/crm/salesteam/setup/media/image07.jpg b/crm/salesteam/setup/media/image07.jpg deleted file mode 100644 index 242844168..000000000 Binary files a/crm/salesteam/setup/media/image07.jpg and /dev/null differ diff --git a/crm/salesteam/setup/media/image08.jpg b/crm/salesteam/setup/media/image08.jpg deleted file mode 100644 index 5ce40b5ff..000000000 Binary files a/crm/salesteam/setup/media/image08.jpg and /dev/null differ diff --git a/crm/salesteam/setup/media/image09.jpg b/crm/salesteam/setup/media/image09.jpg deleted file mode 100644 index ffc1635db..000000000 Binary files a/crm/salesteam/setup/media/image09.jpg and /dev/null differ diff --git a/crm/salesteam/setup/media/team_kanban.jpg b/crm/salesteam/setup/media/team_kanban.jpg deleted file mode 100644 index 0ea01d234..000000000 Binary files a/crm/salesteam/setup/media/team_kanban.jpg and /dev/null differ diff --git a/crm/salesteam/setup/organize_pipeline.rst b/crm/salesteam/setup/organize_pipeline.rst deleted file mode 100644 index 6e2ca3f85..000000000 --- a/crm/salesteam/setup/organize_pipeline.rst +++ /dev/null @@ -1,159 +0,0 @@ -======================================= -Set up and organize your sales pipeline -======================================= - -A well structured sales pipeline is crucial in order to keep control of -your sales process and to have a 360-degrees view of your leads, -opportunities and customers. - -The sales pipeline is a visual representation of your sales process, -from the first contact to the final sale. It refers to the process by -which you generate, qualify and close leads through your sales cycle. -In Odoo CRM, leads are brought in at the left end of the sales -pipeline in the Kanban view and then moved along to the right from one -stage to another. - -Each stage refers to a specific step in the sale cycle and -specifically the sale-readiness of your potential customer. The number -of stages in the sales funnel varies from one company to another. An -example of a sales funnel will contain the following stages: -*Territory, Qualified, Qualified Sponsor, Proposition, Negotiation, -Won, Lost*. - -.. image:: ./media/team_kanban.jpg - :align: center - -Of course, each organization defines the sales funnel depending on their -processes and workflow, so more or fewer stages may exist. - -Create and organize your stages -=============================== - -Add/ rearrange stages ---------------------- - -From the sales module, go to your dashboard and click on the -**PIPELINE** button of the desired sales team. If you don't have any -sales team yet, you need to create one first. - -.. todo:: link to the create salesteam page - -.. image:: ./media/image09.jpg - :align: center - -.. todo:: ***Kanban view*** link to the CRM terminologies page - -From the Kanban view of -your pipeline, you can add stages by clicking on **Add new column.** -When a column is created, Odoo will then automatically propose you to -add another column in order to complete your process. If you want to -rearrange the order of your stages, you can easily do so by dragging and -dropping the column you want to move to the desired location. - -.. image:: ./media/add_column.png - :align: center - -.. tip:: - - You can add as many stages as you wish, even if we advise you not having - more than 6 in order to keep a clear pipeline - -Activate the lead stage ------------------------ - -Some companies use a pre qualification step to manage their leads before -to convert them into opportunities. To activate the lead stage, go to -:menuselection:`Configuration --> Settings` and select the radio button as shown -below. It will create a new submenu **Leads** under **Sales** that -gives you access to a listview of all your leads. - -.. image:: ./media/image01.jpg - :align: center - -Set up stage probabilities -========================== - -What is a stage probability? ----------------------------- - -To better understand what are the chances of closing a deal for a given -opportunity in your pipe, you have to set up a probability percentage -for each of your stages. That percentage refers to the success rate of -closing the deal. - -.. note:: Setting up stage probabilities is essential if you want to estimate the expected revenues of your sales cycle - -.. todo:: estimate the expected revenues of your sales cycle (*link to the related topic*) - -For example, if your sales cycle contains the stages *Territory, -Qualified, Qualified Sponsor, Proposition, Negotiation, Won and Lost,* -then your workflow could look like this : - -- **Territory** : opportunity just received from Leads Management or - created from a cold call campaign. Customer's Interest is not - yet confirmed. - - *Success rate : 5%* - -- **Qualified** : prospect's business and workflow are understood, - pains are identified and confirmed, budget and timing are known - - *Success rate : 15%* - -- **Qualified sponsor**: direct contact with decision maker has been - done - - *Success rate : 25%* - -- **Proposition** : the prospect received a quotation - - *Success rate : 50%* - -- **Negotiation**: the prospect negotiates his quotation - - *Success rate : 75%* - -- **Won** : the prospect confirmed his quotation and received a sales - order. He is now a customer - - *Success rate : 100%* - -- **Lost** : the prospect is no longer interested - - *Success rate : 0%* - -.. tip:: - - Within your pipeline, each stage should correspond to a defined goal with - a corresponding probability. Every time you move your opportunity to the - next stage, your probability of closing the sale will automatically adapt. - - You should consider using probability value as **100** when the deal is - closed-won and **0** for deal closed-lost. - -How to set up stage probabilities? ------------------------------------ - -To edit a stage, click on the **Settings** icon at the right of the -desired stage then on EDIT - -.. image:: ./media/image08.jpg - :align: center - -Select the Change probability automatically checkbox to let Odoo adapt -the probability of the opportunity to the probability defined in the -stage. For example, if you set a probability of 0% (Lost) or 100% (Won), -Odoo will assign the corresponding stage when the opportunity is marked -as Lost or Won. - -.. tip:: - - Under the requirements field you can enter the internal requirements for - this stage. It will appear as a tooltip when you place your mouse over the - name of a stage. - -.. todo:: Read more - - - *How to estimate the effectiveness of my sales cycle?* - - *How to estimate expected revenues ?* - diff --git a/crm/track_leads.rst b/crm/track_leads.rst new file mode 100644 index 000000000..56b0a8017 --- /dev/null +++ b/crm/track_leads.rst @@ -0,0 +1,9 @@ +====================== +Assign and track leads +====================== + +.. toctree:: + :titlesonly: + + track_leads/prospect_visits + track_leads/lead_scoring diff --git a/crm/track_leads/lead_scoring.rst b/crm/track_leads/lead_scoring.rst new file mode 100644 index 000000000..3a9b0e042 --- /dev/null +++ b/crm/track_leads/lead_scoring.rst @@ -0,0 +1,78 @@ +============================= +Assign leads based on scoring +============================= + +With *Leads Scoring* you can automatically rank your leads based on +selected criterias. + +For example you could score customers from your country higher or the +ones that visited specific pages on your website. + +Configuration +============= + +To use scoring, install the free module *Lead Scoring* under your +*Apps* page (only available in Odoo Enterprise). + +.. image:: media/lead_scoring01.png + :align: center + +Create scoring rules +==================== + +You now have a new tab in your *CRM* app called *Leads Management* +where you can manage your scoring rules. + +Here's an example for a Canadian lead, you can modify for whatever +criteria you wish to score your leads on. You can add as many criterias +as you wish. + +.. image:: media/lead_scoring02.png + :align: center + +Every hour every lead without a score will be automatically scanned and +assigned their right score according to your scoring rules. + +.. image:: media/lead_scoring03.png + :align: center + +Assign leads +============ + +Once the scores computed, leads can be assigned to specific teams using +the same domain mechanism. To do so go to :menuselection:`CRM --> Leads Management --> Team Assignation` +and apply a specific domain on each team. This domain can include scores. + +.. image:: media/lead_scoring04.png + :align: center + +Further on, you can assign to a specific vendor in the team with an even +more refined domain. + +To do so go to :menuselection:`CRM --> Leads Management --> Leads Assignation`. + +.. image:: media/lead_scoring05.png + :align: center + +.. note:: + The team & leads assignation will assign the unassigned leads + once a day. + +Evaluate & use the unassigned leads +=================================== + +Once your scoring rules are in place you will most likely still have +some unassigned leads. Some of them could still lead to an opportunity +so it is useful to do something with them. + +In your leads page you can place a filter to find your unassigned leads. + +.. image:: media/lead_scoring06.png + :align: center + +Why not using :menuselection:`Email Marketing` or +:menuselection:`Marketing Automation` apps to send a mass email to +them? You can also easily find such unassigned leads from there. + +.. image:: media/lead_scoring07.png + :align: center diff --git a/crm/track_leads/media/lead_scoring01.png b/crm/track_leads/media/lead_scoring01.png new file mode 100644 index 000000000..21eefd2d5 Binary files /dev/null and b/crm/track_leads/media/lead_scoring01.png differ diff --git a/crm/track_leads/media/lead_scoring02.png b/crm/track_leads/media/lead_scoring02.png new file mode 100644 index 000000000..8b52bcf5c Binary files /dev/null and b/crm/track_leads/media/lead_scoring02.png differ diff --git a/crm/track_leads/media/lead_scoring03.png b/crm/track_leads/media/lead_scoring03.png new file mode 100644 index 000000000..9838c2f1b Binary files /dev/null and b/crm/track_leads/media/lead_scoring03.png differ diff --git a/crm/track_leads/media/lead_scoring04.png b/crm/track_leads/media/lead_scoring04.png new file mode 100644 index 000000000..208042822 Binary files /dev/null and b/crm/track_leads/media/lead_scoring04.png differ diff --git a/crm/track_leads/media/lead_scoring05.png b/crm/track_leads/media/lead_scoring05.png new file mode 100644 index 000000000..b03ee8d56 Binary files /dev/null and b/crm/track_leads/media/lead_scoring05.png differ diff --git a/crm/track_leads/media/lead_scoring06.png b/crm/track_leads/media/lead_scoring06.png new file mode 100644 index 000000000..0d7f6c151 Binary files /dev/null and b/crm/track_leads/media/lead_scoring06.png differ diff --git a/crm/track_leads/media/lead_scoring07.png b/crm/track_leads/media/lead_scoring07.png new file mode 100644 index 000000000..fb82bb2bc Binary files /dev/null and b/crm/track_leads/media/lead_scoring07.png differ diff --git a/crm/track_leads/media/prospect_visits01.png b/crm/track_leads/media/prospect_visits01.png new file mode 100644 index 000000000..21eefd2d5 Binary files /dev/null and b/crm/track_leads/media/prospect_visits01.png differ diff --git a/crm/track_leads/media/prospect_visits02.png b/crm/track_leads/media/prospect_visits02.png new file mode 100644 index 000000000..2b8ef0fa8 Binary files /dev/null and b/crm/track_leads/media/prospect_visits02.png differ diff --git a/crm/track_leads/media/prospect_visits03.png b/crm/track_leads/media/prospect_visits03.png new file mode 100644 index 000000000..e71e3e5aa Binary files /dev/null and b/crm/track_leads/media/prospect_visits03.png differ diff --git a/crm/track_leads/media/prospect_visits04.png b/crm/track_leads/media/prospect_visits04.png new file mode 100644 index 000000000..224f79b22 Binary files /dev/null and b/crm/track_leads/media/prospect_visits04.png differ diff --git a/crm/track_leads/media/prospect_visits05.png b/crm/track_leads/media/prospect_visits05.png new file mode 100644 index 000000000..15ad910b5 Binary files /dev/null and b/crm/track_leads/media/prospect_visits05.png differ diff --git a/crm/track_leads/prospect_visits.rst b/crm/track_leads/prospect_visits.rst new file mode 100644 index 000000000..d5979398a --- /dev/null +++ b/crm/track_leads/prospect_visits.rst @@ -0,0 +1,55 @@ +=========================== +Track your prospects visits +=========================== + +Tracking your website pages will give you much more information about +the interests of your website visitors. + +Every tracked page they visit will be recorded on your lead/opportunity +if they use the contact form on your website. + +Configuration +============= + +To use this feature, install the free module *Lead Scoring* under your +*Apps* page (only available in Odoo Enterprise). + +.. image:: media/prospect_visits01.png + :align: center + +Track a webpage +=============== + +Go to any static page you want to track on your website and under the +*Promote* tab you will find *Optimize SEO* + +.. image:: media/prospect_visits02.png + :align: center + +There you will see a *Track Page* checkbox to track this page. + +.. image:: media/prospect_visits03.png + :align: center + +See visited pages in your leads/opportunities +============================================= + +Now each time a lead is created from the contact form it will keep track +of the pages visited by that visitor. You have two ways to see those +pages, on the top right corner of your lead/opportunity you can see a +*Page Views* button but also further down you will see them in the +chatter. + +Both will update if the viewers comes back to your website and visits +more pages. + +.. image:: media/prospect_visits04.png + :align: center + +.. image:: media/prospect_visits05.png + :align: center + +The feature will not repeat multiple viewings of the same pages in the +chatter. + +Your customers will no longer be able to keep any secrets from you! diff --git a/db_management/db_online.rst b/db_management/db_online.rst index 1bf7df2c6..67c6960c5 100644 --- a/db_management/db_online.rst +++ b/db_management/db_online.rst @@ -7,45 +7,76 @@ Online Database management ========================== +To manage your databases, access the `database management page +`__ (you will have to sign in). Then click +on the `Manage Your Databases `__ +button. + +.. image:: media/databases.png + :align: center + +Make sure you are connected as the administrator of the database you +want to manage - many operations depends on indentifying you remotely to that +database. + +Several actions are available: + +.. image:: media/db_buttons.png + :align: center + +* Upgrade + Upgrade your database to the latest Odoo version to enjoy cutting-edge + features +* :ref:`Duplicate ` + Make an exact copy of your database, if you want + to try out new apps or new flows without compromising + your daily operations +* Rename + Rename your database (and its URL) +* **Backup** + Download an instant backup of your database; note that we + back up databases daily according to our Odoo Cloud SLA +* :ref:`Domains ` + Configure custom domains to access your + database via another URL +* :ref:`Delete ` + Delete a database instantly +* Contact Support + Access our `support page `__ + with the correct database already selected + + .. _duplicate_online: Duplicating a database ====================== .. note:: Database duplication, renaming, custom DNS, etc. is not available - to free customers of our Online platform. + for trial databases on our Online platform. Paid Databases and "One App + Free" database can duplicate without problem. -Access the `database management page `__ -(you will have to sign in). Next, make sure you are connected as the -administrator of the database you want to duplicate. After that, click -on the **Manage Your Databases** button. - -.. image:: media/databases.png - :align: center In the line of the database you want to duplicate, you will have a few buttons. To duplicate your database, just click **Duplicate**. You will have to give a name to your duplicate, then click **Duplicate Database**. -.. image:: media/db_buttons.png - :align: center - .. image:: media/db_duplicate.png :align: center -.. danger:: A duplicated database has the same behaviour as a real one: +.. danger:: If you do not check the "For testing purposes" checkbox when + duplicating a database, all external communication will remain active: * Emails are sent - * Payments are processed (in the e-commerce, for example) + * Payments are processed (in the e-commerce or Subscriptions apps, for + example) * Delivery orders (shipping providers) are sent * Etc. - It is **strongly** advised to test behaviour using sample - customers/products (with a `disposable e-mail `__ - address, for example) + Make sure to check the checkbox "For testing purposes" if you want these + behaviours to be disabled. After a few seconds, you will be logged in your duplicated database. Notice that the url uses the name you chose for your duplicated @@ -55,3 +86,38 @@ database. .. image:: media/dup_expires.png :align: center + +.. _delete_online_database: + +Deleting a Database +=================== + +You can only delete databases of which you are the administrator. + +.. danger:: When you delete your database all the data will be permanently lost. + The deletion is instant and for all the Users. We advise you to do an + instant backup of your database before deleting it, since the last automated + daily backup may be several hours old at that point. + + +From the `database management page `__, +on the line of the database you want to delete, click on the "Delete" button. + +.. image:: media/delete_button.png + :align: center + + +Read carefully the warning message that will appear and proceed only if you +fully understand the implications of deleting a database: + +.. image:: media/delete_warning.png + :align: center + +After a few seconds, the database will be deleted and the page will +reload automatically. + +.. note:: + * If you need to re-use this database name, it will be immediately available. + + * If you want to delete your Account, please contact + `Odoo Support `__ diff --git a/db_management/media/add_more_users.png b/db_management/media/add_more_users.png index ddce1cc33..4088de604 100644 Binary files a/db_management/media/add_more_users.png and b/db_management/media/add_more_users.png differ diff --git a/db_management/media/browse_apps.png b/db_management/media/browse_apps.png index 3781c9213..de6793e9e 100644 Binary files a/db_management/media/browse_apps.png and b/db_management/media/browse_apps.png differ diff --git a/db_management/media/browse_users.png b/db_management/media/browse_users.png index f858184fa..02c195547 100644 Binary files a/db_management/media/browse_users.png and b/db_management/media/browse_users.png differ diff --git a/db_management/media/database_expired.png b/db_management/media/database_expired.png index b42cfa685..87075026a 100644 Binary files a/db_management/media/database_expired.png and b/db_management/media/database_expired.png differ diff --git a/db_management/media/databases.png b/db_management/media/databases.png index 92ef1892b..9c3d1e28c 100644 Binary files a/db_management/media/databases.png and b/db_management/media/databases.png differ diff --git a/db_management/media/db_buttons.png b/db_management/media/db_buttons.png index 0ac200606..6a0fec602 100644 Binary files a/db_management/media/db_buttons.png and b/db_management/media/db_buttons.png differ diff --git a/db_management/media/db_duplicate.png b/db_management/media/db_duplicate.png index b0508b916..68b5a34c0 100644 Binary files a/db_management/media/db_duplicate.png and b/db_management/media/db_duplicate.png differ diff --git a/db_management/media/db_uuid.png b/db_management/media/db_uuid.png index bcb1dd8ad..589e063b2 100644 Binary files a/db_management/media/db_uuid.png and b/db_management/media/db_uuid.png differ diff --git a/db_management/media/delete_button.png b/db_management/media/delete_button.png new file mode 100644 index 000000000..1a9a623b3 Binary files /dev/null and b/db_management/media/delete_button.png differ diff --git a/db_management/media/delete_warning.png b/db_management/media/delete_warning.png new file mode 100644 index 000000000..3c5df0a1f Binary files /dev/null and b/db_management/media/delete_warning.png differ diff --git a/db_management/media/dependencies.png b/db_management/media/dependencies.png index b3ff05985..4d62d7d76 100644 Binary files a/db_management/media/dependencies.png and b/db_management/media/dependencies.png differ diff --git a/db_management/media/dup_expires.png b/db_management/media/dup_expires.png index d3d5cf469..0a3359bdd 100644 Binary files a/db_management/media/dup_expires.png and b/db_management/media/dup_expires.png differ diff --git a/db_management/media/error_message_sub_code.png b/db_management/media/error_message_sub_code.png index 8cfec38ad..b8c102362 100644 Binary files a/db_management/media/error_message_sub_code.png and b/db_management/media/error_message_sub_code.png differ diff --git a/db_management/media/list_users.png b/db_management/media/list_users.png index 0ebcb9169..d34994a5f 100644 Binary files a/db_management/media/list_users.png and b/db_management/media/list_users.png differ diff --git a/db_management/media/settings_app.png b/db_management/media/settings_app.png index 5cd868d62..4a8a3c6b6 100644 Binary files a/db_management/media/settings_app.png and b/db_management/media/settings_app.png differ diff --git a/db_management/media/uninstall.png b/db_management/media/uninstall.png index 198f8e4a6..a686d24cc 100644 Binary files a/db_management/media/uninstall.png and b/db_management/media/uninstall.png differ diff --git a/db_management/media/uninstall_deps.png b/db_management/media/uninstall_deps.png index 1fe23c59b..e8357ef02 100644 Binary files a/db_management/media/uninstall_deps.png and b/db_management/media/uninstall_deps.png differ diff --git a/db_management/media/unlink_confirm_enterprise_edition.png b/db_management/media/unlink_confirm_enterprise_edition.png index 4f45380aa..967fd3f1f 100644 Binary files a/db_management/media/unlink_confirm_enterprise_edition.png and b/db_management/media/unlink_confirm_enterprise_edition.png differ diff --git a/db_management/media/unlink_db_name_collision.png b/db_management/media/unlink_db_name_collision.png index 3e4aa1735..a718162ef 100644 Binary files a/db_management/media/unlink_db_name_collision.png and b/db_management/media/unlink_db_name_collision.png differ diff --git a/db_management/media/unlink_single_db.png b/db_management/media/unlink_single_db.png index 23210b359..6188a9437 100644 Binary files a/db_management/media/unlink_single_db.png and b/db_management/media/unlink_single_db.png differ diff --git a/discuss/email_servers.rst b/discuss/email_servers.rst index 47983d1f2..e333d285e 100644 --- a/discuss/email_servers.rst +++ b/discuss/email_servers.rst @@ -107,7 +107,7 @@ The easiest and most recommended method is to manage one email address per Odoo alias in your mail server. * Create the corresponding email addresses in your mail server - (catcall@, bounce@, sales@, etc.). + (catchall@, bounce@, sales@, etc.). * Set your domain name in the General Settings. .. image:: media/alias_domain.png @@ -147,4 +147,4 @@ alias in your mail server. .. note:: By default inbound messages are fetched every 5 minutes in Odoo on-premise. You can change this value in developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> - Scheduled Actions` and look for *Mail: Fetchmail Service*. \ No newline at end of file + Scheduled Actions` and look for *Mail: Fetchmail Service*. diff --git a/general/odoo_basics/add_user.rst b/general/odoo_basics/add_user.rst index d0211fc29..c3bff60fd 100644 --- a/general/odoo_basics/add_user.rst +++ b/general/odoo_basics/add_user.rst @@ -43,6 +43,5 @@ log-in. .. seealso:: * `Deactivating Users <../../db_management/documentation.html#deactivating-users>`_ - * :doc:`../../crm/salesteam/setup/create_team` .. todo:: Add link to How to add companies diff --git a/helpdesk.rst b/helpdesk.rst new file mode 100644 index 000000000..50d3ae387 --- /dev/null +++ b/helpdesk.rst @@ -0,0 +1,11 @@ +:banner: banners/helpdesk.jpg + +======== +Helpdesk +======== + +.. toctree:: + :titlesonly: + + helpdesk/getting_started + helpdesk/invoice_time diff --git a/helpdesk/helpdesk.rst b/helpdesk/getting_started.rst similarity index 98% rename from helpdesk/helpdesk.rst rename to helpdesk/getting_started.rst index f0b215c06..4a2f4d5a5 100644 --- a/helpdesk/helpdesk.rst +++ b/helpdesk/getting_started.rst @@ -1,8 +1,6 @@ -:banner: banners/helpdesk.jpg - -======== -Helpdesk -======== +============================== +Get started with Odoo Helpdesk +============================== Overview ======== diff --git a/helpdesk/invoice_time.rst b/helpdesk/invoice_time.rst new file mode 100644 index 000000000..397c29cd3 --- /dev/null +++ b/helpdesk/invoice_time.rst @@ -0,0 +1,126 @@ +=================================== +Record and invoice time for tickets +=================================== + +You may have service contracts with your clients to provide them +assistance in case of a problem. For this purpose, Odoo will help you +record the time spent fixing the issue and most importantly, to invoice +it to your clients. + +The modules needed +================== + +In order to record and invoice time for tickets, the following modules +are needed : Helpdesk, Project, Timesheets, Sales. If you are missing +one of them, go to the Apps module, search for it and then click on +*Install*. + +Get started to offer the helpdesk service +========================================= + +Step 1 : start a helpdesk project +--------------------------------- + +To start a dedicated project for the helpdesk service, first go to +:menuselection:`Project --> Configuration --> Settings` and make sure +that the *Timesheets* feature is activated. + +.. image:: media/invoice_time01.png + :align: center + +Then, go to your dashboard, create the new project and allow timesheets +for it. + +Step 2 : gather a helpdesk team +------------------------------- + +To set a team in charge of the helpdesk, go to :menuselection:`Helpdesk +--> Configuration --> Helpdesk Teams` and create a new team or select +an existing one. On the form, tick the box in front of *Timesheet on +Ticket* to activate the feature. Make sure to select the helpdesk +project you have previously created as well. + +.. image:: media/invoice_time02.png + :align: center + +Step 3 : launch the helpdesk service +------------------------------------ + +Finally, to launch the new helpdesk service, first go to +:menuselection:`Sales --> Configuration --> Settings` and make sure +that the *Units of Measure* feature is activated. + +.. image:: media/invoice_time03.png + :align: center + +Then, go to :menuselection:`Products --> Products` and create a new +one. Make sure that the product is set as a service. + +.. image:: media/invoice_time04.png + :align: center + +.. note:: + Here, we suggest that you set the *Unit of Measure* as + *Hour(s)*, but any unit will do. + +Finally, select the invoicing management you would like to have under +the *Sales* tab of the product form. Here, we recommend the following +configuration : + +.. image:: media/invoice_time05.png + :align: center + +Now, you are ready to start receiving tickets ! + +Solve issues and record time spent +================================== + +Step 1 : place an order +----------------------- + +You are now in the Helpdesk module and you have just received a ticket +from a client. To place a new order, go to :menuselection:`Sales --> +Orders --> Orders` and create one for the help desk service product you +have previously recorded. Set the number of hours needed to assist the +client and confirm the sale. + +.. image:: media/invoice_time06.png + :align: center + +Step 2 : link the task to the ticket +------------------------------------ + +If you access the dedicated helpdesk project, you will notice that a new +task has automatically been generated with the order. To link this task +with the client ticket, go to the Helpdesk module, access the ticket in +question and select the task on its form. + +.. image:: media/invoice_time07.png + :align: center + +Step 3 : record the time spent to help the client +------------------------------------------------- + +The job is done and the client's issue is sorted out. To record the +hours performed for this task, go back to the ticket form and add them +under the *Timesheets* tab. + +.. image:: media/invoice_time08.png + :align: center + +.. tip:: + The hours recorded on the ticket will also automatically appear + in the Timesheet module and on the dedicated task. + +Step 4 : invoice the client +--------------------------- + +To invoice the client, go back to the Sales module and select the order +that had been placed. Notice that the hours recorded on the ticket form +now appear as the delivered quantity. + +.. image:: media/invoice_time09.png + :align: center + +All that is left to do, is to create the invoice from the order and then +validate it. Now you just have to wait for the client's payment ! diff --git a/helpdesk/media/invoice_time01.png b/helpdesk/media/invoice_time01.png new file mode 100644 index 000000000..193f5dd8f Binary files /dev/null and b/helpdesk/media/invoice_time01.png differ diff --git a/helpdesk/media/invoice_time02.png b/helpdesk/media/invoice_time02.png new file mode 100644 index 000000000..24bb7a70f Binary files /dev/null and b/helpdesk/media/invoice_time02.png differ diff --git a/helpdesk/media/invoice_time03.png b/helpdesk/media/invoice_time03.png new file mode 100644 index 000000000..fe832f2c0 Binary files /dev/null and b/helpdesk/media/invoice_time03.png differ diff --git a/helpdesk/media/invoice_time04.png b/helpdesk/media/invoice_time04.png new file mode 100644 index 000000000..ab6099f3a Binary files /dev/null and b/helpdesk/media/invoice_time04.png differ diff --git a/helpdesk/media/invoice_time05.png b/helpdesk/media/invoice_time05.png new file mode 100644 index 000000000..ef8a8455e Binary files /dev/null and b/helpdesk/media/invoice_time05.png differ diff --git a/helpdesk/media/invoice_time06.png b/helpdesk/media/invoice_time06.png new file mode 100644 index 000000000..948b4fa1e Binary files /dev/null and b/helpdesk/media/invoice_time06.png differ diff --git a/helpdesk/media/invoice_time07.png b/helpdesk/media/invoice_time07.png new file mode 100644 index 000000000..b353fb3a4 Binary files /dev/null and b/helpdesk/media/invoice_time07.png differ diff --git a/helpdesk/media/invoice_time08.png b/helpdesk/media/invoice_time08.png new file mode 100644 index 000000000..63bf86d22 Binary files /dev/null and b/helpdesk/media/invoice_time08.png differ diff --git a/helpdesk/media/invoice_time09.png b/helpdesk/media/invoice_time09.png new file mode 100644 index 000000000..0d6d8a70e Binary files /dev/null and b/helpdesk/media/invoice_time09.png differ diff --git a/legal.rst b/legal.rst index fcb729175..51c2b1b8f 100644 --- a/legal.rst +++ b/legal.rst @@ -1,4 +1,7 @@ :banner: banners/sign.jpg +:has-toc: + +.. ^^: cheat to have a full-width table as if this was a real toc page ===== Legal @@ -23,38 +26,110 @@ Terms and Conditions   -.. |download_enterprise| image:: _static/banners/pdf-icon.png - :alt: Download Odoo Enterprise Agreement - :target: odoo_enterprise_agreement_v5.pdf +.. |view_enterprise_en| image:: _static/banners/txt.svg + :alt: View Odoo Enterprise Agreement + :target: legal/terms/enterprise.html -.. |download_enterprise_fr| image:: _static/banners/pdf-icon.png - :alt: Download Odoo Enterprise Agreement (FR) - :target: odoo_enterprise_agreement_v5_fr.pdf +.. |download_enterprise_en| image:: _static/banners/pdf.svg + :alt: Download Odoo Enterprise Agreement + :target: odoo_enterprise_agreement.pdf -.. |download_terms_of_sale| image:: _static/banners/pdf-icon.png +.. |view_partnership_en| image:: _static/banners/txt.svg + :alt: View Odoo Partnership Agreement + :target: legal/terms/partnership.html + +.. |download_partnership_en| image:: _static/banners/pdf.svg + :alt: Download Odoo Partnership Agreement + :target: odoo_partnership_agreement.pdf + +.. |view_terms_of_sale_en| image:: _static/banners/txt.svg + :alt: View Terms of Sale + :target: legal/terms/terms_of_sale.html + +.. |view_terms_odoosh| image:: _static/banners/txt.svg + :alt: View Odoo.sh Terms + :target: legal/terms/odoo_sh_terms.html + +.. |download_terms_of_sale_en| image:: _static/banners/pdf.svg :alt: Download Odoo Terms of Sale - :target: terms_of_sale_v1.pdf + :target: terms_of_sale.pdf -.. |download_terms_of_sale_fr| image:: _static/banners/pdf-icon.png +.. |download_enterprise_fr| image:: _static/banners/pdf.svg + :alt: Download Odoo Enterprise Agreement (FR) + :target: odoo_enterprise_agreement_fr.pdf + +.. |view_enterprise_fr| image:: _static/banners/txt.svg + :alt: View Odoo Enterprise Agreement (FR) + :target: legal/terms/i18n/enterprise_fr.html + +.. |download_partnership_fr| image:: _static/banners/pdf.svg + :alt: Download Odoo Partnership Agreement (FR) + :target: odoo_partnership_agreement_fr.pdf + +.. |view_partnership_fr| image:: _static/banners/txt.svg + :alt: View Odoo Partnership Agreement (FR) + :target: legal/terms/i18n/partnership_fr.html + +.. |download_terms_of_sale_fr| image:: _static/banners/pdf.svg :alt: Download Odoo Terms of Sale (FR) - :target: terms_of_sale_v1_fr.pdf + :target: terms_of_sale_fr.pdf -.. |download_partnership| image:: _static/banners/pdf-icon.png - :alt: Download Odoo Partnership Agreement - :target: odoo_partnership_agreement_v5.pdf +.. |view_terms_of_sale_fr| image:: _static/banners/txt.svg + :alt: View Terms of Sale (FR) + :target: legal/terms/i18n/terms_of_sale_fr.html -- :ref:`enterprise_agreement` |nbsp| |nbsp| |download_enterprise| -- :ref:`enterprise_agreement_fr` |nbsp| |nbsp| |download_enterprise_fr| +.. |download_enterprise_nl| image:: _static/banners/pdf.svg + :alt: Download Odoo Enterprise Agreement (NL) + :target: odoo_enterprise_agreement_nl.pdf -- :ref:`partnership_agreement` |nbsp| |nbsp| |download_partnership| +.. |download_partnership_nl| image:: _static/banners/pdf.svg + :alt: Download Odoo Partnership Agreement (NL) + :target: odoo_partnership_agreement_nl.pdf -- :ref:`terms_of_sale` |nbsp| |nbsp| |download_terms_of_sale| -- :ref:`terms_of_sale_fr` |nbsp| |nbsp| |download_terms_of_sale_fr| +.. |download_enterprise_de| image:: _static/banners/pdf.svg + :alt: Download Odoo Enterprise Agreement (DE) + :target: odoo_enterprise_agreement_de.pdf -- :ref:`online_terms_of_sale` +.. |view_enterprise_de| image:: _static/banners/txt.svg + :alt: View Odoo Enterprise Agreement (DE) + :target: legal/terms/i18n/enterprise_de.html -- :ref:`odoo_sh_terms` +.. |download_partnership_de| image:: _static/banners/pdf.svg + :alt: Download Odoo Partnership Agreement (DE) + :target: odoo_partnership_agreement_de.pdf +.. |view_partnership_de| image:: _static/banners/txt.svg + :alt: View Odoo Partnership Agreement (DE) + :target: legal/terms/i18n/partnership_de.html + +.. |download_enterprise_es| image:: _static/banners/pdf.svg + :alt: Download Odoo Enterprise Agreement (ES) + :target: odoo_enterprise_agreement_es.pdf + +.. |view_enterprise_es| image:: _static/banners/txt.svg + :alt: View Odoo Partnership Agreement (ES) + :target: legal/terms/i18n/partnership_es.html + +.. |download_partnership_es| image:: _static/banners/pdf.svg + :alt: Download Odoo Partnership Agreement (ES) + :target: odoo_partnership_agreement_es.pdf + +.. |view_partnership_es| image:: _static/banners/txt.svg + :alt: View Odoo Partnership Agreement (ES) + :target: legal/terms/i18n/partnership_es.html + + ++-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| | **English** | Français | Nederlands | Deutsch | Español | ++=============================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+ +| Odoo Enterprise Agreement | |view_enterprise_en| |download_enterprise_en| | |view_enterprise_fr| |download_enterprise_fr| | (Coming soon) | |view_enterprise_de| |download_enterprise_de| | (Coming soon) | ++-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Odoo Partnership Agreement | |view_partnership_en| |download_partnership_en| | |view_partnership_fr| |download_partnership_fr| | (Coming soon) | (Coming soon) | |view_partnership_es| |download_partnership_es| | ++-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Odoo.sh Terms of Use | |view_terms_odoosh| | | | | | ++-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | | ++-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ Other legal references @@ -64,4 +139,4 @@ Other legal references - `Odoo Online Acceptable Use Policy `_ - :ref:`cla` -.. - :ref:`privacy_policy` TODO! \ No newline at end of file +.. - :ref:`privacy_policy` TODO! diff --git a/legal/terms/enterprise.rst b/legal/terms/enterprise.rst index d29cb7f0f..f101f9c42 100644 --- a/legal/terms/enterprise.rst +++ b/legal/terms/enterprise.rst @@ -5,10 +5,11 @@ Odoo Enterprise Subscription Agreement ====================================== -.. note:: Version 7 - 2017-12-07 +.. note:: Version 7.1 - 2018-03-16 .. v6: add "App" definition + update pricing per-App .. v7: remove possibility of price change at renewal after prior notice +.. 7.1: specify that 7% renewal increase applies to all charges, not just per-User. By subscribing to the Odoo Enterprise services (the "Services") provided by Odoo SA and its affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or @@ -203,9 +204,8 @@ of the first Term, at the sole discretion of Odoo SA, to cover the extra mainten 5.2 Renewal charges ------------------- -Upon renewal as covered in section :ref:`term`, if the per-User charges applied during the previous Term -are lower than the most current applicable per-User list price, the per-User charges will increase -by up to 7%. +Upon renewal as covered in section :ref:`term`, if the charges applied during the previous Term +are lower than the most current applicable list price, these charges will increase by up to 7%. .. _charges_thirdparty: @@ -435,11 +435,12 @@ objectives. .. only:: latex - Odoo 9 Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, + Odoo Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, defined as follows: - .. include:: ../licenses/enterprise_license.txt - :literal: + .. highlight:: none + + .. literalinclude:: ../licenses/enterprise_license.txt .. only:: html diff --git a/legal/terms/i18n/enterprise_de.rst b/legal/terms/i18n/enterprise_de.rst new file mode 100644 index 000000000..b39276460 --- /dev/null +++ b/legal/terms/i18n/enterprise_de.rst @@ -0,0 +1,481 @@ + +.. _enterprise_agreement_de: + +=========================================== +Odoo Enterprise Subscription Agreement (DE) +=========================================== + +.. warning:: + This is a german translation of the “Odoo Enterprise Subscription Agreement”. + This translation is provided in the hope that it will facilitate understanding, but it has + no legal value. + The only official reference of the terms of the “Odoo Enterprise Subscription Agreement” + is the :ref:`original english version `. + +.. note:: Version 7.1 - 2018-03-16 + +.. v6: add "App" definition + update pricing per-App +.. v7: remove possibility of price change at renewal after prior notice +.. 7.1: specify that 7% renewal increase applies to all charges, not just per-User. + +Durch das Abonnieren der von der Odoo SA und ihren Tochtergesellschaften (zusammen „Odoo SA“) +hinsichtlich der Odoo Enterprise Edition oder der Odoo Community Edition (der „Software“) +bereitgestellten Odoo Enterprise-Dienstleistungen (der „Dienste“) sind Sie (der „Kunde“) +verpflichtet, die nachstehenden Allgemeinen Geschäftsbedingungen (die „Vereinbarung“) einzuhalten. + +.. _term_de: + +1. Laufzeit der Vereinbarung +============================ + +Die Dauer dieser Vereinbarung (die „Laufzeit“) beträgt mindestens ein Jahr wie schriftlich bei +Unterzeichnung dieser Vereinbarung festgelegt, beginnend zum Datum der Unterschrift. +Sie wird automatisch um die gleiche Laufzeit verlängert, sofern nicht eine der Parteien mindestens +30 Tage vor Ablauf der Laufzeit gegenüber der anderen Partei per Einschreiben schriftlich kündigt. + +.. _definitions_de: + +2. Definitionen +=============== + +Benutzer + Alle aktiven Benutzerkonten mit Zugriff auf die Software im Erstellungs- und/oder + Bearbeitungsmodus. + Deaktivierte Benutzerkonten und Konten, die von externen Personen (oder Systemen) verwendet + werden, die über das Portal nur eingeschränkten Zugriff auf die Software haben + („Portalbenutzer“ genannt), werden nicht als Benutzer gezählt. + +App + Eine „App“ ist eine spezielle Gruppe von Funktionen, die in der Software installiert + werden können und bei Unterzeichnung dieser Vereinbarung in der öffentlichen Preisliste der + `Odoo SA-Website `_ aufgeführt sind. + +Fehler (Bug) + Als Fehler (oder auch Bug) gilt jeder Fehler der Software, der zu einem vollständigen Stopp, + einer Traceback-Fehlermeldung oder einer Sicherheitsverletzung führt und nicht direkt durch + eine fehlerhafte Installation oder Konfiguration verursacht wird. Eine Nichteinhaltung von + Spezifikationen oder Anforderungen wird im Ermessen von Odoo SA als Fehler angesehen + (in der Regel dann, wenn die Software nicht die Ergebnisse oder die Leistungswerte liefert, + für die sie entwickelt wurde oder wenn eine landesspezifische Funktion nicht mehr den + gesetzlichen Buchhaltungsanforderungen entspricht). + +Abgedeckte Versionen + Alle im Rahmen Vereinbarung erbrachten Dienstleistungen gelten nur für die abgedeckten + Versionen der Software, welche die 3 (drei) zuletzt veröffentlichten Hauptversionen umfassen. + + Um von der aktuellen Vereinbarung abgedeckt zu sein, müssen die Installationen des Kunden + die aktuellste abgedeckte Version zum Zeitpunkt der Unterzeichnung dieser Vereinbarung + aufweisen. Sollte dies nicht der Fall sein, so können zusätzliche Kosten anfallen, + die unter :ref:`charges_de` beschrieben werden. + + +.. _enterprise_access_de: + +3. Zugriff auf die Odoo Enterprise Edition +========================================== + +Für die Laufzeit dieser Vereinbarung gewährt Odoo SA dem Kunden eine nicht-ausschließliche, +nicht übertragbare Nutzungslizenz (Ausführung, Änderung, Ausführung nach Änderung) +der Odoo Enterprise Edition-Software unter den in :ref:`appendix_a_de` festgelegten Bedingungen. + +Der Kunde erklärt, alle notwendigen Maßnahmen zu ergreifen, um die unveränderte Ausführung des +Teils der Software zu gewährleisten, mit dem die gültige Nutzung der Odoo Enterprise Edition +überprüft wird und die zu diesem Zweck Statistiken sammelt, einschließlich unter anderem +die Ausführung einer Instanz, die Anzahl der Benutzer und die installierten Apps. + +Odoo SA ist verpflichtet, einzelne keine einzelnen oder benannten Zahlen ohne Zustimmung des Kunden +an Dritte weiterzugeben und alle gesammelten Daten gemäß seiner offiziellen Datenschutzrichtlinie +zu behandeln, die unter https://www.odoo.com/privacy veröffentlicht ist. + +Nach Ablauf oder Kündigung dieser Vereinbarung wird diese Lizenz sofort widerrufen und der Kunde +ist verpflichtet, die Nutzung der Odoo Enterprise Edition-Software einzustellen. + +Sollte der Kunde gegen die Bestimmungen dieses Abschnitts verstoßen, so ist er verpflichtet, +Odoo SA eine zusätzliche Gebühr in Höhe von 300 % des geltenden Listenpreises für +die tatsächliche Anzahl der Nutzer zu zahlen. + + +.. _services_de: + +4. Inbegriffene Dienstleistungen +================================ + +4.1 Fehlerbehebung +------------------ + +Während der Laufzeit dieser Vereinbarung ist Odoo SA verpflichtet, alle zumutbaren Anstrengungen +zu unternehmen, um die Fehler zu beheben, die vom Kunden über den entsprechenden Kanal +(üblicherweise die E-Mail-Adresse oder das Websiteformular des Odoo SA Servicedesks) +eingereicht wurden, und mit der Bearbeitung dieser Einsendungen des Kunden innerhalb von +2 Werktagen zu beginnen. + +Der Kunde versteht, dass Fehler, die durch eine Änderung oder Erweiterung verursacht wurden, +die kein Teil der offiziellen Software sind, von dieser Dienstleistung nicht abgedeckt sind. + +Sobald der Fehler behoben wurde, wird dem Kunden eine geeignete Gegenmaßnahme mitgeteilt. +Falls der Fehler in einer neueren Version der vom Kunden verwendeten Software behoben wurde, +so ist der Kunde verpflichtet, seine Systeme auf diese Version zu aktualisieren, +um die Korrektur zu erhalten. Der Kunde wird nicht aufgefordert, auf eine neuere abgedeckte +Version der Software zu aktualisieren, um einen Fehler zu beheben. + +Wenn ein Fehler in einer abgedeckten Version behoben wurde, ist Odoo SA verpflichtet, +den Fehler auch in allen neueren abgedeckten Versionen der Software zu beheben. + +Beide Parteien erkennen an, dass Odoo SA gemäß der Softwarelizenz und dem Abschnitt +:ref:`liability_de` dieser Vereinbarung für Fehler in der Software nicht haftbar gemacht werden kann. + + +4.2 Sicherheitsmitteilungen +--------------------------- + +Für die Dauer dieser Vereinbarung ist Odoo SA verpflichtet, dem Kunden für jedes Sicherheitsproblem, +das in den abgedeckten Versionen der Software entdeckt wurde, eine Sicherheitsmitteilung zuzusenden. +Diese Zusendung muss mindestens 2 Wochen vor Veröffentlichung der Sicherheitsmitteilung erfolgen, +außer wenn der Fehler bereits von Dritten öffentlich gemacht wurde. +Diese Sicherheitsberatung umfasst eine vollständige Beschreibung des Fehlers, seine Ursache, +seine möglichen Auswirkungen auf die Kundensysteme sowie die entsprechenden Gegenmaßnahmen +für jede abgedeckte Version. + +Der Kunde versteht, dass der Fehler und die Informationen in der Sicherheitsmitteilung während +der Sperrfrist vor der öffentlichen Bekanntgabe als vertrauliche Informationen behandelt +werden müssen, die im Abschnitt :ref:'confidentiality_de' beschrieben werden. + +.. _upgrade_de: + +4.3 Upgrade-Dienstleistungen +---------------------------- + +.. _upgrade_odoo_de: + +Upgrade-Service für die Software +++++++++++++++++++++++++++++++++ + +Während der Laufzeit dieser Vereinbarung kann der Kunde Upgrade-Anfragen über den entsprechenden +Kanal übermitteln (üblicherweise die Website der Odoo SA für den Upgrade-Service), um eine +Datenbank der Software einer abgedeckten Softwareversion auf eine neuere abgedeckte Version +(die „Zielversion“) zu konvertieren. + +Upgrade-Anfragen müssen eine vollständige Sicherungskopie der Kundendatenbank und die zugehörigen +Daten enthalten (die in der Regel mit dem Backup-Menü der Software abgerufen werden können). +Sollte es aus Gründen der Datensicherheit oder der Regulierung erforderlich sein, so umfasst der +Upgrade-Service ein optionales Tool zur Anonymisierung identifizierbarer Daten einer Datenbank, +bevor die Upgrade-Anfrage eingereicht wird, und ebenso ein Tool zum Wiederherstellen der +anonymisierten Daten nach dem Upgrade. + +Dieser Service erfolgt über eine automatisierte Plattform, damit der Kunde unbeaufsichtigte +Upgrades durchführen kann, sobald eine frühere Version der Kundendatenbank für eine abgedeckte +Version erfolgreich aktualisiert worden ist. Der Kunde kann aufeinander folgende Upgrade-Anfragen +für eine Datenbank einreichen. Er ist damit einverstanden, zuerst mindestens +1 (eine) Upgrade-Anfrage zu Testzwecken einzureichen, bevor er die abschließende Upgrade-Anfrage +einreicht. + +Der Upgrade-Service ist beschränkt auf die technische Konvertierung und Anpassung der +Kundendatenbank, um diese mit der Zielversion kompatibel zu machen, und auf die Korrektur von +Fehlern, die unmittelbar durch den Upgrade-Vorgang verursacht werden und in der Zielversion +normalerweise nicht auftreten würden. + +Es liegt in der alleinigen Verantwortung des Kunden, die Datenbank nach dem Upgrade zu +überprüfen und zu validieren, um Fehler zu erkennen, die Auswirkungen der in der Zielversion +umgesetzten Änderungen und neuen Funktionen zu analysieren und diejenigen Erweiterungen der +Software von Drittanbietern für die Zielversion zu konvertieren und anzupassen, die vor dem +Upgrade in der Datenbank installiert waren (sofern nicht anders vorgesehen, +siehe Abschnitt :ref:`upgrade_extra_de`). Der Kunde kann mehrere Upgrade-Anforderungen für eine +Datenbank einreichen, bis ein akzeptables Ergebnis erzielt wird. + +.. _upgrade_extra_de: + +Upgrade-Service für Erweiterungen von Drittanbietern +++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Für die Laufzeit dieser Vereinbarung kann der Kunde optionale Upgrade-Services optionale für von +Drittanbieter angebotene Erweiterungsmodule der Software anfordern. Für diese optionale +Dienstleistung fallen zusätzlichen Gebühren an (die unter „Gebühren“ beschrieben werden). +Sie umfasst die technische Anpassung der Module von Drittanbietern, die in der Datenbank des +Kunden installiert sind, und deren entsprechende Daten, damit sie mit der Zielversion kompatibel +sind. Der Kunde wird eine Upgrade-Version aller installierten Module von Drittanbietern zusammen +mit der aktualisierten Datenbank erhalten. + +.. _charges_de: + +5. Abgaben und Gebühren +======================= + +.. _charges_standard_de: + +5.1 Standardgebühren +-------------------- + +Die Standardgebühren für das Odoo Enterprise Abonnement, die Fehlerbehebung, +die Sicherheitsmitteilungen und die Upgrades basieren auf der Anzahl der Benutzer, den +installierten Apps, der vom Kunden verwendeten Softwareversion und werden bei Unterzeichnung +der Vereinbarung schriftlich festgehalten. + +Sollte der Kunde während der Laufzeit mehr Benutzer oder mehr installierte Apps als bei +Unterzeichnung der vorliegenden Vereinbarung angegeben haben, so erklärt sich der Kunde bereit, +für die restliche Laufzeit eine zusätzliche Gebühr in Höhe des (zu Beginn der Laufzeit) geltenden +Listenpreises für die zusätzlichen Benutzer oder Apps zu entrichten. + +Sollte der Kunde bei Unterzeichnung dieser Vereinbarung eine abgedeckte Version verwenden, +bei der es sich nicht um die neueste Version handelt, so können die Standardgebühren für die erste +Laufzeit im Ermessen der Odoo SA um 50 % erhöht werden, um die zusätzlichen Wartungskosten +abzudecken. + +.. _charges_renewal_de: + +5.2 Verlängerungsgebühren +------------------------- + +Bei einer Verlängerung gemäß Abschnitt :ref:`term_de` erhöhen sich die Gebühren um bis +zu 7 %, wenn die in der vorherigen Laufzeit erhobenen Gebühren niedriger als der dann +gültige Listenpreis pro Benutzer waren. + +.. _charges_thirdparty_de: + +5.3 Gebühren für Upgrade-Services für Module von Drittanbietern +--------------------------------------------------------------- + +Die zusätzliche Gebühr für das Upgrade von Drittanbietern-Modulen beträgt 1000,00 € +(eintausend Euro) pro 1000 Codezeilen in diesen Modulen, jeweils aufgerundet auf die nächsten +Tausend Zeilen. Die Codezeilen umfassen alle Textzeilen im Quellcode dieser Module, unabhängig +von Programmiersprache (Python, Javascript usw.) oder Datenformat (XML, TSV usw.). Ausgenommen +sind Leer- und Kommentarzeilen. + +Odoo SA behält sich das Recht vor, eine Upgrade-Anfrage für Drittanbieter-Module unter den +vorstehenden Bedingungen abzulehnen, wenn die Qualität des Quellcodes dieser Module zu schlecht +sein oder diese Module eine Schnittstelle mit Drittanbieter-Software oder -Systemen darstellen +sollten. Das Upgrade dieser Module erfolgt vorbehaltlich eines separaten Angebots außerhalb der +vorliegenden Vereinbarung. + +.. _taxes_de: + +5.4 Steuern +----------- + +Alle Gebühren und Abgaben verstehen sich ausschließlich aller geltenden Steuern, Gebühren oder +Abgaben auf Bundes-, Provinz-, Bundesland- oder Kommunalebene oder anderer Behörden (zusammen +als „Steuern“ bezeichnet). Der Kunde ist für die Zahlung sämtlicher Steuern im Zusammenhang mit +seinen Käufen im Rahmen dieser Vereinbarung verantwortlich, außer wenn Odoo SA rechtlich +verpflichtet sein sollte, Steuern zu zahlen oder einzuziehen, für welche der Kunde verantwortlich +ist. + + +.. _conditions_de: + +6. Dienstleistungsbedingungen +============================= + +6.1 Pflichten des Kunden +------------------------ + +Der Kunde stimmt folgenden Klauseln zu: + +- er zahlt Odoo SA sämtliche Gebühren für die Dienstleistungen im Rahmen der vorliegenden + Vereinbarung gemäß den Zahlungsbedingungen, die auf der entsprechenden Rechnung angegeben sind; +- er wird Odoo SA unverzüglich informieren, sobald seine tatsächliche Benutzerzahl oder die Anzahl + der installierten Apps die bei Unterzeichnung der Vereinbarung angegebenen Zahlen überschreiten + sollten. In diesem Falle wird er die geltende zusätzliche Gebühr gemäß dem Abschnitt + :ref:`charges_standard_de` entrichten; +- er wird alle notwendigen Maßnahmen zu ergreifen, um die unveränderte Ausführung des Teils der + Software zu gewährleisten, mit dem die gültige Nutzung der Odoo Enterprise Edition überprüft, + wie sie in :ref:`enterprise_access_de` beschrieben wird; +- er wird Odoo SA den notwendigen Zugang einräumen, um die Gültigkeit der Nutzung der Odoo + Enterprise Edition auf Anfrage zu prüfen (z. B. wenn die automatische Validierung für den Kunden + nicht funktioniert); +- er wird 1 speziellen Ansprechpartner des Kunden für die gesamte Laufzeit der Vereinbarung + ernennen; +- er wird alle angemessenen Maßnahmen ergreifen, um die Dateien und Datenbanken des Kunden zu + schützen und sicherzustellen, dass die Kundendaten sicher sind, während er anerkennt, + dass Odoo SA für Datenverluste nicht haftbar gemacht werden kann; + + +.. _no_soliciting_de: + +6.2 Verzicht auf Abwerbung oder Einstellung +------------------------------------------- + +Beide Parteien, ihre Tochtergesellschaften und Vertreter sind verpflichtet, während der Laufzeit +dieser Vereinbarung und für einen Zeitraum von 12 Monaten ab dem Datum der Kündigung oder +des Ablaufs dieser Vereinbarung keine Mitarbeiter der anderen Partei, die an der Erbringung oder +Nutzung der Dienstleistungen im Rahmen dieser Vereinbarung beteiligt sind, abzuwerben oder eine +Beschäftigung anzubieten, außer wenn diese andere Partei eine schriftliche Zustimmung dafür +erteilt hat. +Im Falle eines Verstoßes gegen die Bestimmungen dieses Abschnitts, der zu einer diesbezüglichen +Kündigung dieses Arbeitnehmers führt, ist die dagegen verstoßende Partei verpflichtet, der anderen +Partei einen Betrag in Höhe von 30.000,00 € (dreißigtausend Euro) zu zahlen. + + +.. _publicity_de: + +6.3 Werbung +----------- + +Sofern keine anderslautende schriftliche Mitteilung erfolgte, gewährt jede Partei der anderen +Partei eine nicht übertragbare, nicht ausschließliche, gebührenfreie, weltweite Lizenz zur +Wiedergabe und Anzeige des Namens, der Logos und der Markenzeichen der jeweils anderen Partei. +Diese Lizenz gilt ausschließlich für die Bezugnahme auf die andere Partei als Kunde oder Lieferant +auf Websites, Pressemitteilungen und anderen Marketingmaterialien. + + +.. _confidentiality_de: + +6.4 Vertraulichkeit +------------------- + +Definition von „vertraulichen Informationen“: + Alle von einer Partei (der „offenlegenden Partei“) gegenüber der anderen Partei + (der „empfangenden Partei“) mündlich oder schriftlich mitgeteilten, offengelegten + Informationen, die als vertraulich bezeichnet werden oder angesichts der Art der + Informationen und den Umständen der Offenlegung vernünftigerweise als vertraulich + verstanden werden sollten. Insbesondere sollten alle Informationen zu Unternehmen, + Geschäften, Produkten, Entwicklungen, Geschäftsgeheimnissen, Fachwissen, Personal, + Kunden und Lieferanten beider Parteien als vertraulich betrachtet werden. + +Für alle während der Laufzeit dieser Vereinbarung empfangenen vertraulichen Informationen +wird die empfangende Partei die gleiche Sorgfalt aufwenden, mit der sie die Vertraulichkeit +ihrer eigenen, ähnlichen vertraulichen Informationen schützt, mindestens jedoch angemessene +Sorgfalt. + +Die empfangende Partei kann vertrauliche Informationen der offenlegenden Partei offenlegen, +soweit dies gesetzlich vorgeschrieben ist, sofern die empfangende Partei der offenlegenden +Partei diese vorgeschriebene Offenlegung im gesetzlich zulässigen Umfang mitteilt. + +.. _termination_de: + +6.5 Kündigung +------------- + +Sollte eine der Parteien ihre Verpflichtungen aus dieser Vereinbarung nicht erfüllen und dieser +Verstoß nicht innerhalb von 30 Kalendertagen nach schriftlicher Benachrichtigung über diesen +Verstoß nicht behoben worden sein, so kann dieser Vertrag von der nicht säumigen Partei fristlos +gekündigt werden. + +Außerdem kann Odoo SA den Vertrag sofort kündigen, falls der Kunde die geltenden Gebühren für +die Dienstleistungen nicht bis zum in der entsprechenden Rechnung angegebenen Fälligkeitsdatum +bezahlt. + +Überdauernde Bestimmungen: +Die Abschnitte ":ref:`confidentiality_de`”, “:ref:`disclaimers_de`”, “:ref:`liability_de`” sowie +“:ref:`general_provisions_de`” werden jede Kündigung oder Ablauf dieser Vereinbarung überdauern. + + +.. _warranties_disclaimers_de: + +7. Garantien, Haftungsausschlüsse, Haftung +========================================== + +.. _warranties_de: + +7.1 Garantie +--------------- + +Für die Laufzeit dieser Vereinbarung ist Odoo SA verpflichtet, wirtschaftlich angemessene +Anstrengungen zu unternehmen, um die Dienstleistungen gemäß den allgemein branchenweit +anerkannten Standards auszuführen, sofern folgende Bedingungen erfüllt sind: + +- die Computersysteme des Kunden befinden sich in einem guten Betriebszustand und die Software + ist in einer geeigneten Betriebsumgebung installiert; +- der Kunde stellt angemessene Informationen und Zugänge für die Fehlerbehebung bereit, damit + Odoo SA Probleme identifizieren, reproduzieren und beheben kann; +- alle Odoo SA zustehenden Beträge wurden bezahlt. + +Das einzige und ausschließliche Rechtsmittel des Kunden und die einzige Verpflichtung von Odoo SA +bei Verstößen gegen diese Garantie besteht darin, dass Odoo SA die Ausführung der Dienste ohne +zusätzliche Kosten wiederaufnimmt. + +.. _disclaimers_de: + +7.2 Haftungsausschlüsse +----------------------- + +Außer wenn in diesem Dokument ausdrücklich angegeben, räumt keine der beiden Parteien weder +ausdrückliche noch stillschweigende, gesetzliche oder anderweitige Gewährleistungen irgendeiner +Art ein, und beide Parteien lehnen alle implizierten Garantien ausdrücklich ab, einschließlich +jeglicher stillschweigenden Zusicherung der Marktgängigkeit, der Eignung für einen bestimmten +Zweck oder der Nichtverletzung, soweit diese Einschränkung nach geltendem Recht zulässig ist. + +Odoo SA garantiert nicht, dass die Software örtlichen oder internationalen Gesetzen oder +Rechtsvorschriften entspricht. + +.. _liability_de: + +7.3 Haftungsbeschränkung +------------------------ + +Im gesetzlich maximal zulässigen Umfang darf die Gesamthaftung jeder Partei zusammen mit ihren +Tochtergesellschaften aus oder im Zusammenhang mit dieser Vereinbarung 50 % des vom Kunden im +Rahmen dieser Vereinbarung in den 12 Monaten unmittelbar vor dem Datum des Ereignisses, das zu +diesem Anspruch führt, gezahlten Gesamtbetrags nicht übersteigen. Auch bei mehreren Ansprüchen +darf diese Beschränkung nicht verändert werden. + +Keine der beiden Parteien oder ihre Tochtergesellschaften werden unter keinen Umständen für +indirekte, besondere, exemplarische, zufällige oder Folgeschäden jeglicher Art haften, +einschließlich unter anderem Verluste von Erträgen, Gewinnen, Einsparungen, verlorene +Geschäftsgelegenheiten oder andere finanzielle Verluste, Kosten für Stillstand oder Verspätung, +verlorene oder beschädigte Daten, die aus oder im Zusammenhang mit dieser Vereinbarung entstehen. +Dies gilt unabhängig von der Art der Handlung, egal ob vertraglicher Art, unerlaubte Handlung +(einschließlich grober Fahrlässigkeit) oder einer anderen rechtlichen oder billigen Theorie, +selbst wenn eine Partei oder ihre Tochtergesellschaften auf die Möglichkeit solcher Schäden +hingewiesen wurden oder die von einer Partei oder ihren Tochtergesellschaften ergriffenen +Abhilfemaßnahmen ihren wesentlichen Zweck verfehlen. + +.. _force_majeure_de: + +7.4 Höhere Gewalt +------------------ + +Keine der beiden Parteien haftet gegenüber der anderen Partei für die Verzögerung oder die +Nichterbringung einer Leistung im Rahmen dieser Vereinbarung, wenn diese Nichterbringung oder +Verzögerung durch folgende Punkte verursacht wurden: staatliche Rechtsvorschriften, Brand, Streik, +Krieg, Überschwemmung, Unfall, Epidemie, Embargo, vollständige oder teilweise Enteignung von +Anlagen oder Produkten seitens einer Regierung oder einer öffentlichen Behörde oder aus allen +anderen Gründen oder Ursachen gleicher oder unterschiedlicher Art, die außerhalb des angemessenen +Einflussbereichs dieser Partei liegen. Dies gilt, solange diese Gründe oder Ursachen vorliegen. + + +.. _general_provisions_de: + +8. Allgemeine Bestimmungen +========================== + +.. _governing_law_de: + +8.1 Geltendes Recht +------------------- + +Beide Parteien stimmen zu, dass im Falle von Streitigkeiten aus oder im Zusammenhang mit dieser +Vereinbarung das belgische Recht angewendet wird, ohne Rücksicht auf Wahl- oder Kollisionsrecht. +Soweit im Rahmen dieser Bestimmung eine Klage oder ein Gerichtsverfahren zulässig ist, stimmen +beide Parteien bei, die Gerichte in Nivelles (Belgien) für die Beilegung aller Streitigkeiten als +ausschließlich zuständig anzuerkennen. + +.. _severability_de: + +8.2 Salvatorische Klausel +------------------------- + +Sollten eine oder mehrere Bestimmungen dieser Vereinbarung oder deren Anwendung unwirksam, +rechtswidrig oder nicht durchsetzbar sein, so werden die Wirksamkeit, Rechtmäßigkeit und +Durchsetzbarkeit der übrigen Bestimmungen dieser Vereinbarung und ihrer Anwendung davon +nicht berührt oder beeinträchtigt. Beide Parteien verpflichten sich, alle unwirksamen, +rechtswidrigen oder nicht durchsetzbaren Bestimmungen dieser Vereinbarung durch eine wirksame +Bestimmung möglichst mit gleichen Wirkungen und Zielen zu ersetzen. + + +.. _appendix_a_de: + +9. Anhang A: Odoo Enterprise Edition-Lizenz +=========================================== + +.. only:: latex + + Die Odoo Enterprise Edition ist unter nachstehend definierten der Odoo Enterprise Edition + Lizenz v1.0 lizenziert: + + .. highlight:: none + + .. literalinclude:: ../../licenses/enterprise_license.txt + +.. only:: html + + Siehe :ref:`odoo_enterprise_license`. + diff --git a/legal/terms/i18n/enterprise_es.rst b/legal/terms/i18n/enterprise_es.rst new file mode 100644 index 000000000..4b55ea408 --- /dev/null +++ b/legal/terms/i18n/enterprise_es.rst @@ -0,0 +1,8 @@ + +.. _enterprise_agreement_es: + +=========================================== +Odoo Enterprise Subscription Agreement (ES) +=========================================== + +.. todo \ No newline at end of file diff --git a/legal/terms/i18n/enterprise_fr.rst b/legal/terms/i18n/enterprise_fr.rst index 72eaa92c7..3868009bb 100644 --- a/legal/terms/i18n/enterprise_fr.rst +++ b/legal/terms/i18n/enterprise_fr.rst @@ -10,18 +10,14 @@ Odoo Enterprise Subscription Agreement (FR) Cette traduction est fournie dans l’espoir qu’elle facilitera sa compréhension, mais elle n'a aucune valeur légale. La seule référence officielle des termes du contrat “Odoo Enterprise Subscription Agreement” - est la :ref:`version originale `. + est la :ref:`version originale en anglais `. - This is a french translation of the "Odoo Enterprise Subscription Agreement”. - This translation is provided in the hope that it will facilitate understanding, but it - has no legal value. - The only official reference of the terms and conditions of the “Odoo Enterprise Subscription - Agreement” is the :ref:`original english version `. - -.. note:: Version 7 - Dernière modification: 7 décembre 2017. +.. note:: Version 7.1 - 2018-03-16 .. v6: add "App" definition + update pricing per-App .. v7: remove possibility of price change at renewal after prior notice +.. 7.1: specify that 7% renewal increase applies to all charges, not just per-User. + En vous abonnant aux services de Odoo Enterprise (les "Services") fournis par Odoo SA et ses filiales (collectivement, "Odoo SA") en relation avec Odoo Enterprise Edition ou Odoo Community Edition @@ -288,8 +284,6 @@ Le Client accepte de / d': qu'Odoo SA ne peut être tenue responsable de toute perte de données ; -.. _no_soliciting_fr: - 6.2 Non solicitation ou embauche -------------------------------- @@ -465,7 +459,7 @@ du présent contrat par une disposition valable ayant les mêmes effets et objec 9 Appendice A: Odoo Enterprise Edition License ============================================== -Odoo 9 Enterprise Edition est publié sous la licence Odoo Enterprise Edition License v1.0, +Odoo Enterprise Edition est publié sous la licence Odoo Enterprise Edition License v1.0, définie ci-dessous. .. warning:: diff --git a/legal/terms/i18n/enterprise_nl.rst b/legal/terms/i18n/enterprise_nl.rst new file mode 100644 index 000000000..10955ff58 --- /dev/null +++ b/legal/terms/i18n/enterprise_nl.rst @@ -0,0 +1,8 @@ + +.. _enterprise_agreement_nl: + +=========================================== +Odoo Enterprise Subscription Agreement (NL) +=========================================== + +.. todo \ No newline at end of file diff --git a/legal/terms/i18n/enterprise_tex_de.rst b/legal/terms/i18n/enterprise_tex_de.rst new file mode 100644 index 000000000..aa2e1707a --- /dev/null +++ b/legal/terms/i18n/enterprise_tex_de.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + enterprise_de \ No newline at end of file diff --git a/legal/terms/i18n/enterprise_tex_es.rst b/legal/terms/i18n/enterprise_tex_es.rst new file mode 100644 index 000000000..022179bab --- /dev/null +++ b/legal/terms/i18n/enterprise_tex_es.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + enterprise_es \ No newline at end of file diff --git a/legal/terms/i18n/enterprise_tex_nl.rst b/legal/terms/i18n/enterprise_tex_nl.rst new file mode 100644 index 000000000..923e8432d --- /dev/null +++ b/legal/terms/i18n/enterprise_tex_nl.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + enterprise_nl \ No newline at end of file diff --git a/legal/terms/i18n/partnership_es.rst b/legal/terms/i18n/partnership_es.rst new file mode 100644 index 000000000..05574e94c --- /dev/null +++ b/legal/terms/i18n/partnership_es.rst @@ -0,0 +1,361 @@ +.. _partnership_agreement_es: + +=============================== +Odoo Partnership Agreement (ES) +=============================== + +.. warning:: + This is a spanish translation of the "Odoo Enterprise Partnership Agreement”. + This translation is provided in the hope that it will facilitate understanding, but it + has no legal value. + The only official reference of the terms and conditions of the “Odoo Enterprise Subscription + Agreement” is the :ref:`original english version `. + +.. note:: Versión 6 - 2017-12-04 + +ENTRE: + +Odoo S.A., inscrita en el Registro mercantil y de sociedades de Nivelles con el número RCN 95656, +que tiene su sede social en Chaussée de Namur, 40, 1367 Grand-Rosière, Bélgica, +y sus filiales (denominados conjuntamente “ODOO”) + +Y +________________________________, una empresa que tiene su domicilio social +en _____________________(en adelante denominado “EL COLABORADOR”) + +ODOO y EL COLABORADOR se denominan individualmente “Parte” y conjuntamente “las Partes”. + +1 Objeto +======== +El presente contrato tiene por objeto regular las condiciones bajo las cuales ODOO presta servicios +a EL COLABORADOR, acceso al software Odoo Enterprise Edition, y bajo las cuales EL COLABORADOR +cumple con las obligaciones establecidas a continuación. + +Por la presente ODOO nombra a EL COLABORADOR, y EL COLABORADOR acepta ser nombrado, socio no +exclusivo para promover y vender “Odoo Enterprise Edition” a los clientes. + +EL COLABORADOR se compromete a hacer su mejor esfuerzo para vender contratos de Odoo Enterprise a +sus clientes. En apoyo a esta afirmación, EL COLABORADOR dará prioridad a la comercialización +de la versión “Odoo Enterprise Edition” a clientes potenciales y clientes. +EL COLABORADOR siempre tiene la posibilidad de vender servicios con otras versiones del software, +como “Odoo Community Edition”, en caso de ser necesario. + +2 Duración del Contrato +======================= +La duración de este contrato será de un año ("la Duración") a partir de la fecha de la firma. +Se renueva automáticamente por una duración igual, a menos que cualquiera de las partes notifique +por escrito a la otra parte su terminación como mínimo 30 días antes del final de la duración. + +3 Acceso a Odoo Enterprise Edition +=================================== + +3.1 Acceso a la plataforma del proyecto +--------------------------------------- +Para ayudar a EL COLABORADOR a promover Odoo Enterprise Edition, ODOO otorga a EL COLABORADOR +acceso a su repositorio de código del proyecto para todas las “Aplicaciones Odoo Enterprise Edition”, +en los términos establecidos en :ref:`appendix_p_a_es` y las condiciones restringidas del presente +Contrato. +Este acceso se otorgará a partir de la firma de este contrato y se revocará cuando se rescinda este +Contrato. + + +.. _restrictions_es: + +3.2 Restricciones +----------------- +EL COLABORADOR se compromete a mantener la confidencialidad del código fuente de las aplicaciones +Odoo Enterprise Edition entre su personal. El acceso al código fuente de Odoo Enterprise Edition +para los clientes se rige por el Contrato de suscripción de Odoo Enterprise (versión 4.0 y superior). +EL COLABORADOR se compromete a NO redistribuir este código a terceros sin el permiso por escrito +de ODOO. + +A pesar de lo anterior, EL COLABORADOR se compromete a preservar por completo la integridad del +código de Odoo Enterprise Edition necesario para verificar la validez del uso de Odoo Enterprise +Edition y para recopilar estadísticas necesarias para este fin. + + +4 Servicios de colaboración +=========================== + +4.1 Niveles de colaboración +--------------------------- +El programa de socios de Odoo consta de tres niveles de colaboración (Ready, Silver y Gold), con +requisitos y beneficios específicos. +El nivel de colaboración otorgado a EL COLABORADOR depende de los ingresos anuales de +Odoo Enterprise generados para ODOO. Las renovaciones de los contratos existentes no tienen en +cuenta el nivel de colaboración, pero EL COLABORADOR sigue recibiendo una comisión por estos +contratos, tal como se indica en la sección :ref:`benefits_es`.. + +La tabla siguiente resume los requisitos para cada nivel de colaboración. + ++----------------------------------------------+----------+----------+--------+ +| | Ready | Silver | Gold | ++==============================================+==========+==========+========+ +| Usuarios de Odoo Enterprise anuales vendidos | 0 | 50 | 100 | ++----------------------------------------------+----------+----------+--------+ +| Recursos internos certificados activos | 1 | 2 | 4 | ++----------------------------------------------+----------+----------+--------+ +| Tasa de retención mínima | n/a | 85% | 85% | ++----------------------------------------------+----------+----------+--------+ + +Las certificaciones son personales, por lo que cuando un miembro certificado del personal deja +la empresa, EL COLABORADOR debe notificarlo a ODOO para que actualice la cantidad de recursos +certificados activos para el contrato de colaboración. + +ODOO revisará trimestralmente el nivel de las colaboraciones sobre la base de los nuevos +contratos de Odoo Enterprise vendidos por EL COLABORADOR en los últimos 12 meses. + +El nivel de colaboración puede actualizarse automáticamente a un nivel superior una vez los +socios alcanzan los requisitos específicos para este nivel de colaboración. +Los socios Silver y Gold que no cumplan con sus requisitos de colaboración al final del período +anual pueden ser asignados un nivel de colaboración inferior. + +.. _benefits_es: + +4.2 Ventajas +------------ + +En la tabla siguiente se describen los detalles de las ventajas para cada nivel de colaboración: + ++------------------------------+-----------------+------------------+----------------+ +| | Ready | Silver | Gold | ++==============================+=================+==================+================+ +| **Reconocimiento** | | | | ++------------------------------+-----------------+------------------+----------------+ +| Visibilidad en odoo.com | “Ready Partner” | “Silver Partner” | “Gold Partner” | ++------------------------------+-----------------+------------------+----------------+ +| Derechos de uso de la marca | Logotipo Ready | Logotipo Silver | Logotipo Gold | +| registrada “Odoo” | | | | ++------------------------------+-----------------+------------------+----------------+ +| **Ventajas de la formación** | | | | ++------------------------------+-----------------+------------------+----------------+ +| Seminarios anuales de | Sí | Sí | Sí | +| actualización | | | | ++------------------------------+-----------------+------------------+----------------+ +| Coaching de ventas | Sí | Sí | Sí | ++------------------------------+-----------------+------------------+----------------+ +| Acceso a la plataforma | Sí | Sí | Sí | +| E-Learning y a la base de | | | | +| conocimiento de Odoo | | | | ++------------------------------+-----------------+------------------+----------------+ +| **Ventajas del software** | | | | ++------------------------------+-----------------+------------------+----------------+ +| Acceso al código fuente de | Sí | Sí | Sí | +| Odoo Enterprise | | | | ++------------------------------+-----------------+------------------+----------------+ +| **Ventajas de las ventas** | | | | ++------------------------------+-----------------+------------------+----------------+ +| Comisión por la plataforma | 100% | 100% | 100% | +| Odoo SH [#f1es] | | | | ++------------------------------+-----------------+------------------+----------------+ +| Comisión por Odoo Enterprise | 10% | 15% | 20% | ++------------------------------+-----------------+------------------+----------------+ +| Acceso a un gestor de cuentas| Sí | Sí | Sí | +| especializado | | | | ++------------------------------+-----------------+------------------+----------------+ +| **Ventajas de marketing** | | | | ++------------------------------+-----------------+------------------+----------------+ +| Material de marketing | Sí | Sí | Sí | ++------------------------------+-----------------+------------------+----------------+ +| Evento de EL COLABORADOR - | Sí | Sí | Sí | +| Asistencia y promoción de | | | | +| ODOO | | | | ++------------------------------+-----------------+------------------+----------------+ + +.. [#f1es] La tasa de comisión del 100% por la plataforma Odoo SH se concede a todas las + suscripciones de Odoo Enterprise firmadas durante el primer año de colaboración, + siempre que se renueve dicha suscripción. Después del primer año, EL COLABORADOR + obtiene la comisión habitual de Odoo Enterprise, de acuerdo con el nivel de + colaboración. + + +4.3 Reconocimiento de socios +---------------------------- +ODOO promocionará EL COLABORADOR como socio oficial en el sitio web oficial (odoo.com). + +ODOO concede a EL COLABORADOR, de forma no exclusiva, el derecho a usar y reproducir el logotipo +de socio de ODOO del nivel de colaboración correspondiente y el nombre “Odoo” en relación con este +contrato de colaboración. + +Cada Parte se compromete a respetar todos los derechos de la otra Parte en todos los elementos +mencionados en el párrafo anterior y, más concretamente, cada Parte debe abstenerse de causar +cualquier analogía o crear confusión entre sus respectivas compañías en el público general, +por cualquier motivo y por cualquier medio. + +4.4 Ventajas de la formación +---------------------------- +EL COLABORADOR tiene acceso a la base de conocimiento de ODOO durante la duración de este Contrato. +La base de conocimiento de ODOO es una plataforma electrónica en línea que contiene un conjunto de +documentos comerciales, funcionales y de marketing para ayudar a EL COLABORADOR a adquirir +y aprovechar el conocimiento de Odoo, hacer crecer su negocio, atraer más clientes y crear +conciencia de marca. + +EL COLABORADOR también recibe acceso gratuito a la plataforma E-Learning de ODOO (para usuarios +ilimitados). La plataforma E-Learning de ODOO ofrece en línea un conjunto de tutoriales y cursos +en vídeo de alta calidad sobre las aplicaciones oficiales de Odoo. + +EL COLABORADOR podrá acceder al coaching comercial facilitado por su gestor de cuentas +especializado, designado por ODOO. + +EL COLABORADOR también tiene la opción de comprar formación técnica específica suscribiéndose a un +Pack de éxito de Odoo, por una tarifa adicional. + +4.5 Comisiones por los servicios de Odoo vendidos por EL COLABORADOR +--------------------------------------------------------------------- +EL COLABORADOR recibe una retribución por los servicios de ODOO comprados directamente por un +cliente a través de EL COLABORADOR, de la forma siguiente: + +- Por las suscripciones “Odoo Enterprise” y “Odoo SH” vendidas a través de EL COLABORADOR; ODOO + factura directamente al cliente en función del precio final acordado entre ODOO, + EL COLABORADOR y el cliente. A continuación, EL COLABORADOR factura su comisión a ODOO en función + del precio de Odoo Enterprise Edition, libre de posibles reducciones, y en función del nivel de + colaboración de EL COLABORADOR en el momento de la firma de la venta. +- Por las renovaciones de las suscripciones “Odoo Enterprise”; EL COLABORADOR recibe una comisión + por cada renovación de una suscripción vendida a través de EL COLABORADOR, siempre y cuando + EL COLABORADOR mantenga una relación contractual con el cliente correspondiente. +- Por otros servicios; EL COLABORADOR factura directamente al cliente, y ODOO factura a + EL COLABORADOR directamente, comisión incluida (como descuento). + + +5 Tarifas +========= +EL COLABORADOR se compromete a pagar la tarifa de Inscripción de colaboración o la tarifa de +Renovación anual de colaboración inmediatamente después de recibir la factura anual enviada por +ODOO. Las tarifas se especificarán por escrito en el momento de la firma de este contrato. + +EL COLABORADOR reconoce que las tarifas de colaboración mencionadas anteriormente no son +reembolsables. + +La tarifa de “Inscripción de colaboración” debe pagarse antes de la activación de este contrato, +y solo se aplica a los nuevos socios. + +La tarifa de “Renovación anual de colaboración” debe pagarse cada año cuando se renueve la +duración de este contrato. + +Si por algún motivo EL COLABORADOR decide rescindir este contrato, y más adelante solicita +renovarlo, se aplicará la tarifa de “Renovación anual de colaboración”. + + +6 Resolución +============ +En el caso de que cualquiera de las Partes no cumpla con cualquiera de sus obligaciones que se +derivan de este documento, y si tal incumplimiento no se ha rectificado en un período de 30 días +naturales a partir de la notificación por escrito de dicho incumplimiento, la Parte que no +incumplió sus obligaciones puede rescindir este contrato inmediatamente. + +Disposiciones subsistentes: + Las secciones « :ref:`restrictions_es` », « :ref:`p_liability_es` », y « :ref:`gov_law_es` » + mantendrán su vigencia tras cualquier resolución o expiración de este contrato. + +6.1 Consecuencia de la resolución +--------------------------------- +En el momento de la resolución de este contrato, EL COLABORADOR: + - no deberá utilizar más los materiales y/o la marca Odoo ni reclamar la existencia de ninguna + colaboración o relación con ODOO; + - deberá cumplir con sus obligaciones durante cualquier período de aviso previo a dicha resolución; + - ya no podrá usar Odoo Enterprise para fines de desarrollo, prueba o producción + +.. _p_liability_es: + +7 Responsabilidad e indemnizaciones +=================================== +Ambas Partes están vinculadas por una obligación de medios aquí descrita. + +En la medida máxima permitida por la ley, la responsabilidad de ODOO por cualquier reclamo, +pérdida, daño o gasto derivado de cualquier manera o bajo cualquier circunstancia del presente +contrato se limitará a los daños directos demostrados, pero en ningún caso excederá por todos los +eventos o series de eventos relacionados que ocasionen daños la cantidad total de las tarifas +pagadas por EL COLABORADOR en el transcurso de los seis (6) meses inmediatamente anteriores a la +fecha del evento que dio lugar a dicha reclamación. + +En ningún caso ODOO será responsable de ningún daño indirecto o consecuente, incluyendo, +entre otros, reclamaciones de clientes o terceros, pérdidas de ingresos, ganancias, ahorros, +pérdidas de negocios y otras pérdidas financieras, costos de paralización y retraso, datos perdidos +o dañados derivados o relacionados con el cumplimiento de sus obligaciones. + +EL COLABORADOR reconoce que no tiene ninguna expectativa y que no ha recibido garantías de recuperar +ninguna inversión realizada en la ejecución de este contrato y el programa de socios de Odoo o de +obtener ninguna cantidad anticipada de ganancias en virtud de este contrato. + +EL COLABORADOR renuncia a cualquier compromiso en favor de ODOO respecto a la evolución del software. + +De acuerdo con los términos de la licencia del software, ODOO no se hace responsable de ningún +error ni de la calidad y el rendimiento del software. + + +8 Disposiciones diversas +======================== + +8.1 Comunicaciones +------------------ +Ninguna comunicación de una Parte a la otra tendrá validez en virtud del presente Contrato, +a menos que se realice por escrito en nombre de ODOO o EL COLABORADOR, según sea el caso, +de conformidad con las disposiciones de este Contrato. +Cualquier tipo de aviso que cualquiera de las Partes de este documento tenga el derecho o la +obligación de comunicara la otra, debe hacerse por correo certificado. + +8.2 Imagen de marca +------------------- +Ambas Partes se abstendrán de dañar de ninguna manera la imagen de marca y la reputación de la otra +Parte en el cumplimiento de este contrato. El incumplimiento de esta disposición será causa de +resolución de este Contrato. + +8.3 Publicidad +-------------- +EL COLABORADOR concede a ODOO el derecho no exclusivo de utilizar el nombre y las marcas +comerciales de EL COLABORADOR en comunicados de prensa, promociones u otros anuncios públicos. +En concreto, EL COLABORADOR acepta que se le mencione, y que el logotipo y la marca comercial +de EL COLABORADOR se use solo para este fin, en la lista oficial de socios de ODOO. + +.. _no_soliciting_es: + +8.4 No captación o contratación +------------------------------- +Excepto cuando la otra Parte dé su consentimiento por escrito, cada Parte, sus afiliados y +representantes acuerdan no captar u ofrecer empleo a ningún empleado de la otra Parte +que participe en la realización o uso de los servicios de este contrato, +durante la duración de este contrato y por un período de 24 meses a partir de la fecha de +resolución o expiración de este contrato. +En caso de cualquier incumplimiento de las condiciones de esta sección que conduzca al despido de +dicho empleado con este objetivo, la Parte incumplidora se compromete a pagar a la otra parte +la cantidad de 30 000,00 EUR (€) (treinta mil euros). + + +8.5 Contratistas independientes +-------------------------------- +Las Partes son contratistas independientes, y este contrato no debe interpretarse como la +configuración de cualquier Parte como socia, empresa conjunta o fiduciaria de la otra, +como la creación de otra forma de asociación legal que exigiría responsabilidad a una Parte por +la acción o la falta de acción de la otra, o como la prestación a cada Parte del derecho, +poder o autoridad (expresa o implícita) para crear cualquier deber u obligación de la otra. + + +.. _gov_law_es: + +9 Ley y jurisdicción aplicables +================================= +Este contrato se rige y se interpreta de acuerdo con las leyes de Bélgica. +Todas las disputas que surjan en relación con este contrato para las que no se pueda encontrar una +solución amistosa serán resueltas definitivamente en los Tribunales de Bélgica en Nivelles. + + + +**Firmas**: + +================================== ================================== +Por ODOO, Por EL COLABORADOR, +================================== ================================== + + +.. _appendix_p_a_es: + +10 Anexo A: Licencia Odoo Enterprise Edition +============================================ + +.. only:: latex + + .. include:: ../../licenses/enterprise_license.txt + +.. only:: html + + See :ref:`odoo_enterprise_license`. diff --git a/legal/terms/i18n/partnership_fr.rst b/legal/terms/i18n/partnership_fr.rst new file mode 100644 index 000000000..8ee41d718 --- /dev/null +++ b/legal/terms/i18n/partnership_fr.rst @@ -0,0 +1,405 @@ +.. _partnership_agreement_fr: + +=============================== +Odoo Partnership Agreement (FR) +=============================== + +.. warning:: + Ceci est une traduction en français du contrat “Odoo Enterprise Partnership Agreement”. + Cette traduction est fournie dans l’espoir qu’elle facilitera sa compréhension, mais elle + n'a aucune valeur légale. + La seule référence officielle des termes du contrat “Odoo Enterprise Partnership Agreement” + est la :ref:`version originale en anglais `. + +.. note:: Version 6 - 2017-12-04 + +ENTRE : + +Odoo S.A., enregistrée au Registre de commerce de Nivelles sous le numéro RCN 95656, dont le siège +social se situe Chaussée de Namur, 40, 1367 Grand-Rosière, Belgique, et ses filiales (désignées +collectivement sous le terme « ODOO ») + +ET +________________________________, une entreprise dont le siège social se situe à __________________ +(ci-après dénommée « PARTENAIRE »). + +ODOO et PARTENAIRE sont désignées individuellement par le terme « Partie » et collectivement par +le terme « les Parties ». + +1 Objectif +========== +L’objectif de ce Contrat est de présenter les conditions auxquelles ODOO fournit des services au +PARTENAIRE et l’accès au logiciel Odoo Enterprise Edition, et en vertu desquelles le PARTENAIRE +se plie aux obligations énoncées ci-après. + +Par le présent accord, ODOO désigne le PARTENAIRE, désignation acceptée par le PARTENAIRE, +comme partenaire non exclusif pour promouvoir et vendre « Odoo Enterprise Edition » à des clients. + +Le PARTENAIRE s’engage à faire tous les efforts possibles pour vendre des contrats Odoo Enterprise +à ses clients. Pour étayer ces efforts, le PARTENAIRE commercialisera en priorité la version +« Odoo Enterprise Edition » aux prospects et clients. Si nécessaire, le PARTENAIRE peut vendre des +services sur d’autres versions du logiciel, comme « Odoo Community Edition ». + +2 Durée du Contrat +================== +Ce Contrat restera en vigueur pendant un an (la « Durée ») à compter de la date de la signature. +Il est automatiquement renouvelé pour une Durée équivalente, à moins qu’une partie transmette +à l’autre partie une dénonciation écrite au moins 30 jours avant la fin de la Durée. + + +3 Accès à Odoo Enterprise Edition +================================= + +3.1 Accès à la plate-forme projet +--------------------------------- +Pour aider le PARTENAIRE à promouvoir Odoo Enterprise Edition, ODOO octroie au PARTENAIRE l’accès +à son dépôt de code pour toutes les « Applis Odoo Enterprise Edition » sous les conditions +présentées dans :ref:`appendix_p_a_fr` et les conditions reprises dans ce Contrat. +Cet accès sera octroyé dès la signature de ce Contrat et révoqué à la fin de celui-ci. + +.. _restrictions_fr: + +3.2 Restrictions +---------------- +Le PARTENAIRE s’engage à maintenir la confidentialité du code source des Applis Odoo Enterprise +Edition au sein de son personnel. L’accès au code source d’Odoo Enterprise Edition pour les clients +est gouverné par le Odoo Enterprise Subscription Agreement (version 4 et au-delà). +Le PARTENAIRE s'engage à ne PAS redistribuer ce code à un tiers sans l’autorisation écrite d’ODOO. + +Nonobstant ce qui précède, le PARTENAIRE s’engage à préserver totalement l’intégrité du code +d’Odoo Enterprise Edition requis pour vérifier la validité de l’utilisation d’Odoo Enterprise Edition +et recueillir les données statistiques nécessaires à cette fin. + +4 Services du partenariat +========================= + +4.1 Niveaux de partenariat +-------------------------- +Le programme partenaire d’Odoo consiste en trois niveaux de partenariat reprenant des exigences et +avantages spécifiques pour chacun d’entre eux : Ready, Silver et Gold. +Le niveau de partenariat accordé au PARTENAIRE dépend des nouvelles recettes annuelles +Odoo Enterprise générées par le PARTENAIRE pour ODOO. Les renouvellements de contrats existants +n’entrent pas en ligne de compte pour le niveau de partenariat, mais le PARTENAIRE reçoit tout de +même une commission sur ces contrats, comme indiqué dans la section :ref:`benefits_fr`. + +Le tableau ci-dessous résume les exigences pour chaque niveau de partenariat. + ++----------------------------------------------+----------+----------+----------+ +| | Ready | Silver | Gold | ++==============================================+==========+==========+==========+ +| Nouveaux utilisateurs Odoo Enterprise vendus | 0 | 50 | 100 | ++----------------------------------------------+----------+----------+----------+ +| Ressources internes actives certifiées | 1 | 2 | 4 | ++----------------------------------------------+----------+----------+----------+ +| Taux de rétention minimum | n/a | 85 % | 85 % | ++----------------------------------------------+----------+----------+----------+ + +Les certifications sont personnelles, donc lorsqu’un membre du personnel quitte l’entreprise, +le PARTENAIRE doit en informer ODOO afin que celle-ci puisse mettre à jour le nombre de ressources +certifiées actives pour l’accord de partenariat. + +Le niveau des partenariats sera revu trimestriellement par ODOO sur la base des nouveaux contrats +Odoo Enterprise vendus par le partenaire les 12 mois précédents. + +Les partenaires peuvent monter de niveau une fois qu’ils répondent aux exigences pour ce niveau +supérieur de partenariat. Les partenaires Silver et Gold qui ne répondent pas aux exigences de leur +partenariat à la fin de la période annuelle peuvent retomber à niveau de partenariat inférieur. + +.. _benefits_fr: + +4.2 Avantages +------------- + +Les avantages de chaque niveau de partenariat sont détaillés dans le tableau ci-dessous : + ++---------------------------------------+-----------------+------------------+----------------+ +| | Ready | Silver | Gold | ++=======================================+=================+==================+================+ +| **Reconnaissance** | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| Visibilité sur odoo.com | "Ready Partner" | "Silver Partner" |"Gold Partner" | ++---------------------------------------+-----------------+------------------+----------------+ +| Droit d’utiliser la marque déposée | Logo Ready | Logo Silver | Logo Gold | ++---------------------------------------+-----------------+------------------+----------------+ +| **Avantages formation** | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| Séminaires de mise à jour annuelle | Oui | Oui | Oui | ++---------------------------------------+-----------------+------------------+----------------+ +| Coaching Vente | Oui | Oui | Oui | ++---------------------------------------+-----------------+------------------+----------------+ +| Accès à la plateforme d’E-Learning et | Oui | Oui | Oui | +| | | | | +| à la base de connaissances d’Odoo | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| **Avantages logiciel** | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| Accès au code source Odoo Enterprise | Oui | Oui | Oui | ++---------------------------------------+-----------------+------------------+----------------+ +| **Avantages Ventes** | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| Commission sur la plateforme | 100 % | 100 % | 100 % | +| Odoo SH [#f1fr]_ | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| Commission sur Odoo Enterprise | 10 % | 15 % | 20 % | ++---------------------------------------+-----------------+------------------+----------------+ +| Accès à un Account Manager dédié | Oui | Oui | Oui | ++---------------------------------------+-----------------+------------------+----------------+ +| **Avantages marketing** | | | | ++---------------------------------------+-----------------+------------------+----------------+ +| Accès au matériel de marketing | Oui | Oui | Oui | ++---------------------------------------+-----------------+------------------+----------------+ +| Événement PARTENAIRE - ODOO support & | Oui | Oui | Oui | +| promotion | | | | ++---------------------------------------+-----------------+------------------+----------------+ + +.. [#f1fr] Le taux de commission de 100 % sur la plateforme Odoo SH est octroyé pour toutes les + souscriptions Odoo Enterprise signées pendant la première année du partenariat, tant + que ces souscriptions sont renouvelées. Après la première année, le PARTENAIRE bénéficie + de la commission Odoo Enterprise normale, selon le niveau de partenariat. + +4.3 Reconnaissance du partenaire +-------------------------------- +ODOO promouvra le PARTENAIRE comme partenaire officiel sur le site Internet officiel (odoo.com). + +ODOO octroie au PARTENAIRE, sur une base non exclusive, le droit d’utiliser et de reproduire +le logo partenaire d’ODOO du niveau de partenariat correspondant et le nom « Odoo » en relation +avec ce Contrat de partenariat. + +Chacune des Parties s’engage à respecter les droits de l’autre Partie pour tous les éléments repris +dans le paragraphe précédent et s’abstiendra plus particulièrement de créer des analogies ou +une confusion entre leurs entreprises respectives dans l’esprit du grand public, pour quelque +raison et par quelque moyen que ce soit. + +4.4 Avantages formation +----------------------- +Le PARTENAIRE a accès à la base de connaissances d’ODOO pour toute la durée de ce Contrat. +La base de connaissance d’ODOO est une plateforme en ligne reprenant une série de documents +commerciaux, marketing et de documentation sur les fonctionnalités, pour aider le PARTENAIRE +à engranger et exploiter des connaissances Odoo, étendre son entreprise, attirer davantage +de clients et augmenter la visibilité de sa marque. + +Le PARTENAIRE bénéficie également d’un accès gratuit à la plateforme E-Learning d’Odoo +(usagers illimités). La plateforme E-Learning d’ODOO fournit une série de cours vidéo et +de tutoriels en ligne de haute qualité concernant les Applications Odoo officielles. + +Le PARTENAIRE aura accès à un coaching commercial fourni par son Account Manager dédié désigné +par ODOO. + +Le PARTENAIRE a également la possibilité de suivre une formation technique spécifique en +souscrivant à un Odoo Success Pack, moyennant un supplément. + +4.5 Commissions sur les Services Odoo vendus par le PARTENAIRE +-------------------------------------------------------------- +Pour les services ODOO achetés directement par un client par le biais du PARTENAIRE, le PARTENAIRE +recevra la rétribution suivante : + +- Pour les souscriptions « Odoo Enterprise » et « Odoo SH » vendues via le PARTENAIRE, + ODOO facturera directement au client sur la base du prix final conclu entre ODOO, + le PARTENAIRE et le client. Le PARTENAIRE facturera ensuite sa commission à ODOO sur la base du + prix d’Odoo Enterprise Edition, déduction faite de toute réduction, et sur base du niveau actuel + de partenariat du PARTENAIRE au moment de la signature de la vente. +- Pour le renouvellement de souscriptions « Odoo Enterprise », le PARTENAIRE reçoit une commission + pour chaque renouvellement de souscription vendue via le PARTENAIRE, tant que celui-ci maintient + une relation contractuelle avec le client correspondant. +- Pour les autres services, le PARTENAIRE facture directement au client et ODOO au PARTENAIRE, + commission comprise (sous forme de réduction). + +5 Frais +======= +Le PARTENAIRE s’engage à payer soit les frais de lancement du partenariat, soit les frais annuels +de renouvellement du partenariat immédiatement à la réception de la facture annuelle envoyée par +ODOO. + +Les frais seront spécifiés par écrit au moment de la signature de ce Contrat. + +Le PARTENAIRE accepte que les frais de partenariat susmentionnés ne soient pas remboursables. + +Les frais de lancement du partenariat seront payés avant l’activation de ce Contrat et ne +concernent que les nouveaux partenaires. + +Les frais de renouvellement annuel du partenariat devront être payés chaque année lorsque la Durée +de ce Contrat est renouvelée. + +Si, pour quelque raison que ce soit, le PARTENAIRE décide de mettre un terme à ce Contrat et veut +par la suite le renouveler, les frais de renouvellement annuel du partenariat seront applicables. + +6 Résiliation +============= +Dans le cas où l’une des Parties ne remplirait pas l’une des obligations mentionnées ici et qu’un +tel manquement ne serait remédié dans les 30 jours calendrier suivant la communication écrite +d’un tel manquement, la Partie non fautive peut mettre un terme immédiat à ce Contrat. + +Maintien des dispositions: + Les sections « :ref:`restrictions_fr` », « :ref:`p_liability_fr` », et « :ref:`gov_law_fr` » + seront maintenues après expiration ou résiliation de ce Contrat. + +6.1 Conséquences de la résiliation +---------------------------------- +À l’expiration ou la résiliation de ce Contrat, le PARTENAIRE : + - n’utilisera plus le matériel et/ou le nom de marque d’Odoo et ne revendiquera plus l’existence + d’un partenariat ou d’une relation quelconque avec ODOO ; + - respectera ses engagements pendant toute période de préavis précédant une telle résiliation ; + - ne pourra plus utiliser Odoo Enterprise, que ce soit à des fins de développement, + de test ou de production. + +.. _p_liability_fr: + +7 Responsabilité et Indemnités +============================== +Les deux Parties sont liées par l’obligation de moyens ci-après. + +Dans les limites autorisées par la loi, la responsabilité d’ODOO pour quelque réclamation, perte, +dommage ou dépense que ce soit découlant de n’importe quelle cause et survenant de quelque manière +que ce soit sous ce Contrat sera limitée aux dommages directs prouvés, mais ne dépassera en aucun +cas, pour tous les événements ou séries d’événements connexes entraînant des dommages, +le montant total des frais payés par le PARTENAIRE au cours de six (6) mois précédant immédiatement +la date de l’événement donnant naissance à une telle plainte. + +En aucun cas, ODOO ne sera responsable pour tout dommage indirect ou consécutif, y compris, mais +sans s’y restreindre, aux plaintes, pertes de revenu, de recettes, d’économies, d’entreprise ou +autre perte financière, coûts d’arrêt ou de retard, pertes de données ou données corrompues +de tiers ou de clients résultant de ou en lien avec l’exécution de ses obligations. + +Le PARTENAIRE comprend qu’il n’a aucune attente et n’a reçu aucune assurance qu’un investissement +effectué dans l’exécution de ce Contrat et du Programme de partenariat d’Odoo sera récupéré ou +recouvert ou qu’il obtiendra un quelconque montant de bénéfices anticipé en vertu de ce Contrat. + +Le PARTENAIRE renonce à tout engagement au nom d’ODOO concernant l’évolution du Logiciel. + +Selon les conditions de la licence du Logiciel, ODOO ne sera pas responsable pour quelque bug que +ce soit, ni pour la qualité ou la performance du Logiciel. + + +8 Divers +======== + +8.1 Communications +------------------ +Aucune communication d’une Partie à l’autre n’aura de validité sous ce Contrat à moins qu’elle +n’ait été communiquée par écrit ou au nom du PARTENAIRE ou d’ODOO, le cas échéant, en accord avec +les dispositions de ce Contrat. +Toute communication que les deux Parties doivent ou peuvent émettre ou se transmettre par ce +Contrat sera donnée par courrier recommandé. + +8.2 Image de marque +------------------- +Les deux parties s’abstiendront de nuire à l’image de marque et à la réputation de l’autre Partie +de quelque façon que ce soit, dans l’exécution de ce Contrat. Le non-respect de cette disposition +forme une cause de résiliation de ce Contrat. + +8.3 Publicité +------------- +Le PARTENAIRE octroie à ODOO un droit non exclusif d’utilisation du nom ou de la marque déposée +du PARTENAIRE dans des communiqués de presse, annonces publicitaires ou autres annonces publiques. +Le PARTENAIRE accepte plus particulièrement d’être mentionné et que son logo ou sa marque déposée +soient utilisés à cette fin uniquement, dans la liste officielle des partenaires ODOO. + +8.4 Pas de candidature ou d’engagement +-------------------------------------- + +À moins que l’autre Partie ne donne son consentement écrit, chaque Partie, ses filiales et ses +représentants acceptent de ne pas solliciter ou proposer un emploi à un travailleur de l’autre +Partie impliqué dans l’exécution ou l’utilisation des Services repris dans ce Contrat, +pour toute la durée de l’accord et une période de 24 mois suivant la date de résiliation ou +d’expiration de ce Contrat. En cas de non-respect des conditions de cette section qui mène à la +résiliation dudit travailleur à cet effet, la Partie fautive accepte de payer à l’autre Partie +la somme de 30 000,00 (trente mille) euros (€). + +8.5 Contracteurs indépendants +----------------------------- +Les Parties sont des contracteurs indépendants et ce Contrat ne sera pas interprété comme +constituant une Partie comme partenaire, joint-venture ou fiduciaire de l’autre ni créant tout +autre forme d’association légale qui imposerait à l’une des Parties la responsabilité pour +l’action ou l’inaction de l’autre ou fournissant à l’une des Parties le droit, le pouvoir ou +l’autorité (expresse ou implicite) de créer quelque devoir ou obligation que ce soit. + +.. _gov_law_fr: + +9 Loi applicable et compétence +============================== +Ce Contrat sera gouverné par et interprété en accord avec la loi belge. Tout litige naissant +en lien avec le Contrat et pour lequel aucun règlement à l’amiable ne peut être trouvé sera +finalement réglé par les Tribunaux de Belgique à Nivelles. + + +**Signatures**: + +================================== ================================== +Pour ODOO, Pour le PARTENAIRE, +================================== ================================== + + +.. _appendix_p_a_fr: + +10 Annexe A : Licence Odoo Enterprise Edition +============================================= + +Odoo Enterprise Edition est publié sous la licence Odoo Enterprise Edition License v1.0, +définie ci-dessous. + +.. warning:: + Ceci est une traduction en français de la licence “Odoo Enterprise Edition License”. + Cette traduction est fournie dans l’espoir qu’elle facilitera sa compréhension, mais elle + n'a aucune valeur légale. + La seule référence officielle des termes de la licence “Odoo Enterprise Edition License” + est la :ref:`version originale `. + + This is a french translation of the "Odoo Enterprise Edition License”. + This translation is provided in the hope that it will facilitate understanding, but it has + no legal value. + The only official reference of the terms of the “Odoo Enterprise Edition + License” is the :ref:`original english version `. + +.. raw:: html + + + +.. raw:: latex + + {\tt + + +Odoo Enterprise Edition License v1.0 + +Ce logiciel et les fichiers associés (le "Logiciel") ne peuvent être utilisés +(c'est-à-dire exécutés, modifiés, ou exécutés avec des modifications) qu'avec +un contrat Odoo Enterprise Subscription en ordre de validité, et pour le nombre +d'utilisateurs prévus dans ce contrat. + +Un contrat de Partnariat avec Odoo S.A. en ordre de validité donne les mêmes +permissions que ci-dessus, mais uniquement pour un usage restreint à un +environnement de test ou de développement. + +Vous êtes autorisé à développer des modules Odoo basés sur le Logiciel et +à les distribuer sous la license de votre choix, pour autant que cette licence +soit compatible avec les conditions de la licence Odoo Enterprise Edition Licence +(Par exemple: LGPL, MIT ou d'autres licenses propriétaires similaires à celle-ci). + +Vous êtes autorisé à utiliser des modules Odoo publiés sous n'importe quelle +licence, pour autant que leur licence soit compatible avec les conditions +de la licence Odoo Enterprise Edition License (Notamment tous les +modules publiés sur l'Odoo Apps Store sur odoo.com/apps). + +Il est interdit de publier, distribuer, accorder des sous-licences, ou vendre +tout copie du Logiciel ou toute copie modifiée du Logiciel. + +Toute copie du Logiciel ou d'une partie substantielle de celui-ci doit +inclure l'avis de droit d'auteur original ainsi que le texte de la présente licence. + +LE LOGICIEL EST FOURNI "EN L'ETAT", SANS AUCUNE GARANTIE DE QUELQUE NATURE QUE +CE SOIT, EXPRESSE OU IMPLICITE, Y COMPRIS, MAIS SANS Y ETRE LIMITE, LES +GARANTIES IMPLICITES DE COMMERCIABILITE, DE CONFORMITE A UNE UTILISATION +PARTICULIERE, OU DE NON INFRACTION AUX DROITS D'UN TIERS. + +EN AUCUN CAS LES AUTEURS OU TITULAIRES DE DROITS D'AUTEUR NE POURRONT ETRE TENUS +POUR RESPONSABLE A VOTRE EGARD DE RECLAMATIONS, DOMMAGES OU AUTRES RESPONSABILITES, +EN VERTU D'UN CONTRAT, DÉLIT OU AUTREMENT, RELATIVEMENT AU LOGICIEL, A L'UTILISATION +DU LOGICIEL, OU A TOUTE AUTRE MANIPULATION RELATIVE AU LOGICIEL. + +.. raw:: latex + + } + +.. raw:: html + + diff --git a/legal/terms/i18n/partnership_tex_es.rst b/legal/terms/i18n/partnership_tex_es.rst new file mode 100644 index 000000000..307fc8bd8 --- /dev/null +++ b/legal/terms/i18n/partnership_tex_es.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + partnership_es diff --git a/legal/terms/i18n/partnership_tex_fr.rst b/legal/terms/i18n/partnership_tex_fr.rst new file mode 100644 index 000000000..353009343 --- /dev/null +++ b/legal/terms/i18n/partnership_tex_fr.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + partnership_fr diff --git a/legal/terms/partnership.rst b/legal/terms/partnership.rst index 987e2a167..7ed3c9e5b 100644 --- a/legal/terms/partnership.rst +++ b/legal/terms/partnership.rst @@ -174,7 +174,7 @@ for any reason whatsoever and by any means whatsoever. --------------------- PARTNER has access to the ODOO knowledge base for the duration of this Agreement. The ODOO knowledge base is an online e-platform containing a set of commercial, marketing -and function documents, to help PARTNER acquire and leverage Odoo knowledge, grow its business, +and functional documents, to help PARTNER acquire and leverage Odoo knowledge, grow its business, attract more customers, and build brand awareness. PARTNER also receives free access to the ODOO E-Learning platform (for unlimited users). diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index dfbe393a7..2f93194ce 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Inigo Zuluaga , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -243,7 +243,6 @@ msgstr "Registrar estados de cuenta bancario manualmente" #: ../../accounting/bank/reconciliation/use_cases.rst:6 #: ../../accounting/others/adviser/budget.rst:6 #: ../../accounting/others/analytic/purchases_expenses.rst:6 -#: ../../accounting/others/multicurrencies.rst:3 #: ../../accounting/others/multicurrencies/exchange.rst:6 #: ../../accounting/others/multicurrencies/how_it_works.rst:6 #: ../../accounting/others/multicurrencies/invoices_payments.rst:6 @@ -822,7 +821,7 @@ msgstr "" #: ../../accounting/bank/feeds/synchronize.rst:76 msgid "The synchronization is not working in real time, is it normal?" -msgstr "" +msgstr "La sincroniación no está funcionando en tiempo real, ¿es normal?" #: ../../accounting/bank/feeds/synchronize.rst:78 msgid "" @@ -832,12 +831,19 @@ msgid "" "there is a cron that is running every 4 hours to fetch the information from " "Yodlee." msgstr "" +"Yodlee intenta obtener los datos desde la cuenta de banco una vez al día. " +"Sin embargo, esto no ocurre siempre a la misma hora. Y a veces este proceso " +"puede fallar. En ese caso, Yodlee reintenta una o dos horas despues. Esta es" +" la razón por la cual en Odoo existe un proceso cron que se ejecuta cada 4 " +"horas para obtener la informacion de Yodlee." #: ../../accounting/bank/feeds/synchronize.rst:83 msgid "" "You can however force this synchronization by clicking on the button " "\"Synchronize now\" from the accounting dashboard." msgstr "" +"Sin embargo puede forzar esta sincronización haciendo clic en el botón " +"\"Sincronizar ahora\" desde el tablero de contabilidad." #: ../../accounting/bank/feeds/synchronize.rst:86 msgid "" @@ -846,6 +852,10 @@ msgid "" " status \"pending\" and not the status \"posted\". In that case, Yodlee " "won't import it, you will have to wait that the status changes." msgstr "" +"Además, una transaccion puede ser visible en su cuenta de banco pero no ser " +"obtenida por Yodlee. De hecho, la transacción en su cuenta de banco puede " +"tener el estatus de \"pendiente\" y no el estatus \"lista\". En ese caso, " +"Yodlee no la importará, tendrá que esperar que cambie el estatus." #: ../../accounting/bank/feeds/synchronize.rst:91 msgid "" @@ -853,31 +863,39 @@ msgid "" "transactions in real time. This is a service to facilitate the import of the" " bank statement in the database." msgstr "" +"Lo que es importante recordar es que Yodlee no es un servicio que obtiene " +"las transacciones en tiempo real. Este es un servicio para facilitar la " +"importación de los asientos bancarios a la base de datos." #: ../../accounting/bank/feeds/synchronize.rst:95 msgid "Is the Yodlee feature included in my contract?" -msgstr "" +msgstr "¿Yodlee está incluido en mi contrato?" #: ../../accounting/bank/feeds/synchronize.rst:97 msgid "" "Enterprise Version: Yes, if you have a valid enterprise contract linked to " "your database." msgstr "" +"Versión Enterprise: Si, si tiene un contrato enterprise valido enlazado a su" +" base de datos." #: ../../accounting/bank/feeds/synchronize.rst:98 msgid "" "Community Version: No, this feature is not included in the Community " "Version." msgstr "" +"Versión COmmunity: No, esta característica no está incluida en la Versión " +"Commnity." #: ../../accounting/bank/feeds/synchronize.rst:99 msgid "" "Online Version: Yes, even if you benefit from the One App Free contract." msgstr "" +"Version Online: Si, incluso si se beneficia del contrato One App Free." #: ../../accounting/bank/feeds/synchronize.rst:102 msgid "Some banks have a status \"Beta\", what does it mean?" -msgstr "" +msgstr "Algunos bancos tienen el estatus \"Beta\", ¿qué significa esto?" #: ../../accounting/bank/feeds/synchronize.rst:104 msgid "" @@ -886,6 +904,10 @@ msgid "" " may need a bit more time to have a 100% working synchronization. " "Unfortunately, there is not much to do about except being patient." msgstr "" +"Esto significa que actualmente Yodlee esta trabajando en el desarrollo de la" +" sincronización con ese banco. La sincronización prodría funcionar o quizas " +"necesita un poco mas de tiempo para estar al 100%. Desafortunadamente, no " +"hay mucho que hacer al respecto excepto esperar." #: ../../accounting/bank/feeds/synchronize.rst:110 msgid "All my past transactions are not in Odoo, why?" @@ -1375,7 +1397,6 @@ msgstr "" #: ../../accounting/bank/reconciliation.rst:3 #: ../../accounting/others/reporting/main_reports.rst:153 #: ../../accounting/overview/main_concepts/memento.rst:177 -#: ../../accounting/overview/main_concepts/terminologies.rst:19 msgid "Bank Reconciliation" msgstr "Conciliación Bancaria" @@ -2670,7 +2691,7 @@ msgstr "" #: ../../accounting/localizations/france.rst:130 msgid "Storage" -msgstr "" +msgstr "Almacenamiento" #: ../../accounting/localizations/france.rst:132 msgid "" @@ -2816,6 +2837,7 @@ msgid "Balance Sheet" msgstr "Balance de Situación" #: ../../accounting/localizations/germany.rst:24 +#: ../../accounting/localizations/nederlands.rst:19 msgid "Profit & Loss" msgstr "" @@ -3746,6 +3768,41 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/nederlands.rst:2 +msgid "Netherlands" +msgstr "Holanda" + +#: ../../accounting/localizations/nederlands.rst:5 +msgid "XAF Export" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:7 +msgid "" +"With the Dutch accounting localization installed, you will be able to export" +" all your accounting entries in XAF format. For this, you have to go in " +":menuselection:`Accounting --> Reporting --> General Ledger`, you define the" +" entries you want to export using the filters (period, journals, ...) and " +"then you click on the button **EXPORT (XAF)**." +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:14 +msgid "Dutch Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:16 +msgid "" +"If you install the Dutch accounting localization, you will have access to " +"some reports that are specific to the Netherlands such as :" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:21 +msgid "Tax Report (Aangifte omzetbelasting)" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:23 +msgid "Intrastat Report (ICP)" +msgstr "" + #: ../../accounting/localizations/spain.rst:3 msgid "Spain" msgstr "España" @@ -6244,7 +6301,6 @@ msgid "Prepayments" msgstr "Anticipos" #: ../../accounting/others/configuration/account_type.rst:39 -#: ../../accounting/overview/main_concepts/terminologies.rst:77 msgid "Fixed Assets" msgstr "Activos fijos" @@ -6853,6 +6909,10 @@ msgstr "" "producto es usada para registrar la diferencia entre el costo promedio y el " "precio original de compra." +#: ../../accounting/others/multicurrencies.rst:3 +msgid "Multicurrency" +msgstr "" + #: ../../accounting/others/multicurrencies/exchange.rst:3 msgid "Record exchange rates at payments" msgstr "Registrar diferencias en cambio en pagos" @@ -9778,7 +9838,6 @@ msgstr "Cuenta Bancaria: definida en el diario bancario relacionado" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/overview/main_concepts/terminologies.rst:26 msgid "Reconciliation" msgstr "Conciliación" @@ -10090,207 +10149,6 @@ msgstr "Extracto bancario" msgid "Statement XYZ" msgstr "Extracto XYZ" -#: ../../accounting/overview/main_concepts/terminologies.rst:3 -msgid "Accounting Terminologies" -msgstr "Terminología Contable" - -#: ../../accounting/overview/main_concepts/terminologies.rst:6 -msgid "Journal" -msgstr "Diario" - -#: ../../accounting/overview/main_concepts/terminologies.rst:9 -msgid "" -"A journal is like a folder in which you record all transactions of the same " -"type: all the statements of a bank account, all customer invoices, all " -"supplier bills. It's used to organize similar transactions together." -msgstr "" -"Un diario es como un folder en el cual registra todas las transacciones del " -"mismo tipo: todos los extractos de una cuenta bancaria, todas las facturas " -"de cliente, todas las facturas de proveedor. Es usado para organizar juntas " -"transacciones similares." - -#: ../../accounting/overview/main_concepts/terminologies.rst:13 -msgid "Payment Terms" -msgstr "Plazos de pago" - -#: ../../accounting/overview/main_concepts/terminologies.rst:16 -msgid "" -"Payment terms describe how and when a customer invoice (or supplier bill) " -"should be paid over the time. Example: 30% direct payment, balance due in " -"two months." -msgstr "" -"Los términos de pago describen como y cuando una factura de cliente (o " -"factura de proveedor) debe ser pagada durante el tiempo. Ejemplo: 30% pago " -"directo, saldo pendiente en dos meses." - -#: ../../accounting/overview/main_concepts/terminologies.rst:22 -msgid "" -"Bank reconciliation is the process of matching transactions from your bank " -"records with existing journal items or creating new journal items on the " -"fly. It is a process of verification to ensure that your bank and your " -"records in Odoo say the same thing." -msgstr "" -"La conciliación bancaria es el proceso de corresponder transacciones desde " -"sus registros bancarios con el diario existente o creando un nuevo diario al" -" mismo tiempo. Es un proceso de verificación para asegurar que su banco y " -"sus registros en Odoo dicen la misma cosa." - -#: ../../accounting/overview/main_concepts/terminologies.rst:29 -msgid "" -"Journal items reconciliation is the process of linking several journal items" -" together like an invoice and a payment. This allows you to mark invoices as" -" paid. It is also useful when comparing values of 'goods received not " -"invoiced' and 'goods shipped not billed' accounts." -msgstr "" -"La conciliación de ítems en el diario es el proceso de vincular varios ítems" -" del diario juntos como una factura y un pago. Esto le permite marcar " -"facturas como pagadas. También es útil cuando compare valores de bienes " -"recibidos no facturados y bienes enviados no registrados en las cuentas." - -#: ../../accounting/overview/main_concepts/terminologies.rst:33 -msgid "Deposit Ticket" -msgstr "Comprobante de Depósito" - -#: ../../accounting/overview/main_concepts/terminologies.rst:36 -msgid "" -"Deposit tickets group several payment orders (usually checks) that are " -"deposited together at the bank at the same time. This allows an easy " -"reconciliation with the bank statement line if the line has one line per " -"deposit." -msgstr "" -"Los comprobantes de depósito agrupan varias órdenes de pago (usualmente " -"cheques) que son depositados juntos en el banco al mismo tiempo. Esto " -"permite una conciliación fácil con la línea del extracto bancario si la " -"línea tiene una línea por depósito." - -#: ../../accounting/overview/main_concepts/terminologies.rst:40 -msgid "Journal Entry" -msgstr "Asiento contable" - -#: ../../accounting/overview/main_concepts/terminologies.rst:43 -msgid "" -"A journal entry is an accounting transaction, usually related to a financial" -" document: invoice, payment, receipt, etc. A journal entry always consists " -"of at least two lines, described here as journal items, which credit or " -"debit specific accounts. The sum of the credits of all journal items of a " -"journal entry must be equal to the sum of their debits for the entry to be " -"valid." -msgstr "" -"Una entrada del diario es una transacción contable, usualmente relacionada " -"con un documento financiero: factura, pago, recibo, etc. Un asiento de " -"entrada siempre consiste de por lo menos dos líneas, descritas aquí como " -"ítems del diario, los cuales específican cuentas débito o crédito. La suma " -"de los créditos de todos los ítems del diario de una entrada del diario " -"deben ser iguales a la suma de sus débitos para que la entrada sea válida." - -#: ../../accounting/overview/main_concepts/terminologies.rst:50 -msgid "Journal Item" -msgstr "Apunte contable" - -#: ../../accounting/overview/main_concepts/terminologies.rst:53 -msgid "" -"A line of a journal entry, with a monetary debit or credit associated with a" -" specific account." -msgstr "" -"Una línea de una entrada del diario, con un débito o crédito monetario " -"asociado con una cuenta específica." - -#: ../../accounting/overview/main_concepts/terminologies.rst:55 -msgid "Analytic Accounts" -msgstr "Cuentas analíticas" - -#: ../../accounting/overview/main_concepts/terminologies.rst:58 -msgid "" -"Sometimes called **Cost Accounts**, are accounts that are not part of the " -"chart of accounts and that allow you to track costs and revenues. Analytic " -"accounts are usually grouped by projects, departments, etc. for analysis of " -"a company's expenditures. Every journal item is posted in a regular account " -"in the chart of account and can be posted to an analytic account for the " -"purpose of reporting or analysis." -msgstr "" -"A veces llamadas **Cuentas de Costo**, son cuentas que no son parte del plan" -" de cuentas y que permiten rastrear costos e ingresos. Las cuentas " -"analíticas son usualmente agrupadas por proyectos, departamentos, etc., para" -" el análisis de los gastos de la compañía. Cada ítem del diario es " -"registrado en una cuenta regular en el plan de cuentas y puede ser " -"registrado en una cuenta analítica con el propósito de reportar o analizar." - -#: ../../accounting/overview/main_concepts/terminologies.rst:65 -msgid "Analytic Entries" -msgstr "Entradas analíticas" - -#: ../../accounting/overview/main_concepts/terminologies.rst:68 -msgid "" -"Costs or revenues posted to analytic accounts, usually related to journal " -"entries." -msgstr "" -"Costos o ingresos registrados en cuentas analíticas, usualmente relacionados" -" con entradas del diario." - -#: ../../accounting/overview/main_concepts/terminologies.rst:70 -msgid "Sales Receipt" -msgstr "Recibo de ventas" - -#: ../../accounting/overview/main_concepts/terminologies.rst:73 -msgid "" -"A receipt or other slip of paper issued by a store or other vendor " -"describing the details of a purchase (amount, date, department, etc.). Sales" -" receipt are usually used instead of invoices if the sale is paid in cash in" -" a store." -msgstr "" -"Un recibo u otro pedazo de papel emitido por una tienda u otro proveedor " -"describiendo los detalles de una compra (monto, fecha, departamento, etc.). " -"Los recibos de ventas son usados usualmente en lugar de facturas si la venta" -" es pagada en efectivo en una tienda." - -#: ../../accounting/overview/main_concepts/terminologies.rst:80 -msgid "" -"Property owned by the company, usually with a useful life greater than one " -"reporting period. Odoo Asset management is used to manage the depreciation /" -" amortization of the asset over the time. Typical examples would be capital " -"equipment, vehicles, and real estate." -msgstr "" -"Bienes propiedad de la compañía, usualmente con una vida útil mayor que un " -"período de reporte. La administración de activos es usada para administrar " -"la depreciación / amortización de un activo conforme avanza el tiempo. " -"Ejemplos típicos serían equipo de capital, vehículos y bienes raíces." - -#: ../../accounting/overview/main_concepts/terminologies.rst:84 -msgid "Deferred Revenues" -msgstr "Ingresos diferidos" - -#: ../../accounting/overview/main_concepts/terminologies.rst:87 -msgid "" -"Are used to recognize revenues for sales of services that are provided over " -"a long period of time. If you sell a 3 year maintenance contract, you can " -"use the deferred revenue mechanism to recognize 1/36 of the revenue every " -"month until the contract expires, rather than taking it all initially or at " -"the end." -msgstr "" -"Son usados para reconocer ingresos por ventas de servicios que son proveídos" -" durante un largo período de tiempo. Si vende un contrato de mantenimiento " -"de 3 años, puede usar el ingreso diferido como mecanismo para reconocer 1/36" -" del ingreso cada mes hasta que el contrato expire, en lugar de tomarlo todo" -" inicialmente o al final." - -#: ../../accounting/overview/main_concepts/terminologies.rst:93 -msgid "Fiscal Position" -msgstr "Posición fiscal" - -#: ../../accounting/overview/main_concepts/terminologies.rst:96 -msgid "" -"Define the taxes that should be applied for a specific customer/vendor or " -"invoice. Example: If some customers benefit from specific taxes (government," -" construction companies, EU companies that are VAT subjected,…), you can " -"assign a fiscal position to them and the right tax will be selected " -"according to the products they buy." -msgstr "" -"Defina los impuestos que deben ser aplicados a un cliente/proveedor o " -"factura específica. Ejemplo: si algunos clientes se benefician de impuestos " -"específicos (gobierno, compañías de construcción, compañías Europeas que son" -" sujetas de IVA,...), puede asignarles una posición fiscal y el impuesto " -"correcto será seleccionado de acuerdo a los productos que compran." - #: ../../accounting/overview/process_overview.rst:3 msgid "Process overview" msgstr "Perspectiva general del proceso" @@ -15281,7 +15139,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/payment_sepa.rst:32 msgid "Direct Debit Mandates" -msgstr "" +msgstr "Mandatos de adeudo directo" #: ../../accounting/receivables/customer_payments/payment_sepa.rst:34 msgid "" diff --git a/locale/es/LC_MESSAGES/applications.po b/locale/es/LC_MESSAGES/applications.po index 88aab0651..daa10806b 100644 --- a/locale/es/LC_MESSAGES/applications.po +++ b/locale/es/LC_MESSAGES/applications.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/es/LC_MESSAGES/db_management.po b/locale/es/LC_MESSAGES/db_management.po index 1b7d74191..0ed5af7a3 100644 --- a/locale/es/LC_MESSAGES/db_management.po +++ b/locale/es/LC_MESSAGES/db_management.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Antonio Trueba, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,32 +22,101 @@ msgstr "" msgid "Online Database management" msgstr "" -#: ../../db_management/db_online.rst:13 -msgid "Duplicating a database" -msgstr "" - -#: ../../db_management/db_online.rst:15 +#: ../../db_management/db_online.rst:10 msgid "" -"Database duplication, renaming, custom DNS, etc. is not available to free " -"customers of our Online platform." +"To manage your databases, access the `database management page " +"`__ (you will have to sign in). Then " +"click on the `Manage Your Databases " +"`__ button." msgstr "" -"Duplicación de base de datos, renombrar, DNS perzonalizado, etc. no está " -"disponible para clinetes gratuitos en nuestra plataforma en línea." #: ../../db_management/db_online.rst:18 msgid "" -"Access the `database management page `__ " -"(you will have to sign in). Next, make sure you are connected as the " -"administrator of the database you want to duplicate. After that, click on " -"the **Manage Your Databases** button." +"Make sure you are connected as the administrator of the database you want to" +" manage - many operations depends on indentifying you remotely to that " +"database." msgstr "" -"Accesa a la `página de administración de bases de datos " -"`__ (tendrás que iniciar sesión). " -"Después, asegurarse que estás conectado como administrador de la base de " -"datos que quieres duplicar. Después de eso, da click en el botón " -"**Administrar tus bases de datos**-" -#: ../../db_management/db_online.rst:26 +#: ../../db_management/db_online.rst:22 +msgid "Several actions are available:" +msgstr "" + +#: ../../db_management/db_online.rst:28 +msgid "Upgrade" +msgstr "Actualizar" + +#: ../../db_management/db_online.rst:28 +msgid "" +"Upgrade your database to the latest Odoo version to enjoy cutting-edge " +"features" +msgstr "" + +#: ../../db_management/db_online.rst:32 +msgid ":ref:`Duplicate `" +msgstr "" + +#: ../../db_management/db_online.rst:31 +msgid "" +"Make an exact copy of your database, if you want to try out new apps or new " +"flows without compromising your daily operations" +msgstr "" + +#: ../../db_management/db_online.rst:34 +msgid "Rename" +msgstr "" + +#: ../../db_management/db_online.rst:35 +msgid "Rename your database (and its URL)" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "**Backup**" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "" +"Download an instant backup of your database; note that we back up databases " +"daily according to our Odoo Cloud SLA" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid ":ref:`Domains `" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid "Configure custom domains to access your database via another URL" +msgstr "" + +#: ../../db_management/db_online.rst:42 +msgid ":ref:`Delete `" +msgstr "" + +#: ../../db_management/db_online.rst:43 +msgid "Delete a database instantly" +msgstr "" + +#: ../../db_management/db_online.rst:47 +msgid "Contact Support" +msgstr "" + +#: ../../db_management/db_online.rst:45 +msgid "" +"Access our `support page `__ with the correct " +"database already selected" +msgstr "" + +#: ../../db_management/db_online.rst:52 +msgid "Duplicating a database" +msgstr "" + +#: ../../db_management/db_online.rst:54 +msgid "" +"Database duplication, renaming, custom DNS, etc. is not available for trial " +"databases on our Online platform. Paid Databases and \"One App Free\" " +"database can duplicate without problem." +msgstr "" + +#: ../../db_management/db_online.rst:59 msgid "" "In the line of the database you want to duplicate, you will have a few " "buttons. To duplicate your database, just click **Duplicate**. You will have" @@ -57,38 +126,37 @@ msgstr "" "Para duplicar su base de datos, solo de clic en **Duplicar**. Tendrá que " "darle un nombre a su duplicado, luego de clic en **Duplicar Base de Datos**." -#: ../../db_management/db_online.rst:36 -msgid "A duplicated database has the same behaviour as a real one:" +#: ../../db_management/db_online.rst:66 +msgid "" +"If you do not check the \"For testing purposes\" checkbox when duplicating a" +" database, all external communication will remain active:" msgstr "" -"Una base de datos duplicada tiene el mismo comportamiento que una real:" -#: ../../db_management/db_online.rst:38 +#: ../../db_management/db_online.rst:69 msgid "Emails are sent" msgstr "Los correos electrónicos fueron enviados" -#: ../../db_management/db_online.rst:40 -msgid "Payments are processed (in the e-commerce, for example)" -msgstr "Los pagos fueron procesados (en el comercio electrónico, por ejemplo)" +#: ../../db_management/db_online.rst:71 +msgid "" +"Payments are processed (in the e-commerce or Subscriptions apps, for " +"example)" +msgstr "" -#: ../../db_management/db_online.rst:42 +#: ../../db_management/db_online.rst:74 msgid "Delivery orders (shipping providers) are sent" msgstr "Órdenes de envio (proveedores de envio) fueron enviadas" -#: ../../db_management/db_online.rst:44 +#: ../../db_management/db_online.rst:76 msgid "Etc." msgstr "Etc." -#: ../../db_management/db_online.rst:46 +#: ../../db_management/db_online.rst:78 msgid "" -"It is **strongly** advised to test behaviour using sample customers/products" -" (with a `disposable e-mail `__ address, for " -"example)" +"Make sure to check the checkbox \"For testing purposes\" if you want these " +"behaviours to be disabled." msgstr "" -"Es **fuertemente** aconsejado probar el comportamiento utilizando " -"clientes/productos de muestra (con un `correo electrónico desechable " -"`__ , por ejemplo)" -#: ../../db_management/db_online.rst:50 +#: ../../db_management/db_online.rst:81 msgid "" "After a few seconds, you will be logged in your duplicated database. Notice " "that the url uses the name you chose for your duplicated database." @@ -97,11 +165,57 @@ msgstr "" "duplicada. Observe que la dirección URL utiliza el nombre que elijo para su " "base de datos duplicada." -#: ../../db_management/db_online.rst:54 +#: ../../db_management/db_online.rst:85 msgid "Duplicate databases expire automatically after 15 days." msgstr "" "Las bases de datos duplicadas expiran automaticamente después de 15 días." +#: ../../db_management/db_online.rst:93 +msgid "Deleting a Database" +msgstr "" + +#: ../../db_management/db_online.rst:95 +msgid "You can only delete databases of which you are the administrator." +msgstr "" + +#: ../../db_management/db_online.rst:97 +msgid "" +"When you delete your database all the data will be permanently lost. The " +"deletion is instant and for all the Users. We advise you to do an instant " +"backup of your database before deleting it, since the last automated daily " +"backup may be several hours old at that point." +msgstr "" + +#: ../../db_management/db_online.rst:103 +msgid "" +"From the `database management page `__, " +"on the line of the database you want to delete, click on the \"Delete\" " +"button." +msgstr "" + +#: ../../db_management/db_online.rst:110 +msgid "" +"Read carefully the warning message that will appear and proceed only if you " +"fully understand the implications of deleting a database:" +msgstr "" + +#: ../../db_management/db_online.rst:116 +msgid "" +"After a few seconds, the database will be deleted and the page will reload " +"automatically." +msgstr "" + +#: ../../db_management/db_online.rst:120 +msgid "" +"If you need to re-use this database name, it will be immediately available." +msgstr "" + +#: ../../db_management/db_online.rst:122 +msgid "" +"If you want to delete your Account, please contact `Odoo Support " +"`__" +msgstr "" + #: ../../db_management/db_premise.rst:7 msgid "On-premise Database management" msgstr "" diff --git a/locale/es/LC_MESSAGES/discuss.po b/locale/es/LC_MESSAGES/discuss.po index a8fe20e3f..dfac5760c 100644 --- a/locale/es/LC_MESSAGES/discuss.po +++ b/locale/es/LC_MESSAGES/discuss.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Pablo Rojas , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -447,6 +447,57 @@ msgstr "" "conversaciones sobre proyectos, coordinación de reuniones, y más en una " "sencilla interfaz de búsqueda " +#: ../../discuss/plan_activities.rst:3 +msgid "Get organized by planning activities" +msgstr "" + +#: ../../discuss/plan_activities.rst:5 +msgid "" +"Planning activities is the perfect way to keep on track with your work. Get " +"reminded of what needs to be done and schedule the next activities to " +"undertake." +msgstr "" + +#: ../../discuss/plan_activities.rst:9 +msgid "" +"Your activities are available wherever you are in Odoo. It is easy to manage" +" your priorities." +msgstr "" + +#: ../../discuss/plan_activities.rst:15 +msgid "" +"Activities can be planned and managed from the chatters or in the kanban " +"views. Here is an example for opportunities :" +msgstr "" + +#: ../../discuss/plan_activities.rst:22 +msgid "Set your activity types" +msgstr "" + +#: ../../discuss/plan_activities.rst:24 +msgid "" +"A number of generic activities types are available by default in Odoo (e.g. " +"call, email, meeting, etc.). If you would like to set new ones, go to " +":menuselection:`Settings --> General settings --> Activity types`." +msgstr "" + +#: ../../discuss/plan_activities.rst:29 +msgid "Schedule meetings" +msgstr "" + +#: ../../discuss/plan_activities.rst:31 +msgid "" +"Activities are planned for specific days. If you need to set hours, go with " +"the *Meeting* activity type. When scheduling one, the calendar will simply " +"open to let you select a time slot." +msgstr "" + +#: ../../discuss/plan_activities.rst:36 +msgid "" +"If you need to use other activity types with a calendar planning, make sure " +"their *Category* is set as *Meeting*." +msgstr "" + #: ../../discuss/team_communication.rst:3 msgid "How to efficiently communicate in team using channels" msgstr "" diff --git a/locale/es/LC_MESSAGES/ecommerce.po b/locale/es/LC_MESSAGES/ecommerce.po index 637bda8c4..c7f8ed8e2 100644 --- a/locale/es/LC_MESSAGES/ecommerce.po +++ b/locale/es/LC_MESSAGES/ecommerce.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-10 09:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Nicole Kist , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -709,7 +709,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:3 msgid "How to get paid with Authorize.Net" -msgstr "" +msgstr "Cómo recibir pagos con Authorize.Net" #: ../../ecommerce/shopper_experience/authorize.rst:5 msgid "" diff --git a/locale/es/LC_MESSAGES/expenses.po b/locale/es/LC_MESSAGES/expenses.po index 32c4b2122..ab7491003 100644 --- a/locale/es/LC_MESSAGES/expenses.po +++ b/locale/es/LC_MESSAGES/expenses.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/es/LC_MESSAGES/getting_started.po b/locale/es/LC_MESSAGES/getting_started.po index 3d8108e88..81ae9435d 100644 --- a/locale/es/LC_MESSAGES/getting_started.po +++ b/locale/es/LC_MESSAGES/getting_started.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-13 13:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/es/LC_MESSAGES/helpdesk.po b/locale/es/LC_MESSAGES/helpdesk.po index 1e8edd3a4..396022ba3 100644 --- a/locale/es/LC_MESSAGES/helpdesk.po +++ b/locale/es/LC_MESSAGES/helpdesk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Christopher Ormaza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -18,41 +18,45 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../helpdesk/helpdesk.rst:5 +#: ../../helpdesk.rst:5 msgid "Helpdesk" msgstr "Soporte" -#: ../../helpdesk/helpdesk.rst:8 +#: ../../helpdesk/getting_started.rst:3 +msgid "Get started with Odoo Helpdesk" +msgstr "" + +#: ../../helpdesk/getting_started.rst:6 msgid "Overview" msgstr "Información general" -#: ../../helpdesk/helpdesk.rst:11 +#: ../../helpdesk/getting_started.rst:9 msgid "Getting started with Odoo Helpdesk" msgstr "" -#: ../../helpdesk/helpdesk.rst:13 +#: ../../helpdesk/getting_started.rst:11 msgid "Installing Odoo Helpdesk:" msgstr "" -#: ../../helpdesk/helpdesk.rst:15 +#: ../../helpdesk/getting_started.rst:13 msgid "Open the Apps module, search for \"Helpdesk\", and click install" msgstr "" -#: ../../helpdesk/helpdesk.rst:21 +#: ../../helpdesk/getting_started.rst:19 msgid "Set up Helpdesk teams" msgstr "" -#: ../../helpdesk/helpdesk.rst:23 +#: ../../helpdesk/getting_started.rst:21 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:28 +#: ../../helpdesk/getting_started.rst:26 msgid "" "To modify this team, or create additional teams, select \"Configuration\" in" " the purple bar and select \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:34 +#: ../../helpdesk/getting_started.rst:32 msgid "" "Here you can create new teams, decide what team members to add to this team," " how your customers can submit tickets and set up SLA policies and ratings. " @@ -60,18 +64,18 @@ msgid "" " or manually." msgstr "" -#: ../../helpdesk/helpdesk.rst:40 +#: ../../helpdesk/getting_started.rst:38 msgid "How to set up different stages for each team" msgstr "" -#: ../../helpdesk/helpdesk.rst:42 +#: ../../helpdesk/getting_started.rst:40 msgid "" "First you will need to activate the developer mode. To do this go to your " "settings module, and select the link for \"Activate the developer mode\" on " "the lower right-hand side." msgstr "" -#: ../../helpdesk/helpdesk.rst:49 +#: ../../helpdesk/getting_started.rst:47 msgid "" "Now, when you return to your Helpdesk module and select \"Configuration\" in" " the purple bar you will find additional options, like \"Stages\". Here you " @@ -79,52 +83,52 @@ msgid "" "allowing for customizable stages for each team!" msgstr "" -#: ../../helpdesk/helpdesk.rst:55 +#: ../../helpdesk/getting_started.rst:53 msgid "Start receiving tickets" msgstr "" -#: ../../helpdesk/helpdesk.rst:58 +#: ../../helpdesk/getting_started.rst:56 msgid "How can my customers submit tickets?" msgstr "" -#: ../../helpdesk/helpdesk.rst:60 +#: ../../helpdesk/getting_started.rst:58 msgid "" "Select \"Configuration\" in the purple bar and select \"Settings\", select " "your Helpdesk team. Under \"Channels you will find 4 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:66 +#: ../../helpdesk/getting_started.rst:64 msgid "" "Email Alias allows for customers to email the alias you choose to create a " "ticket. The subject line of the email with become the Subject on the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:73 +#: ../../helpdesk/getting_started.rst:71 msgid "" "Website Form allows your customer to go to " "yourwebsite.com/helpdesk/support-1/submit and submit a ticket via a website " "form - much like odoo.com/help!" msgstr "" -#: ../../helpdesk/helpdesk.rst:80 +#: ../../helpdesk/getting_started.rst:78 msgid "" "Live Chat allows your customers to submit a ticket via Live Chat on your " "website. Your customer will begin the live chat and your Live Chat Operator " "can create the ticket by using the command /helpdesk Subject of Ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:88 +#: ../../helpdesk/getting_started.rst:86 msgid "" "The final option to submit tickets is thru an API connection. View the " "documentation `*here* " "`__." msgstr "" -#: ../../helpdesk/helpdesk.rst:93 +#: ../../helpdesk/getting_started.rst:91 msgid "Tickets have been created, now what?" msgstr "" -#: ../../helpdesk/helpdesk.rst:95 +#: ../../helpdesk/getting_started.rst:93 msgid "" "Now your employees can start working on them! If you have selecting a manual" " assignation method then your employees will need to assign themselves to " @@ -132,106 +136,259 @@ msgid "" "adding themselves to the \"Assigned to\" field." msgstr "" -#: ../../helpdesk/helpdesk.rst:103 +#: ../../helpdesk/getting_started.rst:101 msgid "" "If you have selected \"Random\" or \"Balanced\" assignation method, your " "tickets will be assigned to a member of that Helpdesk team." msgstr "" -#: ../../helpdesk/helpdesk.rst:106 +#: ../../helpdesk/getting_started.rst:104 msgid "" "From there they will begin working on resolving the tickets! When they are " "completed, they will move the ticket to the solved stage." msgstr "" -#: ../../helpdesk/helpdesk.rst:110 +#: ../../helpdesk/getting_started.rst:108 msgid "How do I mark this ticket as urgent?" msgstr "" -#: ../../helpdesk/helpdesk.rst:112 +#: ../../helpdesk/getting_started.rst:110 msgid "" "On your tickets you will see stars. You can determine how urgent a ticket is" " but selecting one or more stars on the ticket. You can do this in the " "Kanban view or on the ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:119 +#: ../../helpdesk/getting_started.rst:117 msgid "" "To set up a Service Level Agreement Policy for your employees, first " "activate the setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:125 +#: ../../helpdesk/getting_started.rst:123 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"." msgstr "" -#: ../../helpdesk/helpdesk.rst:127 +#: ../../helpdesk/getting_started.rst:125 msgid "" "You will fill in information like the Helpdesk team, what the minimum " "priority is on the ticket (the stars) and the targets for the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:134 +#: ../../helpdesk/getting_started.rst:132 msgid "What if a ticket is blocked or is ready to be worked on?" msgstr "" -#: ../../helpdesk/helpdesk.rst:136 +#: ../../helpdesk/getting_started.rst:134 msgid "" "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban " "State\" on the ticket. You have 3 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:139 +#: ../../helpdesk/getting_started.rst:137 msgid "Grey - Normal State" msgstr "" -#: ../../helpdesk/helpdesk.rst:141 +#: ../../helpdesk/getting_started.rst:139 msgid "Red - Blocked" msgstr "" -#: ../../helpdesk/helpdesk.rst:143 +#: ../../helpdesk/getting_started.rst:141 msgid "Green - Ready for next stage" msgstr "" -#: ../../helpdesk/helpdesk.rst:145 +#: ../../helpdesk/getting_started.rst:143 msgid "" "Like the urgency stars you can adjust the state in the Kanban or on the " "Ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:152 +#: ../../helpdesk/getting_started.rst:150 msgid "How can my employees log time against a ticket?" msgstr "" -#: ../../helpdesk/helpdesk.rst:154 +#: ../../helpdesk/getting_started.rst:152 msgid "" "First, head over to \"Settings\" and select the option for \"Timesheet on " "Ticket\". You will see a field appear where you can select the project the " "timesheets will log against." msgstr "" -#: ../../helpdesk/helpdesk.rst:161 +#: ../../helpdesk/getting_started.rst:159 msgid "" "Now that you have selected a project, you can save. If you move back to your" " tickets, you will see a new tab called \"Timesheets\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:167 +#: ../../helpdesk/getting_started.rst:165 msgid "" "Here you employees can add a line to add work they have done for this " "ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:171 +#: ../../helpdesk/getting_started.rst:169 msgid "How to allow your customers to rate the service they received" msgstr "" -#: ../../helpdesk/helpdesk.rst:173 +#: ../../helpdesk/getting_started.rst:171 msgid "First, you will need to activate the ratings setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:178 +#: ../../helpdesk/getting_started.rst:176 msgid "" "Now, when a ticket is moved to its solved or completed stage, it will send " "an email to the customer asking how their service went." msgstr "" + +#: ../../helpdesk/invoice_time.rst:3 +msgid "Record and invoice time for tickets" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:5 +msgid "" +"You may have service contracts with your clients to provide them assistance " +"in case of a problem. For this purpose, Odoo will help you record the time " +"spent fixing the issue and most importantly, to invoice it to your clients." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:11 +msgid "The modules needed" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:13 +msgid "" +"In order to record and invoice time for tickets, the following modules are " +"needed : Helpdesk, Project, Timesheets, Sales. If you are missing one of " +"them, go to the Apps module, search for it and then click on *Install*." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:19 +msgid "Get started to offer the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:22 +msgid "Step 1 : start a helpdesk project" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:24 +msgid "" +"To start a dedicated project for the helpdesk service, first go to " +":menuselection:`Project --> Configuration --> Settings` and make sure that " +"the *Timesheets* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:31 +msgid "" +"Then, go to your dashboard, create the new project and allow timesheets for " +"it." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:35 +msgid "Step 2 : gather a helpdesk team" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:37 +msgid "" +"To set a team in charge of the helpdesk, go to :menuselection:`Helpdesk --> " +"Configuration --> Helpdesk Teams` and create a new team or select an " +"existing one. On the form, tick the box in front of *Timesheet on Ticket* to" +" activate the feature. Make sure to select the helpdesk project you have " +"previously created as well." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:47 +msgid "Step 3 : launch the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:49 +msgid "" +"Finally, to launch the new helpdesk service, first go to " +":menuselection:`Sales --> Configuration --> Settings` and make sure that the" +" *Units of Measure* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:56 +msgid "" +"Then, go to :menuselection:`Products --> Products` and create a new one. " +"Make sure that the product is set as a service." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:63 +msgid "" +"Here, we suggest that you set the *Unit of Measure* as *Hour(s)*, but any " +"unit will do." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:66 +msgid "" +"Finally, select the invoicing management you would like to have under the " +"*Sales* tab of the product form. Here, we recommend the following " +"configuration :" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:73 +msgid "Now, you are ready to start receiving tickets !" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:76 +msgid "Solve issues and record time spent" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:79 +msgid "Step 1 : place an order" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:81 +msgid "" +"You are now in the Helpdesk module and you have just received a ticket from " +"a client. To place a new order, go to :menuselection:`Sales --> Orders --> " +"Orders` and create one for the help desk service product you have previously" +" recorded. Set the number of hours needed to assist the client and confirm " +"the sale." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:91 +msgid "Step 2 : link the task to the ticket" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:93 +msgid "" +"If you access the dedicated helpdesk project, you will notice that a new " +"task has automatically been generated with the order. To link this task with" +" the client ticket, go to the Helpdesk module, access the ticket in question" +" and select the task on its form." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:102 +msgid "Step 3 : record the time spent to help the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:104 +msgid "" +"The job is done and the client's issue is sorted out. To record the hours " +"performed for this task, go back to the ticket form and add them under the " +"*Timesheets* tab." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:112 +msgid "" +"The hours recorded on the ticket will also automatically appear in the " +"Timesheet module and on the dedicated task." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:116 +msgid "Step 4 : invoice the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:118 +msgid "" +"To invoice the client, go back to the Sales module and select the order that" +" had been placed. Notice that the hours recorded on the ticket form now " +"appear as the delivered quantity." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:125 +msgid "" +"All that is left to do, is to create the invoice from the order and then " +"validate it. Now you just have to wait for the client's payment !" +msgstr "" diff --git a/locale/es/LC_MESSAGES/livechat.po b/locale/es/LC_MESSAGES/livechat.po new file mode 100644 index 000000000..3942c6bcc --- /dev/null +++ b/locale/es/LC_MESSAGES/livechat.po @@ -0,0 +1,249 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2015-TODAY, Odoo S.A. +# This file is distributed under the same license as the Odoo Business package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Odoo Business 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Nicolás Broggi , 2018\n" +"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../../livechat/livechat.rst:5 +msgid "Live Chat" +msgstr "Chat en vivo" + +#: ../../livechat/livechat.rst:8 +msgid "Chat in live with website visitors" +msgstr "Chatee en vivo con los visitantes del sitio web" + +#: ../../livechat/livechat.rst:10 +msgid "" +"With Odoo Live Chat, you can establish a direct contact with your website " +"visitors. A simple dialog box will be available on their screen and will " +"allow them to get in touch with one of your sales representatives. This way," +" you can easily turn prospects into potential business opportunities. You " +"will also be able to provide assistance to your customers. Overall, this is " +"the perfect tool to improve customer satisfaction." +msgstr "" +"Con Odoo Live Chat, puede establecer un contacto directo con los visitantes " +"de su sitio web. Un cuadro de diálogo simple estará disponible en su " +"pantalla y les permitirá ponerse en contacto con uno de sus representantes " +"de ventas. De esta manera, puede convertir fácilmente a los prospectos en " +"posibles oportunidades comerciales. También podrá brindar asistencia a sus " +"clientes. En general, esta es la herramienta perfecta para mejorar la " +"satisfacción del cliente." + +#: ../../livechat/livechat.rst:19 +msgid "Configuration" +msgstr "Configuración" + +#: ../../livechat/livechat.rst:21 +msgid "" +"To get the Live Chat feature, open the Apps module, search for \"Live Chat\"" +" and then click on install." +msgstr "" +"Para obtener la función de chat en vivo, abra el módulo Aplicaciones, busque" +" \"Chat en vivo\" y luego haga clic en instalar." + +#: ../../livechat/livechat.rst:27 +msgid "" +"The Live Chat module provides you a direct access to your channels. There, " +"operators can easily join and leave the chat." +msgstr "" +"El módulo Live Chat le proporciona acceso directo a sus canales. Allí, los " +"operadores pueden unirse fácilmente y abandonar el chat." + +#: ../../livechat/livechat.rst:34 +msgid "Add the live chat to an Odoo website" +msgstr "Agregue el chat en vivo a un sitio web de Odoo" + +#: ../../livechat/livechat.rst:36 +msgid "" +"If your website was created with Odoo, then the live chat is automatically " +"added to it. All that is left to do, is to go to :menuselection:`Website -->" +" Configuration --> Settings` to select the channel to be linked to the " +"website." +msgstr "" +"Si su sitio web fue creado con Odoo, entonces el chat en vivo se agrega " +"automáticamente. Todo lo que queda por hacer es ir a: menu selection: `Sitio" +" web -> Configuración -> Configuración` para seleccionar el canal que se va " +"a vincular al sitio web." + +#: ../../livechat/livechat.rst:45 +msgid "Add the live chat to an external website" +msgstr "Agregue el chat en vivo a un sitio web externo" + +#: ../../livechat/livechat.rst:47 +msgid "" +"If your website was not created with Odoo, go to the Live Chat module and " +"then select the channel to be linked. There, you can simply copy paste the " +"code available into your website. A specific url you can send to customers " +"or suppliers for them to access the live chat is also provided." +msgstr "" +"Si su sitio web no se creó con Odoo, vaya al módulo Chat en vivo y luego " +"seleccione el canal que se va a vincular. Allí, simplemente copie y pegue el" +" código disponible en su sitio web. También se proporciona una URL " +"específica que puede enviar a clientes o proveedores para que accedan al " +"chat en vivo." + +#: ../../livechat/livechat.rst:54 +msgid "Hide / display the live chat according to rules" +msgstr "Ocultar / mostrar el chat en vivo de acuerdo a las reglas" + +#: ../../livechat/livechat.rst:56 +msgid "" +"Rules for the live chat can be defined on the channel form. For instance, " +"you can choose to display the chat in the countries you speak the language " +"of. On the contrary, you are able to hide the chat in countries your company" +" does not sell in. If you select *Auto popup*, you can also set the length " +"of time it takes for the chat to appear." +msgstr "" +"Las reglas para el chat en vivo se pueden definir en el formulario del " +"canal. Por ejemplo, puede elegir mostrar el chat en los países en los que " +"habla el idioma. Por el contrario, puede ocultar el chat en países en los " +"que su empresa no vende. Si selecciona *Auto popup*, también puede " +"establecer el tiempo que tarda el chat en aparecer." + +#: ../../livechat/livechat.rst:66 +msgid "Prepare automatic messages" +msgstr "Preparar mensajes automáticos" + +#: ../../livechat/livechat.rst:68 +msgid "" +"On the channel form, in the *Options* section, several messages can be typed" +" to appear automatically on the chat. This will entice visitors to reach you" +" through the live chat." +msgstr "" +"En el formulario del canal, en la sección *Opciones*, se pueden escribir " +"varios mensajes para que aparezcan automáticamente en el chat. Esto atraerá " +"a los visitantes a contactarlo a través del chat en vivo." + +#: ../../livechat/livechat.rst:76 +msgid "Start chatting with customers" +msgstr "Comience a chatear con los clientes" + +#: ../../livechat/livechat.rst:78 +msgid "" +"In order to start chatting with customers, first make sure that the channel " +"is published on your website. To do so, select *Unpublished on Website* on " +"the top right corner of the channel form to toggle the *Published* setting. " +"Then, the live chat can begin once an operator has joined the channel." +msgstr "" +"Para comenzar a chatear con los clientes, primero asegúrese de que el canal " +"esté publicado en su sitio web. Para hacerlo, seleccione *No publicado en el" +" sitio web* en la esquina superior derecha del formulario del canal para " +"alternar la configuración *Publicado*. Luego, el chat en vivo puede comenzar" +" una vez que un operador se haya unido al canal." + +#: ../../livechat/livechat.rst:88 +msgid "" +"If no operator is available and/or if the channel is unpublished on the " +"website, then the live chat button will not appear to visitors." +msgstr "" +"Si no hay un operador disponible y/o si el canal no está publicado en el " +"sitio web, el botón de chat en vivo no aparecerá para los visitantes." + +#: ../../livechat/livechat.rst:92 +msgid "" +"In practice, the conversations initiated by the visitors will appear in the " +"Discuss module and will also pop up as a direct message. Therefore, " +"inquiries can be answered wherever you are in Odoo." +msgstr "" +"En la práctica, las conversaciones iniciadas por los visitantes aparecerán " +"en el módulo Discusión y también aparecerán como un mensaje directo. Por lo " +"tanto, las consultas pueden responderse donde sea que se encuentre en Odoo." + +#: ../../livechat/livechat.rst:96 +msgid "" +"If there several operators in charge of a channel, the system will dispatch " +"sessions randomly between them." +msgstr "" +"Si hay varios operadores a cargo de un canal, el sistema enviará sesiones al" +" azar entre ellos." + +#: ../../livechat/livechat.rst:100 +msgid "Use commands" +msgstr "Usar comandos" + +#: ../../livechat/livechat.rst:102 +msgid "" +"Commands are useful shortcuts for completing certain actions or to access " +"information you might need. To use this feature, simply type the commands " +"into the chat. The following actions are available :" +msgstr "" +"Los comandos son atajos útiles para completar ciertas acciones o para " +"acceder a la información que pueda necesitar. Para usar esta función, " +"simplemente escriba los comandos en el chat. Las siguientes acciones están " +"disponibles:" + +#: ../../livechat/livechat.rst:106 +msgid "**/help** : show a helper message." +msgstr "**/help**: muestra un mensaje de ayuda." + +#: ../../livechat/livechat.rst:108 +msgid "**/helpdesk** : create a helpdesk ticket." +msgstr "**/helpdesk** : crea un ticket de servicio de asistencia." + +#: ../../livechat/livechat.rst:110 +msgid "**/helpdesk\\_search** : search for a helpdesk ticket." +msgstr "**/helpdesk\\_search** : busca un ticket de servicio de asistencia." + +#: ../../livechat/livechat.rst:112 +msgid "**/history** : see 15 last visited pages." +msgstr "**/history** : ver 15 últimas páginas visitadas." + +#: ../../livechat/livechat.rst:114 +msgid "**/lead** : create a new lead." +msgstr "**/lead** : crea una nueva iniciativa." + +#: ../../livechat/livechat.rst:116 +msgid "**/leave** : leave the channel." +msgstr "**/leave** : dejar el canal." + +#: ../../livechat/livechat.rst:119 +msgid "" +"If a helpdesk ticket is created from the chat, then the conversation it was " +"generated from will automatically appear as the description of the ticket. " +"The same goes for the creation of a lead." +msgstr "" +"Si se crea un ticket de servicio de asistencia desde el chat, la " +"conversación de la que se generó aparecerá automáticamente como la " +"descripción del ticket. Lo mismo ocurre con la creación de una iniciativa." + +#: ../../livechat/livechat.rst:124 +msgid "Send canned responses" +msgstr "Enviar respuestas guardadas" + +#: ../../livechat/livechat.rst:126 +msgid "" +"Canned responses allow you to create substitutes to generic sentences you " +"frequently use. Typing a word instead of several will save you a lot of " +"time. To add canned responses, go to :menuselection:`LIVE CHAT --> " +"Configuration --> Canned Responses` and create as many as you need to. Then," +" to use them during a chat, simply type \":\" followed by the shortcut you " +"assigned." +msgstr "" +"Las respuestas guardadas le permiten crear sustitutos a oraciones genéricas " +"que usa con frecuencia. Escribir una palabra en vez de varias le ahorrará " +"mucho tiempo. Para agregar respuestas guardadas, vaya a: menuselection: " +"`CHAT EN VIVO -> Configuración -> Respuestas guardadas` y cree todas las que" +" necesite. Luego, para usarlos durante un chat, simplemente escriba \":\" " +"seguido del atajo que asignó." + +#: ../../livechat/livechat.rst:136 +msgid "" +"You now have all of the tools needed to chat in live with your website " +"visitors, enjoy !" +msgstr "" +"Ahora tiene todas las herramientas necesarias para chatear en vivo con los " +"visitantes de su sitio web, ¡disfrútelo!" diff --git a/locale/es/LC_MESSAGES/point_of_sale.po b/locale/es/LC_MESSAGES/point_of_sale.po index 85c39bff8..b1bf07ebf 100644 --- a/locale/es/LC_MESSAGES/point_of_sale.po +++ b/locale/es/LC_MESSAGES/point_of_sale.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Gustavo Valverde , 2018\n" +"Last-Translator: ES R1 , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1144,7 +1144,7 @@ msgid "POSBox Setup Guide" msgstr "Guía de configuración Caja PdV" #: ../../point_of_sale/overview/setup.rst:11 -#: ../../point_of_sale/overview/setup.rst:206 +#: ../../point_of_sale/overview/setup.rst:205 msgid "Prerequisites" msgstr "Pre-requisitos" @@ -1178,28 +1178,28 @@ msgstr "" "Una red local configurada con DHCP (esta es la configuración predeterminada)" #: ../../point_of_sale/overview/setup.rst:21 -msgid "An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter" -msgstr "Un Cable Ethernet RJ45 o un adaptador USB Wi-Fi compatible con Linux" - -#: ../../point_of_sale/overview/setup.rst:22 msgid "" "An Epson USB TM-T20 Printer or another ESC/POS compatible printer " "(officially supported printers are listed at the `POS Hardware page " "`_)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:25 +#: ../../point_of_sale/overview/setup.rst:24 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" msgstr "" "Un Escáner de código de barras USB Honeywell Eclipse u otro escáner " "compatible" -#: ../../point_of_sale/overview/setup.rst:26 +#: ../../point_of_sale/overview/setup.rst:25 msgid "An Epson compatible cash drawer" msgstr "Un cajón de dinero Epson compatible" +#: ../../point_of_sale/overview/setup.rst:26 +msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)" +msgstr "" + #: ../../point_of_sale/overview/setup.rst:29 -#: ../../point_of_sale/overview/setup.rst:214 +#: ../../point_of_sale/overview/setup.rst:213 msgid "Step By Step Setup Guide" msgstr "Guía de configuración Paso a Paso" @@ -1264,24 +1264,16 @@ msgstr "" #: ../../point_of_sale/overview/setup.rst:60 msgid "" -"**Wi-Fi**: If you do not wish to use Ethernet, plug in a Linux compatible " -"USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux " -"compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 " -"chipset. Make sure not to plug in an Ethernet cable, because all Wi-Fi " -"functionality will be bypassed when a wired network connection is available." +"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure " +"not to plug in an Ethernet cable, because all Wi-Fi functionality will be " +"bypassed when a wired network connection is available." msgstr "" -"*Wi-Fi*. Si no deseas usar Ethernet, enchufe a Linux que sea compatible USB " -"Wi-Fi adaptador. La mayoría de adaptadores comercialmente disponibles Wi-Fi " -"son compatibles con Linux. Oficialmente respaldados son adaptadores Wi-Fi " -"con conjunto de chips Raink 5370. Hace seguro el no enchufar en un cable " -"Ethernet, ya que toda la funcionalidad Wi-Fi puede ser evitada cuando un " -"cable de conexión por red esta disponible." -#: ../../point_of_sale/overview/setup.rst:68 +#: ../../point_of_sale/overview/setup.rst:66 msgid "Power the POSBox" msgstr "Encender la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:70 +#: ../../point_of_sale/overview/setup.rst:68 msgid "" "Plug the power adapter into the POSBox, a bright red status led should light" " up." @@ -1289,11 +1281,11 @@ msgstr "" "Enchufe el adaptador de corriente en la Caja PdV, un estado de LED color " "rojo brillante debe encenderse." -#: ../../point_of_sale/overview/setup.rst:74 +#: ../../point_of_sale/overview/setup.rst:72 msgid "Make sure the POSBox is ready" msgstr "Asegúrese que la Caja PdV está lista." -#: ../../point_of_sale/overview/setup.rst:76 +#: ../../point_of_sale/overview/setup.rst:74 msgid "" "Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it" " should print a status receipt with its IP address. Also the status LED, " @@ -1305,12 +1297,12 @@ msgstr "" "LED, justo después de prender el botón rojo, deberá permanecer en luz " "verde." -#: ../../point_of_sale/overview/setup.rst:82 -#: ../../point_of_sale/overview/setup.rst:293 +#: ../../point_of_sale/overview/setup.rst:80 +#: ../../point_of_sale/overview/setup.rst:292 msgid "Setup the Point of Sale" msgstr "Configurar el Punto de Venta" -#: ../../point_of_sale/overview/setup.rst:84 +#: ../../point_of_sale/overview/setup.rst:82 msgid "" "To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale" " --> Configuration --> Settings` and select your Point of Sale. Scroll down " @@ -1329,7 +1321,7 @@ msgstr "" "después de iniciar la Terminal). Cuando la IP no este especifica en el Punto" " de Venta deberá intentar encontrarla en la red local." -#: ../../point_of_sale/overview/setup.rst:93 +#: ../../point_of_sale/overview/setup.rst:91 msgid "" "If you are running multiple Point of Sales on the same POSBox, make sure " "that only one of them has Remote Scanning/Barcode Scanner activated." @@ -1338,7 +1330,7 @@ msgstr "" " asegúrese de que sólo uno de ellos tenga Escáner Remoto/Escaneo de código " "de barras activado." -#: ../../point_of_sale/overview/setup.rst:96 +#: ../../point_of_sale/overview/setup.rst:94 msgid "" "It might be a good idea to make sure the POSBox IP never changes in your " "network. Refer to your router documentation on how to achieve this." @@ -1346,11 +1338,11 @@ msgstr "" "Podría ser buena idea asegurarse que la terminal del Punto de Venta nunca " "cambie de su red. Consulte la documentación de su router para lograr esto." -#: ../../point_of_sale/overview/setup.rst:101 +#: ../../point_of_sale/overview/setup.rst:99 msgid "Launch the Point of Sale" msgstr "Inicia el Punto de Venta" -#: ../../point_of_sale/overview/setup.rst:103 +#: ../../point_of_sale/overview/setup.rst:101 msgid "" "If you didn't specify the POSBox's IP address in the configuration, the POS " "will need some time to perform a network scan to find the POSBox. This is " @@ -1360,7 +1352,7 @@ msgstr "" "configuración, la Terminal necesita ejecutar el escanear de redes para " "encontrar la de la Terminal. Esto sólo se ejecutará una únicamente vez." -#: ../../point_of_sale/overview/setup.rst:107 +#: ../../point_of_sale/overview/setup.rst:105 msgid "" "The Point of Sale is now connected to the POSBox and your hardware should be" " ready to use." @@ -1368,23 +1360,19 @@ msgstr "" "El punto de venta ahora es conectado con el POSBox y tu disco duro debe " "estar listo para usarse." -#: ../../point_of_sale/overview/setup.rst:111 +#: ../../point_of_sale/overview/setup.rst:109 msgid "Wi-Fi configuration" msgstr "Configuración Wi-Fi" -#: ../../point_of_sale/overview/setup.rst:113 +#: ../../point_of_sale/overview/setup.rst:111 msgid "" -"The POSBox is Wi-Fi-capable. In order to use it you'll need a Linux " -"compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are" -" Linux compatible. Officially supported are Wi-Fi adapters with a Ralink " -"5370 chipset." +"The most recent version of the POSBox has Wi-Fi built in. If you're using an" +" older version you'll need a Linux compatible USB Wi-Fi adapter. Most " +"commercially available Wi-Fi adapters are Linux compatible. Officially " +"supported are Wi-Fi adapters with a Ralink 5370 chipset." msgstr "" -"La Terminal del Punto de Venta es capaz de tener Wi-Fi. Según el uso que se " -"le de es necesario un adaptador USB de Wi-Fi compatible con Linux. Existen " -"adaptadores de Wi-Fi muy comerciales compatibles con Linux. Los adaptadores " -"de Wi-Fi oficiales son los de Ralink 5370 chipset." -#: ../../point_of_sale/overview/setup.rst:118 +#: ../../point_of_sale/overview/setup.rst:117 msgid "" "Make sure not to plug in an Ethernet cable, as all Wi-Fi related " "functionality will be disabled when a wired network connection is available." @@ -1393,7 +1381,7 @@ msgstr "" "relacionadas con el Wi-Fi se desactivarán cuando una conexión de red por " "cable esté disponible." -#: ../../point_of_sale/overview/setup.rst:122 +#: ../../point_of_sale/overview/setup.rst:121 msgid "" "When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi " "Access Point called \"Posbox\" you can connect to. The receipt that gets " @@ -1419,7 +1407,7 @@ msgstr "" "del estado de la Terminal del Punto de Venta después de que se haya " "conectado." -#: ../../point_of_sale/overview/setup.rst:133 +#: ../../point_of_sale/overview/setup.rst:132 msgid "" "If you plan on permanently setting up the POSBox with Wi-Fi, you can use the" " \"persistent\" checkbox on the Wi-Fi configuration page when connecting to " @@ -1434,7 +1422,7 @@ msgstr "" " propia red \"Terminal\" que siempre tratará de conectarse a la red " "especificada después de que se inicie." -#: ../../point_of_sale/overview/setup.rst:140 +#: ../../point_of_sale/overview/setup.rst:139 msgid "" "When the POSBox fails to connect to a network it will fall back to starting " "it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network" @@ -1446,11 +1434,11 @@ msgstr "" "conexión con una red Wi-Fi después de conectarse a ella, la Terminal de " "Punto de Venta intentará restablecer la conexión automáticamente." -#: ../../point_of_sale/overview/setup.rst:146 +#: ../../point_of_sale/overview/setup.rst:145 msgid "Multi-POS Configuration" msgstr "Configuración Multi-PdV" -#: ../../point_of_sale/overview/setup.rst:148 +#: ../../point_of_sale/overview/setup.rst:147 msgid "" "The advised way to setup a multi Point of Sale shop is to have one POSBox " "per Point of Sale. In this case it is mandatory to manually specify the IP " @@ -1465,11 +1453,11 @@ msgstr "" "direcciones de IP de la Terminal no cambien. Por favor, consulte la " "documentación del router." -#: ../../point_of_sale/overview/setup.rst:155 +#: ../../point_of_sale/overview/setup.rst:154 msgid "POSBoxless Guide (advanced)" msgstr "Guía de Caja chica PdV (avanzado)" -#: ../../point_of_sale/overview/setup.rst:159 +#: ../../point_of_sale/overview/setup.rst:158 msgid "" "If you are running your Point of Sale on a Debian-based Linux distribution, " "you do not need the POSBox as you can run its software locally. However the " @@ -1485,7 +1473,7 @@ msgstr "" " de su distribución o de su configuración particular y configuración de " "hardware." -#: ../../point_of_sale/overview/setup.rst:166 +#: ../../point_of_sale/overview/setup.rst:165 msgid "" "Drivers for the various types of supported hardware are provided as Odoo " "modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale" @@ -1502,17 +1490,17 @@ msgstr "" "dato de negocio (por ejemplo las órdenes de punto de venta), pero sólo sirve" " como puerta de enlace entre el punto de venta y el hardware." -#: ../../point_of_sale/overview/setup.rst:173 +#: ../../point_of_sale/overview/setup.rst:172 msgid "" "The goal of this section will be to set up a local Odoo instance that " "behaves like the Odoo instance running on the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:177 +#: ../../point_of_sale/overview/setup.rst:176 msgid "Image building process" msgstr "Proceso de creación de imagen" -#: ../../point_of_sale/overview/setup.rst:179 +#: ../../point_of_sale/overview/setup.rst:178 msgid "" "We generate the official POSBox images using the scripts in " "https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. " @@ -1522,7 +1510,7 @@ msgid "" "`nightly.odoo.com `_ for users to download." msgstr "" -#: ../../point_of_sale/overview/setup.rst:187 +#: ../../point_of_sale/overview/setup.rst:186 msgid "" "The scripts in this directory might be useful as a reference if you get " "stuck or want more detail about something." @@ -1530,11 +1518,11 @@ msgstr "" "Las secuencias de comandos en este directorio podrían ser útiles como " "referencia si te quedas atascado o desean más detalles acerca de algo." -#: ../../point_of_sale/overview/setup.rst:191 +#: ../../point_of_sale/overview/setup.rst:190 msgid "Summary of the image creation process" msgstr "Resumen del proceso de creación de la imagen" -#: ../../point_of_sale/overview/setup.rst:193 +#: ../../point_of_sale/overview/setup.rst:192 msgid "" "The image creation process starts by downloading the latest `Raspbian " "`_ image. It then locally mounts this Raspbian " @@ -1560,15 +1548,15 @@ msgstr "" "arranque y copiamos sobre algunos archivos de configuración adicionales. La " "imagen resultante está entonces lista para ser probada y utilizada." -#: ../../point_of_sale/overview/setup.rst:208 +#: ../../point_of_sale/overview/setup.rst:207 msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)" msgstr "Una distribución Linux basada en Debian (Debian, Ubuntu, Mint, etc.)" -#: ../../point_of_sale/overview/setup.rst:209 +#: ../../point_of_sale/overview/setup.rst:208 msgid "A running Odoo instance you connect to to load the Point of Sale" msgstr "Una instancia Odoo corriendo conectada con el Punto de Venta cargado" -#: ../../point_of_sale/overview/setup.rst:210 +#: ../../point_of_sale/overview/setup.rst:209 msgid "" "You must uninstall any ESC/POS printer driver as it will conflict with " "Odoo's built-in driver" @@ -1576,11 +1564,11 @@ msgstr "" "Debe desinstalar cualquier controlador de impresora ESC/POS, ya que entrará " "en conflicto con controlador integrado de Odoo" -#: ../../point_of_sale/overview/setup.rst:217 +#: ../../point_of_sale/overview/setup.rst:216 msgid "Extra dependencies" msgstr "Dependencias extra" -#: ../../point_of_sale/overview/setup.rst:219 +#: ../../point_of_sale/overview/setup.rst:218 msgid "" "Because Odoo runs on Python 2, you need to check which version of pip you " "need to use." @@ -1588,46 +1576,46 @@ msgstr "" "Porque Odoo corre en Python 2, usted necesita revisar qué versión de PIP es " "necesario utilizar." -#: ../../point_of_sale/overview/setup.rst:222 +#: ../../point_of_sale/overview/setup.rst:221 msgid "``# pip --version``" msgstr "``# pip --version``" -#: ../../point_of_sale/overview/setup.rst:224 -#: ../../point_of_sale/overview/setup.rst:230 +#: ../../point_of_sale/overview/setup.rst:223 +#: ../../point_of_sale/overview/setup.rst:229 msgid "If it returns something like::" msgstr "Si esto devuelve algo como esto:" -#: ../../point_of_sale/overview/setup.rst:228 +#: ../../point_of_sale/overview/setup.rst:227 msgid "You need to try pip2 instead." msgstr "Necesita probar pip2 en su lugar." -#: ../../point_of_sale/overview/setup.rst:234 +#: ../../point_of_sale/overview/setup.rst:233 msgid "You can use pip." msgstr "Puede utilizar pip." -#: ../../point_of_sale/overview/setup.rst:236 +#: ../../point_of_sale/overview/setup.rst:235 msgid "The driver modules requires the installation of new python modules:" msgstr "" "Los módulos de los controladores requieren la instalación de nuevos módulos " "de Python:" -#: ../../point_of_sale/overview/setup.rst:238 +#: ../../point_of_sale/overview/setup.rst:237 msgid "``# pip install pyserial``" msgstr "``# pip install pyserial``" -#: ../../point_of_sale/overview/setup.rst:240 +#: ../../point_of_sale/overview/setup.rst:239 msgid "``# pip install pyusb==1.0.0b1``" msgstr "``# pip install pyusb==1.0.0b1``" -#: ../../point_of_sale/overview/setup.rst:242 +#: ../../point_of_sale/overview/setup.rst:241 msgid "``# pip install qrcode``" msgstr "``# pip install qrcode``" -#: ../../point_of_sale/overview/setup.rst:245 +#: ../../point_of_sale/overview/setup.rst:244 msgid "Access Rights" msgstr "Permisos de acceso" -#: ../../point_of_sale/overview/setup.rst:247 +#: ../../point_of_sale/overview/setup.rst:246 msgid "" "The drivers need raw access to the printer and barcode scanner devices. " "Doing so requires a bit system administration. First we are going to create " @@ -1638,21 +1626,21 @@ msgstr "" "administración de bits. En primer lugar vamos a crear un grupo que tiene " "acceso de los dispositivos USB." -#: ../../point_of_sale/overview/setup.rst:251 +#: ../../point_of_sale/overview/setup.rst:250 msgid "``# groupadd usbusers``" msgstr "``# groupadd usbusers``" -#: ../../point_of_sale/overview/setup.rst:253 +#: ../../point_of_sale/overview/setup.rst:252 msgid "Then we add the user who will run the OpenERP server to ``usbusers``" msgstr "" "Luego añadimos el usuario que va a ejecutar el servidor OpenERP a " "``usbusers``" -#: ../../point_of_sale/overview/setup.rst:255 +#: ../../point_of_sale/overview/setup.rst:254 msgid "``# usermod -a -G usbusers USERNAME``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:257 +#: ../../point_of_sale/overview/setup.rst:256 msgid "" "Then we need to create a udev rule that will automatically allow members of " "``usbusers`` to access raw USB devices. To do so create a file called " @@ -1660,29 +1648,29 @@ msgid "" "following content::" msgstr "" -#: ../../point_of_sale/overview/setup.rst:265 +#: ../../point_of_sale/overview/setup.rst:264 msgid "Then you need to reboot your machine." msgstr "Luego debe reiniciar su máquina." -#: ../../point_of_sale/overview/setup.rst:268 +#: ../../point_of_sale/overview/setup.rst:267 msgid "Start the local Odoo instance" msgstr "Comenzar la instancia local de Odoo" -#: ../../point_of_sale/overview/setup.rst:270 +#: ../../point_of_sale/overview/setup.rst:269 msgid "We must launch the Odoo server with the correct settings" msgstr "Debe iniciar el servidor Odoo con las configuraciones correctas" -#: ../../point_of_sale/overview/setup.rst:272 +#: ../../point_of_sale/overview/setup.rst:271 msgid "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:275 +#: ../../point_of_sale/overview/setup.rst:274 msgid "Test the instance" msgstr "Probar la instancia" -#: ../../point_of_sale/overview/setup.rst:277 +#: ../../point_of_sale/overview/setup.rst:276 msgid "" "Plug all your hardware to your machine's USB ports, and go to " "``http://localhost:8069/hw_proxy/status`` refresh the page a few times and " @@ -1699,11 +1687,11 @@ msgstr "" " exclusivo a los dispositivos, no se aplican las reglas de udev o sustituida" " por otros." -#: ../../point_of_sale/overview/setup.rst:285 +#: ../../point_of_sale/overview/setup.rst:284 msgid "Automatically start Odoo" msgstr "Iniciar automáticamente Odoo" -#: ../../point_of_sale/overview/setup.rst:287 +#: ../../point_of_sale/overview/setup.rst:286 msgid "" "You must now make sure that this Odoo install is automatically started after" " boot. There are various ways to do so, and how to do it depends on your " @@ -1716,7 +1704,7 @@ msgstr "" "de inicio recibido por su distribución es probablemente la forma más fácil " "de lograr esto." -#: ../../point_of_sale/overview/setup.rst:295 +#: ../../point_of_sale/overview/setup.rst:294 msgid "" "The IP address field in the POS configuration must be either ``127.0.0.1`` " "or ``localhost`` if you're running the created Odoo server on the machine " @@ -1727,19 +1715,19 @@ msgstr "" "servidor de Odoo en la máquina que va a utilizar como el Punto de Venta del " "dispositivo. También puede dejarlo vacío." -#: ../../point_of_sale/overview/setup.rst:301 +#: ../../point_of_sale/overview/setup.rst:300 msgid "POSBox Technical Documentation" msgstr "Documentación Técnica de la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:304 +#: ../../point_of_sale/overview/setup.rst:303 msgid "Technical Overview" msgstr "Información técnica general" -#: ../../point_of_sale/overview/setup.rst:307 +#: ../../point_of_sale/overview/setup.rst:306 msgid "The POSBox Hardware" msgstr "El hardware de la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:309 +#: ../../point_of_sale/overview/setup.rst:308 msgid "" "The POSBox's Hardware is based on a `Raspberry Pi 2 " "`_, a popular " @@ -1756,11 +1744,11 @@ msgstr "" " 8 GB Clase 10 o superior SD. Todo este hardware es fácilmente disponible a " "nivel mundial de los proveedores independientes." -#: ../../point_of_sale/overview/setup.rst:318 +#: ../../point_of_sale/overview/setup.rst:317 msgid "Compatible Peripherals" msgstr "Perisféricos compatibles" -#: ../../point_of_sale/overview/setup.rst:320 +#: ../../point_of_sale/overview/setup.rst:319 msgid "" "Officially supported hardware is listed on the `POS Hardware page " "`_." @@ -1768,11 +1756,11 @@ msgstr "" "El hardware con soporte oficial está listado en `POS Hardware page " "`_." -#: ../../point_of_sale/overview/setup.rst:324 +#: ../../point_of_sale/overview/setup.rst:323 msgid "The POSBox Software" msgstr "El software de la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:326 +#: ../../point_of_sale/overview/setup.rst:325 msgid "" "The POSBox runs a heavily modified Raspbian Linux installation, a Debian " "derivative for the Raspberry Pi. It also runs a barebones installation of " @@ -1784,7 +1772,7 @@ msgid "" "branch." msgstr "" -#: ../../point_of_sale/overview/setup.rst:335 +#: ../../point_of_sale/overview/setup.rst:334 msgid "" "The root partition on the POSBox is mounted read-only, ensuring that we " "don't wear out the SD card by writing to it too much. It also ensures that " @@ -1818,15 +1806,15 @@ msgstr "" "/etc_ram /foo /bar. También nos atamos de subir / a /root_bypass_ramdisks " "para poder llegar a la verdadera /etc y /var durante el desarrollo." -#: ../../point_of_sale/overview/setup.rst:351 +#: ../../point_of_sale/overview/setup.rst:350 msgid "Logs of the running Odoo server can be found at:" msgstr "Registros de los servidores Odoo funcionando se pueden encontrar en:" -#: ../../point_of_sale/overview/setup.rst:353 +#: ../../point_of_sale/overview/setup.rst:352 msgid "``/var/log/odoo/odoo.log``" msgstr "``/var/log/odoo/odoo.log``" -#: ../../point_of_sale/overview/setup.rst:355 +#: ../../point_of_sale/overview/setup.rst:354 msgid "" "Various POSBox related scripts (eg. wifi-related scripts) running on the " "POSBox will log to /var/log/syslog and those messages are tagged with " @@ -1836,15 +1824,15 @@ msgstr "" " de wi-fi) que se ejecutan en la Terminal, se registrarán en /var/log/syslog" " y estos mensajes serán etiquetados con ``terminal_*``." -#: ../../point_of_sale/overview/setup.rst:360 +#: ../../point_of_sale/overview/setup.rst:359 msgid "Accessing the POSBox" msgstr "Accediendo a la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:363 +#: ../../point_of_sale/overview/setup.rst:362 msgid "Local Access" msgstr "Acceso local" -#: ../../point_of_sale/overview/setup.rst:365 +#: ../../point_of_sale/overview/setup.rst:364 msgid "" "If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if" " you connect a computer monitor to the *HDMI* port of the POSBox, you can " @@ -1856,17 +1844,17 @@ msgstr "" " se puede utilizar como un pequeño ordenador GNU/Linux y realizará diversas " "tareas de administración, como vistas de algunos registros." -#: ../../point_of_sale/overview/setup.rst:370 +#: ../../point_of_sale/overview/setup.rst:369 msgid "The POSBox will automatically log in as root on the default tty." msgstr "" "La Terminal del Punto de Venta se conectará automáticamente como root en la " "bandeja predeterminada. " -#: ../../point_of_sale/overview/setup.rst:373 +#: ../../point_of_sale/overview/setup.rst:372 msgid "Remote Access" msgstr "Acceso remoto" -#: ../../point_of_sale/overview/setup.rst:375 +#: ../../point_of_sale/overview/setup.rst:374 msgid "" "If you have the POSBox's IP address and an SSH client you can access the " "POSBox's system remotely. The login credentials are ``pi``/``raspberry``." @@ -1875,11 +1863,11 @@ msgstr "" " SSH puede acceder al sistema de la Terminal de manera remoto. Las " "credenciales de inicio de sesión son `pi``/``raspberry``." -#: ../../point_of_sale/overview/setup.rst:380 +#: ../../point_of_sale/overview/setup.rst:379 msgid "Updating The POSBox Software" msgstr "Actualizando el software de la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:382 +#: ../../point_of_sale/overview/setup.rst:381 msgid "" "Only upgrade the POSBox if you experience problems or want to use newly " "implemented features." @@ -1887,7 +1875,7 @@ msgstr "" "Sólo actualizar la Terminal de Punto de Venta si tiene problemas o desea " "utilizar las funciones de reciente aplicación." -#: ../../point_of_sale/overview/setup.rst:385 +#: ../../point_of_sale/overview/setup.rst:384 msgid "" "The best way to update the POSBox software is to download a new version of " "the image and flash the SD-Card with it. This operation is described in " @@ -1906,7 +1894,7 @@ msgstr "" " método de actualización se asegurará de que se está ejecutando la última " "versión del software de la Terminal del Punto de Venta." -#: ../../point_of_sale/overview/setup.rst:394 +#: ../../point_of_sale/overview/setup.rst:393 msgid "" "The second way of upgrading is through the built in upgrade interface that " "can be reached through the POSBox homepage. The nice thing about upgrading " @@ -1922,11 +1910,11 @@ msgstr "" "configurar archivos de la actualización instalada (como por ejemplo " "/etc/hostapd.conf). Sólo se puede actualizar:" -#: ../../point_of_sale/overview/setup.rst:401 +#: ../../point_of_sale/overview/setup.rst:400 msgid "The internal Odoo application" msgstr "La aplicación Odoo interna" -#: ../../point_of_sale/overview/setup.rst:402 +#: ../../point_of_sale/overview/setup.rst:401 msgid "" "Scripts in the folder " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" @@ -1934,19 +1922,19 @@ msgstr "" "Scripts en la carpeta " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" -#: ../../point_of_sale/overview/setup.rst:404 +#: ../../point_of_sale/overview/setup.rst:403 msgid "When in doubt, always use the first method of upgrading." msgstr "En caso de duda, utilice siempre el primer método de actualización." -#: ../../point_of_sale/overview/setup.rst:407 +#: ../../point_of_sale/overview/setup.rst:406 msgid "Troubleshoot" msgstr "Solución de problemas" -#: ../../point_of_sale/overview/setup.rst:410 +#: ../../point_of_sale/overview/setup.rst:409 msgid "The POS cannot connect to the POSBox" msgstr "El PdV no se puede conectar a la Caja PdV" -#: ../../point_of_sale/overview/setup.rst:412 +#: ../../point_of_sale/overview/setup.rst:411 msgid "" "The easiest way to make sure the POSBox is properly set-up is to turn it on " "with the printer plugged in as it will print a receipt indicating any error " @@ -1959,7 +1947,7 @@ msgstr "" "Terminal del Punto de Venta en caso de haber tenido éxito. Si el recibo no " "se imprime, compruebe los siguientes pasos:" -#: ../../point_of_sale/overview/setup.rst:416 +#: ../../point_of_sale/overview/setup.rst:415 msgid "" "Make sure the POSBox is powered on, indicated by a brightly lit red status " "LED." @@ -1967,7 +1955,7 @@ msgstr "" "Asegúrese de que la Terminal del Punto de Venta esté encendida, lo indicará " "una luz brillante roja." -#: ../../point_of_sale/overview/setup.rst:418 +#: ../../point_of_sale/overview/setup.rst:417 msgid "" "Make sure the POSBox is ready, this is indicated by a brightly lit green " "status LED just next to the red power status LED. The POSBox should be ready" @@ -1978,7 +1966,7 @@ msgstr "" "Terminal del Punto de Venta deberá estar lista después de ~2 minutos de " "haber sido encendida." -#: ../../point_of_sale/overview/setup.rst:421 +#: ../../point_of_sale/overview/setup.rst:420 msgid "" "Make sure the POSBox is connected to the same network as your POS device. " "Both the device and the POSBox should be visible in the list of connected " @@ -1988,14 +1976,14 @@ msgstr "" "en la que se encuentra su Terminal. Tanto el dispositivo y la Terminal deben" " ser visibles en la lista de dispositivos conectados a su router de red." -#: ../../point_of_sale/overview/setup.rst:424 +#: ../../point_of_sale/overview/setup.rst:423 msgid "" "Make sure that your LAN is set up with DHCP, and gives IP addresses in the " "range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that " "way, you must manually set up your POSBox's IP address." msgstr "" -#: ../../point_of_sale/overview/setup.rst:428 +#: ../../point_of_sale/overview/setup.rst:427 msgid "" "If you have specified the POSBox's IP address in the configuration, make " "sure it correspond to the printed on the POSBox's status receipt." @@ -2004,11 +1992,11 @@ msgstr "" "asegúrese de que corresponda a la impresa en el recibo del estado de la " "Terminal de Punto de Venta." -#: ../../point_of_sale/overview/setup.rst:431 +#: ../../point_of_sale/overview/setup.rst:430 msgid "Make sure that the POS is not loaded over HTTPS." msgstr "Asegúrese que el PdV no está cargado sobre HTTPS." -#: ../../point_of_sale/overview/setup.rst:432 +#: ../../point_of_sale/overview/setup.rst:431 msgid "" "A bug in Firefox's HTTP implementation prevents the autodiscovery from " "working reliably. When using Firefox you should manually set up the POSBox's" @@ -2019,11 +2007,11 @@ msgstr "" "manualmente la dirección IP de la Terminal del Punto de Venta en la " "configuración de la Terminal." -#: ../../point_of_sale/overview/setup.rst:437 +#: ../../point_of_sale/overview/setup.rst:436 msgid "The Barcode Scanner is not working" msgstr "El escáner de código de barra no está funcionando" -#: ../../point_of_sale/overview/setup.rst:439 +#: ../../point_of_sale/overview/setup.rst:438 msgid "" "The barcode scanner must be configured in US QWERTY and emit an Enter after " "each barcode. This is the default configuration of most barcode readers. " @@ -2035,7 +2023,7 @@ msgstr "" "barras. Consulte la documentación del lector de código de barras para " "obtener más información." -#: ../../point_of_sale/overview/setup.rst:443 +#: ../../point_of_sale/overview/setup.rst:442 msgid "" "The POSBox needs a 2A power supply to work with some barcode scanners. If " "you are not using the provided power supply, make sure the one you use has " @@ -2046,7 +2034,7 @@ msgstr "" "utilizando la fuente de alimentación suministrada, asegúrese de que la que " "utiliza cuente con el poder suficiente." -#: ../../point_of_sale/overview/setup.rst:446 +#: ../../point_of_sale/overview/setup.rst:445 msgid "" "Some barcode scanners will need more than 2A and will not work, or will work" " unreliably, even with the provided power supply. In those case you can plug" @@ -2057,7 +2045,7 @@ msgstr "" "proporcionada. En estos casos usted puede conectar el escáner de código de " "barras en un concentrador USB con alimentación propia." -#: ../../point_of_sale/overview/setup.rst:449 +#: ../../point_of_sale/overview/setup.rst:448 msgid "" "Some poorly built barcode scanners do not advertise themselves as barcode " "scanners but as a usb keyboard instead, and will not be recognized by the " @@ -2067,11 +2055,11 @@ msgstr "" "escáneres de código de barras, sino como un teclado USB en su lugar, y estos" " no serán reconocidos por la terminal del punto de venta." -#: ../../point_of_sale/overview/setup.rst:454 +#: ../../point_of_sale/overview/setup.rst:453 msgid "The Barcode Scanner is not working reliably" msgstr "El escáner de código de barra no está funcionando de manera segura" -#: ../../point_of_sale/overview/setup.rst:456 +#: ../../point_of_sale/overview/setup.rst:455 msgid "" "Make sure that no more than one device with 'Scan via Proxy'/'Barcode " "Scanner' enabled are connected to the POSBox at the same time." @@ -2080,11 +2068,11 @@ msgstr "" "proximidad'/'Escaner de código de barras' esté conectado a la terminal del " "punto de venta al mismo tiempo." -#: ../../point_of_sale/overview/setup.rst:461 +#: ../../point_of_sale/overview/setup.rst:460 msgid "Printing the receipt takes too much time" msgstr "Impresión del recibo tarda demasiado tiempo" -#: ../../point_of_sale/overview/setup.rst:463 +#: ../../point_of_sale/overview/setup.rst:462 msgid "" "A small delay before the first print is expected, as the POSBox will do some" " preprocessing to speed up the next printings. If you suffer delays " @@ -2096,11 +2084,11 @@ msgstr "" "las próximas ediciones. Si usted sufre retrasos después es muy probable que " "sea debido a una mala conexión de red entre el punto de venta y la terminal." -#: ../../point_of_sale/overview/setup.rst:469 +#: ../../point_of_sale/overview/setup.rst:468 msgid "Some characters are not correctly printed on the receipt" msgstr "Algunos caracteres no se imprimen correctamente en el recibo" -#: ../../point_of_sale/overview/setup.rst:471 +#: ../../point_of_sale/overview/setup.rst:470 msgid "" "The POSBox does not support all languages and characters. It currently " "supports Latin and Cyrillic based scripts, with basic Japanese support." @@ -2109,11 +2097,11 @@ msgstr "" "caracteres. Actualmente soporta scripts basados en los latinos y cirílicos, " "con el apoyo del japonés básico." -#: ../../point_of_sale/overview/setup.rst:476 +#: ../../point_of_sale/overview/setup.rst:475 msgid "The printer is offline" msgstr "La impresora está fuera de línea" -#: ../../point_of_sale/overview/setup.rst:478 +#: ../../point_of_sale/overview/setup.rst:477 msgid "" "Make sure the printer is connected, powered, has enough paper and has its " "lid closed, and is not reporting an error. If the error persists, please " @@ -2123,11 +2111,11 @@ msgstr "" "suficiente papel y tener su tapa cerrada, y que no informe error. Si el " "error persiste, póngase en contacto con soporte." -#: ../../point_of_sale/overview/setup.rst:483 +#: ../../point_of_sale/overview/setup.rst:482 msgid "The cashdrawer does not open" msgstr "El cajón de dinero no abre" -#: ../../point_of_sale/overview/setup.rst:485 +#: ../../point_of_sale/overview/setup.rst:484 msgid "" "The cashdrawer should be connected to the printer and should be activated in" " the POS configuration." @@ -2135,11 +2123,11 @@ msgstr "" "El cajón de dinero debe estar conectado a la impresora y se debe activar en " "la configuración de la terminal." -#: ../../point_of_sale/overview/setup.rst:489 +#: ../../point_of_sale/overview/setup.rst:488 msgid "Credits" msgstr "Créditos" -#: ../../point_of_sale/overview/setup.rst:490 +#: ../../point_of_sale/overview/setup.rst:489 msgid "" "The POSBox project was developed by Frédéric van der Essen with the kind " "help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del " @@ -2149,7 +2137,7 @@ msgstr "" "van der Essen con un poco de ayuda de Gary Malherbe, Fabien Meghazi, Nicolas" " Wisniewsky, Dimitri Del Marmol, Joren Van Onder y Antony Lesuisse." -#: ../../point_of_sale/overview/setup.rst:494 +#: ../../point_of_sale/overview/setup.rst:493 msgid "" "This development would not have been possible without the Indiegogo campaign" " and those who contributed to it. Special thanks goes to the partners who " @@ -2159,55 +2147,55 @@ msgstr "" " han contribuido a ello. Especial agradecimiento a los socios que apoyaron " "la campaña con la fundación de paquetes asociados:" -#: ../../point_of_sale/overview/setup.rst:498 +#: ../../point_of_sale/overview/setup.rst:497 msgid "Camptocamp" msgstr "Camptocamp" -#: ../../point_of_sale/overview/setup.rst:499 +#: ../../point_of_sale/overview/setup.rst:498 msgid "BHC" msgstr "BHC" -#: ../../point_of_sale/overview/setup.rst:500 +#: ../../point_of_sale/overview/setup.rst:499 msgid "openBig" msgstr "openBig" -#: ../../point_of_sale/overview/setup.rst:501 +#: ../../point_of_sale/overview/setup.rst:500 msgid "Eeezee-IT" msgstr "Eeezee-IT" -#: ../../point_of_sale/overview/setup.rst:502 +#: ../../point_of_sale/overview/setup.rst:501 msgid "Solarsis LDA" msgstr "Solarsis LDA" -#: ../../point_of_sale/overview/setup.rst:503 +#: ../../point_of_sale/overview/setup.rst:502 msgid "ACSONE" msgstr "ACSONE" -#: ../../point_of_sale/overview/setup.rst:504 +#: ../../point_of_sale/overview/setup.rst:503 msgid "Vauxoo" msgstr "Vauxoo" -#: ../../point_of_sale/overview/setup.rst:505 +#: ../../point_of_sale/overview/setup.rst:504 msgid "Ekomurz" msgstr "Ekomurz" -#: ../../point_of_sale/overview/setup.rst:506 +#: ../../point_of_sale/overview/setup.rst:505 msgid "Datalp" msgstr "Datalp" -#: ../../point_of_sale/overview/setup.rst:507 +#: ../../point_of_sale/overview/setup.rst:506 msgid "Dao Systems" msgstr "Dao Systems" -#: ../../point_of_sale/overview/setup.rst:508 +#: ../../point_of_sale/overview/setup.rst:507 msgid "Eggs Solutions" msgstr "Eggs Solutions" -#: ../../point_of_sale/overview/setup.rst:509 +#: ../../point_of_sale/overview/setup.rst:508 msgid "OpusVL" msgstr "OpusVL" -#: ../../point_of_sale/overview/setup.rst:511 +#: ../../point_of_sale/overview/setup.rst:510 msgid "" "And also the partners who've backed the development with the Founding POSBox" " Bundle:" @@ -2215,27 +2203,27 @@ msgstr "" "Y también a los socios que han respaldado el desarrollo con la fundación de " "la Terminal Bundle:" -#: ../../point_of_sale/overview/setup.rst:514 +#: ../../point_of_sale/overview/setup.rst:513 msgid "Willow IT" msgstr "Willow IT" -#: ../../point_of_sale/overview/setup.rst:515 +#: ../../point_of_sale/overview/setup.rst:514 msgid "E\\. Akhalwaya & Sons" msgstr "E\\. Akhalwaya & Sons" -#: ../../point_of_sale/overview/setup.rst:516 +#: ../../point_of_sale/overview/setup.rst:515 msgid "Multibase" msgstr "Multibase" -#: ../../point_of_sale/overview/setup.rst:517 +#: ../../point_of_sale/overview/setup.rst:516 msgid "Mindesa" msgstr "Mindesa" -#: ../../point_of_sale/overview/setup.rst:518 +#: ../../point_of_sale/overview/setup.rst:517 msgid "bpso.biz" msgstr "bpso.biz" -#: ../../point_of_sale/overview/setup.rst:519 +#: ../../point_of_sale/overview/setup.rst:518 msgid "Shine IT." msgstr "Shine IT." @@ -2403,7 +2391,7 @@ msgstr "Nombre del TPV" #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale." -msgstr "" +msgstr "Identificación interna del punto de venta." #: ../../point_of_sale/overview/start.rst:0 msgid "Sales Channel" @@ -2412,6 +2400,8 @@ msgstr "Canal de Ventas" #: ../../point_of_sale/overview/start.rst:0 msgid "This Point of sale's sales will be related to this Sales Channel." msgstr "" +"Las ventas de este punto de venta estarán relacionadas con el canal de " +"ventas." #: ../../point_of_sale/overview/start.rst:0 msgid "Restaurant Floors" @@ -2419,7 +2409,7 @@ msgstr "Pisos del Restaurante" #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale." -msgstr "" +msgstr "Las zonas del restaurante servidas por este punto de venta." #: ../../point_of_sale/overview/start.rst:0 msgid "Orderline Notes" @@ -2427,7 +2417,7 @@ msgstr "Notas de la Línea de Pedido" #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines." -msgstr "" +msgstr "Permite las notas del cliente en las líneas del pedido." #: ../../point_of_sale/overview/start.rst:0 msgid "Display Category Pictures" @@ -2441,13 +2431,16 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Initial Category" -msgstr "" +msgstr "Categoría inicial" #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown." msgstr "" +"El punto de venta mostrará la categoría de este producto por defecto. Si no " +"se especifica ninguna categoría, se mostrarán todos los productos " +"disponibles." #: ../../point_of_sale/overview/start.rst:0 msgid "Virtual KeyBoard" @@ -2468,7 +2461,7 @@ msgstr "Barras de desplazamiento grandes" #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens." -msgstr "" +msgstr "Para pantallas táctiles industriales imprecisas" #: ../../point_of_sale/overview/start.rst:0 msgid "IP Address" @@ -2479,6 +2472,8 @@ msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty." msgstr "" +"El nombre del equipo o la dirección IP del proxy del hardware se detectarán " +"automáticamente si estos se dejan vacíos." #: ../../point_of_sale/overview/start.rst:0 msgid "Scan via Proxy" @@ -2487,6 +2482,8 @@ msgstr "Escanear vía proxy" #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner." msgstr "" +"Habilitar el escaneo del código de barras con un escáner especial para ello " +"conectado de manera remota." #: ../../point_of_sale/overview/start.rst:0 msgid "Electronic Scale" @@ -2494,7 +2491,7 @@ msgstr "Balanza electrónica" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration." -msgstr "" +msgstr "Habilita la integración de una balanza electrónica." #: ../../point_of_sale/overview/start.rst:0 msgid "Cashdrawer" @@ -2502,7 +2499,7 @@ msgstr "Cajón de monedas" #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer." -msgstr "" +msgstr "Abrir automáticamente la caja registradora." #: ../../point_of_sale/overview/start.rst:0 msgid "Print via Proxy" @@ -2511,20 +2508,25 @@ msgstr "Imprimir vía proxy" #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy." msgstr "" +"Derivar la impresión del navegador e imprimir a través del proxy del " +"hardware." #: ../../point_of_sale/overview/start.rst:0 msgid "Customer Facing Display" -msgstr "" +msgstr "Pantalla orientada al cliente" #: ../../point_of_sale/overview/start.rst:0 msgid "Show checkout to customers with a remotely-connected screen." msgstr "" +"Mostrar la compra a los clientes mediante una pantalla conectada remoto." #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers." msgstr "" +"Indica qué tipo de códigos de barras están disponibles y cómo se asignan a " +"los productos, los clientes o las cajas registradoras." #: ../../point_of_sale/overview/start.rst:0 msgid "Fiscal Positions" @@ -2535,6 +2537,8 @@ msgid "" "This is useful for restaurants with onsite and take-away services that imply" " specific tax rates." msgstr "" +"Esto es útil para los restaurantes que cuentan con servicio para llevar y " +"para consumir allí, y que suponen tasas de impuestos específicos." #: ../../point_of_sale/overview/start.rst:0 msgid "Available Pricelists" @@ -2547,6 +2551,11 @@ msgid "" "be valid, this pricelist must be listed here as an available pricelist. " "Otherwise the default pricelist will apply." msgstr "" +"Disponer de varias listas de precios disponibles en el punto de venta. " +"También puede aplicar una lista de precios para clientes específicos desde " +"su formulario de contacto (en la pestaña de Ventas). Para ser válida, esta " +"lista de precios tiene que enumerarse aquí como una lista de los precios " +"disponibles. De lo contrario, se aplicará la lista de precios por defecto." #: ../../point_of_sale/overview/start.rst:0 msgid "Default Pricelist" @@ -2557,16 +2566,20 @@ msgid "" "The pricelist used if no customer is selected or if the customer has no Sale" " Pricelist configured." msgstr "" +"La lista de precios que se utiliza si no se selecciona ningún cliente o si " +"el cliente no tiene configurada ninguna lista de los precios de venta." #: ../../point_of_sale/overview/start.rst:0 msgid "Restrict Price Modifications to Managers" -msgstr "" +msgstr "Restringir las modificaciones de los precios a los responsables" #: ../../point_of_sale/overview/start.rst:0 msgid "" "Only users with Manager access rights for PoS app can modify the product " "prices on orders." msgstr "" +"Solo los usuarios con derechos de acceso de administrador pueden modificar " +"los precios de los productos en los pedidos." #: ../../point_of_sale/overview/start.rst:0 msgid "Cash Control" @@ -2585,6 +2598,8 @@ msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount." msgstr "" +"El registro del pago actuará de manera similar al registro del pago por el " +"banco, y se cumplimentará con la cantidad exacta debida." #: ../../point_of_sale/overview/start.rst:0 msgid "Order IDs Sequence" @@ -2605,6 +2620,8 @@ msgstr "Cabecera del recibo" #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a header in the printed receipt." msgstr "" +"Un texto corto que se insertará como encabezado de página en el recibo " +"impreso." #: ../../point_of_sale/overview/start.rst:0 msgid "Receipt Footer" @@ -2613,6 +2630,7 @@ msgstr "Pie del recibo" #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a footer in the printed receipt." msgstr "" +"Un texto corto que se insertará como pie de página en el recibo impreso." #: ../../point_of_sale/overview/start.rst:0 msgid "Automatic Receipt Printing" @@ -2620,11 +2638,11 @@ msgstr "Impresión automática del recibo" #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order." -msgstr "" +msgstr "El recibo se imprimirá automáticamente al final de cada pedido." #: ../../point_of_sale/overview/start.rst:0 msgid "Skip Preview Screen" -msgstr "" +msgstr "Saltar pantalla de vista previa" #: ../../point_of_sale/overview/start.rst:0 msgid "" @@ -2640,7 +2658,7 @@ msgstr "Impresión de la cuenta" #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment." -msgstr "" +msgstr "Permitir imprimir la factura antes del pago." #: ../../point_of_sale/overview/start.rst:0 msgid "Bill Splitting" @@ -2648,7 +2666,7 @@ msgstr "Separación de la cuenta" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale." -msgstr "" +msgstr "Permite la división de la factura en el punto de venta." #: ../../point_of_sale/overview/start.rst:0 msgid "Tip Product" @@ -2656,7 +2674,7 @@ msgstr "Producto Propina" #: ../../point_of_sale/overview/start.rst:0 msgid "This product is used as reference on customer receipts." -msgstr "" +msgstr "Este producto se utiliza como referencia en los recibos del cliente." #: ../../point_of_sale/overview/start.rst:0 msgid "Invoicing" @@ -2691,6 +2709,8 @@ msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session." msgstr "" +"Indique si desea agrupar las entradas del diario por producto al cerrar una " +"sesión." #: ../../point_of_sale/overview/start.rst:100 msgid "Now you are ready to make your first steps with your point of sale." diff --git a/locale/es/LC_MESSAGES/sales.po b/locale/es/LC_MESSAGES/sales.po index 953ff9c2f..1631b66d7 100644 --- a/locale/es/LC_MESSAGES/sales.po +++ b/locale/es/LC_MESSAGES/sales.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Alejandro Die Sanchis , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -43,15 +43,10 @@ msgstr "" "de Odoo para ver ciertos documentos o información en el sistema." #: ../../sales/advanced/portal.rst:12 -msgid "" -"For Example: 1. A long term client who needs to view online quotations. 2." -" Accounting consultant who needs to keep track of the company's financials." +msgid "For Example, a long term client who needs to view online quotations." msgstr "" -"Por ejemplo: 1. Un cliente fiel que necesita ver las propuestas en linea. 2." -" Un consultor de contabilida que necesita monitorear las finanzas de la " -"compañia." -#: ../../sales/advanced/portal.rst:16 +#: ../../sales/advanced/portal.rst:14 msgid "" "A portal user has only read/view access. He or she will not be able to edit " "any document in the system." @@ -59,15 +54,15 @@ msgstr "" "Un usuario de portal solo tiene acceso de lectura. No podra editar nigun " "documento en el sistema." -#: ../../sales/advanced/portal.rst:20 +#: ../../sales/advanced/portal.rst:18 msgid "How to give portal access to customers?" msgstr "¿Como otorgar acceso el portal para clientes?" -#: ../../sales/advanced/portal.rst:23 +#: ../../sales/advanced/portal.rst:21 msgid "From Contacts Module" msgstr "Desde el módulo de contactos" -#: ../../sales/advanced/portal.rst:25 +#: ../../sales/advanced/portal.rst:23 msgid "" "From the main menu, select **Contacts** menu. If the contact is not yet " "created in the system, click on the create button to create new contact. " @@ -77,7 +72,7 @@ msgstr "" "creado todavia en el sistema, haga click en el botón **Crear** para crear un" " nuevo contacto. Ingrese los detalles y haga click en **Guardar**." -#: ../../sales/advanced/portal.rst:35 +#: ../../sales/advanced/portal.rst:33 msgid "" "Choose a contact, click on the **Action** menu in the top-center of the " "interface and from the drop down." @@ -86,11 +81,11 @@ msgstr "" "superior del interfaz y del drop down sellecione **Gestión de Acceso al " "Portal**." -#: ../../sales/advanced/portal.rst:38 +#: ../../sales/advanced/portal.rst:36 msgid "Select **Portal Access Management**. A pop up window appears." msgstr "Un pop up emerge." -#: ../../sales/advanced/portal.rst:43 +#: ../../sales/advanced/portal.rst:41 msgid "" "Enter the login **email ID**, check the box under **In Portal** and add the " "content to be included in the email in the text field box below. Click on " @@ -100,7 +95,7 @@ msgstr "" "agregue el contenido para ser incluido en el correo electronico en la " "casilla de texto abajo. Haga click en **Aplicar** cuando haya terminado." -#: ../../sales/advanced/portal.rst:49 +#: ../../sales/advanced/portal.rst:47 msgid "" "An email will be sent to the specified email address, indicating that the " "contact is now a portal user of the respective instance." diff --git a/locale/es/LC_MESSAGES/website.po b/locale/es/LC_MESSAGES/website.po index eefd8715f..e9a983996 100644 --- a/locale/es/LC_MESSAGES/website.po +++ b/locale/es/LC_MESSAGES/website.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-07 09:30+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Pablo Rojas , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -1580,83 +1580,83 @@ msgid "" "This is Odoo's job!" msgstr "" -#: ../../website/publish/domain_name.rst:42 +#: ../../website/publish/domain_name.rst:45 msgid "How to apply my domain name to my Odoo instance" msgstr "" -#: ../../website/publish/domain_name.rst:43 +#: ../../website/publish/domain_name.rst:46 msgid "" "First let's authorize the redirection (yourcompany.com -> " "yourcompany.odoo.com):" msgstr "" -#: ../../website/publish/domain_name.rst:45 +#: ../../website/publish/domain_name.rst:48 msgid "Open your Odoo.com account from your homepage." msgstr "" -#: ../../website/publish/domain_name.rst:50 +#: ../../website/publish/domain_name.rst:53 msgid "Go to the *Manage Databases* page." msgstr "" -#: ../../website/publish/domain_name.rst:55 +#: ../../website/publish/domain_name.rst:58 msgid "" "Click on *Domains* to the right of the database you would like to redirect." msgstr "" -#: ../../website/publish/domain_name.rst:60 +#: ../../website/publish/domain_name.rst:63 msgid "" "A database domain prompt will appear. Enter your custom domain (e.g. " "www.yourcompany.com)." msgstr "" -#: ../../website/publish/domain_name.rst:67 +#: ../../website/publish/domain_name.rst:70 msgid "" "We can now apply the redirection from your domain name's manager account:" msgstr "" -#: ../../website/publish/domain_name.rst:69 +#: ../../website/publish/domain_name.rst:72 msgid "Log in to your account and search for the DNS Zones management page." msgstr "" -#: ../../website/publish/domain_name.rst:71 +#: ../../website/publish/domain_name.rst:74 msgid "" "Create a CNAME record *www.yourdomain.com* pointing to *mywebsite.odoo.com*." " If you want to use the naked domain (e.g. yourdomain.com), you need to " "redirect *yourdomain.com* to *www.yourdomain.com*." msgstr "" -#: ../../website/publish/domain_name.rst:75 +#: ../../website/publish/domain_name.rst:78 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "" -#: ../../website/publish/domain_name.rst:77 +#: ../../website/publish/domain_name.rst:80 msgid "`GoDaddy `__" msgstr "" -#: ../../website/publish/domain_name.rst:78 +#: ../../website/publish/domain_name.rst:81 msgid "" "`Namecheap " "`__" msgstr "" -#: ../../website/publish/domain_name.rst:79 +#: ../../website/publish/domain_name.rst:82 msgid "" "`OVH " "`__" msgstr "" -#: ../../website/publish/domain_name.rst:82 +#: ../../website/publish/domain_name.rst:85 msgid "How to enable SSL (HTTPS) for my Odoo instance" msgstr "" -#: ../../website/publish/domain_name.rst:84 +#: ../../website/publish/domain_name.rst:87 msgid "" "To enable SSL, please use a third-party CDN service provider such as " "CloudFlare.com." msgstr "" -#: ../../website/publish/domain_name.rst:90 +#: ../../website/publish/domain_name.rst:93 msgid ":doc:`../../discuss/email_servers`" msgstr "" diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po index 6b85cfd00..844375cf9 100644 --- a/locale/fr/LC_MESSAGES/accounting.po +++ b/locale/fr/LC_MESSAGES/accounting.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: leemannd , 2017\n" +"Last-Translator: William Henrotin , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -246,7 +246,6 @@ msgstr "Enregistrez vos relevés bancaires manuellement" #: ../../accounting/bank/reconciliation/use_cases.rst:6 #: ../../accounting/others/adviser/budget.rst:6 #: ../../accounting/others/analytic/purchases_expenses.rst:6 -#: ../../accounting/others/multicurrencies.rst:3 #: ../../accounting/others/multicurrencies/exchange.rst:6 #: ../../accounting/others/multicurrencies/how_it_works.rst:6 #: ../../accounting/others/multicurrencies/invoices_payments.rst:6 @@ -833,11 +832,11 @@ msgstr "" #: ../../accounting/bank/feeds/synchronize.rst:73 #: ../../accounting/localizations/mexico.rst:501 msgid "FAQ" -msgstr "" +msgstr "FAQ" #: ../../accounting/bank/feeds/synchronize.rst:76 msgid "The synchronization is not working in real time, is it normal?" -msgstr "" +msgstr "La synchronisation ne fonctionne pas en temps réel, est-ce normal ?" #: ../../accounting/bank/feeds/synchronize.rst:78 msgid "" @@ -847,12 +846,19 @@ msgid "" "there is a cron that is running every 4 hours to fetch the information from " "Yodlee." msgstr "" +"Yodlee tente de récupérer les données d'un compte bancaire une fois par " +"jour. Cependant, cela ne se passe pas toujours au même moment. Et le " +"processus peut parfois échouer, Yodlee réessaye alors une heure ou deux plus" +" tard. C'est pourquoi il existe un cron dans Odoo s'exécutant toutes les 4 " +"heures pour récupérer les information de Yodlee" #: ../../accounting/bank/feeds/synchronize.rst:83 msgid "" "You can however force this synchronization by clicking on the button " "\"Synchronize now\" from the accounting dashboard." msgstr "" +"Vous pouvez cependant forcer la synchronisation en cliquant sur le bouton " +"\"Synchroniser maintenant\" depuis le tableau de bord de comptabilité" #: ../../accounting/bank/feeds/synchronize.rst:86 msgid "" @@ -861,6 +867,10 @@ msgid "" " status \"pending\" and not the status \"posted\". In that case, Yodlee " "won't import it, you will have to wait that the status changes." msgstr "" +"De plus, une transaction peut être visible sur votre compte en banque mais " +"pas récupérée par Yodlee. En effet, cette transaction peut être sous statut " +"\"Attente\" et non sous status \"Lettré\". Dans ce cas, Yodlee ne " +"l'importera pas, vous devrez attendre le changement de statut" #: ../../accounting/bank/feeds/synchronize.rst:91 msgid "" @@ -868,10 +878,13 @@ msgid "" "transactions in real time. This is a service to facilitate the import of the" " bank statement in the database." msgstr "" +"Il est important de rappeler que Yodlee n'est pas un service de récupération" +" de transaction en temps réel. Il s'agit d'un service facilitant " +"l'importation de relevés bancaire dans la base de données" #: ../../accounting/bank/feeds/synchronize.rst:95 msgid "Is the Yodlee feature included in my contract?" -msgstr "" +msgstr "La fonctionnalité Yodlee est-elle incluse à mon contrat" #: ../../accounting/bank/feeds/synchronize.rst:97 msgid "" @@ -1397,7 +1410,6 @@ msgstr "" #: ../../accounting/bank/reconciliation.rst:3 #: ../../accounting/others/reporting/main_reports.rst:153 #: ../../accounting/overview/main_concepts/memento.rst:177 -#: ../../accounting/overview/main_concepts/terminologies.rst:19 msgid "Bank Reconciliation" msgstr "Lettrage bancaire" @@ -2088,7 +2100,7 @@ msgstr "Sélectionner 'General' pour le journal des opérations divers." #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Use in Point of Sale" -msgstr "" +msgstr "Utiliser dans le point de vente" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" @@ -2922,6 +2934,7 @@ msgid "Balance Sheet" msgstr "Bilan" #: ../../accounting/localizations/germany.rst:24 +#: ../../accounting/localizations/nederlands.rst:19 msgid "Profit & Loss" msgstr "" @@ -3807,6 +3820,41 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/nederlands.rst:2 +msgid "Netherlands" +msgstr "Pays-Bas" + +#: ../../accounting/localizations/nederlands.rst:5 +msgid "XAF Export" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:7 +msgid "" +"With the Dutch accounting localization installed, you will be able to export" +" all your accounting entries in XAF format. For this, you have to go in " +":menuselection:`Accounting --> Reporting --> General Ledger`, you define the" +" entries you want to export using the filters (period, journals, ...) and " +"then you click on the button **EXPORT (XAF)**." +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:14 +msgid "Dutch Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:16 +msgid "" +"If you install the Dutch accounting localization, you will have access to " +"some reports that are specific to the Netherlands such as :" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:21 +msgid "Tax Report (Aangifte omzetbelasting)" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:23 +msgid "Intrastat Report (ICP)" +msgstr "" + #: ../../accounting/localizations/spain.rst:3 msgid "Spain" msgstr "Espagne" @@ -6327,7 +6375,6 @@ msgid "Prepayments" msgstr "Prépaiements" #: ../../accounting/others/configuration/account_type.rst:39 -#: ../../accounting/overview/main_concepts/terminologies.rst:77 msgid "Fixed Assets" msgstr "Immobilisations" @@ -6940,6 +6987,10 @@ msgstr "" "utilisé pour enregistrer la différence entre le coût moyen et le prix " "d'achat initial." +#: ../../accounting/others/multicurrencies.rst:3 +msgid "Multicurrency" +msgstr "" + #: ../../accounting/others/multicurrencies/exchange.rst:3 msgid "Record exchange rates at payments" msgstr "Enregistrer les taux de change des paiements" @@ -9699,7 +9750,6 @@ msgstr "Compte bancaire : défini sur le journal de banque lié" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/overview/main_concepts/terminologies.rst:26 msgid "Reconciliation" msgstr "Lettrage" @@ -10008,209 +10058,6 @@ msgstr "Relevé bancaire" msgid "Statement XYZ" msgstr "Relevé XYZ" -#: ../../accounting/overview/main_concepts/terminologies.rst:3 -msgid "Accounting Terminologies" -msgstr "Termes Comptables" - -#: ../../accounting/overview/main_concepts/terminologies.rst:6 -msgid "Journal" -msgstr "Journal" - -#: ../../accounting/overview/main_concepts/terminologies.rst:9 -msgid "" -"A journal is like a folder in which you record all transactions of the same " -"type: all the statements of a bank account, all customer invoices, all " -"supplier bills. It's used to organize similar transactions together." -msgstr "" -"Un journal est comme un dossier dans lequel vous enregistrez toutes les " -"transactions d'un même type : tous les relevés d'un compte bancaire, toutes " -"les factures d'un clients, toutes les factures d'un fournisseur. Il est " -"utilisé pour organiser des opérations similaires." - -#: ../../accounting/overview/main_concepts/terminologies.rst:13 -msgid "Payment Terms" -msgstr "Conditions de règlement" - -#: ../../accounting/overview/main_concepts/terminologies.rst:16 -msgid "" -"Payment terms describe how and when a customer invoice (or supplier bill) " -"should be paid over the time. Example: 30% direct payment, balance due in " -"two months." -msgstr "" -"Les conditionsde paiement décrivent quand et comment une facture client (ou " -"facture fournisseur) doit être payée dans le temps. Exemple : 30% à la " -"commande, le solde sous deux mois." - -#: ../../accounting/overview/main_concepts/terminologies.rst:22 -msgid "" -"Bank reconciliation is the process of matching transactions from your bank " -"records with existing journal items or creating new journal items on the " -"fly. It is a process of verification to ensure that your bank and your " -"records in Odoo say the same thing." -msgstr "" -"Le rapprochement bancaire est le processus d'appariement des transactions de" -" vos relevés bancaires avec les écritures existantes dans des journaux, ou " -"par la création de nouvelles écritures à la volée. C'est un processus qui " -"vérifie que votre banque et vos écritures dans Odoo disent la même chose." - -#: ../../accounting/overview/main_concepts/terminologies.rst:29 -msgid "" -"Journal items reconciliation is the process of linking several journal items" -" together like an invoice and a payment. This allows you to mark invoices as" -" paid. It is also useful when comparing values of 'goods received not " -"invoiced' and 'goods shipped not billed' accounts." -msgstr "" -"Le rapprochement des écritures est le processus d'appariement de plusieurs " -"écritures ensemble, comme une facture et un paiement. Cela vous permet de " -"marquer les factures comme payées. C'est également utile lorsque l'on " -"compare les valeurs des comptes de «marchandises reçues non facturées» et " -"«marchandises expédiées non facturées»." - -#: ../../accounting/overview/main_concepts/terminologies.rst:33 -msgid "Deposit Ticket" -msgstr "Billet de dépôt" - -#: ../../accounting/overview/main_concepts/terminologies.rst:36 -msgid "" -"Deposit tickets group several payment orders (usually checks) that are " -"deposited together at the bank at the same time. This allows an easy " -"reconciliation with the bank statement line if the line has one line per " -"deposit." -msgstr "" -"Les billets de dépôt regroupent plusieurs ordres de paiement (en général des" -" chèques) qui sont déposés ensemble à la banque. Ils facilitent le " -"rapprochement avec la ligne de relevé bancaire si elle n'indique qu'un seul " -"montant par dépôt." - -#: ../../accounting/overview/main_concepts/terminologies.rst:40 -msgid "Journal Entry" -msgstr "Écriture du journal" - -#: ../../accounting/overview/main_concepts/terminologies.rst:43 -msgid "" -"A journal entry is an accounting transaction, usually related to a financial" -" document: invoice, payment, receipt, etc. A journal entry always consists " -"of at least two lines, described here as journal items, which credit or " -"debit specific accounts. The sum of the credits of all journal items of a " -"journal entry must be equal to the sum of their debits for the entry to be " -"valid." -msgstr "" -"Une pièce comptable est une opération comptable, généralement liée à un " -"document financier : la facture, le paiement, la réception, etc. Une pièce " -"comptable est toujours composé d'au moins deux lignes, décrites ici comme " -"des écritures, qui créditent ou débitent des comptes spécifiques. La somme " -"des crédits de toutes les écritures d'une pièce comptable doit être égale à " -"la somme des débits pour que la pièce soit valide." - -#: ../../accounting/overview/main_concepts/terminologies.rst:50 -msgid "Journal Item" -msgstr "Écriture comptable" - -#: ../../accounting/overview/main_concepts/terminologies.rst:53 -msgid "" -"A line of a journal entry, with a monetary debit or credit associated with a" -" specific account." -msgstr "" -"Une ligne d'une écriture, avec un débit ou un crédit monétaire associé à un " -"compte spécifique." - -#: ../../accounting/overview/main_concepts/terminologies.rst:55 -msgid "Analytic Accounts" -msgstr "Comptes analytiques" - -#: ../../accounting/overview/main_concepts/terminologies.rst:58 -msgid "" -"Sometimes called **Cost Accounts**, are accounts that are not part of the " -"chart of accounts and that allow you to track costs and revenues. Analytic " -"accounts are usually grouped by projects, departments, etc. for analysis of " -"a company's expenditures. Every journal item is posted in a regular account " -"in the chart of account and can be posted to an analytic account for the " -"purpose of reporting or analysis." -msgstr "" -"Parfois appelé **Comptes de coûts**, ce sont des comptes qui ne font pas " -"partie du plan comptable et qui permettent de suivre les coûts et les " -"revenus. Les comptes analytiques sont généralement regroupés par projets, " -"par départements, etc..., pour l'analyse des dépenses d'une entreprise. " -"Chaque écriture est consignée dans un compte du plan comptable et peut être " -"affectée à un compte analytique à des fins de reporting ou d'analyse." - -#: ../../accounting/overview/main_concepts/terminologies.rst:65 -msgid "Analytic Entries" -msgstr "Écritures analytiques" - -#: ../../accounting/overview/main_concepts/terminologies.rst:68 -msgid "" -"Costs or revenues posted to analytic accounts, usually related to journal " -"entries." -msgstr "" -"Les coûts ou les revenus affectés à des comptes analytiques, généralement " -"liés à des pièces comptables." - -#: ../../accounting/overview/main_concepts/terminologies.rst:70 -msgid "Sales Receipt" -msgstr "Reçu de ventes" - -#: ../../accounting/overview/main_concepts/terminologies.rst:73 -msgid "" -"A receipt or other slip of paper issued by a store or other vendor " -"describing the details of a purchase (amount, date, department, etc.). Sales" -" receipt are usually used instead of invoices if the sale is paid in cash in" -" a store." -msgstr "" -"Un reçu ou un ticket en papier émis par un magasin ou un fournisseur " -"décrivant les détails d'un achat (montant, date, département, etc.). Les " -"tickets de caisse sont généralement utilisés à la place des factures si la " -"vente est réglée en espèces dans un magasin." - -#: ../../accounting/overview/main_concepts/terminologies.rst:80 -msgid "" -"Property owned by the company, usually with a useful life greater than one " -"reporting period. Odoo Asset management is used to manage the depreciation /" -" amortization of the asset over the time. Typical examples would be capital " -"equipment, vehicles, and real estate." -msgstr "" -"Bien détenu par la société, habituellement avec une durée de vie supérieure " -"à un exercice fiscal. La gestion d'actifs d'Odoo est utilisée pour gérer la " -"dépréciation / l'amortissement des biens immobilisés au cours du temps. Des " -"exemples typiques sont les véhicules et les biens immobiliers." - -#: ../../accounting/overview/main_concepts/terminologies.rst:84 -msgid "Deferred Revenues" -msgstr "Revenus différés" - -#: ../../accounting/overview/main_concepts/terminologies.rst:87 -msgid "" -"Are used to recognize revenues for sales of services that are provided over " -"a long period of time. If you sell a 3 year maintenance contract, you can " -"use the deferred revenue mechanism to recognize 1/36 of the revenue every " -"month until the contract expires, rather than taking it all initially or at " -"the end." -msgstr "" -"Méthode utilisée pour planifier des recettes des ventes de services qui " -"seront fournis sur une longue période de temps. Si vous vendez un contrat de" -" maintenance de 3 ans, vous pouvez utiliser cette méthode pour affecter 1/36" -" des revenus tous les mois jusqu'à l'expiration du contrat, plutôt que de " -"tout facturer au début ou à la fin." - -#: ../../accounting/overview/main_concepts/terminologies.rst:93 -msgid "Fiscal Position" -msgstr "Position Fiscale" - -#: ../../accounting/overview/main_concepts/terminologies.rst:96 -msgid "" -"Define the taxes that should be applied for a specific customer/vendor or " -"invoice. Example: If some customers benefit from specific taxes (government," -" construction companies, EU companies that are VAT subjected,…), you can " -"assign a fiscal position to them and the right tax will be selected " -"according to the products they buy." -msgstr "" -"Définit les taxes qui doivent être appliqués pour un client, un fournisseur " -"ou une facture spécifique. Exemple : si certains clients bénéficient de " -"taxes spécifiques (gouvernement, entreprises de construction, les " -"entreprises de l'UE qui sont soumis à la TVA...), vous pouvez leur attribuer" -" une position fiscale, et les taxes appropriées seront choisies en fonction " -"des produits qu'ils achètent." - #: ../../accounting/overview/process_overview.rst:3 msgid "Process overview" msgstr "Vue d'ensemble du processus" diff --git a/locale/fr/LC_MESSAGES/db_management.po b/locale/fr/LC_MESSAGES/db_management.po index e89e0270a..7f28e4652 100644 --- a/locale/fr/LC_MESSAGES/db_management.po +++ b/locale/fr/LC_MESSAGES/db_management.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Xavier Belmere , 2017\n" +"Last-Translator: Lucas Deliege , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,33 +22,101 @@ msgstr "" msgid "Online Database management" msgstr "" -#: ../../db_management/db_online.rst:13 -msgid "Duplicating a database" -msgstr "" - -#: ../../db_management/db_online.rst:15 +#: ../../db_management/db_online.rst:10 msgid "" -"Database duplication, renaming, custom DNS, etc. is not available to free " -"customers of our Online platform." +"To manage your databases, access the `database management page " +"`__ (you will have to sign in). Then " +"click on the `Manage Your Databases " +"`__ button." msgstr "" -"La duplication et le renommage de bases de données, un nom DNS personnalisé," -" etc... ne sont pas accessibles aux clients gratuits de notre plate-forme en" -" ligne." #: ../../db_management/db_online.rst:18 msgid "" -"Access the `database management page `__ " -"(you will have to sign in). Next, make sure you are connected as the " -"administrator of the database you want to duplicate. After that, click on " -"the **Manage Your Databases** button." +"Make sure you are connected as the administrator of the database you want to" +" manage - many operations depends on indentifying you remotely to that " +"database." msgstr "" -"Accédez à la page de `gestion de base de données " -"`__ (vous devrez vous connecter). " -"Ensuite, assurez-vous que vous êtes connecté en tant qu'administrateur de la" -" base de données que vous souhaitez dupliquer. Après cela, cliquez sur le " -"bouton **Gérer vos bases de données**." -#: ../../db_management/db_online.rst:26 +#: ../../db_management/db_online.rst:22 +msgid "Several actions are available:" +msgstr "" + +#: ../../db_management/db_online.rst:28 +msgid "Upgrade" +msgstr "Mettre à jour" + +#: ../../db_management/db_online.rst:28 +msgid "" +"Upgrade your database to the latest Odoo version to enjoy cutting-edge " +"features" +msgstr "" + +#: ../../db_management/db_online.rst:32 +msgid ":ref:`Duplicate `" +msgstr "" + +#: ../../db_management/db_online.rst:31 +msgid "" +"Make an exact copy of your database, if you want to try out new apps or new " +"flows without compromising your daily operations" +msgstr "" + +#: ../../db_management/db_online.rst:34 +msgid "Rename" +msgstr "" + +#: ../../db_management/db_online.rst:35 +msgid "Rename your database (and its URL)" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "**Backup**" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "" +"Download an instant backup of your database; note that we back up databases " +"daily according to our Odoo Cloud SLA" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid ":ref:`Domains `" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid "Configure custom domains to access your database via another URL" +msgstr "" + +#: ../../db_management/db_online.rst:42 +msgid ":ref:`Delete `" +msgstr "" + +#: ../../db_management/db_online.rst:43 +msgid "Delete a database instantly" +msgstr "" + +#: ../../db_management/db_online.rst:47 +msgid "Contact Support" +msgstr "" + +#: ../../db_management/db_online.rst:45 +msgid "" +"Access our `support page `__ with the correct " +"database already selected" +msgstr "" + +#: ../../db_management/db_online.rst:52 +msgid "Duplicating a database" +msgstr "" + +#: ../../db_management/db_online.rst:54 +msgid "" +"Database duplication, renaming, custom DNS, etc. is not available for trial " +"databases on our Online platform. Paid Databases and \"One App Free\" " +"database can duplicate without problem." +msgstr "" + +#: ../../db_management/db_online.rst:59 msgid "" "In the line of the database you want to duplicate, you will have a few " "buttons. To duplicate your database, just click **Duplicate**. You will have" @@ -59,37 +127,37 @@ msgstr "" "cliquer sur **Dupliquer**. Vous devrez donner un nom à votre copie, puis " "cliquez sur **Dupliquer la base de données**." -#: ../../db_management/db_online.rst:36 -msgid "A duplicated database has the same behaviour as a real one:" -msgstr "Une base de données dupliquée a le même comportement que l'original :" +#: ../../db_management/db_online.rst:66 +msgid "" +"If you do not check the \"For testing purposes\" checkbox when duplicating a" +" database, all external communication will remain active:" +msgstr "" -#: ../../db_management/db_online.rst:38 +#: ../../db_management/db_online.rst:69 msgid "Emails are sent" msgstr "Les courriels sont envoyés" -#: ../../db_management/db_online.rst:40 -msgid "Payments are processed (in the e-commerce, for example)" -msgstr "Les paiements sont effectués (pour le eCommerce, par exemple)" +#: ../../db_management/db_online.rst:71 +msgid "" +"Payments are processed (in the e-commerce or Subscriptions apps, for " +"example)" +msgstr "" -#: ../../db_management/db_online.rst:42 +#: ../../db_management/db_online.rst:74 msgid "Delivery orders (shipping providers) are sent" msgstr "Les bons de livraison (fournisseurs d'expédition) sont envoyés" -#: ../../db_management/db_online.rst:44 +#: ../../db_management/db_online.rst:76 msgid "Etc." msgstr "Etc." -#: ../../db_management/db_online.rst:46 +#: ../../db_management/db_online.rst:78 msgid "" -"It is **strongly** advised to test behaviour using sample customers/products" -" (with a `disposable e-mail `__ address, for " -"example)" +"Make sure to check the checkbox \"For testing purposes\" if you want these " +"behaviours to be disabled." msgstr "" -"Il est **fortement** conseillé de tester le comportement en utilisant de " -"faux clients/articles (avec des adresses `email jetables " -"`__, par exemple)" -#: ../../db_management/db_online.rst:50 +#: ../../db_management/db_online.rst:81 msgid "" "After a few seconds, you will be logged in your duplicated database. Notice " "that the url uses the name you chose for your duplicated database." @@ -98,11 +166,57 @@ msgstr "" "données. Notez que l'URL utilise le nom que vous avez choisi lors de la " "duplication." -#: ../../db_management/db_online.rst:54 +#: ../../db_management/db_online.rst:85 msgid "Duplicate databases expire automatically after 15 days." msgstr "" "Les copies de bases de données expirent automatiquement après 15 jours." +#: ../../db_management/db_online.rst:93 +msgid "Deleting a Database" +msgstr "" + +#: ../../db_management/db_online.rst:95 +msgid "You can only delete databases of which you are the administrator." +msgstr "" + +#: ../../db_management/db_online.rst:97 +msgid "" +"When you delete your database all the data will be permanently lost. The " +"deletion is instant and for all the Users. We advise you to do an instant " +"backup of your database before deleting it, since the last automated daily " +"backup may be several hours old at that point." +msgstr "" + +#: ../../db_management/db_online.rst:103 +msgid "" +"From the `database management page `__, " +"on the line of the database you want to delete, click on the \"Delete\" " +"button." +msgstr "" + +#: ../../db_management/db_online.rst:110 +msgid "" +"Read carefully the warning message that will appear and proceed only if you " +"fully understand the implications of deleting a database:" +msgstr "" + +#: ../../db_management/db_online.rst:116 +msgid "" +"After a few seconds, the database will be deleted and the page will reload " +"automatically." +msgstr "" + +#: ../../db_management/db_online.rst:120 +msgid "" +"If you need to re-use this database name, it will be immediately available." +msgstr "" + +#: ../../db_management/db_online.rst:122 +msgid "" +"If you want to delete your Account, please contact `Odoo Support " +"`__" +msgstr "" + #: ../../db_management/db_premise.rst:7 msgid "On-premise Database management" msgstr "" diff --git a/locale/fr/LC_MESSAGES/discuss.po b/locale/fr/LC_MESSAGES/discuss.po index 12b378381..0335c970a 100644 --- a/locale/fr/LC_MESSAGES/discuss.po +++ b/locale/fr/LC_MESSAGES/discuss.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Lenoir , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -450,6 +450,57 @@ msgstr "" "de réunion, et plus encore dans une interface simple et facilement " "consultable." +#: ../../discuss/plan_activities.rst:3 +msgid "Get organized by planning activities" +msgstr "" + +#: ../../discuss/plan_activities.rst:5 +msgid "" +"Planning activities is the perfect way to keep on track with your work. Get " +"reminded of what needs to be done and schedule the next activities to " +"undertake." +msgstr "" + +#: ../../discuss/plan_activities.rst:9 +msgid "" +"Your activities are available wherever you are in Odoo. It is easy to manage" +" your priorities." +msgstr "" + +#: ../../discuss/plan_activities.rst:15 +msgid "" +"Activities can be planned and managed from the chatters or in the kanban " +"views. Here is an example for opportunities :" +msgstr "" + +#: ../../discuss/plan_activities.rst:22 +msgid "Set your activity types" +msgstr "" + +#: ../../discuss/plan_activities.rst:24 +msgid "" +"A number of generic activities types are available by default in Odoo (e.g. " +"call, email, meeting, etc.). If you would like to set new ones, go to " +":menuselection:`Settings --> General settings --> Activity types`." +msgstr "" + +#: ../../discuss/plan_activities.rst:29 +msgid "Schedule meetings" +msgstr "" + +#: ../../discuss/plan_activities.rst:31 +msgid "" +"Activities are planned for specific days. If you need to set hours, go with " +"the *Meeting* activity type. When scheduling one, the calendar will simply " +"open to let you select a time slot." +msgstr "" + +#: ../../discuss/plan_activities.rst:36 +msgid "" +"If you need to use other activity types with a calendar planning, make sure " +"their *Category* is set as *Meeting*." +msgstr "" + #: ../../discuss/team_communication.rst:3 msgid "How to efficiently communicate in team using channels" msgstr "" diff --git a/locale/fr/LC_MESSAGES/ecommerce.po b/locale/fr/LC_MESSAGES/ecommerce.po index 47a0b6600..bd1a34295 100644 --- a/locale/fr/LC_MESSAGES/ecommerce.po +++ b/locale/fr/LC_MESSAGES/ecommerce.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-10 09:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Hamid Darabi , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -662,7 +662,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:3 msgid "How to get paid with Authorize.Net" -msgstr "" +msgstr "Comment se faire payer avec Authorize.Net" #: ../../ecommerce/shopper_experience/authorize.rst:5 msgid "" @@ -830,7 +830,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:28 msgid "Ingenico" -msgstr "" +msgstr "Ingenico" #: ../../ecommerce/shopper_experience/payment.rst:29 msgid "Authorize.net" @@ -846,7 +846,7 @@ msgstr "Buckaroo" #: ../../ecommerce/shopper_experience/payment.rst:32 msgid "PayUmoney" -msgstr "" +msgstr "PayUmoney" #: ../../ecommerce/shopper_experience/payment.rst:33 msgid "Sips" @@ -854,7 +854,7 @@ msgstr "Sips" #: ../../ecommerce/shopper_experience/payment.rst:34 msgid "Stripe" -msgstr "" +msgstr "Stripe" #: ../../ecommerce/shopper_experience/payment.rst:38 msgid "How to go live" diff --git a/locale/fr/LC_MESSAGES/helpdesk.po b/locale/fr/LC_MESSAGES/helpdesk.po index cff374908..7094370fc 100644 --- a/locale/fr/LC_MESSAGES/helpdesk.po +++ b/locale/fr/LC_MESSAGES/helpdesk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: William Henrotin , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -18,36 +18,40 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../../helpdesk/helpdesk.rst:5 +#: ../../helpdesk.rst:5 msgid "Helpdesk" msgstr "Assistance" -#: ../../helpdesk/helpdesk.rst:8 +#: ../../helpdesk/getting_started.rst:3 +msgid "Get started with Odoo Helpdesk" +msgstr "" + +#: ../../helpdesk/getting_started.rst:6 msgid "Overview" msgstr "Vue d'ensemble" -#: ../../helpdesk/helpdesk.rst:11 +#: ../../helpdesk/getting_started.rst:9 msgid "Getting started with Odoo Helpdesk" msgstr "" -#: ../../helpdesk/helpdesk.rst:13 +#: ../../helpdesk/getting_started.rst:11 msgid "Installing Odoo Helpdesk:" msgstr "Installation d'Odoo Assistance" -#: ../../helpdesk/helpdesk.rst:15 +#: ../../helpdesk/getting_started.rst:13 msgid "Open the Apps module, search for \"Helpdesk\", and click install" msgstr "" -#: ../../helpdesk/helpdesk.rst:21 +#: ../../helpdesk/getting_started.rst:19 msgid "Set up Helpdesk teams" msgstr "Mise en place des équipes d'Assistance" -#: ../../helpdesk/helpdesk.rst:23 +#: ../../helpdesk/getting_started.rst:21 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\"" msgstr "" "Par défaut, Odoo Assistance est accompagné d'une équipe appelée \"Support\"" -#: ../../helpdesk/helpdesk.rst:28 +#: ../../helpdesk/getting_started.rst:26 msgid "" "To modify this team, or create additional teams, select \"Configuration\" in" " the purple bar and select \"Settings\"" @@ -55,7 +59,7 @@ msgstr "" "Pour modifier cette équipe, ou en ajouter d'autres. Sélectionnez " "\"Configuration\" dans la bar mauve puis \"Paramètres\"." -#: ../../helpdesk/helpdesk.rst:34 +#: ../../helpdesk/getting_started.rst:32 msgid "" "Here you can create new teams, decide what team members to add to this team," " how your customers can submit tickets and set up SLA policies and ratings. " @@ -67,18 +71,18 @@ msgstr "" "en place les politiques d'accord de niveau de service. Les tickets sont " "assignés de manière aléatoire, équilibrée ou manuelle. " -#: ../../helpdesk/helpdesk.rst:40 +#: ../../helpdesk/getting_started.rst:38 msgid "How to set up different stages for each team" msgstr "Comment mettre en place différentes étapes pour chaque équipe" -#: ../../helpdesk/helpdesk.rst:42 +#: ../../helpdesk/getting_started.rst:40 msgid "" "First you will need to activate the developer mode. To do this go to your " "settings module, and select the link for \"Activate the developer mode\" on " "the lower right-hand side." msgstr "" -#: ../../helpdesk/helpdesk.rst:49 +#: ../../helpdesk/getting_started.rst:47 msgid "" "Now, when you return to your Helpdesk module and select \"Configuration\" in" " the purple bar you will find additional options, like \"Stages\". Here you " @@ -86,52 +90,52 @@ msgid "" "allowing for customizable stages for each team!" msgstr "" -#: ../../helpdesk/helpdesk.rst:55 +#: ../../helpdesk/getting_started.rst:53 msgid "Start receiving tickets" msgstr "" -#: ../../helpdesk/helpdesk.rst:58 +#: ../../helpdesk/getting_started.rst:56 msgid "How can my customers submit tickets?" msgstr "" -#: ../../helpdesk/helpdesk.rst:60 +#: ../../helpdesk/getting_started.rst:58 msgid "" "Select \"Configuration\" in the purple bar and select \"Settings\", select " "your Helpdesk team. Under \"Channels you will find 4 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:66 +#: ../../helpdesk/getting_started.rst:64 msgid "" "Email Alias allows for customers to email the alias you choose to create a " "ticket. The subject line of the email with become the Subject on the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:73 +#: ../../helpdesk/getting_started.rst:71 msgid "" "Website Form allows your customer to go to " "yourwebsite.com/helpdesk/support-1/submit and submit a ticket via a website " "form - much like odoo.com/help!" msgstr "" -#: ../../helpdesk/helpdesk.rst:80 +#: ../../helpdesk/getting_started.rst:78 msgid "" "Live Chat allows your customers to submit a ticket via Live Chat on your " "website. Your customer will begin the live chat and your Live Chat Operator " "can create the ticket by using the command /helpdesk Subject of Ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:88 +#: ../../helpdesk/getting_started.rst:86 msgid "" "The final option to submit tickets is thru an API connection. View the " "documentation `*here* " "`__." msgstr "" -#: ../../helpdesk/helpdesk.rst:93 +#: ../../helpdesk/getting_started.rst:91 msgid "Tickets have been created, now what?" msgstr "" -#: ../../helpdesk/helpdesk.rst:95 +#: ../../helpdesk/getting_started.rst:93 msgid "" "Now your employees can start working on them! If you have selecting a manual" " assignation method then your employees will need to assign themselves to " @@ -139,106 +143,259 @@ msgid "" "adding themselves to the \"Assigned to\" field." msgstr "" -#: ../../helpdesk/helpdesk.rst:103 +#: ../../helpdesk/getting_started.rst:101 msgid "" "If you have selected \"Random\" or \"Balanced\" assignation method, your " "tickets will be assigned to a member of that Helpdesk team." msgstr "" -#: ../../helpdesk/helpdesk.rst:106 +#: ../../helpdesk/getting_started.rst:104 msgid "" "From there they will begin working on resolving the tickets! When they are " "completed, they will move the ticket to the solved stage." msgstr "" -#: ../../helpdesk/helpdesk.rst:110 +#: ../../helpdesk/getting_started.rst:108 msgid "How do I mark this ticket as urgent?" msgstr "" -#: ../../helpdesk/helpdesk.rst:112 +#: ../../helpdesk/getting_started.rst:110 msgid "" "On your tickets you will see stars. You can determine how urgent a ticket is" " but selecting one or more stars on the ticket. You can do this in the " "Kanban view or on the ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:119 +#: ../../helpdesk/getting_started.rst:117 msgid "" "To set up a Service Level Agreement Policy for your employees, first " "activate the setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:125 +#: ../../helpdesk/getting_started.rst:123 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"." msgstr "" -#: ../../helpdesk/helpdesk.rst:127 +#: ../../helpdesk/getting_started.rst:125 msgid "" "You will fill in information like the Helpdesk team, what the minimum " "priority is on the ticket (the stars) and the targets for the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:134 +#: ../../helpdesk/getting_started.rst:132 msgid "What if a ticket is blocked or is ready to be worked on?" msgstr "" -#: ../../helpdesk/helpdesk.rst:136 +#: ../../helpdesk/getting_started.rst:134 msgid "" "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban " "State\" on the ticket. You have 3 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:139 +#: ../../helpdesk/getting_started.rst:137 msgid "Grey - Normal State" msgstr "" -#: ../../helpdesk/helpdesk.rst:141 +#: ../../helpdesk/getting_started.rst:139 msgid "Red - Blocked" msgstr "" -#: ../../helpdesk/helpdesk.rst:143 +#: ../../helpdesk/getting_started.rst:141 msgid "Green - Ready for next stage" msgstr "" -#: ../../helpdesk/helpdesk.rst:145 +#: ../../helpdesk/getting_started.rst:143 msgid "" "Like the urgency stars you can adjust the state in the Kanban or on the " "Ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:152 +#: ../../helpdesk/getting_started.rst:150 msgid "How can my employees log time against a ticket?" msgstr "" -#: ../../helpdesk/helpdesk.rst:154 +#: ../../helpdesk/getting_started.rst:152 msgid "" "First, head over to \"Settings\" and select the option for \"Timesheet on " "Ticket\". You will see a field appear where you can select the project the " "timesheets will log against." msgstr "" -#: ../../helpdesk/helpdesk.rst:161 +#: ../../helpdesk/getting_started.rst:159 msgid "" "Now that you have selected a project, you can save. If you move back to your" " tickets, you will see a new tab called \"Timesheets\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:167 +#: ../../helpdesk/getting_started.rst:165 msgid "" "Here you employees can add a line to add work they have done for this " "ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:171 +#: ../../helpdesk/getting_started.rst:169 msgid "How to allow your customers to rate the service they received" msgstr "" -#: ../../helpdesk/helpdesk.rst:173 +#: ../../helpdesk/getting_started.rst:171 msgid "First, you will need to activate the ratings setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:178 +#: ../../helpdesk/getting_started.rst:176 msgid "" "Now, when a ticket is moved to its solved or completed stage, it will send " "an email to the customer asking how their service went." msgstr "" + +#: ../../helpdesk/invoice_time.rst:3 +msgid "Record and invoice time for tickets" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:5 +msgid "" +"You may have service contracts with your clients to provide them assistance " +"in case of a problem. For this purpose, Odoo will help you record the time " +"spent fixing the issue and most importantly, to invoice it to your clients." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:11 +msgid "The modules needed" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:13 +msgid "" +"In order to record and invoice time for tickets, the following modules are " +"needed : Helpdesk, Project, Timesheets, Sales. If you are missing one of " +"them, go to the Apps module, search for it and then click on *Install*." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:19 +msgid "Get started to offer the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:22 +msgid "Step 1 : start a helpdesk project" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:24 +msgid "" +"To start a dedicated project for the helpdesk service, first go to " +":menuselection:`Project --> Configuration --> Settings` and make sure that " +"the *Timesheets* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:31 +msgid "" +"Then, go to your dashboard, create the new project and allow timesheets for " +"it." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:35 +msgid "Step 2 : gather a helpdesk team" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:37 +msgid "" +"To set a team in charge of the helpdesk, go to :menuselection:`Helpdesk --> " +"Configuration --> Helpdesk Teams` and create a new team or select an " +"existing one. On the form, tick the box in front of *Timesheet on Ticket* to" +" activate the feature. Make sure to select the helpdesk project you have " +"previously created as well." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:47 +msgid "Step 3 : launch the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:49 +msgid "" +"Finally, to launch the new helpdesk service, first go to " +":menuselection:`Sales --> Configuration --> Settings` and make sure that the" +" *Units of Measure* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:56 +msgid "" +"Then, go to :menuselection:`Products --> Products` and create a new one. " +"Make sure that the product is set as a service." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:63 +msgid "" +"Here, we suggest that you set the *Unit of Measure* as *Hour(s)*, but any " +"unit will do." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:66 +msgid "" +"Finally, select the invoicing management you would like to have under the " +"*Sales* tab of the product form. Here, we recommend the following " +"configuration :" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:73 +msgid "Now, you are ready to start receiving tickets !" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:76 +msgid "Solve issues and record time spent" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:79 +msgid "Step 1 : place an order" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:81 +msgid "" +"You are now in the Helpdesk module and you have just received a ticket from " +"a client. To place a new order, go to :menuselection:`Sales --> Orders --> " +"Orders` and create one for the help desk service product you have previously" +" recorded. Set the number of hours needed to assist the client and confirm " +"the sale." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:91 +msgid "Step 2 : link the task to the ticket" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:93 +msgid "" +"If you access the dedicated helpdesk project, you will notice that a new " +"task has automatically been generated with the order. To link this task with" +" the client ticket, go to the Helpdesk module, access the ticket in question" +" and select the task on its form." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:102 +msgid "Step 3 : record the time spent to help the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:104 +msgid "" +"The job is done and the client's issue is sorted out. To record the hours " +"performed for this task, go back to the ticket form and add them under the " +"*Timesheets* tab." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:112 +msgid "" +"The hours recorded on the ticket will also automatically appear in the " +"Timesheet module and on the dedicated task." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:116 +msgid "Step 4 : invoice the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:118 +msgid "" +"To invoice the client, go back to the Sales module and select the order that" +" had been placed. Notice that the hours recorded on the ticket form now " +"appear as the delivered quantity." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:125 +msgid "" +"All that is left to do, is to create the invoice from the order and then " +"validate it. Now you just have to wait for the client's payment !" +msgstr "" diff --git a/locale/fr/LC_MESSAGES/livechat.po b/locale/fr/LC_MESSAGES/livechat.po new file mode 100644 index 000000000..35555d327 --- /dev/null +++ b/locale/fr/LC_MESSAGES/livechat.po @@ -0,0 +1,206 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2015-TODAY, Odoo S.A. +# This file is distributed under the same license as the Odoo Business package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Odoo Business 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: William Henrotin , 2018\n" +"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../../livechat/livechat.rst:5 +msgid "Live Chat" +msgstr "Discussion instantanée" + +#: ../../livechat/livechat.rst:8 +msgid "Chat in live with website visitors" +msgstr "Discutez en direct avec les visiteurs du site web" + +#: ../../livechat/livechat.rst:10 +msgid "" +"With Odoo Live Chat, you can establish a direct contact with your website " +"visitors. A simple dialog box will be available on their screen and will " +"allow them to get in touch with one of your sales representatives. This way," +" you can easily turn prospects into potential business opportunities. You " +"will also be able to provide assistance to your customers. Overall, this is " +"the perfect tool to improve customer satisfaction." +msgstr "" +"Avec Odoo Discussion instantanée, vous pouvez établir un contact direct avec" +" les visiteur de votre site web. Une simple boite de dialogue sera " +"disponible sur leur écran et leur permettra de discuter av,ec un de vos " +"représentant commercial. de cette manière, vous pouvez facilement " +"transformer un intérêt en une potentielle opportunité. Vous serez aussi " +"capable d'apporter une aide à vos clients. En résumé, il s'agit du parfait " +"outil pour améliorer la satisfaction de votre clientèle" + +#: ../../livechat/livechat.rst:19 +msgid "Configuration" +msgstr "Configuration" + +#: ../../livechat/livechat.rst:21 +msgid "" +"To get the Live Chat feature, open the Apps module, search for \"Live Chat\"" +" and then click on install." +msgstr "" +"Pour avoir la fonctionnalité Discussion Instantanée, ouvrez le module " +"Applications, cherchez \"Discussion Instantanée\" et cliquer sur installer." + +#: ../../livechat/livechat.rst:27 +msgid "" +"The Live Chat module provides you a direct access to your channels. There, " +"operators can easily join and leave the chat." +msgstr "" +"Le module Discussion Instantanée vous donne un accès direct au canaux de " +"discussion, Là, les opérateurs peuvent facilement rejoindre et quitter les " +"discussions." + +#: ../../livechat/livechat.rst:34 +msgid "Add the live chat to an Odoo website" +msgstr "Ajouter les discussions instantanées au site web Odoo" + +#: ../../livechat/livechat.rst:36 +msgid "" +"If your website was created with Odoo, then the live chat is automatically " +"added to it. All that is left to do, is to go to :menuselection:`Website -->" +" Configuration --> Settings` to select the channel to be linked to the " +"website." +msgstr "" + +#: ../../livechat/livechat.rst:45 +msgid "Add the live chat to an external website" +msgstr "" + +#: ../../livechat/livechat.rst:47 +msgid "" +"If your website was not created with Odoo, go to the Live Chat module and " +"then select the channel to be linked. There, you can simply copy paste the " +"code available into your website. A specific url you can send to customers " +"or suppliers for them to access the live chat is also provided." +msgstr "" + +#: ../../livechat/livechat.rst:54 +msgid "Hide / display the live chat according to rules" +msgstr "" + +#: ../../livechat/livechat.rst:56 +msgid "" +"Rules for the live chat can be defined on the channel form. For instance, " +"you can choose to display the chat in the countries you speak the language " +"of. On the contrary, you are able to hide the chat in countries your company" +" does not sell in. If you select *Auto popup*, you can also set the length " +"of time it takes for the chat to appear." +msgstr "" + +#: ../../livechat/livechat.rst:66 +msgid "Prepare automatic messages" +msgstr "" + +#: ../../livechat/livechat.rst:68 +msgid "" +"On the channel form, in the *Options* section, several messages can be typed" +" to appear automatically on the chat. This will entice visitors to reach you" +" through the live chat." +msgstr "" + +#: ../../livechat/livechat.rst:76 +msgid "Start chatting with customers" +msgstr "" + +#: ../../livechat/livechat.rst:78 +msgid "" +"In order to start chatting with customers, first make sure that the channel " +"is published on your website. To do so, select *Unpublished on Website* on " +"the top right corner of the channel form to toggle the *Published* setting. " +"Then, the live chat can begin once an operator has joined the channel." +msgstr "" + +#: ../../livechat/livechat.rst:88 +msgid "" +"If no operator is available and/or if the channel is unpublished on the " +"website, then the live chat button will not appear to visitors." +msgstr "" + +#: ../../livechat/livechat.rst:92 +msgid "" +"In practice, the conversations initiated by the visitors will appear in the " +"Discuss module and will also pop up as a direct message. Therefore, " +"inquiries can be answered wherever you are in Odoo." +msgstr "" + +#: ../../livechat/livechat.rst:96 +msgid "" +"If there several operators in charge of a channel, the system will dispatch " +"sessions randomly between them." +msgstr "" + +#: ../../livechat/livechat.rst:100 +msgid "Use commands" +msgstr "" + +#: ../../livechat/livechat.rst:102 +msgid "" +"Commands are useful shortcuts for completing certain actions or to access " +"information you might need. To use this feature, simply type the commands " +"into the chat. The following actions are available :" +msgstr "" + +#: ../../livechat/livechat.rst:106 +msgid "**/help** : show a helper message." +msgstr "" + +#: ../../livechat/livechat.rst:108 +msgid "**/helpdesk** : create a helpdesk ticket." +msgstr "" + +#: ../../livechat/livechat.rst:110 +msgid "**/helpdesk\\_search** : search for a helpdesk ticket." +msgstr "" + +#: ../../livechat/livechat.rst:112 +msgid "**/history** : see 15 last visited pages." +msgstr "" + +#: ../../livechat/livechat.rst:114 +msgid "**/lead** : create a new lead." +msgstr "" + +#: ../../livechat/livechat.rst:116 +msgid "**/leave** : leave the channel." +msgstr "" + +#: ../../livechat/livechat.rst:119 +msgid "" +"If a helpdesk ticket is created from the chat, then the conversation it was " +"generated from will automatically appear as the description of the ticket. " +"The same goes for the creation of a lead." +msgstr "" + +#: ../../livechat/livechat.rst:124 +msgid "Send canned responses" +msgstr "" + +#: ../../livechat/livechat.rst:126 +msgid "" +"Canned responses allow you to create substitutes to generic sentences you " +"frequently use. Typing a word instead of several will save you a lot of " +"time. To add canned responses, go to :menuselection:`LIVE CHAT --> " +"Configuration --> Canned Responses` and create as many as you need to. Then," +" to use them during a chat, simply type \":\" followed by the shortcut you " +"assigned." +msgstr "" + +#: ../../livechat/livechat.rst:136 +msgid "" +"You now have all of the tools needed to chat in live with your website " +"visitors, enjoy !" +msgstr "" diff --git a/locale/fr/LC_MESSAGES/point_of_sale.po b/locale/fr/LC_MESSAGES/point_of_sale.po index 12b190c52..3616c4926 100644 --- a/locale/fr/LC_MESSAGES/point_of_sale.po +++ b/locale/fr/LC_MESSAGES/point_of_sale.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Hubert TETARD , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -938,7 +938,7 @@ msgid "POSBox Setup Guide" msgstr "Manuel de Configuration de la POSBox" #: ../../point_of_sale/overview/setup.rst:11 -#: ../../point_of_sale/overview/setup.rst:206 +#: ../../point_of_sale/overview/setup.rst:205 msgid "Prerequisites" msgstr "Pré-requis" @@ -971,28 +971,28 @@ msgid "A local network set up with DHCP (this is the default setting)" msgstr "Un réseau local configuré avec DHCP (c'est le réglage par défaut)" #: ../../point_of_sale/overview/setup.rst:21 -msgid "An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter" -msgstr "Un câble Ethernet RJ45 ou un adaptateur Wi-Fi compatible Linux" - -#: ../../point_of_sale/overview/setup.rst:22 msgid "" "An Epson USB TM-T20 Printer or another ESC/POS compatible printer " "(officially supported printers are listed at the `POS Hardware page " "`_)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:25 +#: ../../point_of_sale/overview/setup.rst:24 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" msgstr "" "Un scanner code à barre USB Eclipse Honeywell ou tout autre scanner " "compatible" -#: ../../point_of_sale/overview/setup.rst:26 +#: ../../point_of_sale/overview/setup.rst:25 msgid "An Epson compatible cash drawer" msgstr "Un tiroir-caisse compatible Epson" +#: ../../point_of_sale/overview/setup.rst:26 +msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)" +msgstr "" + #: ../../point_of_sale/overview/setup.rst:29 -#: ../../point_of_sale/overview/setup.rst:214 +#: ../../point_of_sale/overview/setup.rst:213 msgid "Step By Step Setup Guide" msgstr "Guide d'installation pas à pas" @@ -1060,18 +1060,16 @@ msgstr "" #: ../../point_of_sale/overview/setup.rst:60 msgid "" -"**Wi-Fi**: If you do not wish to use Ethernet, plug in a Linux compatible " -"USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux " -"compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 " -"chipset. Make sure not to plug in an Ethernet cable, because all Wi-Fi " -"functionality will be bypassed when a wired network connection is available." +"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure " +"not to plug in an Ethernet cable, because all Wi-Fi functionality will be " +"bypassed when a wired network connection is available." msgstr "" -#: ../../point_of_sale/overview/setup.rst:68 +#: ../../point_of_sale/overview/setup.rst:66 msgid "Power the POSBox" msgstr "" -#: ../../point_of_sale/overview/setup.rst:70 +#: ../../point_of_sale/overview/setup.rst:68 msgid "" "Plug the power adapter into the POSBox, a bright red status led should light" " up." @@ -1079,11 +1077,11 @@ msgstr "" "Connecter l'adaptateur secteur à la POSBox, une led rouge brillante devrait " "s'allumer." -#: ../../point_of_sale/overview/setup.rst:74 +#: ../../point_of_sale/overview/setup.rst:72 msgid "Make sure the POSBox is ready" msgstr "Veuillez vérifier que la POSBox est prête" -#: ../../point_of_sale/overview/setup.rst:76 +#: ../../point_of_sale/overview/setup.rst:74 msgid "" "Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it" " should print a status receipt with its IP address. Also the status LED, " @@ -1094,12 +1092,12 @@ msgstr "" "adresse IP devrait s'imprimer. La LED qui se trouve juste à côté de la LED " "rouge d'alimentation devrait alors s'allumer de façon permanente en vert." -#: ../../point_of_sale/overview/setup.rst:82 -#: ../../point_of_sale/overview/setup.rst:293 +#: ../../point_of_sale/overview/setup.rst:80 +#: ../../point_of_sale/overview/setup.rst:292 msgid "Setup the Point of Sale" msgstr "Configurer le Point de Ventes" -#: ../../point_of_sale/overview/setup.rst:84 +#: ../../point_of_sale/overview/setup.rst:82 msgid "" "To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale" " --> Configuration --> Settings` and select your Point of Sale. Scroll down " @@ -1110,30 +1108,30 @@ msgid "" "attempt to find it on the local network." msgstr "" -#: ../../point_of_sale/overview/setup.rst:93 +#: ../../point_of_sale/overview/setup.rst:91 msgid "" "If you are running multiple Point of Sales on the same POSBox, make sure " "that only one of them has Remote Scanning/Barcode Scanner activated." msgstr "" -#: ../../point_of_sale/overview/setup.rst:96 +#: ../../point_of_sale/overview/setup.rst:94 msgid "" "It might be a good idea to make sure the POSBox IP never changes in your " "network. Refer to your router documentation on how to achieve this." msgstr "" -#: ../../point_of_sale/overview/setup.rst:101 +#: ../../point_of_sale/overview/setup.rst:99 msgid "Launch the Point of Sale" msgstr "" -#: ../../point_of_sale/overview/setup.rst:103 +#: ../../point_of_sale/overview/setup.rst:101 msgid "" "If you didn't specify the POSBox's IP address in the configuration, the POS " "will need some time to perform a network scan to find the POSBox. This is " "only done once." msgstr "" -#: ../../point_of_sale/overview/setup.rst:107 +#: ../../point_of_sale/overview/setup.rst:105 msgid "" "The Point of Sale is now connected to the POSBox and your hardware should be" " ready to use." @@ -1141,19 +1139,19 @@ msgstr "" "Le Point de Ventes est désormais connecté à la POSBox et votre matériel est " "prêt à être utilisé." -#: ../../point_of_sale/overview/setup.rst:111 +#: ../../point_of_sale/overview/setup.rst:109 msgid "Wi-Fi configuration" msgstr "Configuration Wi-Fi" -#: ../../point_of_sale/overview/setup.rst:113 +#: ../../point_of_sale/overview/setup.rst:111 msgid "" -"The POSBox is Wi-Fi-capable. In order to use it you'll need a Linux " -"compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are" -" Linux compatible. Officially supported are Wi-Fi adapters with a Ralink " -"5370 chipset." +"The most recent version of the POSBox has Wi-Fi built in. If you're using an" +" older version you'll need a Linux compatible USB Wi-Fi adapter. Most " +"commercially available Wi-Fi adapters are Linux compatible. Officially " +"supported are Wi-Fi adapters with a Ralink 5370 chipset." msgstr "" -#: ../../point_of_sale/overview/setup.rst:118 +#: ../../point_of_sale/overview/setup.rst:117 msgid "" "Make sure not to plug in an Ethernet cable, as all Wi-Fi related " "functionality will be disabled when a wired network connection is available." @@ -1162,7 +1160,7 @@ msgstr "" "fonctionnalité relative au Wi-Fi est désactivée si une connexion filaire est" " détectée." -#: ../../point_of_sale/overview/setup.rst:122 +#: ../../point_of_sale/overview/setup.rst:121 msgid "" "When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi " "Access Point called \"Posbox\" you can connect to. The receipt that gets " @@ -1187,7 +1185,7 @@ msgstr "" "essaiera de se connecter au réseau sélectionné et imprimer une nouvelle " "étiquette avec ses nouveaux paramètres." -#: ../../point_of_sale/overview/setup.rst:133 +#: ../../point_of_sale/overview/setup.rst:132 msgid "" "If you plan on permanently setting up the POSBox with Wi-Fi, you can use the" " \"persistent\" checkbox on the Wi-Fi configuration page when connecting to " @@ -1196,7 +1194,7 @@ msgid "" "attempt to connect to the specified network after it boots." msgstr "" -#: ../../point_of_sale/overview/setup.rst:140 +#: ../../point_of_sale/overview/setup.rst:139 msgid "" "When the POSBox fails to connect to a network it will fall back to starting " "it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network" @@ -1204,11 +1202,11 @@ msgid "" "automatically." msgstr "" -#: ../../point_of_sale/overview/setup.rst:146 +#: ../../point_of_sale/overview/setup.rst:145 msgid "Multi-POS Configuration" msgstr "" -#: ../../point_of_sale/overview/setup.rst:148 +#: ../../point_of_sale/overview/setup.rst:147 msgid "" "The advised way to setup a multi Point of Sale shop is to have one POSBox " "per Point of Sale. In this case it is mandatory to manually specify the IP " @@ -1217,11 +1215,11 @@ msgid "" " your router documentation." msgstr "" -#: ../../point_of_sale/overview/setup.rst:155 +#: ../../point_of_sale/overview/setup.rst:154 msgid "POSBoxless Guide (advanced)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:159 +#: ../../point_of_sale/overview/setup.rst:158 msgid "" "If you are running your Point of Sale on a Debian-based Linux distribution, " "you do not need the POSBox as you can run its software locally. However the " @@ -1230,7 +1228,7 @@ msgid "" "distribution or to your particular setup and hardware configuration." msgstr "" -#: ../../point_of_sale/overview/setup.rst:166 +#: ../../point_of_sale/overview/setup.rst:165 msgid "" "Drivers for the various types of supported hardware are provided as Odoo " "modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale" @@ -1240,17 +1238,17 @@ msgid "" "Point of Sale and the hardware." msgstr "" -#: ../../point_of_sale/overview/setup.rst:173 +#: ../../point_of_sale/overview/setup.rst:172 msgid "" "The goal of this section will be to set up a local Odoo instance that " "behaves like the Odoo instance running on the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:177 +#: ../../point_of_sale/overview/setup.rst:176 msgid "Image building process" msgstr "" -#: ../../point_of_sale/overview/setup.rst:179 +#: ../../point_of_sale/overview/setup.rst:178 msgid "" "We generate the official POSBox images using the scripts in " "https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. " @@ -1260,17 +1258,17 @@ msgid "" "`nightly.odoo.com `_ for users to download." msgstr "" -#: ../../point_of_sale/overview/setup.rst:187 +#: ../../point_of_sale/overview/setup.rst:186 msgid "" "The scripts in this directory might be useful as a reference if you get " "stuck or want more detail about something." msgstr "" -#: ../../point_of_sale/overview/setup.rst:191 +#: ../../point_of_sale/overview/setup.rst:190 msgid "Summary of the image creation process" msgstr "" -#: ../../point_of_sale/overview/setup.rst:193 +#: ../../point_of_sale/overview/setup.rst:192 msgid "" "The image creation process starts by downloading the latest `Raspbian " "`_ image. It then locally mounts this Raspbian " @@ -1284,87 +1282,87 @@ msgid "" "files. The resulting image is then ready to be tested and used." msgstr "" -#: ../../point_of_sale/overview/setup.rst:208 +#: ../../point_of_sale/overview/setup.rst:207 msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:209 +#: ../../point_of_sale/overview/setup.rst:208 msgid "A running Odoo instance you connect to to load the Point of Sale" msgstr "" -#: ../../point_of_sale/overview/setup.rst:210 +#: ../../point_of_sale/overview/setup.rst:209 msgid "" "You must uninstall any ESC/POS printer driver as it will conflict with " "Odoo's built-in driver" msgstr "" -#: ../../point_of_sale/overview/setup.rst:217 +#: ../../point_of_sale/overview/setup.rst:216 msgid "Extra dependencies" msgstr "" -#: ../../point_of_sale/overview/setup.rst:219 +#: ../../point_of_sale/overview/setup.rst:218 msgid "" "Because Odoo runs on Python 2, you need to check which version of pip you " "need to use." msgstr "" -#: ../../point_of_sale/overview/setup.rst:222 +#: ../../point_of_sale/overview/setup.rst:221 msgid "``# pip --version``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:224 -#: ../../point_of_sale/overview/setup.rst:230 +#: ../../point_of_sale/overview/setup.rst:223 +#: ../../point_of_sale/overview/setup.rst:229 msgid "If it returns something like::" msgstr "" -#: ../../point_of_sale/overview/setup.rst:228 +#: ../../point_of_sale/overview/setup.rst:227 msgid "You need to try pip2 instead." msgstr "" -#: ../../point_of_sale/overview/setup.rst:234 +#: ../../point_of_sale/overview/setup.rst:233 msgid "You can use pip." msgstr "Vous pouvez utiliser pip." -#: ../../point_of_sale/overview/setup.rst:236 +#: ../../point_of_sale/overview/setup.rst:235 msgid "The driver modules requires the installation of new python modules:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:238 +#: ../../point_of_sale/overview/setup.rst:237 msgid "``# pip install pyserial``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:240 +#: ../../point_of_sale/overview/setup.rst:239 msgid "``# pip install pyusb==1.0.0b1``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:242 +#: ../../point_of_sale/overview/setup.rst:241 msgid "``# pip install qrcode``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:245 +#: ../../point_of_sale/overview/setup.rst:244 msgid "Access Rights" msgstr "Droits d'accès" -#: ../../point_of_sale/overview/setup.rst:247 +#: ../../point_of_sale/overview/setup.rst:246 msgid "" "The drivers need raw access to the printer and barcode scanner devices. " "Doing so requires a bit system administration. First we are going to create " "a group that has access to USB devices" msgstr "" -#: ../../point_of_sale/overview/setup.rst:251 +#: ../../point_of_sale/overview/setup.rst:250 msgid "``# groupadd usbusers``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:253 +#: ../../point_of_sale/overview/setup.rst:252 msgid "Then we add the user who will run the OpenERP server to ``usbusers``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:255 +#: ../../point_of_sale/overview/setup.rst:254 msgid "``# usermod -a -G usbusers USERNAME``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:257 +#: ../../point_of_sale/overview/setup.rst:256 msgid "" "Then we need to create a udev rule that will automatically allow members of " "``usbusers`` to access raw USB devices. To do so create a file called " @@ -1372,29 +1370,29 @@ msgid "" "following content::" msgstr "" -#: ../../point_of_sale/overview/setup.rst:265 +#: ../../point_of_sale/overview/setup.rst:264 msgid "Then you need to reboot your machine." msgstr "" -#: ../../point_of_sale/overview/setup.rst:268 +#: ../../point_of_sale/overview/setup.rst:267 msgid "Start the local Odoo instance" msgstr "" -#: ../../point_of_sale/overview/setup.rst:270 +#: ../../point_of_sale/overview/setup.rst:269 msgid "We must launch the Odoo server with the correct settings" msgstr "" -#: ../../point_of_sale/overview/setup.rst:272 +#: ../../point_of_sale/overview/setup.rst:271 msgid "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:275 +#: ../../point_of_sale/overview/setup.rst:274 msgid "Test the instance" msgstr "" -#: ../../point_of_sale/overview/setup.rst:277 +#: ../../point_of_sale/overview/setup.rst:276 msgid "" "Plug all your hardware to your machine's USB ports, and go to " "``http://localhost:8069/hw_proxy/status`` refresh the page a few times and " @@ -1404,11 +1402,11 @@ msgid "" "the udev rules do not apply or a superseded by others." msgstr "" -#: ../../point_of_sale/overview/setup.rst:285 +#: ../../point_of_sale/overview/setup.rst:284 msgid "Automatically start Odoo" msgstr "" -#: ../../point_of_sale/overview/setup.rst:287 +#: ../../point_of_sale/overview/setup.rst:286 msgid "" "You must now make sure that this Odoo install is automatically started after" " boot. There are various ways to do so, and how to do it depends on your " @@ -1416,26 +1414,26 @@ msgid "" "probably the easiest way to accomplish this." msgstr "" -#: ../../point_of_sale/overview/setup.rst:295 +#: ../../point_of_sale/overview/setup.rst:294 msgid "" "The IP address field in the POS configuration must be either ``127.0.0.1`` " "or ``localhost`` if you're running the created Odoo server on the machine " "that you'll use as the Point of Sale device. You can also leave it empty." msgstr "" -#: ../../point_of_sale/overview/setup.rst:301 +#: ../../point_of_sale/overview/setup.rst:300 msgid "POSBox Technical Documentation" msgstr "" -#: ../../point_of_sale/overview/setup.rst:304 +#: ../../point_of_sale/overview/setup.rst:303 msgid "Technical Overview" msgstr "" -#: ../../point_of_sale/overview/setup.rst:307 +#: ../../point_of_sale/overview/setup.rst:306 msgid "The POSBox Hardware" msgstr "" -#: ../../point_of_sale/overview/setup.rst:309 +#: ../../point_of_sale/overview/setup.rst:308 msgid "" "The POSBox's Hardware is based on a `Raspberry Pi 2 " "`_, a popular " @@ -1445,21 +1443,21 @@ msgid "" "hardware is easily available worldwide from independent vendors." msgstr "" -#: ../../point_of_sale/overview/setup.rst:318 +#: ../../point_of_sale/overview/setup.rst:317 msgid "Compatible Peripherals" msgstr "Périphériques compatibles" -#: ../../point_of_sale/overview/setup.rst:320 +#: ../../point_of_sale/overview/setup.rst:319 msgid "" "Officially supported hardware is listed on the `POS Hardware page " "`_." msgstr "" -#: ../../point_of_sale/overview/setup.rst:324 +#: ../../point_of_sale/overview/setup.rst:323 msgid "The POSBox Software" msgstr "Le logiciel de la POSBox" -#: ../../point_of_sale/overview/setup.rst:326 +#: ../../point_of_sale/overview/setup.rst:325 msgid "" "The POSBox runs a heavily modified Raspbian Linux installation, a Debian " "derivative for the Raspberry Pi. It also runs a barebones installation of " @@ -1471,7 +1469,7 @@ msgid "" "branch." msgstr "" -#: ../../point_of_sale/overview/setup.rst:335 +#: ../../point_of_sale/overview/setup.rst:334 msgid "" "The root partition on the POSBox is mounted read-only, ensuring that we " "don't wear out the SD card by writing to it too much. It also ensures that " @@ -1489,30 +1487,30 @@ msgid "" "to get to the real /etc and /var during development." msgstr "" -#: ../../point_of_sale/overview/setup.rst:351 +#: ../../point_of_sale/overview/setup.rst:350 msgid "Logs of the running Odoo server can be found at:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:353 +#: ../../point_of_sale/overview/setup.rst:352 msgid "``/var/log/odoo/odoo.log``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:355 +#: ../../point_of_sale/overview/setup.rst:354 msgid "" "Various POSBox related scripts (eg. wifi-related scripts) running on the " "POSBox will log to /var/log/syslog and those messages are tagged with " "``posbox_*``." msgstr "" -#: ../../point_of_sale/overview/setup.rst:360 +#: ../../point_of_sale/overview/setup.rst:359 msgid "Accessing the POSBox" msgstr "" -#: ../../point_of_sale/overview/setup.rst:363 +#: ../../point_of_sale/overview/setup.rst:362 msgid "Local Access" msgstr "Accès local" -#: ../../point_of_sale/overview/setup.rst:365 +#: ../../point_of_sale/overview/setup.rst:364 msgid "" "If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if" " you connect a computer monitor to the *HDMI* port of the POSBox, you can " @@ -1520,31 +1518,31 @@ msgid "" "tasks, like viewing some logs." msgstr "" -#: ../../point_of_sale/overview/setup.rst:370 +#: ../../point_of_sale/overview/setup.rst:369 msgid "The POSBox will automatically log in as root on the default tty." msgstr "" -#: ../../point_of_sale/overview/setup.rst:373 +#: ../../point_of_sale/overview/setup.rst:372 msgid "Remote Access" msgstr "Accès distant" -#: ../../point_of_sale/overview/setup.rst:375 +#: ../../point_of_sale/overview/setup.rst:374 msgid "" "If you have the POSBox's IP address and an SSH client you can access the " "POSBox's system remotely. The login credentials are ``pi``/``raspberry``." msgstr "" -#: ../../point_of_sale/overview/setup.rst:380 +#: ../../point_of_sale/overview/setup.rst:379 msgid "Updating The POSBox Software" msgstr "" -#: ../../point_of_sale/overview/setup.rst:382 +#: ../../point_of_sale/overview/setup.rst:381 msgid "" "Only upgrade the POSBox if you experience problems or want to use newly " "implemented features." msgstr "" -#: ../../point_of_sale/overview/setup.rst:385 +#: ../../point_of_sale/overview/setup.rst:384 msgid "" "The best way to update the POSBox software is to download a new version of " "the image and flash the SD-Card with it. This operation is described in " @@ -1555,7 +1553,7 @@ msgid "" "the POSBox software." msgstr "" -#: ../../point_of_sale/overview/setup.rst:394 +#: ../../point_of_sale/overview/setup.rst:393 msgid "" "The second way of upgrading is through the built in upgrade interface that " "can be reached through the POSBox homepage. The nice thing about upgrading " @@ -1564,29 +1562,29 @@ msgid "" "configuration files (like eg. /etc/hostapd.conf). It can only upgrade:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:401 +#: ../../point_of_sale/overview/setup.rst:400 msgid "The internal Odoo application" msgstr "" -#: ../../point_of_sale/overview/setup.rst:402 +#: ../../point_of_sale/overview/setup.rst:401 msgid "" "Scripts in the folder " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:404 +#: ../../point_of_sale/overview/setup.rst:403 msgid "When in doubt, always use the first method of upgrading." msgstr "" -#: ../../point_of_sale/overview/setup.rst:407 +#: ../../point_of_sale/overview/setup.rst:406 msgid "Troubleshoot" msgstr "Problèmes" -#: ../../point_of_sale/overview/setup.rst:410 +#: ../../point_of_sale/overview/setup.rst:409 msgid "The POS cannot connect to the POSBox" msgstr "Le POS ne se connecte pas à la POSBox" -#: ../../point_of_sale/overview/setup.rst:412 +#: ../../point_of_sale/overview/setup.rst:411 msgid "" "The easiest way to make sure the POSBox is properly set-up is to turn it on " "with the printer plugged in as it will print a receipt indicating any error " @@ -1598,13 +1596,13 @@ msgstr "" "indiquant toute erreur le cas échéant ou l'adresse IP de la POSBox en cas de" " succès. Si aucun reçu n'est imprimé, procédez aux étapes suivantes:" -#: ../../point_of_sale/overview/setup.rst:416 +#: ../../point_of_sale/overview/setup.rst:415 msgid "" "Make sure the POSBox is powered on, indicated by a brightly lit red status " "LED." msgstr "Assurez-vous que la POSBox est allumée, indiquée par une LED rouge." -#: ../../point_of_sale/overview/setup.rst:418 +#: ../../point_of_sale/overview/setup.rst:417 msgid "" "Make sure the POSBox is ready, this is indicated by a brightly lit green " "status LED just next to the red power status LED. The POSBox should be ready" @@ -1614,7 +1612,7 @@ msgstr "" "juste à coté de la LED rouge. La POSBox devrait être prête environ 2 minutes" " après le démarrage." -#: ../../point_of_sale/overview/setup.rst:421 +#: ../../point_of_sale/overview/setup.rst:420 msgid "" "Make sure the POSBox is connected to the same network as your POS device. " "Both the device and the POSBox should be visible in the list of connected " @@ -1624,7 +1622,7 @@ msgstr "" "POS et la POSBox doivent tout deux être visibles dans la liste des appareils" " connectés sur votre réseau." -#: ../../point_of_sale/overview/setup.rst:424 +#: ../../point_of_sale/overview/setup.rst:423 msgid "" "Make sure that your LAN is set up with DHCP, and gives IP addresses in the " "range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that " @@ -1635,7 +1633,7 @@ msgstr "" "votre LAN de cette façon, vous devez manuellement assigner une adresse IP à " "la POSBox." -#: ../../point_of_sale/overview/setup.rst:428 +#: ../../point_of_sale/overview/setup.rst:427 msgid "" "If you have specified the POSBox's IP address in the configuration, make " "sure it correspond to the printed on the POSBox's status receipt." @@ -1644,11 +1642,11 @@ msgstr "" "assurez-vous qu'elle corresponde à l'adresse imprimée sur le reçu de status " "imprimé au démarrage." -#: ../../point_of_sale/overview/setup.rst:431 +#: ../../point_of_sale/overview/setup.rst:430 msgid "Make sure that the POS is not loaded over HTTPS." msgstr "Assurez-vous que la page du POS n'est pas chargé en HTTPS." -#: ../../point_of_sale/overview/setup.rst:432 +#: ../../point_of_sale/overview/setup.rst:431 msgid "" "A bug in Firefox's HTTP implementation prevents the autodiscovery from " "working reliably. When using Firefox you should manually set up the POSBox's" @@ -1658,11 +1656,11 @@ msgstr "" "Firefox. Nous conseillons de spécifier l'adresse IP de la POSBox dans la " "configuration du point de vente par sécurité." -#: ../../point_of_sale/overview/setup.rst:437 +#: ../../point_of_sale/overview/setup.rst:436 msgid "The Barcode Scanner is not working" msgstr "Le scanner de code barre ne fonctionne pas correctement" -#: ../../point_of_sale/overview/setup.rst:439 +#: ../../point_of_sale/overview/setup.rst:438 msgid "" "The barcode scanner must be configured in US QWERTY and emit an Enter after " "each barcode. This is the default configuration of most barcode readers. " @@ -1673,7 +1671,7 @@ msgstr "" "la plupart des scanners. Vérifiez le manuel du scanner pour plus " "d'information." -#: ../../point_of_sale/overview/setup.rst:443 +#: ../../point_of_sale/overview/setup.rst:442 msgid "" "The POSBox needs a 2A power supply to work with some barcode scanners. If " "you are not using the provided power supply, make sure the one you use has " @@ -1683,7 +1681,7 @@ msgstr "" "scanners. Si vous n'utilisez pas l'alimentation fournie avec la POSBox, " "assurez-vous d'avoir assez de courant." -#: ../../point_of_sale/overview/setup.rst:446 +#: ../../point_of_sale/overview/setup.rst:445 msgid "" "Some barcode scanners will need more than 2A and will not work, or will work" " unreliably, even with the provided power supply. In those case you can plug" @@ -1693,7 +1691,7 @@ msgstr "" "façon instable, même avec l'alimentation fournie. Dans ce cas, vous devrez " "utiliser une alimentation externe pour le scanner." -#: ../../point_of_sale/overview/setup.rst:449 +#: ../../point_of_sale/overview/setup.rst:448 msgid "" "Some poorly built barcode scanners do not advertise themselves as barcode " "scanners but as a usb keyboard instead, and will not be recognized by the " @@ -1702,21 +1700,21 @@ msgstr "" "Des scanners bon marché ne sont pas détectés comme un scanner de code barre " "mais comme un clavier USB. Ceux-ci ne fonctionneront pas avec la POSBox." -#: ../../point_of_sale/overview/setup.rst:454 +#: ../../point_of_sale/overview/setup.rst:453 msgid "The Barcode Scanner is not working reliably" msgstr "" -#: ../../point_of_sale/overview/setup.rst:456 +#: ../../point_of_sale/overview/setup.rst:455 msgid "" "Make sure that no more than one device with 'Scan via Proxy'/'Barcode " "Scanner' enabled are connected to the POSBox at the same time." msgstr "" -#: ../../point_of_sale/overview/setup.rst:461 +#: ../../point_of_sale/overview/setup.rst:460 msgid "Printing the receipt takes too much time" msgstr "" -#: ../../point_of_sale/overview/setup.rst:463 +#: ../../point_of_sale/overview/setup.rst:462 msgid "" "A small delay before the first print is expected, as the POSBox will do some" " preprocessing to speed up the next printings. If you suffer delays " @@ -1724,42 +1722,42 @@ msgid "" "and the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:469 +#: ../../point_of_sale/overview/setup.rst:468 msgid "Some characters are not correctly printed on the receipt" msgstr "" -#: ../../point_of_sale/overview/setup.rst:471 +#: ../../point_of_sale/overview/setup.rst:470 msgid "" "The POSBox does not support all languages and characters. It currently " "supports Latin and Cyrillic based scripts, with basic Japanese support." msgstr "" -#: ../../point_of_sale/overview/setup.rst:476 +#: ../../point_of_sale/overview/setup.rst:475 msgid "The printer is offline" msgstr "" -#: ../../point_of_sale/overview/setup.rst:478 +#: ../../point_of_sale/overview/setup.rst:477 msgid "" "Make sure the printer is connected, powered, has enough paper and has its " "lid closed, and is not reporting an error. If the error persists, please " "contact support." msgstr "" -#: ../../point_of_sale/overview/setup.rst:483 +#: ../../point_of_sale/overview/setup.rst:482 msgid "The cashdrawer does not open" msgstr "" -#: ../../point_of_sale/overview/setup.rst:485 +#: ../../point_of_sale/overview/setup.rst:484 msgid "" "The cashdrawer should be connected to the printer and should be activated in" " the POS configuration." msgstr "" -#: ../../point_of_sale/overview/setup.rst:489 +#: ../../point_of_sale/overview/setup.rst:488 msgid "Credits" msgstr "Crédits" -#: ../../point_of_sale/overview/setup.rst:490 +#: ../../point_of_sale/overview/setup.rst:489 msgid "" "The POSBox project was developed by Frédéric van der Essen with the kind " "help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del " @@ -1769,7 +1767,7 @@ msgstr "" "amicale de Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del " "Marmol, Joren Van Onder and Antony Lesuisse." -#: ../../point_of_sale/overview/setup.rst:494 +#: ../../point_of_sale/overview/setup.rst:493 msgid "" "This development would not have been possible without the Indiegogo campaign" " and those who contributed to it. Special thanks goes to the partners who " @@ -1779,81 +1777,81 @@ msgstr "" "ceux qui y ont contribué. Remerciements particuliers aux partenaires qui ont" " soutenu la campagne ainsi que l'ensemble des partenaires fondateurs:" -#: ../../point_of_sale/overview/setup.rst:498 +#: ../../point_of_sale/overview/setup.rst:497 msgid "Camptocamp" msgstr "Camptocamp" -#: ../../point_of_sale/overview/setup.rst:499 +#: ../../point_of_sale/overview/setup.rst:498 msgid "BHC" msgstr "BHC" -#: ../../point_of_sale/overview/setup.rst:500 +#: ../../point_of_sale/overview/setup.rst:499 msgid "openBig" msgstr "openBig" -#: ../../point_of_sale/overview/setup.rst:501 +#: ../../point_of_sale/overview/setup.rst:500 msgid "Eeezee-IT" msgstr "Eeezee-IT" -#: ../../point_of_sale/overview/setup.rst:502 +#: ../../point_of_sale/overview/setup.rst:501 msgid "Solarsis LDA" msgstr "Solarsis LDA" -#: ../../point_of_sale/overview/setup.rst:503 +#: ../../point_of_sale/overview/setup.rst:502 msgid "ACSONE" msgstr "ACSONE" -#: ../../point_of_sale/overview/setup.rst:504 +#: ../../point_of_sale/overview/setup.rst:503 msgid "Vauxoo" msgstr "Vauxoo" -#: ../../point_of_sale/overview/setup.rst:505 +#: ../../point_of_sale/overview/setup.rst:504 msgid "Ekomurz" msgstr "Ekomurz" -#: ../../point_of_sale/overview/setup.rst:506 +#: ../../point_of_sale/overview/setup.rst:505 msgid "Datalp" msgstr "Datalp" -#: ../../point_of_sale/overview/setup.rst:507 +#: ../../point_of_sale/overview/setup.rst:506 msgid "Dao Systems" msgstr "Dao Systems" -#: ../../point_of_sale/overview/setup.rst:508 +#: ../../point_of_sale/overview/setup.rst:507 msgid "Eggs Solutions" msgstr "Eggs Solutions" -#: ../../point_of_sale/overview/setup.rst:509 +#: ../../point_of_sale/overview/setup.rst:508 msgid "OpusVL" msgstr "OpusVL" -#: ../../point_of_sale/overview/setup.rst:511 +#: ../../point_of_sale/overview/setup.rst:510 msgid "" "And also the partners who've backed the development with the Founding POSBox" " Bundle:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:514 +#: ../../point_of_sale/overview/setup.rst:513 msgid "Willow IT" msgstr "Willow IT" -#: ../../point_of_sale/overview/setup.rst:515 +#: ../../point_of_sale/overview/setup.rst:514 msgid "E\\. Akhalwaya & Sons" msgstr "E\\. Akhalwaya & Sons" -#: ../../point_of_sale/overview/setup.rst:516 +#: ../../point_of_sale/overview/setup.rst:515 msgid "Multibase" msgstr "Multibase" -#: ../../point_of_sale/overview/setup.rst:517 +#: ../../point_of_sale/overview/setup.rst:516 msgid "Mindesa" msgstr "Mindesa" -#: ../../point_of_sale/overview/setup.rst:518 +#: ../../point_of_sale/overview/setup.rst:517 msgid "bpso.biz" msgstr "bpso.biz" -#: ../../point_of_sale/overview/setup.rst:519 +#: ../../point_of_sale/overview/setup.rst:518 msgid "Shine IT." msgstr "Shine IT." @@ -1982,7 +1980,7 @@ msgstr "Nom du point de vente" #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale." -msgstr "" +msgstr "Un identifiant interne du point de vente." #: ../../point_of_sale/overview/start.rst:0 msgid "Sales Channel" @@ -1998,7 +1996,7 @@ msgstr "Plans du restaurant" #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale." -msgstr "" +msgstr "Les étages du restaurant servis par ce point de vente." #: ../../point_of_sale/overview/start.rst:0 msgid "Orderline Notes" @@ -2006,7 +2004,7 @@ msgstr "Notes de commandes" #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines." -msgstr "" +msgstr "Autoriser les notes personnalisées sur les lignes de commande" #: ../../point_of_sale/overview/start.rst:0 msgid "Display Category Pictures" @@ -2018,13 +2016,16 @@ msgstr "Les catégories de produits seront affichées avec des photos. " #: ../../point_of_sale/overview/start.rst:0 msgid "Initial Category" -msgstr "" +msgstr "Catégorie initiale" #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown." msgstr "" +"Le point de vente affichera cette catégorie de produits par défaut. Si " +"aucune catégorie n'est spécifiée, tous les produits disponibles seront " +"affichés." #: ../../point_of_sale/overview/start.rst:0 msgid "Virtual KeyBoard" @@ -2045,7 +2046,7 @@ msgstr "Barres de défilement larges" #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens." -msgstr "" +msgstr "Pour les écrans tactiles industriels peu précis." #: ../../point_of_sale/overview/start.rst:0 msgid "IP Address" @@ -2056,6 +2057,8 @@ msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty." msgstr "" +"Nom d'hôte ou adresse IP du proxy matériel. Laisser vide pour utiliser " +"l'autodétection." #: ../../point_of_sale/overview/start.rst:0 msgid "Scan via Proxy" @@ -2064,6 +2067,8 @@ msgstr "Scan via Proxy" #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner." msgstr "" +"Permet d'activer la lecture des code-barres depuis un lecteur connecté à " +"distance." #: ../../point_of_sale/overview/start.rst:0 msgid "Electronic Scale" @@ -2071,7 +2076,7 @@ msgstr "Balance électronique" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration." -msgstr "" +msgstr "Permet d'activer l'intégration d'une balance électronique." #: ../../point_of_sale/overview/start.rst:0 msgid "Cashdrawer" @@ -2079,7 +2084,7 @@ msgstr "Tiroir-caisse" #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer." -msgstr "" +msgstr "Ouvrir automatiquement le tiroir-caisse." #: ../../point_of_sale/overview/start.rst:0 msgid "Print via Proxy" @@ -2088,20 +2093,26 @@ msgstr "Imprimer via un proxy" #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy." msgstr "" +"Contourner l'impression via le navigateur pour imprimer via le proxy " +"matériel." #: ../../point_of_sale/overview/start.rst:0 msgid "Customer Facing Display" -msgstr "" +msgstr "Affichage côté client" #: ../../point_of_sale/overview/start.rst:0 msgid "Show checkout to customers with a remotely-connected screen." msgstr "" +"Afficher l'étape de paiement aux clients munis d'un écran connecté à " +"distance." #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers." msgstr "" +"Permet de définir les types de code-barres disponibles et la façon dont ils " +"sont attribués aux produits, clients et caissiers." #: ../../point_of_sale/overview/start.rst:0 msgid "Fiscal Positions" @@ -2112,10 +2123,12 @@ msgid "" "This is useful for restaurants with onsite and take-away services that imply" " specific tax rates." msgstr "" +"Ceci est utile pour les restaurants qui proposent des services sur place et " +"à emporter, auquel cas le taux de la TVA peut différer." #: ../../point_of_sale/overview/start.rst:0 msgid "Available Pricelists" -msgstr "" +msgstr "Listes de prix disponibles" #: ../../point_of_sale/overview/start.rst:0 msgid "" @@ -2124,6 +2137,11 @@ msgid "" "be valid, this pricelist must be listed here as an available pricelist. " "Otherwise the default pricelist will apply." msgstr "" +"Mettre plusieurs listes de prix à disposition du point de vente. Vous pouvez" +" également une liste de prix à un client spécifique à partir de leur " +"formulaire de contact (onglet Ventes). Pour être valide, cette liste de prix" +" doit être répertoriée ici en tant que liste de prix disponible. Autrement, " +"la liste de prix par défaut sera appliquée." #: ../../point_of_sale/overview/start.rst:0 msgid "Default Pricelist" @@ -2134,16 +2152,20 @@ msgid "" "The pricelist used if no customer is selected or if the customer has no Sale" " Pricelist configured." msgstr "" +"La liste de prix utilisée si aucun client n'est sélectionné ou si aucune " +"liste de prix de vente n'est configurée pour le client." #: ../../point_of_sale/overview/start.rst:0 msgid "Restrict Price Modifications to Managers" -msgstr "" +msgstr "Limiter les modifications de prix aux responsables" #: ../../point_of_sale/overview/start.rst:0 msgid "" "Only users with Manager access rights for PoS app can modify the product " "prices on orders." msgstr "" +"Seuls les utilisateurs disposant des droits d'accès de responsable dans " +"l'application PdV peuvent modifier le prix d'un produit sur une commande." #: ../../point_of_sale/overview/start.rst:0 msgid "Cash Control" @@ -2162,6 +2184,8 @@ msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount." msgstr "" +"Ce paiement sera traité de la même façon qu'un paiement bancaire. Il sera " +"pré-rempli avec le montant dû exact." #: ../../point_of_sale/overview/start.rst:0 msgid "Order IDs Sequence" @@ -2182,6 +2206,7 @@ msgstr "En-tête du ticket :" #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a header in the printed receipt." msgstr "" +"Un message court qui sera inséré comme en-tête dans le ticket de reçu." #: ../../point_of_sale/overview/start.rst:0 msgid "Receipt Footer" @@ -2190,6 +2215,7 @@ msgstr "Pied du ticket :" #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a footer in the printed receipt." msgstr "" +"Un texte court qui sera inséré comme pied de page dans le ticket de reçu." #: ../../point_of_sale/overview/start.rst:0 msgid "Automatic Receipt Printing" @@ -2197,11 +2223,11 @@ msgstr "Impression automatique du reçu" #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order." -msgstr "" +msgstr "Le reçu sera automatiquement imprimé à la fin de chaque commande." #: ../../point_of_sale/overview/start.rst:0 msgid "Skip Preview Screen" -msgstr "" +msgstr "Passer l'écran Aperçu" #: ../../point_of_sale/overview/start.rst:0 msgid "" @@ -2216,7 +2242,7 @@ msgstr "Impression de la Facture" #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment." -msgstr "" +msgstr "Permet d'imprimer la facture avant le paiement." #: ../../point_of_sale/overview/start.rst:0 msgid "Bill Splitting" @@ -2224,7 +2250,7 @@ msgstr "Partage d'addition" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale." -msgstr "" +msgstr "Autoriser le partage d'une addition au point de vente." #: ../../point_of_sale/overview/start.rst:0 msgid "Tip Product" @@ -2232,7 +2258,7 @@ msgstr "Produit pour pourboire" #: ../../point_of_sale/overview/start.rst:0 msgid "This product is used as reference on customer receipts." -msgstr "" +msgstr "Ce produit est utilisé comme référence sur les reçus client." #: ../../point_of_sale/overview/start.rst:0 msgid "Invoicing" @@ -2240,7 +2266,7 @@ msgstr "Facturation" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale." -msgstr "" +msgstr "Permet l'émission d'une facture depuis le point de vente." #: ../../point_of_sale/overview/start.rst:0 msgid "Invoice Journal" @@ -2268,6 +2294,8 @@ msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session." msgstr "" +"Cochez cette case si vous souhaitez regrouper les pièces comptables par " +"produit lors de la fermeture d'une session." #: ../../point_of_sale/overview/start.rst:100 msgid "Now you are ready to make your first steps with your point of sale." diff --git a/locale/fr/LC_MESSAGES/sales.po b/locale/fr/LC_MESSAGES/sales.po index a690790d6..8b1a87a9e 100644 --- a/locale/fr/LC_MESSAGES/sales.po +++ b/locale/fr/LC_MESSAGES/sales.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Fabien Pinckaers , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -44,15 +44,10 @@ msgstr "" "système." #: ../../sales/advanced/portal.rst:12 -msgid "" -"For Example: 1. A long term client who needs to view online quotations. 2." -" Accounting consultant who needs to keep track of the company's financials." +msgid "For Example, a long term client who needs to view online quotations." msgstr "" -"Par exemple: 1. Un client à long terme qui a besoin de voir des devis en " -"ligne. 2. Un consultant en comptabilité qui a besoin de suivre les données " -"financières de l'entreprise." -#: ../../sales/advanced/portal.rst:16 +#: ../../sales/advanced/portal.rst:14 msgid "" "A portal user has only read/view access. He or she will not be able to edit " "any document in the system." @@ -60,15 +55,15 @@ msgstr "" "Un utilisateur du portail a un accès en lecture seulement. Il ou elle ne " "pourra pas modifier un document dans le système." -#: ../../sales/advanced/portal.rst:20 +#: ../../sales/advanced/portal.rst:18 msgid "How to give portal access to customers?" msgstr "Comment donner un accès au portail aux clients ?" -#: ../../sales/advanced/portal.rst:23 +#: ../../sales/advanced/portal.rst:21 msgid "From Contacts Module" msgstr "Depuis l'application Contacts" -#: ../../sales/advanced/portal.rst:25 +#: ../../sales/advanced/portal.rst:23 msgid "" "From the main menu, select **Contacts** menu. If the contact is not yet " "created in the system, click on the create button to create new contact. " @@ -79,7 +74,7 @@ msgstr "" " pour créer un nouveau contact. Entrez les détails du contact et cliquez sur" " \"Enregistrer\"." -#: ../../sales/advanced/portal.rst:35 +#: ../../sales/advanced/portal.rst:33 msgid "" "Choose a contact, click on the **Action** menu in the top-center of the " "interface and from the drop down." @@ -87,12 +82,12 @@ msgstr "" "Choisissez un contact, cliquez sur le menu **Action** en haut au centre de " "l'interface et dans la liste déroulante." -#: ../../sales/advanced/portal.rst:38 +#: ../../sales/advanced/portal.rst:36 msgid "Select **Portal Access Management**. A pop up window appears." msgstr "" "Sélectionnez **Gestion del'accès au portail**. Une fenêtre pop-up apparaît." -#: ../../sales/advanced/portal.rst:43 +#: ../../sales/advanced/portal.rst:41 msgid "" "Enter the login **email ID**, check the box under **In Portal** and add the " "content to be included in the email in the text field box below. Click on " @@ -102,7 +97,7 @@ msgstr "" "ajoutez le du message qui sera envoyé dans la zone de texte en bas. Cliquez " "sur **Appliquer** lorsque vous avez terminé." -#: ../../sales/advanced/portal.rst:49 +#: ../../sales/advanced/portal.rst:47 msgid "" "An email will be sent to the specified email address, indicating that the " "contact is now a portal user of the respective instance." diff --git a/locale/nl/LC_MESSAGES/accounting.po b/locale/nl/LC_MESSAGES/accounting.po index b71e699fb..80c7c7055 100644 --- a/locale/nl/LC_MESSAGES/accounting.po +++ b/locale/nl/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Pol Van Dingenen , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -242,7 +242,6 @@ msgstr "Registreer manueel bankafschriften" #: ../../accounting/bank/reconciliation/use_cases.rst:6 #: ../../accounting/others/adviser/budget.rst:6 #: ../../accounting/others/analytic/purchases_expenses.rst:6 -#: ../../accounting/others/multicurrencies.rst:3 #: ../../accounting/others/multicurrencies/exchange.rst:6 #: ../../accounting/others/multicurrencies/how_it_works.rst:6 #: ../../accounting/others/multicurrencies/invoices_payments.rst:6 @@ -1196,7 +1195,6 @@ msgstr "" #: ../../accounting/bank/reconciliation.rst:3 #: ../../accounting/others/reporting/main_reports.rst:153 #: ../../accounting/overview/main_concepts/memento.rst:177 -#: ../../accounting/overview/main_concepts/terminologies.rst:19 msgid "Bank Reconciliation" msgstr "Afletteren bank" @@ -2453,6 +2451,7 @@ msgid "Balance Sheet" msgstr "Balans" #: ../../accounting/localizations/germany.rst:24 +#: ../../accounting/localizations/nederlands.rst:19 msgid "Profit & Loss" msgstr "" @@ -3338,6 +3337,41 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/nederlands.rst:2 +msgid "Netherlands" +msgstr "Nederland" + +#: ../../accounting/localizations/nederlands.rst:5 +msgid "XAF Export" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:7 +msgid "" +"With the Dutch accounting localization installed, you will be able to export" +" all your accounting entries in XAF format. For this, you have to go in " +":menuselection:`Accounting --> Reporting --> General Ledger`, you define the" +" entries you want to export using the filters (period, journals, ...) and " +"then you click on the button **EXPORT (XAF)**." +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:14 +msgid "Dutch Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:16 +msgid "" +"If you install the Dutch accounting localization, you will have access to " +"some reports that are specific to the Netherlands such as :" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:21 +msgid "Tax Report (Aangifte omzetbelasting)" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:23 +msgid "Intrastat Report (ICP)" +msgstr "" + #: ../../accounting/localizations/spain.rst:3 msgid "Spain" msgstr "Spanje" @@ -5400,7 +5434,6 @@ msgid "Prepayments" msgstr "Vooruitbetaalde kosten" #: ../../accounting/others/configuration/account_type.rst:39 -#: ../../accounting/overview/main_concepts/terminologies.rst:77 msgid "Fixed Assets" msgstr "Vaste activa" @@ -5937,6 +5970,10 @@ msgid "" "average cost and the original purchase price." msgstr "" +#: ../../accounting/others/multicurrencies.rst:3 +msgid "Multicurrency" +msgstr "" + #: ../../accounting/others/multicurrencies/exchange.rst:3 msgid "Record exchange rates at payments" msgstr "Wisselkoersen toepassen op betalingen" @@ -8335,7 +8372,6 @@ msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/overview/main_concepts/terminologies.rst:26 msgid "Reconciliation" msgstr "Aflettering" @@ -8380,7 +8416,7 @@ msgstr "Rekeningoverzicht voorbeeld" #: ../../accounting/overview/process_overview/customer_invoice.rst:109 #: ../../accounting/overview/process_overview/customer_invoice.rst:132 msgid "Accounts Receivable" -msgstr "" +msgstr "Debiteuren rekeningen" #: ../../accounting/overview/main_concepts/memento.rst:156 #: ../../accounting/overview/main_concepts/memento.rst:216 @@ -8616,154 +8652,6 @@ msgstr "Bankafschrift" msgid "Statement XYZ" msgstr "Afschrift XYZ" -#: ../../accounting/overview/main_concepts/terminologies.rst:3 -msgid "Accounting Terminologies" -msgstr "Boekhoud terminologieën" - -#: ../../accounting/overview/main_concepts/terminologies.rst:6 -msgid "Journal" -msgstr "Dagboek" - -#: ../../accounting/overview/main_concepts/terminologies.rst:9 -msgid "" -"A journal is like a folder in which you record all transactions of the same " -"type: all the statements of a bank account, all customer invoices, all " -"supplier bills. It's used to organize similar transactions together." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:13 -msgid "Payment Terms" -msgstr "Betalingscondities" - -#: ../../accounting/overview/main_concepts/terminologies.rst:16 -msgid "" -"Payment terms describe how and when a customer invoice (or supplier bill) " -"should be paid over the time. Example: 30% direct payment, balance due in " -"two months." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:22 -msgid "" -"Bank reconciliation is the process of matching transactions from your bank " -"records with existing journal items or creating new journal items on the " -"fly. It is a process of verification to ensure that your bank and your " -"records in Odoo say the same thing." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:29 -msgid "" -"Journal items reconciliation is the process of linking several journal items" -" together like an invoice and a payment. This allows you to mark invoices as" -" paid. It is also useful when comparing values of 'goods received not " -"invoiced' and 'goods shipped not billed' accounts." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:33 -msgid "Deposit Ticket" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:36 -msgid "" -"Deposit tickets group several payment orders (usually checks) that are " -"deposited together at the bank at the same time. This allows an easy " -"reconciliation with the bank statement line if the line has one line per " -"deposit." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:40 -msgid "Journal Entry" -msgstr "Boeking" - -#: ../../accounting/overview/main_concepts/terminologies.rst:43 -msgid "" -"A journal entry is an accounting transaction, usually related to a financial" -" document: invoice, payment, receipt, etc. A journal entry always consists " -"of at least two lines, described here as journal items, which credit or " -"debit specific accounts. The sum of the credits of all journal items of a " -"journal entry must be equal to the sum of their debits for the entry to be " -"valid." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:50 -msgid "Journal Item" -msgstr "Boeking" - -#: ../../accounting/overview/main_concepts/terminologies.rst:53 -msgid "" -"A line of a journal entry, with a monetary debit or credit associated with a" -" specific account." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:55 -msgid "Analytic Accounts" -msgstr "Kostenplaatsen" - -#: ../../accounting/overview/main_concepts/terminologies.rst:58 -msgid "" -"Sometimes called **Cost Accounts**, are accounts that are not part of the " -"chart of accounts and that allow you to track costs and revenues. Analytic " -"accounts are usually grouped by projects, departments, etc. for analysis of " -"a company's expenditures. Every journal item is posted in a regular account " -"in the chart of account and can be posted to an analytic account for the " -"purpose of reporting or analysis." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:65 -msgid "Analytic Entries" -msgstr "Kostenplaats boekingen" - -#: ../../accounting/overview/main_concepts/terminologies.rst:68 -msgid "" -"Costs or revenues posted to analytic accounts, usually related to journal " -"entries." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:70 -msgid "Sales Receipt" -msgstr "Betaalbewijs" - -#: ../../accounting/overview/main_concepts/terminologies.rst:73 -msgid "" -"A receipt or other slip of paper issued by a store or other vendor " -"describing the details of a purchase (amount, date, department, etc.). Sales" -" receipt are usually used instead of invoices if the sale is paid in cash in" -" a store." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:80 -msgid "" -"Property owned by the company, usually with a useful life greater than one " -"reporting period. Odoo Asset management is used to manage the depreciation /" -" amortization of the asset over the time. Typical examples would be capital " -"equipment, vehicles, and real estate." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:84 -msgid "Deferred Revenues" -msgstr "Uitgestelde omzet" - -#: ../../accounting/overview/main_concepts/terminologies.rst:87 -msgid "" -"Are used to recognize revenues for sales of services that are provided over " -"a long period of time. If you sell a 3 year maintenance contract, you can " -"use the deferred revenue mechanism to recognize 1/36 of the revenue every " -"month until the contract expires, rather than taking it all initially or at " -"the end." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:93 -msgid "Fiscal Position" -msgstr "Fiscale positie" - -#: ../../accounting/overview/main_concepts/terminologies.rst:96 -msgid "" -"Define the taxes that should be applied for a specific customer/vendor or " -"invoice. Example: If some customers benefit from specific taxes (government," -" construction companies, EU companies that are VAT subjected,…), you can " -"assign a fiscal position to them and the right tax will be selected " -"according to the products they buy." -msgstr "" - #: ../../accounting/overview/process_overview.rst:3 msgid "Process overview" msgstr "Proces overzicht" diff --git a/locale/nl/LC_MESSAGES/applications.po b/locale/nl/LC_MESSAGES/applications.po index c40eea22c..d940b3dc9 100644 --- a/locale/nl/LC_MESSAGES/applications.po +++ b/locale/nl/LC_MESSAGES/applications.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/nl/LC_MESSAGES/db_management.po b/locale/nl/LC_MESSAGES/db_management.po index 0b2349430..ed16450d1 100644 --- a/locale/nl/LC_MESSAGES/db_management.po +++ b/locale/nl/LC_MESSAGES/db_management.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cas Vissers , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -22,31 +22,101 @@ msgstr "" msgid "Online Database management" msgstr "Online database beheer" -#: ../../db_management/db_online.rst:13 -msgid "Duplicating a database" -msgstr "Een database dupliceren" - -#: ../../db_management/db_online.rst:15 +#: ../../db_management/db_online.rst:10 msgid "" -"Database duplication, renaming, custom DNS, etc. is not available to free " -"customers of our Online platform." +"To manage your databases, access the `database management page " +"`__ (you will have to sign in). Then " +"click on the `Manage Your Databases " +"`__ button." msgstr "" -"Database duplicatie, hernoemen, custom DNS, etc. is niet beschikbaar voor " -"gratis klanten van ons Online platform." #: ../../db_management/db_online.rst:18 msgid "" -"Access the `database management page `__ " -"(you will have to sign in). Next, make sure you are connected as the " -"administrator of the database you want to duplicate. After that, click on " -"the **Manage Your Databases** button." +"Make sure you are connected as the administrator of the database you want to" +" manage - many operations depends on indentifying you remotely to that " +"database." msgstr "" -"Ga naar de `database beheer pagina `__ " -"(u moet zich aanmelden). Zorg er vervolgens voor dat u aangemeld bent als " -"administrator van de database die u wilt dupliceren. Klik vervolgens op de " -"**Beheer databases** knop." -#: ../../db_management/db_online.rst:26 +#: ../../db_management/db_online.rst:22 +msgid "Several actions are available:" +msgstr "" + +#: ../../db_management/db_online.rst:28 +msgid "Upgrade" +msgstr "Bijwerken" + +#: ../../db_management/db_online.rst:28 +msgid "" +"Upgrade your database to the latest Odoo version to enjoy cutting-edge " +"features" +msgstr "" + +#: ../../db_management/db_online.rst:32 +msgid ":ref:`Duplicate `" +msgstr "" + +#: ../../db_management/db_online.rst:31 +msgid "" +"Make an exact copy of your database, if you want to try out new apps or new " +"flows without compromising your daily operations" +msgstr "" + +#: ../../db_management/db_online.rst:34 +msgid "Rename" +msgstr "" + +#: ../../db_management/db_online.rst:35 +msgid "Rename your database (and its URL)" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "**Backup**" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "" +"Download an instant backup of your database; note that we back up databases " +"daily according to our Odoo Cloud SLA" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid ":ref:`Domains `" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid "Configure custom domains to access your database via another URL" +msgstr "" + +#: ../../db_management/db_online.rst:42 +msgid ":ref:`Delete `" +msgstr "" + +#: ../../db_management/db_online.rst:43 +msgid "Delete a database instantly" +msgstr "" + +#: ../../db_management/db_online.rst:47 +msgid "Contact Support" +msgstr "" + +#: ../../db_management/db_online.rst:45 +msgid "" +"Access our `support page `__ with the correct " +"database already selected" +msgstr "" + +#: ../../db_management/db_online.rst:52 +msgid "Duplicating a database" +msgstr "Een database dupliceren" + +#: ../../db_management/db_online.rst:54 +msgid "" +"Database duplication, renaming, custom DNS, etc. is not available for trial " +"databases on our Online platform. Paid Databases and \"One App Free\" " +"database can duplicate without problem." +msgstr "" + +#: ../../db_management/db_online.rst:59 msgid "" "In the line of the database you want to duplicate, you will have a few " "buttons. To duplicate your database, just click **Duplicate**. You will have" @@ -56,37 +126,37 @@ msgstr "" " u database te dupliceren klikt u op **Dupliceren**. U moet een naam ingeven" " om te dupliceren, klik vervolgens op **Database dupliceren**." -#: ../../db_management/db_online.rst:36 -msgid "A duplicated database has the same behaviour as a real one:" -msgstr "Een gedupliceerde database heeft hetzelfde gedrag als een echte:" +#: ../../db_management/db_online.rst:66 +msgid "" +"If you do not check the \"For testing purposes\" checkbox when duplicating a" +" database, all external communication will remain active:" +msgstr "" -#: ../../db_management/db_online.rst:38 +#: ../../db_management/db_online.rst:69 msgid "Emails are sent" msgstr "E-mails worden verzonden" -#: ../../db_management/db_online.rst:40 -msgid "Payments are processed (in the e-commerce, for example)" -msgstr "Betalingen worden verwerkt (in de online shop bijvoorbeeld)" +#: ../../db_management/db_online.rst:71 +msgid "" +"Payments are processed (in the e-commerce or Subscriptions apps, for " +"example)" +msgstr "" -#: ../../db_management/db_online.rst:42 +#: ../../db_management/db_online.rst:74 msgid "Delivery orders (shipping providers) are sent" msgstr "Afleverorders (leveranciers) zijn verzonden" -#: ../../db_management/db_online.rst:44 +#: ../../db_management/db_online.rst:76 msgid "Etc." msgstr "Etc." -#: ../../db_management/db_online.rst:46 +#: ../../db_management/db_online.rst:78 msgid "" -"It is **strongly** advised to test behaviour using sample customers/products" -" (with a `disposable e-mail `__ address, for " -"example)" +"Make sure to check the checkbox \"For testing purposes\" if you want these " +"behaviours to be disabled." msgstr "" -"Het is ten sterkste aanbevolen het gedrag te testen door demo " -"klanten/producten te gebruiken (met een 'wegwerp e-mail' " -"'__adres, bijvoorbeeld)" -#: ../../db_management/db_online.rst:50 +#: ../../db_management/db_online.rst:81 msgid "" "After a few seconds, you will be logged in your duplicated database. Notice " "that the url uses the name you chose for your duplicated database." @@ -94,10 +164,56 @@ msgstr "" "Na een paar seconden wordt u ingelogd in uw gedupliceerde database. Merk op " "dat de URL de naam van uw gedupliceerde database gebruikt." -#: ../../db_management/db_online.rst:54 +#: ../../db_management/db_online.rst:85 msgid "Duplicate databases expire automatically after 15 days." msgstr "Gedupliceerde databases verlopen automatisch na 15 dagen." +#: ../../db_management/db_online.rst:93 +msgid "Deleting a Database" +msgstr "" + +#: ../../db_management/db_online.rst:95 +msgid "You can only delete databases of which you are the administrator." +msgstr "" + +#: ../../db_management/db_online.rst:97 +msgid "" +"When you delete your database all the data will be permanently lost. The " +"deletion is instant and for all the Users. We advise you to do an instant " +"backup of your database before deleting it, since the last automated daily " +"backup may be several hours old at that point." +msgstr "" + +#: ../../db_management/db_online.rst:103 +msgid "" +"From the `database management page `__, " +"on the line of the database you want to delete, click on the \"Delete\" " +"button." +msgstr "" + +#: ../../db_management/db_online.rst:110 +msgid "" +"Read carefully the warning message that will appear and proceed only if you " +"fully understand the implications of deleting a database:" +msgstr "" + +#: ../../db_management/db_online.rst:116 +msgid "" +"After a few seconds, the database will be deleted and the page will reload " +"automatically." +msgstr "" + +#: ../../db_management/db_online.rst:120 +msgid "" +"If you need to re-use this database name, it will be immediately available." +msgstr "" + +#: ../../db_management/db_online.rst:122 +msgid "" +"If you want to delete your Account, please contact `Odoo Support " +"`__" +msgstr "" + #: ../../db_management/db_premise.rst:7 msgid "On-premise Database management" msgstr "On site database beheer" diff --git a/locale/nl/LC_MESSAGES/discuss.po b/locale/nl/LC_MESSAGES/discuss.po index 0f52c7040..722ddfaf2 100644 --- a/locale/nl/LC_MESSAGES/discuss.po +++ b/locale/nl/LC_MESSAGES/discuss.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cas Vissers , 2018\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -426,6 +426,57 @@ msgid "" "simple and searchable interface." msgstr "" +#: ../../discuss/plan_activities.rst:3 +msgid "Get organized by planning activities" +msgstr "" + +#: ../../discuss/plan_activities.rst:5 +msgid "" +"Planning activities is the perfect way to keep on track with your work. Get " +"reminded of what needs to be done and schedule the next activities to " +"undertake." +msgstr "" + +#: ../../discuss/plan_activities.rst:9 +msgid "" +"Your activities are available wherever you are in Odoo. It is easy to manage" +" your priorities." +msgstr "" + +#: ../../discuss/plan_activities.rst:15 +msgid "" +"Activities can be planned and managed from the chatters or in the kanban " +"views. Here is an example for opportunities :" +msgstr "" + +#: ../../discuss/plan_activities.rst:22 +msgid "Set your activity types" +msgstr "" + +#: ../../discuss/plan_activities.rst:24 +msgid "" +"A number of generic activities types are available by default in Odoo (e.g. " +"call, email, meeting, etc.). If you would like to set new ones, go to " +":menuselection:`Settings --> General settings --> Activity types`." +msgstr "" + +#: ../../discuss/plan_activities.rst:29 +msgid "Schedule meetings" +msgstr "" + +#: ../../discuss/plan_activities.rst:31 +msgid "" +"Activities are planned for specific days. If you need to set hours, go with " +"the *Meeting* activity type. When scheduling one, the calendar will simply " +"open to let you select a time slot." +msgstr "" + +#: ../../discuss/plan_activities.rst:36 +msgid "" +"If you need to use other activity types with a calendar planning, make sure " +"their *Category* is set as *Meeting*." +msgstr "" + #: ../../discuss/team_communication.rst:3 msgid "How to efficiently communicate in team using channels" msgstr "Hoe efficiënt communiceren in team met kanalen" diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index 9ab51aadb..a634504d4 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -113,6 +113,10 @@ msgid "" "any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " "etc.)." msgstr "" +"Importeer sjablonen zijn beschikbaar in de importeer tool voor de meest " +"voorkomende data om te importeren (contacten, producten, bankafschriften, " +"enz). U kan ze met eender welke spreadsheet software openen (Microsoft " +"Office, OpenOffice, Google Drive, enz)." #: ../../general/base_import/adapt_template.rst:11 msgid "How to customize the file" diff --git a/locale/nl/LC_MESSAGES/getting_started.po b/locale/nl/LC_MESSAGES/getting_started.po index 37fa44c74..3a8cc6d21 100644 --- a/locale/nl/LC_MESSAGES/getting_started.po +++ b/locale/nl/LC_MESSAGES/getting_started.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-13 13:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/nl/LC_MESSAGES/helpdesk.po b/locale/nl/LC_MESSAGES/helpdesk.po index ce462abb0..66b16d530 100644 --- a/locale/nl/LC_MESSAGES/helpdesk.po +++ b/locale/nl/LC_MESSAGES/helpdesk.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,35 +18,39 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../helpdesk/helpdesk.rst:5 +#: ../../helpdesk.rst:5 msgid "Helpdesk" msgstr "Helpdesk" -#: ../../helpdesk/helpdesk.rst:8 +#: ../../helpdesk/getting_started.rst:3 +msgid "Get started with Odoo Helpdesk" +msgstr "" + +#: ../../helpdesk/getting_started.rst:6 msgid "Overview" msgstr "Overzicht" -#: ../../helpdesk/helpdesk.rst:11 +#: ../../helpdesk/getting_started.rst:9 msgid "Getting started with Odoo Helpdesk" msgstr "Starten met Odoo Helpdesk" -#: ../../helpdesk/helpdesk.rst:13 +#: ../../helpdesk/getting_started.rst:11 msgid "Installing Odoo Helpdesk:" msgstr "Odoo Helpdesk installeren:" -#: ../../helpdesk/helpdesk.rst:15 +#: ../../helpdesk/getting_started.rst:13 msgid "Open the Apps module, search for \"Helpdesk\", and click install" msgstr "Open de Apps module, zoek voor \"Helpdesk\" en klik op installeren" -#: ../../helpdesk/helpdesk.rst:21 +#: ../../helpdesk/getting_started.rst:19 msgid "Set up Helpdesk teams" msgstr "Helpdesk teams opzetten" -#: ../../helpdesk/helpdesk.rst:23 +#: ../../helpdesk/getting_started.rst:21 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\"" msgstr "Standaard komt Odoo Helpdesk met een team \"Support\" genaamd." -#: ../../helpdesk/helpdesk.rst:28 +#: ../../helpdesk/getting_started.rst:26 msgid "" "To modify this team, or create additional teams, select \"Configuration\" in" " the purple bar and select \"Settings\"" @@ -54,7 +58,7 @@ msgstr "" "Om dit team te wijzigen, of extra teams aan te maken, selecteert u " "\"Configuratie\" in de paarse balk en selecteert u \"Instellingen\"" -#: ../../helpdesk/helpdesk.rst:34 +#: ../../helpdesk/getting_started.rst:32 msgid "" "Here you can create new teams, decide what team members to add to this team," " how your customers can submit tickets and set up SLA policies and ratings. " @@ -62,18 +66,18 @@ msgid "" " or manually." msgstr "" -#: ../../helpdesk/helpdesk.rst:40 +#: ../../helpdesk/getting_started.rst:38 msgid "How to set up different stages for each team" msgstr "Hoe verschillende fases opzetten voor elk team" -#: ../../helpdesk/helpdesk.rst:42 +#: ../../helpdesk/getting_started.rst:40 msgid "" "First you will need to activate the developer mode. To do this go to your " "settings module, and select the link for \"Activate the developer mode\" on " "the lower right-hand side." msgstr "" -#: ../../helpdesk/helpdesk.rst:49 +#: ../../helpdesk/getting_started.rst:47 msgid "" "Now, when you return to your Helpdesk module and select \"Configuration\" in" " the purple bar you will find additional options, like \"Stages\". Here you " @@ -81,41 +85,41 @@ msgid "" "allowing for customizable stages for each team!" msgstr "" -#: ../../helpdesk/helpdesk.rst:55 +#: ../../helpdesk/getting_started.rst:53 msgid "Start receiving tickets" msgstr "Start met het ontvangen van tickets" -#: ../../helpdesk/helpdesk.rst:58 +#: ../../helpdesk/getting_started.rst:56 msgid "How can my customers submit tickets?" msgstr "Hoe kunnen mijn klanten tickets doorsturen?" -#: ../../helpdesk/helpdesk.rst:60 +#: ../../helpdesk/getting_started.rst:58 msgid "" "Select \"Configuration\" in the purple bar and select \"Settings\", select " "your Helpdesk team. Under \"Channels you will find 4 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:66 +#: ../../helpdesk/getting_started.rst:64 msgid "" "Email Alias allows for customers to email the alias you choose to create a " "ticket. The subject line of the email with become the Subject on the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:73 +#: ../../helpdesk/getting_started.rst:71 msgid "" "Website Form allows your customer to go to " "yourwebsite.com/helpdesk/support-1/submit and submit a ticket via a website " "form - much like odoo.com/help!" msgstr "" -#: ../../helpdesk/helpdesk.rst:80 +#: ../../helpdesk/getting_started.rst:78 msgid "" "Live Chat allows your customers to submit a ticket via Live Chat on your " "website. Your customer will begin the live chat and your Live Chat Operator " "can create the ticket by using the command /helpdesk Subject of Ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:88 +#: ../../helpdesk/getting_started.rst:86 msgid "" "The final option to submit tickets is thru an API connection. View the " "documentation `*here* " @@ -125,11 +129,11 @@ msgstr "" "Bekijk de documentatie `*hier* " "`__." -#: ../../helpdesk/helpdesk.rst:93 +#: ../../helpdesk/getting_started.rst:91 msgid "Tickets have been created, now what?" msgstr "Er zijn tickets aangemaakt, wat nu?" -#: ../../helpdesk/helpdesk.rst:95 +#: ../../helpdesk/getting_started.rst:93 msgid "" "Now your employees can start working on them! If you have selecting a manual" " assignation method then your employees will need to assign themselves to " @@ -137,13 +141,13 @@ msgid "" "adding themselves to the \"Assigned to\" field." msgstr "" -#: ../../helpdesk/helpdesk.rst:103 +#: ../../helpdesk/getting_started.rst:101 msgid "" "If you have selected \"Random\" or \"Balanced\" assignation method, your " "tickets will be assigned to a member of that Helpdesk team." msgstr "" -#: ../../helpdesk/helpdesk.rst:106 +#: ../../helpdesk/getting_started.rst:104 msgid "" "From there they will begin working on resolving the tickets! When they are " "completed, they will move the ticket to the solved stage." @@ -151,94 +155,247 @@ msgstr "" "Van hieruit beginnen zij te werken aan het oplossen van de tickets! Wanneer " "ze voltooid zijn komt het ticket in de opgelost fase." -#: ../../helpdesk/helpdesk.rst:110 +#: ../../helpdesk/getting_started.rst:108 msgid "How do I mark this ticket as urgent?" msgstr "Hoe markeer ik dit ticket als urgent?" -#: ../../helpdesk/helpdesk.rst:112 +#: ../../helpdesk/getting_started.rst:110 msgid "" "On your tickets you will see stars. You can determine how urgent a ticket is" " but selecting one or more stars on the ticket. You can do this in the " "Kanban view or on the ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:119 +#: ../../helpdesk/getting_started.rst:117 msgid "" "To set up a Service Level Agreement Policy for your employees, first " "activate the setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:125 +#: ../../helpdesk/getting_started.rst:123 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"." msgstr "" -#: ../../helpdesk/helpdesk.rst:127 +#: ../../helpdesk/getting_started.rst:125 msgid "" "You will fill in information like the Helpdesk team, what the minimum " "priority is on the ticket (the stars) and the targets for the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:134 +#: ../../helpdesk/getting_started.rst:132 msgid "What if a ticket is blocked or is ready to be worked on?" msgstr "" -#: ../../helpdesk/helpdesk.rst:136 +#: ../../helpdesk/getting_started.rst:134 msgid "" "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban " "State\" on the ticket. You have 3 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:139 +#: ../../helpdesk/getting_started.rst:137 msgid "Grey - Normal State" msgstr "" -#: ../../helpdesk/helpdesk.rst:141 +#: ../../helpdesk/getting_started.rst:139 msgid "Red - Blocked" msgstr "" -#: ../../helpdesk/helpdesk.rst:143 +#: ../../helpdesk/getting_started.rst:141 msgid "Green - Ready for next stage" msgstr "" -#: ../../helpdesk/helpdesk.rst:145 +#: ../../helpdesk/getting_started.rst:143 msgid "" "Like the urgency stars you can adjust the state in the Kanban or on the " "Ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:152 +#: ../../helpdesk/getting_started.rst:150 msgid "How can my employees log time against a ticket?" msgstr "" -#: ../../helpdesk/helpdesk.rst:154 +#: ../../helpdesk/getting_started.rst:152 msgid "" "First, head over to \"Settings\" and select the option for \"Timesheet on " "Ticket\". You will see a field appear where you can select the project the " "timesheets will log against." msgstr "" -#: ../../helpdesk/helpdesk.rst:161 +#: ../../helpdesk/getting_started.rst:159 msgid "" "Now that you have selected a project, you can save. If you move back to your" " tickets, you will see a new tab called \"Timesheets\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:167 +#: ../../helpdesk/getting_started.rst:165 msgid "" "Here you employees can add a line to add work they have done for this " "ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:171 +#: ../../helpdesk/getting_started.rst:169 msgid "How to allow your customers to rate the service they received" msgstr "" -#: ../../helpdesk/helpdesk.rst:173 +#: ../../helpdesk/getting_started.rst:171 msgid "First, you will need to activate the ratings setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:178 +#: ../../helpdesk/getting_started.rst:176 msgid "" "Now, when a ticket is moved to its solved or completed stage, it will send " "an email to the customer asking how their service went." msgstr "" + +#: ../../helpdesk/invoice_time.rst:3 +msgid "Record and invoice time for tickets" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:5 +msgid "" +"You may have service contracts with your clients to provide them assistance " +"in case of a problem. For this purpose, Odoo will help you record the time " +"spent fixing the issue and most importantly, to invoice it to your clients." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:11 +msgid "The modules needed" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:13 +msgid "" +"In order to record and invoice time for tickets, the following modules are " +"needed : Helpdesk, Project, Timesheets, Sales. If you are missing one of " +"them, go to the Apps module, search for it and then click on *Install*." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:19 +msgid "Get started to offer the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:22 +msgid "Step 1 : start a helpdesk project" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:24 +msgid "" +"To start a dedicated project for the helpdesk service, first go to " +":menuselection:`Project --> Configuration --> Settings` and make sure that " +"the *Timesheets* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:31 +msgid "" +"Then, go to your dashboard, create the new project and allow timesheets for " +"it." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:35 +msgid "Step 2 : gather a helpdesk team" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:37 +msgid "" +"To set a team in charge of the helpdesk, go to :menuselection:`Helpdesk --> " +"Configuration --> Helpdesk Teams` and create a new team or select an " +"existing one. On the form, tick the box in front of *Timesheet on Ticket* to" +" activate the feature. Make sure to select the helpdesk project you have " +"previously created as well." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:47 +msgid "Step 3 : launch the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:49 +msgid "" +"Finally, to launch the new helpdesk service, first go to " +":menuselection:`Sales --> Configuration --> Settings` and make sure that the" +" *Units of Measure* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:56 +msgid "" +"Then, go to :menuselection:`Products --> Products` and create a new one. " +"Make sure that the product is set as a service." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:63 +msgid "" +"Here, we suggest that you set the *Unit of Measure* as *Hour(s)*, but any " +"unit will do." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:66 +msgid "" +"Finally, select the invoicing management you would like to have under the " +"*Sales* tab of the product form. Here, we recommend the following " +"configuration :" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:73 +msgid "Now, you are ready to start receiving tickets !" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:76 +msgid "Solve issues and record time spent" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:79 +msgid "Step 1 : place an order" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:81 +msgid "" +"You are now in the Helpdesk module and you have just received a ticket from " +"a client. To place a new order, go to :menuselection:`Sales --> Orders --> " +"Orders` and create one for the help desk service product you have previously" +" recorded. Set the number of hours needed to assist the client and confirm " +"the sale." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:91 +msgid "Step 2 : link the task to the ticket" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:93 +msgid "" +"If you access the dedicated helpdesk project, you will notice that a new " +"task has automatically been generated with the order. To link this task with" +" the client ticket, go to the Helpdesk module, access the ticket in question" +" and select the task on its form." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:102 +msgid "Step 3 : record the time spent to help the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:104 +msgid "" +"The job is done and the client's issue is sorted out. To record the hours " +"performed for this task, go back to the ticket form and add them under the " +"*Timesheets* tab." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:112 +msgid "" +"The hours recorded on the ticket will also automatically appear in the " +"Timesheet module and on the dedicated task." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:116 +msgid "Step 4 : invoice the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:118 +msgid "" +"To invoice the client, go back to the Sales module and select the order that" +" had been placed. Notice that the hours recorded on the ticket form now " +"appear as the delivered quantity." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:125 +msgid "" +"All that is left to do, is to create the invoice from the order and then " +"validate it. Now you just have to wait for the client's payment !" +msgstr "" diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po index 55a0fe692..aaa03ffb6 100644 --- a/locale/nl/LC_MESSAGES/inventory.po +++ b/locale/nl/LC_MESSAGES/inventory.po @@ -4378,7 +4378,7 @@ msgstr "Een product" #: ../../inventory/overview/concepts/double-entry.rst:205 msgid "Product Route Example: Quality Control" -msgstr "" +msgstr "Product route voorbeeld: Kwaliteitscontrole" #: ../../inventory/overview/concepts/double-entry.rst:207 #: ../../inventory/overview/concepts/double-entry.rst:217 @@ -4388,7 +4388,7 @@ msgstr "Ontvangst:" #: ../../inventory/overview/concepts/double-entry.rst:208 #: ../../inventory/overview/concepts/double-entry.rst:218 msgid "Supplier → Input" -msgstr "" +msgstr "Leverancier → Input" #: ../../inventory/overview/concepts/double-entry.rst:209 msgid "Confirmation:" @@ -4396,7 +4396,7 @@ msgstr "Bevestiging:" #: ../../inventory/overview/concepts/double-entry.rst:210 msgid "Input → Quality Control" -msgstr "" +msgstr "Input → Kwaliteitscontrole" #: ../../inventory/overview/concepts/double-entry.rst:212 msgid "Storage:" @@ -4404,7 +4404,7 @@ msgstr "Opslag:" #: ../../inventory/overview/concepts/double-entry.rst:212 msgid "Quality Control → Stock" -msgstr "" +msgstr "Kwaliteitscontrole → Stock" #: ../../inventory/overview/concepts/double-entry.rst:221 msgid "Product Category" @@ -4488,7 +4488,7 @@ msgstr "" #: ../../inventory/overview/concepts/double-entry.rst:247 msgid "Procurement Groups" -msgstr "" +msgstr "Verwervingsgroepen" #: ../../inventory/overview/concepts/double-entry.rst:249 msgid "" diff --git a/locale/nl/LC_MESSAGES/livechat.po b/locale/nl/LC_MESSAGES/livechat.po new file mode 100644 index 000000000..dc17b12dc --- /dev/null +++ b/locale/nl/LC_MESSAGES/livechat.po @@ -0,0 +1,194 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2015-TODAY, Odoo S.A. +# This file is distributed under the same license as the Odoo Business package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Odoo Business 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Cas Vissers , 2018\n" +"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../../livechat/livechat.rst:5 +msgid "Live Chat" +msgstr "Live Chat" + +#: ../../livechat/livechat.rst:8 +msgid "Chat in live with website visitors" +msgstr "" + +#: ../../livechat/livechat.rst:10 +msgid "" +"With Odoo Live Chat, you can establish a direct contact with your website " +"visitors. A simple dialog box will be available on their screen and will " +"allow them to get in touch with one of your sales representatives. This way," +" you can easily turn prospects into potential business opportunities. You " +"will also be able to provide assistance to your customers. Overall, this is " +"the perfect tool to improve customer satisfaction." +msgstr "" + +#: ../../livechat/livechat.rst:19 +msgid "Configuration" +msgstr "Instelling" + +#: ../../livechat/livechat.rst:21 +msgid "" +"To get the Live Chat feature, open the Apps module, search for \"Live Chat\"" +" and then click on install." +msgstr "" + +#: ../../livechat/livechat.rst:27 +msgid "" +"The Live Chat module provides you a direct access to your channels. There, " +"operators can easily join and leave the chat." +msgstr "" + +#: ../../livechat/livechat.rst:34 +msgid "Add the live chat to an Odoo website" +msgstr "" + +#: ../../livechat/livechat.rst:36 +msgid "" +"If your website was created with Odoo, then the live chat is automatically " +"added to it. All that is left to do, is to go to :menuselection:`Website -->" +" Configuration --> Settings` to select the channel to be linked to the " +"website." +msgstr "" + +#: ../../livechat/livechat.rst:45 +msgid "Add the live chat to an external website" +msgstr "" + +#: ../../livechat/livechat.rst:47 +msgid "" +"If your website was not created with Odoo, go to the Live Chat module and " +"then select the channel to be linked. There, you can simply copy paste the " +"code available into your website. A specific url you can send to customers " +"or suppliers for them to access the live chat is also provided." +msgstr "" + +#: ../../livechat/livechat.rst:54 +msgid "Hide / display the live chat according to rules" +msgstr "" + +#: ../../livechat/livechat.rst:56 +msgid "" +"Rules for the live chat can be defined on the channel form. For instance, " +"you can choose to display the chat in the countries you speak the language " +"of. On the contrary, you are able to hide the chat in countries your company" +" does not sell in. If you select *Auto popup*, you can also set the length " +"of time it takes for the chat to appear." +msgstr "" + +#: ../../livechat/livechat.rst:66 +msgid "Prepare automatic messages" +msgstr "" + +#: ../../livechat/livechat.rst:68 +msgid "" +"On the channel form, in the *Options* section, several messages can be typed" +" to appear automatically on the chat. This will entice visitors to reach you" +" through the live chat." +msgstr "" + +#: ../../livechat/livechat.rst:76 +msgid "Start chatting with customers" +msgstr "" + +#: ../../livechat/livechat.rst:78 +msgid "" +"In order to start chatting with customers, first make sure that the channel " +"is published on your website. To do so, select *Unpublished on Website* on " +"the top right corner of the channel form to toggle the *Published* setting. " +"Then, the live chat can begin once an operator has joined the channel." +msgstr "" + +#: ../../livechat/livechat.rst:88 +msgid "" +"If no operator is available and/or if the channel is unpublished on the " +"website, then the live chat button will not appear to visitors." +msgstr "" + +#: ../../livechat/livechat.rst:92 +msgid "" +"In practice, the conversations initiated by the visitors will appear in the " +"Discuss module and will also pop up as a direct message. Therefore, " +"inquiries can be answered wherever you are in Odoo." +msgstr "" + +#: ../../livechat/livechat.rst:96 +msgid "" +"If there several operators in charge of a channel, the system will dispatch " +"sessions randomly between them." +msgstr "" + +#: ../../livechat/livechat.rst:100 +msgid "Use commands" +msgstr "" + +#: ../../livechat/livechat.rst:102 +msgid "" +"Commands are useful shortcuts for completing certain actions or to access " +"information you might need. To use this feature, simply type the commands " +"into the chat. The following actions are available :" +msgstr "" + +#: ../../livechat/livechat.rst:106 +msgid "**/help** : show a helper message." +msgstr "" + +#: ../../livechat/livechat.rst:108 +msgid "**/helpdesk** : create a helpdesk ticket." +msgstr "" + +#: ../../livechat/livechat.rst:110 +msgid "**/helpdesk\\_search** : search for a helpdesk ticket." +msgstr "" + +#: ../../livechat/livechat.rst:112 +msgid "**/history** : see 15 last visited pages." +msgstr "" + +#: ../../livechat/livechat.rst:114 +msgid "**/lead** : create a new lead." +msgstr "" + +#: ../../livechat/livechat.rst:116 +msgid "**/leave** : leave the channel." +msgstr "" + +#: ../../livechat/livechat.rst:119 +msgid "" +"If a helpdesk ticket is created from the chat, then the conversation it was " +"generated from will automatically appear as the description of the ticket. " +"The same goes for the creation of a lead." +msgstr "" + +#: ../../livechat/livechat.rst:124 +msgid "Send canned responses" +msgstr "" + +#: ../../livechat/livechat.rst:126 +msgid "" +"Canned responses allow you to create substitutes to generic sentences you " +"frequently use. Typing a word instead of several will save you a lot of " +"time. To add canned responses, go to :menuselection:`LIVE CHAT --> " +"Configuration --> Canned Responses` and create as many as you need to. Then," +" to use them during a chat, simply type \":\" followed by the shortcut you " +"assigned." +msgstr "" + +#: ../../livechat/livechat.rst:136 +msgid "" +"You now have all of the tools needed to chat in live with your website " +"visitors, enjoy !" +msgstr "" diff --git a/locale/nl/LC_MESSAGES/manufacturing.po b/locale/nl/LC_MESSAGES/manufacturing.po index c05f1720a..5661702c8 100644 --- a/locale/nl/LC_MESSAGES/manufacturing.po +++ b/locale/nl/LC_MESSAGES/manufacturing.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-22 15:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/nl/LC_MESSAGES/point_of_sale.po b/locale/nl/LC_MESSAGES/point_of_sale.po index 0066d1f79..ffee014f8 100644 --- a/locale/nl/LC_MESSAGES/point_of_sale.po +++ b/locale/nl/LC_MESSAGES/point_of_sale.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Melroy van den Berg , 2018\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -1086,7 +1086,7 @@ msgid "POSBox Setup Guide" msgstr "POSBox opzet handleiding" #: ../../point_of_sale/overview/setup.rst:11 -#: ../../point_of_sale/overview/setup.rst:206 +#: ../../point_of_sale/overview/setup.rst:205 msgid "Prerequisites" msgstr "Vereisten" @@ -1119,27 +1119,27 @@ msgid "A local network set up with DHCP (this is the default setting)" msgstr "Een lokale netwerk opzet met DHCP (dit is de standaard instelling)" #: ../../point_of_sale/overview/setup.rst:21 -msgid "An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter" -msgstr "Een RJ-45 internetkabel of een Linux compatibele Wi-Fi USB adapter" - -#: ../../point_of_sale/overview/setup.rst:22 msgid "" "An Epson USB TM-T20 Printer or another ESC/POS compatible printer " "(officially supported printers are listed at the `POS Hardware page " "`_)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:25 +#: ../../point_of_sale/overview/setup.rst:24 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" msgstr "" "Een Honeywell Eclipse USB Barcode scanner of een ander compatibel apparaat" -#: ../../point_of_sale/overview/setup.rst:26 +#: ../../point_of_sale/overview/setup.rst:25 msgid "An Epson compatible cash drawer" msgstr "Een Epson compatibele kassa lade" +#: ../../point_of_sale/overview/setup.rst:26 +msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)" +msgstr "" + #: ../../point_of_sale/overview/setup.rst:29 -#: ../../point_of_sale/overview/setup.rst:214 +#: ../../point_of_sale/overview/setup.rst:213 msgid "Step By Step Setup Guide" msgstr "Stap per stap opzethandleiding" @@ -1205,24 +1205,16 @@ msgstr "" #: ../../point_of_sale/overview/setup.rst:60 msgid "" -"**Wi-Fi**: If you do not wish to use Ethernet, plug in a Linux compatible " -"USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux " -"compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 " -"chipset. Make sure not to plug in an Ethernet cable, because all Wi-Fi " -"functionality will be bypassed when a wired network connection is available." +"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure " +"not to plug in an Ethernet cable, because all Wi-Fi functionality will be " +"bypassed when a wired network connection is available." msgstr "" -"**Wi-Fi**: Indien u geen internet wilt gebruiken moet u een Linux " -"compatibele USB Wi-FI adapter inpluggen. De meeste commerciële Wi-Fi " -"adapters zijn Linux compatibel. Officieel ondersteunde Wi-Fi adapters zijn " -"diegene met een Ralink 5370 chipset. Verzeker u er van dat u geen " -"internetkabel insteekt, omdat alle Wi-Fi functionaliteit omzeilt wordt " -"wanneer een bekabelde verbinding beschikbaar is." -#: ../../point_of_sale/overview/setup.rst:68 +#: ../../point_of_sale/overview/setup.rst:66 msgid "Power the POSBox" msgstr "Zet de POSBox aan" -#: ../../point_of_sale/overview/setup.rst:70 +#: ../../point_of_sale/overview/setup.rst:68 msgid "" "Plug the power adapter into the POSBox, a bright red status led should light" " up." @@ -1230,11 +1222,11 @@ msgstr "" "Steek de oplader in uw POSbox, een helderrood status led licht zou moeten " "gaan branden." -#: ../../point_of_sale/overview/setup.rst:74 +#: ../../point_of_sale/overview/setup.rst:72 msgid "Make sure the POSBox is ready" msgstr "Verzeker er u van dat de POSBox klaar is" -#: ../../point_of_sale/overview/setup.rst:76 +#: ../../point_of_sale/overview/setup.rst:74 msgid "" "Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it" " should print a status receipt with its IP address. Also the status LED, " @@ -1245,12 +1237,12 @@ msgstr "" " met het IP adres op. De status LED, net naast de rode stroom LED, moet " "permanent groen branden." -#: ../../point_of_sale/overview/setup.rst:82 -#: ../../point_of_sale/overview/setup.rst:293 +#: ../../point_of_sale/overview/setup.rst:80 +#: ../../point_of_sale/overview/setup.rst:292 msgid "Setup the Point of Sale" msgstr "De kassa opzetten" -#: ../../point_of_sale/overview/setup.rst:84 +#: ../../point_of_sale/overview/setup.rst:82 msgid "" "To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale" " --> Configuration --> Settings` and select your Point of Sale. Scroll down " @@ -1268,7 +1260,7 @@ msgstr "" "opstarten van de POSBox). Wanneer er geen IP is opgegeven zal de Kassa " "proberen deze zelf te vinden in het lokale netwerk." -#: ../../point_of_sale/overview/setup.rst:93 +#: ../../point_of_sale/overview/setup.rst:91 msgid "" "If you are running multiple Point of Sales on the same POSBox, make sure " "that only one of them has Remote Scanning/Barcode Scanner activated." @@ -1276,7 +1268,7 @@ msgstr "" "Verzeker u er van dat er maar één kassa is geactiveerd met de optie voor " "Scanning/Barcode indien u meerdere kassa's draait op dezelfde POSBox." -#: ../../point_of_sale/overview/setup.rst:96 +#: ../../point_of_sale/overview/setup.rst:94 msgid "" "It might be a good idea to make sure the POSBox IP never changes in your " "network. Refer to your router documentation on how to achieve this." @@ -1285,11 +1277,11 @@ msgstr "" "veranderd in uw netwerk. Kijk naar uw router documentatie om te zien hoe u " "dit kan doen." -#: ../../point_of_sale/overview/setup.rst:101 +#: ../../point_of_sale/overview/setup.rst:99 msgid "Launch the Point of Sale" msgstr "Lanceer de kassa" -#: ../../point_of_sale/overview/setup.rst:103 +#: ../../point_of_sale/overview/setup.rst:101 msgid "" "If you didn't specify the POSBox's IP address in the configuration, the POS " "will need some time to perform a network scan to find the POSBox. This is " @@ -1299,7 +1291,7 @@ msgstr "" " POS tijd nodig hebben om een netwerkscan uit te voeren om de POSBox te " "vinden. Dit wordt slechts éénmalig gedaan." -#: ../../point_of_sale/overview/setup.rst:107 +#: ../../point_of_sale/overview/setup.rst:105 msgid "" "The Point of Sale is now connected to the POSBox and your hardware should be" " ready to use." @@ -1307,23 +1299,19 @@ msgstr "" "De Kassa is nu verbonden met de POSBox en u hardware zou klaar moeten zijn " "om te kunnen gebruiken." -#: ../../point_of_sale/overview/setup.rst:111 +#: ../../point_of_sale/overview/setup.rst:109 msgid "Wi-Fi configuration" msgstr "Wi-Fi configuratie" -#: ../../point_of_sale/overview/setup.rst:113 +#: ../../point_of_sale/overview/setup.rst:111 msgid "" -"The POSBox is Wi-Fi-capable. In order to use it you'll need a Linux " -"compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are" -" Linux compatible. Officially supported are Wi-Fi adapters with a Ralink " -"5370 chipset." +"The most recent version of the POSBox has Wi-Fi built in. If you're using an" +" older version you'll need a Linux compatible USB Wi-Fi adapter. Most " +"commercially available Wi-Fi adapters are Linux compatible. Officially " +"supported are Wi-Fi adapters with a Ralink 5370 chipset." msgstr "" -"De POSBox kan Wi-Fi gebruiken. Om Wi-Fi te gebruiken heeft u een Linux " -"compatibele Wi-Fi USB adapter nodig. De meeste commercieel beschikbare " -"adapters zijn Linux compatibel. Ofifcieel ondersteunde Wi-FI adapters zijn " -"degene met een Ralink 5370 chipset." -#: ../../point_of_sale/overview/setup.rst:118 +#: ../../point_of_sale/overview/setup.rst:117 msgid "" "Make sure not to plug in an Ethernet cable, as all Wi-Fi related " "functionality will be disabled when a wired network connection is available." @@ -1331,7 +1319,7 @@ msgstr "" "Steek zeker geen internetkabel in, anders wordt alle Wi-Fi gerelateerde " "functionaliteit uitgeschakeld wanneer een bekabeld netwerk beschikbaar is." -#: ../../point_of_sale/overview/setup.rst:122 +#: ../../point_of_sale/overview/setup.rst:121 msgid "" "When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi " "Access Point called \"Posbox\" you can connect to. The receipt that gets " @@ -1355,7 +1343,7 @@ msgstr "" "invullen. De POSBox zal proberen te connecteren met het opgegeven netwerk en" " print een nieuw POSBox status ticket nadat deze verbonden is." -#: ../../point_of_sale/overview/setup.rst:133 +#: ../../point_of_sale/overview/setup.rst:132 msgid "" "If you plan on permanently setting up the POSBox with Wi-Fi, you can use the" " \"persistent\" checkbox on the Wi-Fi configuration page when connecting to " @@ -1370,7 +1358,7 @@ msgstr "" "*Posbox* netwerk de POSBox altijd zal proberen om te connecteren met het " "opgegeven netwerk na een boot." -#: ../../point_of_sale/overview/setup.rst:140 +#: ../../point_of_sale/overview/setup.rst:139 msgid "" "When the POSBox fails to connect to a network it will fall back to starting " "it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network" @@ -1382,11 +1370,11 @@ msgstr "" "Fi netwerk na er mee te verbinden zal de POSBox proberen de connectie " "automatisch te herstellen." -#: ../../point_of_sale/overview/setup.rst:146 +#: ../../point_of_sale/overview/setup.rst:145 msgid "Multi-POS Configuration" msgstr "Multi-POS configuratie" -#: ../../point_of_sale/overview/setup.rst:148 +#: ../../point_of_sale/overview/setup.rst:147 msgid "" "The advised way to setup a multi Point of Sale shop is to have one POSBox " "per Point of Sale. In this case it is mandatory to manually specify the IP " @@ -1400,11 +1388,11 @@ msgstr "" "configureren om u er van te verzekeren dat de POSBoxen hun IP adressen niet " "veranderen. Bekijk hiervoor aub uw router documentatie." -#: ../../point_of_sale/overview/setup.rst:155 +#: ../../point_of_sale/overview/setup.rst:154 msgid "POSBoxless Guide (advanced)" msgstr "Kassa zonder POSBox handleiding (geavanceerd)" -#: ../../point_of_sale/overview/setup.rst:159 +#: ../../point_of_sale/overview/setup.rst:158 msgid "" "If you are running your Point of Sale on a Debian-based Linux distribution, " "you do not need the POSBox as you can run its software locally. However the " @@ -1418,7 +1406,7 @@ msgstr "" "configureert. U kan ook tegen problemen aanlopen die specifiek zijn aan uw " "distributie of tot uw specifieke opzet / hardware configuratie." -#: ../../point_of_sale/overview/setup.rst:166 +#: ../../point_of_sale/overview/setup.rst:165 msgid "" "Drivers for the various types of supported hardware are provided as Odoo " "modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale" @@ -1434,17 +1422,17 @@ msgstr "" "zakelijke data (bijvoorbeeld kassa orders), maar dient enkel als een poort " "tussen de Kassa en de hardware." -#: ../../point_of_sale/overview/setup.rst:173 +#: ../../point_of_sale/overview/setup.rst:172 msgid "" "The goal of this section will be to set up a local Odoo instance that " "behaves like the Odoo instance running on the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:177 +#: ../../point_of_sale/overview/setup.rst:176 msgid "Image building process" msgstr "Afbeelding bouwen proces" -#: ../../point_of_sale/overview/setup.rst:179 +#: ../../point_of_sale/overview/setup.rst:178 msgid "" "We generate the official POSBox images using the scripts in " "https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. " @@ -1454,7 +1442,7 @@ msgid "" "`nightly.odoo.com `_ for users to download." msgstr "" -#: ../../point_of_sale/overview/setup.rst:187 +#: ../../point_of_sale/overview/setup.rst:186 msgid "" "The scripts in this directory might be useful as a reference if you get " "stuck or want more detail about something." @@ -1462,11 +1450,11 @@ msgstr "" "De scripts in deze map zijn mogelijk handig als een referentie als u vastzit" " of meer details over iets wilt." -#: ../../point_of_sale/overview/setup.rst:191 +#: ../../point_of_sale/overview/setup.rst:190 msgid "Summary of the image creation process" msgstr "Samenvatting van het afbeelding bouw proces" -#: ../../point_of_sale/overview/setup.rst:193 +#: ../../point_of_sale/overview/setup.rst:192 msgid "" "The image creation process starts by downloading the latest `Raspbian " "`_ image. It then locally mounts this Raspbian " @@ -1492,16 +1480,16 @@ msgstr "" "bestanden. De resulterende afbeelding is dan klaar om te testen en te " "gebruiken." -#: ../../point_of_sale/overview/setup.rst:208 +#: ../../point_of_sale/overview/setup.rst:207 msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)" msgstr "Een Debian gebaseerde Linux distributie (Debian, Ubuntu, Mint, etc.)" -#: ../../point_of_sale/overview/setup.rst:209 +#: ../../point_of_sale/overview/setup.rst:208 msgid "A running Odoo instance you connect to to load the Point of Sale" msgstr "" "Een draaiende Odoo instantie die u connecteert om te laden met de Kassa" -#: ../../point_of_sale/overview/setup.rst:210 +#: ../../point_of_sale/overview/setup.rst:209 msgid "" "You must uninstall any ESC/POS printer driver as it will conflict with " "Odoo's built-in driver" @@ -1509,11 +1497,11 @@ msgstr "" "U moet alle ECS/POS printer drivers verwijderen aangezien deze conflicteren " "met de Odoo ingebouwde driver" -#: ../../point_of_sale/overview/setup.rst:217 +#: ../../point_of_sale/overview/setup.rst:216 msgid "Extra dependencies" msgstr "Extra afhankelijkheden" -#: ../../point_of_sale/overview/setup.rst:219 +#: ../../point_of_sale/overview/setup.rst:218 msgid "" "Because Odoo runs on Python 2, you need to check which version of pip you " "need to use." @@ -1521,44 +1509,44 @@ msgstr "" "Omdat Odoo draait op Pyton 2 moet u controleren welke versie van pip u moet " "gebruiken." -#: ../../point_of_sale/overview/setup.rst:222 +#: ../../point_of_sale/overview/setup.rst:221 msgid "``# pip --version``" msgstr "``# pip --version``" -#: ../../point_of_sale/overview/setup.rst:224 -#: ../../point_of_sale/overview/setup.rst:230 +#: ../../point_of_sale/overview/setup.rst:223 +#: ../../point_of_sale/overview/setup.rst:229 msgid "If it returns something like::" msgstr "Als het iets terugstuurt zoals:" -#: ../../point_of_sale/overview/setup.rst:228 +#: ../../point_of_sale/overview/setup.rst:227 msgid "You need to try pip2 instead." msgstr "Moet u pip2 in de plaats gebruiken." -#: ../../point_of_sale/overview/setup.rst:234 +#: ../../point_of_sale/overview/setup.rst:233 msgid "You can use pip." msgstr "Kan u pip gebruiken." -#: ../../point_of_sale/overview/setup.rst:236 +#: ../../point_of_sale/overview/setup.rst:235 msgid "The driver modules requires the installation of new python modules:" msgstr "De driver module vereist de installatie van nieuwe Python modules:" -#: ../../point_of_sale/overview/setup.rst:238 +#: ../../point_of_sale/overview/setup.rst:237 msgid "``# pip install pyserial``" msgstr "``# pip install pyserial``" -#: ../../point_of_sale/overview/setup.rst:240 +#: ../../point_of_sale/overview/setup.rst:239 msgid "``# pip install pyusb==1.0.0b1``" msgstr "``# pip install pyusb==1.0.0b1``" -#: ../../point_of_sale/overview/setup.rst:242 +#: ../../point_of_sale/overview/setup.rst:241 msgid "``# pip install qrcode``" msgstr "``# pip install qrcode``" -#: ../../point_of_sale/overview/setup.rst:245 +#: ../../point_of_sale/overview/setup.rst:244 msgid "Access Rights" msgstr "Toegangsrechten" -#: ../../point_of_sale/overview/setup.rst:247 +#: ../../point_of_sale/overview/setup.rst:246 msgid "" "The drivers need raw access to the printer and barcode scanner devices. " "Doing so requires a bit system administration. First we are going to create " @@ -1568,21 +1556,21 @@ msgstr "" "toestellen. Om dit te doen is er wat systeem administratie nodig. Eerst " "maken we een groep die toegang heeft tot de USB toestellen" -#: ../../point_of_sale/overview/setup.rst:251 +#: ../../point_of_sale/overview/setup.rst:250 msgid "``# groupadd usbusers``" msgstr "``# groupadd usbusers``" -#: ../../point_of_sale/overview/setup.rst:253 +#: ../../point_of_sale/overview/setup.rst:252 msgid "Then we add the user who will run the OpenERP server to ``usbusers``" msgstr "" "Vervolgens voegen we de gebruiker toe aan ``usbusers`` die de Odoo server " "zal uitvoeren" -#: ../../point_of_sale/overview/setup.rst:255 +#: ../../point_of_sale/overview/setup.rst:254 msgid "``# usermod -a -G usbusers USERNAME``" msgstr "``# usermod -a -G usbusers USERNAME``" -#: ../../point_of_sale/overview/setup.rst:257 +#: ../../point_of_sale/overview/setup.rst:256 msgid "" "Then we need to create a udev rule that will automatically allow members of " "``usbusers`` to access raw USB devices. To do so create a file called " @@ -1590,19 +1578,19 @@ msgid "" "following content::" msgstr "" -#: ../../point_of_sale/overview/setup.rst:265 +#: ../../point_of_sale/overview/setup.rst:264 msgid "Then you need to reboot your machine." msgstr "Dan moet u uw machine opnieuw opstarten." -#: ../../point_of_sale/overview/setup.rst:268 +#: ../../point_of_sale/overview/setup.rst:267 msgid "Start the local Odoo instance" msgstr "Start de lokale Odoo instantie" -#: ../../point_of_sale/overview/setup.rst:270 +#: ../../point_of_sale/overview/setup.rst:269 msgid "We must launch the Odoo server with the correct settings" msgstr "We moeten de Odoo server lanceren met de correcte instellingen" -#: ../../point_of_sale/overview/setup.rst:272 +#: ../../point_of_sale/overview/setup.rst:271 msgid "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" @@ -1610,11 +1598,11 @@ msgstr "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" -#: ../../point_of_sale/overview/setup.rst:275 +#: ../../point_of_sale/overview/setup.rst:274 msgid "Test the instance" msgstr "Test de instantie" -#: ../../point_of_sale/overview/setup.rst:277 +#: ../../point_of_sale/overview/setup.rst:276 msgid "" "Plug all your hardware to your machine's USB ports, and go to " "``http://localhost:8069/hw_proxy/status`` refresh the page a few times and " @@ -1630,11 +1618,11 @@ msgstr "" "drivers, een ander proces heeft exclusieve toegang gekregen tot de " "toestellen, de udev regels worden niet toegepast of overheerst door anderen." -#: ../../point_of_sale/overview/setup.rst:285 +#: ../../point_of_sale/overview/setup.rst:284 msgid "Automatically start Odoo" msgstr "Start automatisch Odoo" -#: ../../point_of_sale/overview/setup.rst:287 +#: ../../point_of_sale/overview/setup.rst:286 msgid "" "You must now make sure that this Odoo install is automatically started after" " boot. There are various ways to do so, and how to do it depends on your " @@ -1646,7 +1634,7 @@ msgstr "" " dit is afhankelijk van uw opzet. Het gebruik van het init systeem van uw " "distributie is waarschijnlijk de gemakkelijkste weg om dit te bereiken." -#: ../../point_of_sale/overview/setup.rst:295 +#: ../../point_of_sale/overview/setup.rst:294 msgid "" "The IP address field in the POS configuration must be either ``127.0.0.1`` " "or ``localhost`` if you're running the created Odoo server on the machine " @@ -1657,19 +1645,19 @@ msgstr "" "hetzelfde apparaat als waar u de Kassa op gebruikt. U kan het ook leeg " "laten." -#: ../../point_of_sale/overview/setup.rst:301 +#: ../../point_of_sale/overview/setup.rst:300 msgid "POSBox Technical Documentation" msgstr "Technische documentatie POSBox" -#: ../../point_of_sale/overview/setup.rst:304 +#: ../../point_of_sale/overview/setup.rst:303 msgid "Technical Overview" msgstr "Technisch overzicht" -#: ../../point_of_sale/overview/setup.rst:307 +#: ../../point_of_sale/overview/setup.rst:306 msgid "The POSBox Hardware" msgstr "De POSBox Hardware" -#: ../../point_of_sale/overview/setup.rst:309 +#: ../../point_of_sale/overview/setup.rst:308 msgid "" "The POSBox's Hardware is based on a `Raspberry Pi 2 " "`_, a popular " @@ -1686,11 +1674,11 @@ msgstr "" "hardware is wereldwijd gemakkelijk verkrijgbaar van onafhankelijke " "leveranciers." -#: ../../point_of_sale/overview/setup.rst:318 +#: ../../point_of_sale/overview/setup.rst:317 msgid "Compatible Peripherals" msgstr "Compatibele apparaten" -#: ../../point_of_sale/overview/setup.rst:320 +#: ../../point_of_sale/overview/setup.rst:319 msgid "" "Officially supported hardware is listed on the `POS Hardware page " "`_." @@ -1698,11 +1686,11 @@ msgstr "" "Officieel ondersteunde hardware is opgelijst op `de POS Hardware pagina " "`_," -#: ../../point_of_sale/overview/setup.rst:324 +#: ../../point_of_sale/overview/setup.rst:323 msgid "The POSBox Software" msgstr "De POSBox software" -#: ../../point_of_sale/overview/setup.rst:326 +#: ../../point_of_sale/overview/setup.rst:325 msgid "" "The POSBox runs a heavily modified Raspbian Linux installation, a Debian " "derivative for the Raspberry Pi. It also runs a barebones installation of " @@ -1714,7 +1702,7 @@ msgid "" "branch." msgstr "" -#: ../../point_of_sale/overview/setup.rst:335 +#: ../../point_of_sale/overview/setup.rst:334 msgid "" "The root partition on the POSBox is mounted read-only, ensuring that we " "don't wear out the SD card by writing to it too much. It also ensures that " @@ -1748,15 +1736,15 @@ msgstr "" "/root_bypass_rasms om de echte /etc en /var te kunnen bereiken tijdens " "ontwikkeling." -#: ../../point_of_sale/overview/setup.rst:351 +#: ../../point_of_sale/overview/setup.rst:350 msgid "Logs of the running Odoo server can be found at:" msgstr "Logs van de draaiende Odoo server kunnen gevonden worden onder:" -#: ../../point_of_sale/overview/setup.rst:353 +#: ../../point_of_sale/overview/setup.rst:352 msgid "``/var/log/odoo/odoo.log``" msgstr "``/var/log/odoo/odoo.log``" -#: ../../point_of_sale/overview/setup.rst:355 +#: ../../point_of_sale/overview/setup.rst:354 msgid "" "Various POSBox related scripts (eg. wifi-related scripts) running on the " "POSBox will log to /var/log/syslog and those messages are tagged with " @@ -1766,15 +1754,15 @@ msgstr "" "scripts) die op de POSBox draaien loggen onder /var/log/syslog en deze " "berichten zijn getagd met ``posbox_*``." -#: ../../point_of_sale/overview/setup.rst:360 +#: ../../point_of_sale/overview/setup.rst:359 msgid "Accessing the POSBox" msgstr "Toegang krijgen tot de POSBox" -#: ../../point_of_sale/overview/setup.rst:363 +#: ../../point_of_sale/overview/setup.rst:362 msgid "Local Access" msgstr "Lokale toegang" -#: ../../point_of_sale/overview/setup.rst:365 +#: ../../point_of_sale/overview/setup.rst:364 msgid "" "If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if" " you connect a computer monitor to the *HDMI* port of the POSBox, you can " @@ -1787,15 +1775,15 @@ msgstr "" "verschillende administratieve taken uitvoeren, zoals het bekijken van de log" " bestanden." -#: ../../point_of_sale/overview/setup.rst:370 +#: ../../point_of_sale/overview/setup.rst:369 msgid "The POSBox will automatically log in as root on the default tty." msgstr "De POSBox logt automatisch in als root op de standaard tty." -#: ../../point_of_sale/overview/setup.rst:373 +#: ../../point_of_sale/overview/setup.rst:372 msgid "Remote Access" msgstr "Toegang van op afstand" -#: ../../point_of_sale/overview/setup.rst:375 +#: ../../point_of_sale/overview/setup.rst:374 msgid "" "If you have the POSBox's IP address and an SSH client you can access the " "POSBox's system remotely. The login credentials are ``pi``/``raspberry``." @@ -1804,11 +1792,11 @@ msgstr "" "POSBox systeem van op afstand bereiken. De login gegevens zijn " "``pi``/``raspberry``." -#: ../../point_of_sale/overview/setup.rst:380 +#: ../../point_of_sale/overview/setup.rst:379 msgid "Updating The POSBox Software" msgstr "De POSBox software updaten" -#: ../../point_of_sale/overview/setup.rst:382 +#: ../../point_of_sale/overview/setup.rst:381 msgid "" "Only upgrade the POSBox if you experience problems or want to use newly " "implemented features." @@ -1816,7 +1804,7 @@ msgstr "" "Upgrade enkel de POSBox als u problemen ondervind of nieuw geïmplementeerde " "opties wilt gebruiken." -#: ../../point_of_sale/overview/setup.rst:385 +#: ../../point_of_sale/overview/setup.rst:384 msgid "" "The best way to update the POSBox software is to download a new version of " "the image and flash the SD-Card with it. This operation is described in " @@ -1835,7 +1823,7 @@ msgstr "" " verzekert u er van dat u de laatste versie van de POSBox software heeft " "draaien." -#: ../../point_of_sale/overview/setup.rst:394 +#: ../../point_of_sale/overview/setup.rst:393 msgid "" "The second way of upgrading is through the built in upgrade interface that " "can be reached through the POSBox homepage. The nice thing about upgrading " @@ -1850,11 +1838,11 @@ msgstr "" " bestanden updaten bijvoorbeeld (zoals /etc/hostapd.conf). Het kan enkel het" " volgende upgraden:" -#: ../../point_of_sale/overview/setup.rst:401 +#: ../../point_of_sale/overview/setup.rst:400 msgid "The internal Odoo application" msgstr "De interne Odoo applicatie" -#: ../../point_of_sale/overview/setup.rst:402 +#: ../../point_of_sale/overview/setup.rst:401 msgid "" "Scripts in the folder " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" @@ -1862,19 +1850,19 @@ msgstr "" "Scripts in de folder " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" -#: ../../point_of_sale/overview/setup.rst:404 +#: ../../point_of_sale/overview/setup.rst:403 msgid "When in doubt, always use the first method of upgrading." msgstr "Wanneer u twijfelt gebruikt u altijd de eerste methode van upgraden." -#: ../../point_of_sale/overview/setup.rst:407 +#: ../../point_of_sale/overview/setup.rst:406 msgid "Troubleshoot" msgstr "Troubleshoot" -#: ../../point_of_sale/overview/setup.rst:410 +#: ../../point_of_sale/overview/setup.rst:409 msgid "The POS cannot connect to the POSBox" msgstr "De kassa kan niet connecteren met de POSBox" -#: ../../point_of_sale/overview/setup.rst:412 +#: ../../point_of_sale/overview/setup.rst:411 msgid "" "The easiest way to make sure the POSBox is properly set-up is to turn it on " "with the printer plugged in as it will print a receipt indicating any error " @@ -1887,7 +1875,7 @@ msgstr "" "het IP adres van de POSBox indien alles in orde is. Controleer de volgende " "stappen als er geen ticket wordt geprint:" -#: ../../point_of_sale/overview/setup.rst:416 +#: ../../point_of_sale/overview/setup.rst:415 msgid "" "Make sure the POSBox is powered on, indicated by a brightly lit red status " "LED." @@ -1895,7 +1883,7 @@ msgstr "" "Verzeker u er van dat de POSBox opstaat en dat de LED een heldere rode " "status kleur heeft." -#: ../../point_of_sale/overview/setup.rst:418 +#: ../../point_of_sale/overview/setup.rst:417 msgid "" "Make sure the POSBox is ready, this is indicated by a brightly lit green " "status LED just next to the red power status LED. The POSBox should be ready" @@ -1905,7 +1893,7 @@ msgstr "" " groene status LED net naast de rode status LED. De POSBox zou klaar moeten " "zijn ~2 minuten nadat deze is opgestart." -#: ../../point_of_sale/overview/setup.rst:421 +#: ../../point_of_sale/overview/setup.rst:420 msgid "" "Make sure the POSBox is connected to the same network as your POS device. " "Both the device and the POSBox should be visible in the list of connected " @@ -1915,14 +1903,14 @@ msgstr "" "uw Kassa toestel. Beide het toestel en de POSBox moeten zichtbaar zijn in de" " lijst van verbonden toestellen op uw netwerk router." -#: ../../point_of_sale/overview/setup.rst:424 +#: ../../point_of_sale/overview/setup.rst:423 msgid "" "Make sure that your LAN is set up with DHCP, and gives IP addresses in the " "range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that " "way, you must manually set up your POSBox's IP address." msgstr "" -#: ../../point_of_sale/overview/setup.rst:428 +#: ../../point_of_sale/overview/setup.rst:427 msgid "" "If you have specified the POSBox's IP address in the configuration, make " "sure it correspond to the printed on the POSBox's status receipt." @@ -1931,11 +1919,11 @@ msgstr "" " van verzekeren dat deze correspondeert met het geprinte POSBox status " "ticket." -#: ../../point_of_sale/overview/setup.rst:431 +#: ../../point_of_sale/overview/setup.rst:430 msgid "Make sure that the POS is not loaded over HTTPS." msgstr "Verzeker u er van dat de POS niet over HTTPS laad." -#: ../../point_of_sale/overview/setup.rst:432 +#: ../../point_of_sale/overview/setup.rst:431 msgid "" "A bug in Firefox's HTTP implementation prevents the autodiscovery from " "working reliably. When using Firefox you should manually set up the POSBox's" @@ -1945,11 +1933,11 @@ msgstr "" "automatische ontdekking. Wanneer u Firefox gebruikt moet u manueel de POSBox" " zijn IP adres ingeven in de Kassa configuratie." -#: ../../point_of_sale/overview/setup.rst:437 +#: ../../point_of_sale/overview/setup.rst:436 msgid "The Barcode Scanner is not working" msgstr "De Barcode Scanner werkt niet" -#: ../../point_of_sale/overview/setup.rst:439 +#: ../../point_of_sale/overview/setup.rst:438 msgid "" "The barcode scanner must be configured in US QWERTY and emit an Enter after " "each barcode. This is the default configuration of most barcode readers. " @@ -1959,7 +1947,7 @@ msgstr "" "toevoegen achter de barcode. Dit is de standaard configuratie voor de meeste" " barcode lezers. Kijk naar de barcode documentatie voor meer informatie." -#: ../../point_of_sale/overview/setup.rst:443 +#: ../../point_of_sale/overview/setup.rst:442 msgid "" "The POSBox needs a 2A power supply to work with some barcode scanners. If " "you are not using the provided power supply, make sure the one you use has " @@ -1969,7 +1957,7 @@ msgstr "" "scanners. Zorg ervoor dat de voeding die u gebruikt genoeg kracht heeft " "indien u niet de mee aangeboden voeding gebruikt." -#: ../../point_of_sale/overview/setup.rst:446 +#: ../../point_of_sale/overview/setup.rst:445 msgid "" "Some barcode scanners will need more than 2A and will not work, or will work" " unreliably, even with the provided power supply. In those case you can plug" @@ -1979,7 +1967,7 @@ msgstr "" "onbetrouwbaar werken, zelfs met de meegeleverde voeding. In die gevallen kan" " u een barcode scanner inpluggen in een zelfvoorzienende USB hub." -#: ../../point_of_sale/overview/setup.rst:449 +#: ../../point_of_sale/overview/setup.rst:448 msgid "" "Some poorly built barcode scanners do not advertise themselves as barcode " "scanners but as a usb keyboard instead, and will not be recognized by the " @@ -1989,11 +1977,11 @@ msgstr "" "scanners maar als usb toetsenborden en zullen niet herkend worden door de " "POSBox." -#: ../../point_of_sale/overview/setup.rst:454 +#: ../../point_of_sale/overview/setup.rst:453 msgid "The Barcode Scanner is not working reliably" msgstr "De Barcode Scanner werkt niet betrouwbaar" -#: ../../point_of_sale/overview/setup.rst:456 +#: ../../point_of_sale/overview/setup.rst:455 msgid "" "Make sure that no more than one device with 'Scan via Proxy'/'Barcode " "Scanner' enabled are connected to the POSBox at the same time." @@ -2002,11 +1990,11 @@ msgstr "" "Proxy'/'Barcode Scanner' is aangevinkt en geconnecteerd is met de POSBox op " "dezelfde tijd." -#: ../../point_of_sale/overview/setup.rst:461 +#: ../../point_of_sale/overview/setup.rst:460 msgid "Printing the receipt takes too much time" msgstr "Het ticket printen duurt te lang" -#: ../../point_of_sale/overview/setup.rst:463 +#: ../../point_of_sale/overview/setup.rst:462 msgid "" "A small delay before the first print is expected, as the POSBox will do some" " preprocessing to speed up the next printings. If you suffer delays " @@ -2018,11 +2006,11 @@ msgstr "" "versnellen. Als u hierna nog vertragingen heeft bij het printen is dit " "mogelijk door een slechte netwerkconnectie tussen de Kassa en de POSBox." -#: ../../point_of_sale/overview/setup.rst:469 +#: ../../point_of_sale/overview/setup.rst:468 msgid "Some characters are not correctly printed on the receipt" msgstr "Sommige karakters zijn niet correct afgedrukt op het ticket" -#: ../../point_of_sale/overview/setup.rst:471 +#: ../../point_of_sale/overview/setup.rst:470 msgid "" "The POSBox does not support all languages and characters. It currently " "supports Latin and Cyrillic based scripts, with basic Japanese support." @@ -2031,11 +2019,11 @@ msgstr "" "momenteel Latin en Cyrillic gebaseerde scripts, met basis Japanse " "ondersteuning." -#: ../../point_of_sale/overview/setup.rst:476 +#: ../../point_of_sale/overview/setup.rst:475 msgid "The printer is offline" msgstr "De printer is offline" -#: ../../point_of_sale/overview/setup.rst:478 +#: ../../point_of_sale/overview/setup.rst:477 msgid "" "Make sure the printer is connected, powered, has enough paper and has its " "lid closed, and is not reporting an error. If the error persists, please " @@ -2045,11 +2033,11 @@ msgstr "" " dat het deksel gesloten is en dat de printer geen fouten meld. Gelieve " "support te contacteren als deze fout zich blijft voordoen." -#: ../../point_of_sale/overview/setup.rst:483 +#: ../../point_of_sale/overview/setup.rst:482 msgid "The cashdrawer does not open" msgstr "De kassalade opent niet" -#: ../../point_of_sale/overview/setup.rst:485 +#: ../../point_of_sale/overview/setup.rst:484 msgid "" "The cashdrawer should be connected to the printer and should be activated in" " the POS configuration." @@ -2057,11 +2045,11 @@ msgstr "" "De kassalade moet verbonden zijn met de printer en moet geactiveerd worden " "in de POS configuratie." -#: ../../point_of_sale/overview/setup.rst:489 +#: ../../point_of_sale/overview/setup.rst:488 msgid "Credits" msgstr "Krediet" -#: ../../point_of_sale/overview/setup.rst:490 +#: ../../point_of_sale/overview/setup.rst:489 msgid "" "The POSBox project was developed by Frédéric van der Essen with the kind " "help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del " @@ -2071,7 +2059,7 @@ msgstr "" "van Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del Marmol, " "Joren Van Onder en Antony Lesuisse." -#: ../../point_of_sale/overview/setup.rst:494 +#: ../../point_of_sale/overview/setup.rst:493 msgid "" "This development would not have been possible without the Indiegogo campaign" " and those who contributed to it. Special thanks goes to the partners who " @@ -2081,55 +2069,55 @@ msgstr "" "mensen die hier aan hebben bijgedragen. Speciale dank gaat naar de partners " "die de campagne hebben gesteund met de POSBox oprichters bundel:" -#: ../../point_of_sale/overview/setup.rst:498 +#: ../../point_of_sale/overview/setup.rst:497 msgid "Camptocamp" msgstr "Camptocamp" -#: ../../point_of_sale/overview/setup.rst:499 +#: ../../point_of_sale/overview/setup.rst:498 msgid "BHC" msgstr "BHC" -#: ../../point_of_sale/overview/setup.rst:500 +#: ../../point_of_sale/overview/setup.rst:499 msgid "openBig" msgstr "openBig" -#: ../../point_of_sale/overview/setup.rst:501 +#: ../../point_of_sale/overview/setup.rst:500 msgid "Eeezee-IT" msgstr "Eeezee-IT" -#: ../../point_of_sale/overview/setup.rst:502 +#: ../../point_of_sale/overview/setup.rst:501 msgid "Solarsis LDA" msgstr "Solarsis LDA" -#: ../../point_of_sale/overview/setup.rst:503 +#: ../../point_of_sale/overview/setup.rst:502 msgid "ACSONE" msgstr "ACSONE" -#: ../../point_of_sale/overview/setup.rst:504 +#: ../../point_of_sale/overview/setup.rst:503 msgid "Vauxoo" msgstr "Vauxoo" -#: ../../point_of_sale/overview/setup.rst:505 +#: ../../point_of_sale/overview/setup.rst:504 msgid "Ekomurz" msgstr "Ekomurz" -#: ../../point_of_sale/overview/setup.rst:506 +#: ../../point_of_sale/overview/setup.rst:505 msgid "Datalp" msgstr "Datalp" -#: ../../point_of_sale/overview/setup.rst:507 +#: ../../point_of_sale/overview/setup.rst:506 msgid "Dao Systems" msgstr "Dao Systems" -#: ../../point_of_sale/overview/setup.rst:508 +#: ../../point_of_sale/overview/setup.rst:507 msgid "Eggs Solutions" msgstr "Eggs Solutions" -#: ../../point_of_sale/overview/setup.rst:509 +#: ../../point_of_sale/overview/setup.rst:508 msgid "OpusVL" msgstr "OpusVL" -#: ../../point_of_sale/overview/setup.rst:511 +#: ../../point_of_sale/overview/setup.rst:510 msgid "" "And also the partners who've backed the development with the Founding POSBox" " Bundle:" @@ -2137,27 +2125,27 @@ msgstr "" "En ook de partners die de ontwikkeling hebben gesteund met de POSBox " "oprichters bundel:" -#: ../../point_of_sale/overview/setup.rst:514 +#: ../../point_of_sale/overview/setup.rst:513 msgid "Willow IT" msgstr "Willow IT" -#: ../../point_of_sale/overview/setup.rst:515 +#: ../../point_of_sale/overview/setup.rst:514 msgid "E\\. Akhalwaya & Sons" msgstr "E\\. Akhalwaya & Sons" -#: ../../point_of_sale/overview/setup.rst:516 +#: ../../point_of_sale/overview/setup.rst:515 msgid "Multibase" msgstr "Multibasis" -#: ../../point_of_sale/overview/setup.rst:517 +#: ../../point_of_sale/overview/setup.rst:516 msgid "Mindesa" msgstr "Mindesa" -#: ../../point_of_sale/overview/setup.rst:518 +#: ../../point_of_sale/overview/setup.rst:517 msgid "bpso.biz" msgstr "bpso.biz" -#: ../../point_of_sale/overview/setup.rst:519 +#: ../../point_of_sale/overview/setup.rst:518 msgid "Shine IT." msgstr "Shine IT." diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index c4cb965db..9bff6124e 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Pol Van Dingenen , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -44,15 +44,12 @@ msgstr "" "kunnen bekijken." #: ../../sales/advanced/portal.rst:12 -msgid "" -"For Example: 1. A long term client who needs to view online quotations. 2." -" Accounting consultant who needs to keep track of the company's financials." +msgid "For Example, a long term client who needs to view online quotations." msgstr "" -"Bijvoorbeeld: 1. Een klant die al lang bij u is en online zijn offertes moet" -" kunnen zien. 2. Boekhoudconsultant die de financiële bedrjifsgegevens moet " -"opvolgen." +"Bijvoorbeeld een lange termijn klant die zijn offertes online moet kunnen " +"zien" -#: ../../sales/advanced/portal.rst:16 +#: ../../sales/advanced/portal.rst:14 msgid "" "A portal user has only read/view access. He or she will not be able to edit " "any document in the system." @@ -60,15 +57,15 @@ msgstr "" "Een portaalgebruiker heeft alleen lees / kijkrechten. Hij of zij kan geen " "document wijzigen in het systeem." -#: ../../sales/advanced/portal.rst:20 +#: ../../sales/advanced/portal.rst:18 msgid "How to give portal access to customers?" msgstr "Hoe geef ik portaal toegang aan mijn gebruikers" -#: ../../sales/advanced/portal.rst:23 +#: ../../sales/advanced/portal.rst:21 msgid "From Contacts Module" msgstr "Vanuit de contact module" -#: ../../sales/advanced/portal.rst:25 +#: ../../sales/advanced/portal.rst:23 msgid "" "From the main menu, select **Contacts** menu. If the contact is not yet " "created in the system, click on the create button to create new contact. " @@ -79,7 +76,7 @@ msgstr "" "nieuw contact aan te maken. Geef de contactgegevens in en klik op " "\"opslaan\"." -#: ../../sales/advanced/portal.rst:35 +#: ../../sales/advanced/portal.rst:33 msgid "" "Choose a contact, click on the **Action** menu in the top-center of the " "interface and from the drop down." @@ -87,12 +84,12 @@ msgstr "" "Kies een contact, klik op het **Actie** menu bovenaan in het midden van de " "interface vanuit de dropdown." -#: ../../sales/advanced/portal.rst:38 +#: ../../sales/advanced/portal.rst:36 msgid "Select **Portal Access Management**. A pop up window appears." msgstr "" "Selecteer **portaal toegang beheer**. Een pop up scherm zal verschijnen" -#: ../../sales/advanced/portal.rst:43 +#: ../../sales/advanced/portal.rst:41 msgid "" "Enter the login **email ID**, check the box under **In Portal** and add the " "content to be included in the email in the text field box below. Click on " @@ -102,7 +99,7 @@ msgstr "" "portaal** en voeg de inhoud toe die in de email toegevoegd moet worden in de" " tekstcontainer onderaan. Druk op **Opslaan** wanneer je klaar bent." -#: ../../sales/advanced/portal.rst:49 +#: ../../sales/advanced/portal.rst:47 msgid "" "An email will be sent to the specified email address, indicating that the " "contact is now a portal user of the respective instance." @@ -1661,6 +1658,10 @@ msgid "" "any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " "etc.)." msgstr "" +"Importeer sjablonen zijn beschikbaar in de importeer tool voor de meest " +"voorkomende data om te importeren (contacten, producten, bankafschriften, " +"enz). U kan ze met eender welke spreadsheet software openen (Microsoft " +"Office, OpenOffice, Google Drive, enz)." #: ../../sales/products_prices/products/import.rst:11 msgid "How to customize the file" diff --git a/locale/nl/LC_MESSAGES/website.po b/locale/nl/LC_MESSAGES/website.po index db34ec991..e25c774eb 100644 --- a/locale/nl/LC_MESSAGES/website.po +++ b/locale/nl/LC_MESSAGES/website.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-07 09:30+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Pol Van Dingenen , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -1505,6 +1505,9 @@ msgid "" "name, for both the URL and the emails. But you can change to a custom one " "(e.g. www.yourcompany.com)." msgstr "" +"Standaard heeft uw Odoo online instantie en website een *.odoo.com* " +"domeinnaam, voor beide de URL en de e-mails. U kan dit wijzigen naar een " +"eigen domein (bijvoorbeeld www.uwbedrijf.com)." #: ../../website/publish/domain_name.rst:10 msgid "What is a good domain name" @@ -1543,6 +1546,9 @@ msgid "" "`__" msgstr "" +"Lees meer: `Hoe een domeinnaam te kiezen voor optimale SEO " +"`__" #: ../../website/publish/domain_name.rst:24 msgid "How to buy a domain name" @@ -1587,11 +1593,11 @@ msgid "" "This is Odoo's job!" msgstr "" -#: ../../website/publish/domain_name.rst:42 +#: ../../website/publish/domain_name.rst:45 msgid "How to apply my domain name to my Odoo instance" msgstr "Hoe mijn domeinnaam koppelen aan mijn Odoo instantie" -#: ../../website/publish/domain_name.rst:43 +#: ../../website/publish/domain_name.rst:46 msgid "" "First let's authorize the redirection (yourcompany.com -> " "yourcompany.odoo.com):" @@ -1599,20 +1605,20 @@ msgstr "" "Laten we eerste de doorverwijzing authoriseren (uwbedrijf.com -> " "uwbedrijf.odoo.com):" -#: ../../website/publish/domain_name.rst:45 +#: ../../website/publish/domain_name.rst:48 msgid "Open your Odoo.com account from your homepage." msgstr "Open uw Odoo.com account vanuit uw homepage." -#: ../../website/publish/domain_name.rst:50 +#: ../../website/publish/domain_name.rst:53 msgid "Go to the *Manage Databases* page." msgstr "Ga naar de *Beheer databases** pagina." -#: ../../website/publish/domain_name.rst:55 +#: ../../website/publish/domain_name.rst:58 msgid "" "Click on *Domains* to the right of the database you would like to redirect." msgstr "Klik op *Domeinen* rechts van de database die u wilt doorverwijzen." -#: ../../website/publish/domain_name.rst:60 +#: ../../website/publish/domain_name.rst:63 msgid "" "A database domain prompt will appear. Enter your custom domain (e.g. " "www.yourcompany.com)." @@ -1620,34 +1626,34 @@ msgstr "" "Een database domein dialoog verschijnt. Geef uw persoonlijk domein in " "(bijvoorbeeld www.uwbedrijf.com)." -#: ../../website/publish/domain_name.rst:67 +#: ../../website/publish/domain_name.rst:70 msgid "" "We can now apply the redirection from your domain name's manager account:" msgstr "" "We kunnen nu de doorverwijzing toepassen vanuit uw domeinnaam zijn " "beheerders account:" -#: ../../website/publish/domain_name.rst:69 +#: ../../website/publish/domain_name.rst:72 msgid "Log in to your account and search for the DNS Zones management page." msgstr "Log in op uw account en zoek voor de DNS zones beheer pagina." -#: ../../website/publish/domain_name.rst:71 +#: ../../website/publish/domain_name.rst:74 msgid "" "Create a CNAME record *www.yourdomain.com* pointing to *mywebsite.odoo.com*." " If you want to use the naked domain (e.g. yourdomain.com), you need to " "redirect *yourdomain.com* to *www.yourdomain.com*." msgstr "" -#: ../../website/publish/domain_name.rst:75 +#: ../../website/publish/domain_name.rst:78 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "" "Hier zijn een paar specifieke richtlijnen om een CNAME record aan te maken:" -#: ../../website/publish/domain_name.rst:77 +#: ../../website/publish/domain_name.rst:80 msgid "`GoDaddy `__" msgstr "`GoDaddy `__" -#: ../../website/publish/domain_name.rst:78 +#: ../../website/publish/domain_name.rst:81 msgid "" "`Namecheap " "`__" -#: ../../website/publish/domain_name.rst:79 -msgid "" -"`OVH " -"`__" -msgstr "" -"`OVH " -"`__" - #: ../../website/publish/domain_name.rst:82 +msgid "" +"`OVH " +"`__" +msgstr "" +"`OVH " +"`__" + +#: ../../website/publish/domain_name.rst:85 msgid "How to enable SSL (HTTPS) for my Odoo instance" msgstr "Hoe SSL inschakelen (HTTPS) voor mijn Odoo instantie" -#: ../../website/publish/domain_name.rst:84 +#: ../../website/publish/domain_name.rst:87 msgid "" "To enable SSL, please use a third-party CDN service provider such as " "CloudFlare.com." @@ -1677,7 +1683,7 @@ msgstr "" "Schakel een externe partij CDN dienst in, zoals CloudFlare.com, om SSL in te" " schakelen." -#: ../../website/publish/domain_name.rst:90 +#: ../../website/publish/domain_name.rst:93 msgid ":doc:`../../discuss/email_servers`" msgstr ":doc:`../../discuss/email_servers`" diff --git a/locale/sources/accounting.pot b/locale/sources/accounting.pot index 84987f7af..6ffa85b2d 100644 --- a/locale/sources/accounting.pot +++ b/locale/sources/accounting.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,7 +165,6 @@ msgstr "" #: ../../accounting/bank/reconciliation/use_cases.rst:6 #: ../../accounting/others/adviser/budget.rst:6 #: ../../accounting/others/analytic/purchases_expenses.rst:6 -#: ../../accounting/others/multicurrencies.rst:3 #: ../../accounting/others/multicurrencies/exchange.rst:6 #: ../../accounting/others/multicurrencies/how_it_works.rst:6 #: ../../accounting/others/multicurrencies/invoices_payments.rst:6 @@ -769,7 +768,6 @@ msgstr "" #: ../../accounting/bank/reconciliation.rst:3 #: ../../accounting/others/reporting/main_reports.rst:153 #: ../../accounting/overview/main_concepts/memento.rst:177 -#: ../../accounting/overview/main_concepts/terminologies.rst:19 msgid "Bank Reconciliation" msgstr "" @@ -1692,6 +1690,7 @@ msgid "Balance Sheet" msgstr "" #: ../../accounting/localizations/germany.rst:24 +#: ../../accounting/localizations/nederlands.rst:19 msgid "Profit & Loss" msgstr "" @@ -2281,6 +2280,34 @@ msgstr "" msgid "**Solution:** Set the mexican name for the tax 0% and 16% in your system and used on the invoice." msgstr "" +#: ../../accounting/localizations/nederlands.rst:2 +msgid "Netherlands" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:5 +msgid "XAF Export" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:7 +msgid "With the Dutch accounting localization installed, you will be able to export all your accounting entries in XAF format. For this, you have to go in :menuselection:`Accounting --> Reporting --> General Ledger`, you define the entries you want to export using the filters (period, journals, ...) and then you click on the button **EXPORT (XAF)**." +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:14 +msgid "Dutch Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:16 +msgid "If you install the Dutch accounting localization, you will have access to some reports that are specific to the Netherlands such as :" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:21 +msgid "Tax Report (Aangifte omzetbelasting)" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:23 +msgid "Intrastat Report (ICP)" +msgstr "" + #: ../../accounting/localizations/spain.rst:3 msgid "Spain" msgstr "" @@ -3874,7 +3901,6 @@ msgid "Prepayments" msgstr "" #: ../../accounting/others/configuration/account_type.rst:39 -#: ../../accounting/overview/main_concepts/terminologies.rst:77 msgid "Fixed Assets" msgstr "" @@ -4325,6 +4351,10 @@ msgstr "" msgid "This is because the vendor refund will be made using the original purchase price, so to zero out the effect of the return in the stock input in last operation, we need to reuse the original price. The price difference account located on the product category is used to book the difference between the average cost and the original purchase price." msgstr "" +#: ../../accounting/others/multicurrencies.rst:3 +msgid "Multicurrency" +msgstr "" + #: ../../accounting/others/multicurrencies/exchange.rst:3 msgid "Record exchange rates at payments" msgstr "" @@ -5998,7 +6028,6 @@ msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/overview/main_concepts/terminologies.rst:26 msgid "Reconciliation" msgstr "" @@ -6253,102 +6282,6 @@ msgstr "" msgid "Statement XYZ" msgstr "" -#: ../../accounting/overview/main_concepts/terminologies.rst:3 -msgid "Accounting Terminologies" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:6 -msgid "Journal" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:9 -msgid "A journal is like a folder in which you record all transactions of the same type: all the statements of a bank account, all customer invoices, all supplier bills. It's used to organize similar transactions together." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:13 -msgid "Payment Terms" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:16 -msgid "Payment terms describe how and when a customer invoice (or supplier bill) should be paid over the time. Example: 30% direct payment, balance due in two months." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:22 -msgid "Bank reconciliation is the process of matching transactions from your bank records with existing journal items or creating new journal items on the fly. It is a process of verification to ensure that your bank and your records in Odoo say the same thing." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:29 -msgid "Journal items reconciliation is the process of linking several journal items together like an invoice and a payment. This allows you to mark invoices as paid. It is also useful when comparing values of 'goods received not invoiced' and 'goods shipped not billed' accounts." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:33 -msgid "Deposit Ticket" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:36 -msgid "Deposit tickets group several payment orders (usually checks) that are deposited together at the bank at the same time. This allows an easy reconciliation with the bank statement line if the line has one line per deposit." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:40 -msgid "Journal Entry" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:43 -msgid "A journal entry is an accounting transaction, usually related to a financial document: invoice, payment, receipt, etc. A journal entry always consists of at least two lines, described here as journal items, which credit or debit specific accounts. The sum of the credits of all journal items of a journal entry must be equal to the sum of their debits for the entry to be valid." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:50 -msgid "Journal Item" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:53 -msgid "A line of a journal entry, with a monetary debit or credit associated with a specific account." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:55 -msgid "Analytic Accounts" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:58 -msgid "Sometimes called **Cost Accounts**, are accounts that are not part of the chart of accounts and that allow you to track costs and revenues. Analytic accounts are usually grouped by projects, departments, etc. for analysis of a company's expenditures. Every journal item is posted in a regular account in the chart of account and can be posted to an analytic account for the purpose of reporting or analysis." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:65 -msgid "Analytic Entries" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:68 -msgid "Costs or revenues posted to analytic accounts, usually related to journal entries." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:70 -msgid "Sales Receipt" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:73 -msgid "A receipt or other slip of paper issued by a store or other vendor describing the details of a purchase (amount, date, department, etc.). Sales receipt are usually used instead of invoices if the sale is paid in cash in a store." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:80 -msgid "Property owned by the company, usually with a useful life greater than one reporting period. Odoo Asset management is used to manage the depreciation / amortization of the asset over the time. Typical examples would be capital equipment, vehicles, and real estate." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:84 -msgid "Deferred Revenues" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:87 -msgid "Are used to recognize revenues for sales of services that are provided over a long period of time. If you sell a 3 year maintenance contract, you can use the deferred revenue mechanism to recognize 1/36 of the revenue every month until the contract expires, rather than taking it all initially or at the end." -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:93 -msgid "Fiscal Position" -msgstr "" - -#: ../../accounting/overview/main_concepts/terminologies.rst:96 -msgid "Define the taxes that should be applied for a specific customer/vendor or invoice. Example: If some customers benefit from specific taxes (government, construction companies, EU companies that are VAT subjected,…), you can assign a fiscal position to them and the right tax will be selected according to the products they buy." -msgstr "" - #: ../../accounting/overview/process_overview.rst:3 msgid "Process overview" msgstr "" diff --git a/locale/sources/db_management.pot b/locale/sources/db_management.pot index 3f44d8cca..9caadee26 100644 --- a/locale/sources/db_management.pot +++ b/locale/sources/db_management.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,54 +20,150 @@ msgstr "" msgid "Online Database management" msgstr "" -#: ../../db_management/db_online.rst:13 -msgid "Duplicating a database" -msgstr "" - -#: ../../db_management/db_online.rst:15 -msgid "Database duplication, renaming, custom DNS, etc. is not available to free customers of our Online platform." +#: ../../db_management/db_online.rst:10 +msgid "To manage your databases, access the `database management page `__ (you will have to sign in). Then click on the `Manage Your Databases `__ button." msgstr "" #: ../../db_management/db_online.rst:18 -msgid "Access the `database management page `__ (you will have to sign in). Next, make sure you are connected as the administrator of the database you want to duplicate. After that, click on the **Manage Your Databases** button." +msgid "Make sure you are connected as the administrator of the database you want to manage - many operations depends on indentifying you remotely to that database." msgstr "" -#: ../../db_management/db_online.rst:26 -msgid "In the line of the database you want to duplicate, you will have a few buttons. To duplicate your database, just click **Duplicate**. You will have to give a name to your duplicate, then click **Duplicate Database**." +#: ../../db_management/db_online.rst:22 +msgid "Several actions are available:" msgstr "" -#: ../../db_management/db_online.rst:36 -msgid "A duplicated database has the same behaviour as a real one:" +#: ../../db_management/db_online.rst:28 +msgid "Upgrade" msgstr "" -#: ../../db_management/db_online.rst:38 -msgid "Emails are sent" +#: ../../db_management/db_online.rst:28 +msgid "Upgrade your database to the latest Odoo version to enjoy cutting-edge features" +msgstr "" + +#: ../../db_management/db_online.rst:32 +msgid ":ref:`Duplicate `" +msgstr "" + +#: ../../db_management/db_online.rst:31 +msgid "Make an exact copy of your database, if you want to try out new apps or new flows without compromising your daily operations" +msgstr "" + +#: ../../db_management/db_online.rst:34 +msgid "Rename" +msgstr "" + +#: ../../db_management/db_online.rst:35 +msgid "Rename your database (and its URL)" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "**Backup**" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "Download an instant backup of your database; note that we back up databases daily according to our Odoo Cloud SLA" msgstr "" #: ../../db_management/db_online.rst:40 -msgid "Payments are processed (in the e-commerce, for example)" +msgid ":ref:`Domains `" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid "Configure custom domains to access your database via another URL" msgstr "" #: ../../db_management/db_online.rst:42 -msgid "Delivery orders (shipping providers) are sent" +msgid ":ref:`Delete `" msgstr "" -#: ../../db_management/db_online.rst:44 -msgid "Etc." +#: ../../db_management/db_online.rst:43 +msgid "Delete a database instantly" msgstr "" -#: ../../db_management/db_online.rst:46 -msgid "It is **strongly** advised to test behaviour using sample customers/products (with a `disposable e-mail `__ address, for example)" +#: ../../db_management/db_online.rst:47 +msgid "Contact Support" msgstr "" -#: ../../db_management/db_online.rst:50 -msgid "After a few seconds, you will be logged in your duplicated database. Notice that the url uses the name you chose for your duplicated database." +#: ../../db_management/db_online.rst:45 +msgid "Access our `support page `__ with the correct database already selected" +msgstr "" + +#: ../../db_management/db_online.rst:52 +msgid "Duplicating a database" msgstr "" #: ../../db_management/db_online.rst:54 +msgid "Database duplication, renaming, custom DNS, etc. is not available for trial databases on our Online platform. Paid Databases and \"One App Free\" database can duplicate without problem." +msgstr "" + +#: ../../db_management/db_online.rst:59 +msgid "In the line of the database you want to duplicate, you will have a few buttons. To duplicate your database, just click **Duplicate**. You will have to give a name to your duplicate, then click **Duplicate Database**." +msgstr "" + +#: ../../db_management/db_online.rst:66 +msgid "If you do not check the \"For testing purposes\" checkbox when duplicating a database, all external communication will remain active:" +msgstr "" + +#: ../../db_management/db_online.rst:69 +msgid "Emails are sent" +msgstr "" + +#: ../../db_management/db_online.rst:71 +msgid "Payments are processed (in the e-commerce or Subscriptions apps, for example)" +msgstr "" + +#: ../../db_management/db_online.rst:74 +msgid "Delivery orders (shipping providers) are sent" +msgstr "" + +#: ../../db_management/db_online.rst:76 +msgid "Etc." +msgstr "" + +#: ../../db_management/db_online.rst:78 +msgid "Make sure to check the checkbox \"For testing purposes\" if you want these behaviours to be disabled." +msgstr "" + +#: ../../db_management/db_online.rst:81 +msgid "After a few seconds, you will be logged in your duplicated database. Notice that the url uses the name you chose for your duplicated database." +msgstr "" + +#: ../../db_management/db_online.rst:85 msgid "Duplicate databases expire automatically after 15 days." msgstr "" +#: ../../db_management/db_online.rst:93 +msgid "Deleting a Database" +msgstr "" + +#: ../../db_management/db_online.rst:95 +msgid "You can only delete databases of which you are the administrator." +msgstr "" + +#: ../../db_management/db_online.rst:97 +msgid "When you delete your database all the data will be permanently lost. The deletion is instant and for all the Users. We advise you to do an instant backup of your database before deleting it, since the last automated daily backup may be several hours old at that point." +msgstr "" + +#: ../../db_management/db_online.rst:103 +msgid "From the `database management page `__, on the line of the database you want to delete, click on the \"Delete\" button." +msgstr "" + +#: ../../db_management/db_online.rst:110 +msgid "Read carefully the warning message that will appear and proceed only if you fully understand the implications of deleting a database:" +msgstr "" + +#: ../../db_management/db_online.rst:116 +msgid "After a few seconds, the database will be deleted and the page will reload automatically." +msgstr "" + +#: ../../db_management/db_online.rst:120 +msgid "If you need to re-use this database name, it will be immediately available." +msgstr "" + +#: ../../db_management/db_online.rst:122 +msgid "If you want to delete your Account, please contact `Odoo Support `__" +msgstr "" + #: ../../db_management/db_premise.rst:7 msgid "On-premise Database management" msgstr "" diff --git a/locale/sources/discuss.pot b/locale/sources/discuss.pot index aab6185ca..dab8c72c1 100644 --- a/locale/sources/discuss.pot +++ b/locale/sources/discuss.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -272,6 +272,42 @@ msgstr "" msgid "Odoo Discuss is an easy to use messaging app for teams that brings all your organization's communication into one place and seamlessly integrates with the Odoo platform. Discuss lets you send and receive messages from wherever you are in Odoo as well as manage your messages and notifications easily from within the app. Discuss allows you to create **channels** for team chats, conversations about projects, meeting coordination, and more in one simple and searchable interface." msgstr "" +#: ../../discuss/plan_activities.rst:3 +msgid "Get organized by planning activities" +msgstr "" + +#: ../../discuss/plan_activities.rst:5 +msgid "Planning activities is the perfect way to keep on track with your work. Get reminded of what needs to be done and schedule the next activities to undertake." +msgstr "" + +#: ../../discuss/plan_activities.rst:9 +msgid "Your activities are available wherever you are in Odoo. It is easy to manage your priorities." +msgstr "" + +#: ../../discuss/plan_activities.rst:15 +msgid "Activities can be planned and managed from the chatters or in the kanban views. Here is an example for opportunities :" +msgstr "" + +#: ../../discuss/plan_activities.rst:22 +msgid "Set your activity types" +msgstr "" + +#: ../../discuss/plan_activities.rst:24 +msgid "A number of generic activities types are available by default in Odoo (e.g. call, email, meeting, etc.). If you would like to set new ones, go to :menuselection:`Settings --> General settings --> Activity types`." +msgstr "" + +#: ../../discuss/plan_activities.rst:29 +msgid "Schedule meetings" +msgstr "" + +#: ../../discuss/plan_activities.rst:31 +msgid "Activities are planned for specific days. If you need to set hours, go with the *Meeting* activity type. When scheduling one, the calendar will simply open to let you select a time slot." +msgstr "" + +#: ../../discuss/plan_activities.rst:36 +msgid "If you need to use other activity types with a calendar planning, make sure their *Category* is set as *Meeting*." +msgstr "" + #: ../../discuss/team_communication.rst:3 msgid "How to efficiently communicate in team using channels" msgstr "" diff --git a/locale/sources/helpdesk.pot b/locale/sources/helpdesk.pot index 00eb32d41..a4f09d674 100644 --- a/locale/sources/helpdesk.pot +++ b/locale/sources/helpdesk.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,167 +16,279 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../helpdesk/helpdesk.rst:5 +#: ../../helpdesk.rst:5 msgid "Helpdesk" msgstr "" -#: ../../helpdesk/helpdesk.rst:8 +#: ../../helpdesk/getting_started.rst:3 +msgid "Get started with Odoo Helpdesk" +msgstr "" + +#: ../../helpdesk/getting_started.rst:6 msgid "Overview" msgstr "" -#: ../../helpdesk/helpdesk.rst:11 +#: ../../helpdesk/getting_started.rst:9 msgid "Getting started with Odoo Helpdesk" msgstr "" -#: ../../helpdesk/helpdesk.rst:13 +#: ../../helpdesk/getting_started.rst:11 msgid "Installing Odoo Helpdesk:" msgstr "" -#: ../../helpdesk/helpdesk.rst:15 +#: ../../helpdesk/getting_started.rst:13 msgid "Open the Apps module, search for \"Helpdesk\", and click install" msgstr "" -#: ../../helpdesk/helpdesk.rst:21 +#: ../../helpdesk/getting_started.rst:19 msgid "Set up Helpdesk teams" msgstr "" -#: ../../helpdesk/helpdesk.rst:23 +#: ../../helpdesk/getting_started.rst:21 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:28 +#: ../../helpdesk/getting_started.rst:26 msgid "To modify this team, or create additional teams, select \"Configuration\" in the purple bar and select \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:34 +#: ../../helpdesk/getting_started.rst:32 msgid "Here you can create new teams, decide what team members to add to this team, how your customers can submit tickets and set up SLA policies and ratings. For the assignation method you can have tickets assigned randomly, balanced, or manually." msgstr "" -#: ../../helpdesk/helpdesk.rst:40 +#: ../../helpdesk/getting_started.rst:38 msgid "How to set up different stages for each team" msgstr "" -#: ../../helpdesk/helpdesk.rst:42 +#: ../../helpdesk/getting_started.rst:40 msgid "First you will need to activate the developer mode. To do this go to your settings module, and select the link for \"Activate the developer mode\" on the lower right-hand side." msgstr "" -#: ../../helpdesk/helpdesk.rst:49 +#: ../../helpdesk/getting_started.rst:47 msgid "Now, when you return to your Helpdesk module and select \"Configuration\" in the purple bar you will find additional options, like \"Stages\". Here you can create new stages and assign those stages to 1 or multiple teams allowing for customizable stages for each team!" msgstr "" -#: ../../helpdesk/helpdesk.rst:55 +#: ../../helpdesk/getting_started.rst:53 msgid "Start receiving tickets" msgstr "" -#: ../../helpdesk/helpdesk.rst:58 +#: ../../helpdesk/getting_started.rst:56 msgid "How can my customers submit tickets?" msgstr "" -#: ../../helpdesk/helpdesk.rst:60 +#: ../../helpdesk/getting_started.rst:58 msgid "Select \"Configuration\" in the purple bar and select \"Settings\", select your Helpdesk team. Under \"Channels you will find 4 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:66 +#: ../../helpdesk/getting_started.rst:64 msgid "Email Alias allows for customers to email the alias you choose to create a ticket. The subject line of the email with become the Subject on the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:73 +#: ../../helpdesk/getting_started.rst:71 msgid "Website Form allows your customer to go to yourwebsite.com/helpdesk/support-1/submit and submit a ticket via a website form - much like odoo.com/help!" msgstr "" -#: ../../helpdesk/helpdesk.rst:80 +#: ../../helpdesk/getting_started.rst:78 msgid "Live Chat allows your customers to submit a ticket via Live Chat on your website. Your customer will begin the live chat and your Live Chat Operator can create the ticket by using the command /helpdesk Subject of Ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:88 +#: ../../helpdesk/getting_started.rst:86 msgid "The final option to submit tickets is thru an API connection. View the documentation `*here* `__." msgstr "" -#: ../../helpdesk/helpdesk.rst:93 +#: ../../helpdesk/getting_started.rst:91 msgid "Tickets have been created, now what?" msgstr "" -#: ../../helpdesk/helpdesk.rst:95 +#: ../../helpdesk/getting_started.rst:93 msgid "Now your employees can start working on them! If you have selecting a manual assignation method then your employees will need to assign themselves to tickets using the \"Assign To Me\" button on the top left of a ticket or by adding themselves to the \"Assigned to\" field." msgstr "" -#: ../../helpdesk/helpdesk.rst:103 +#: ../../helpdesk/getting_started.rst:101 msgid "If you have selected \"Random\" or \"Balanced\" assignation method, your tickets will be assigned to a member of that Helpdesk team." msgstr "" -#: ../../helpdesk/helpdesk.rst:106 +#: ../../helpdesk/getting_started.rst:104 msgid "From there they will begin working on resolving the tickets! When they are completed, they will move the ticket to the solved stage." msgstr "" -#: ../../helpdesk/helpdesk.rst:110 +#: ../../helpdesk/getting_started.rst:108 msgid "How do I mark this ticket as urgent?" msgstr "" -#: ../../helpdesk/helpdesk.rst:112 +#: ../../helpdesk/getting_started.rst:110 msgid "On your tickets you will see stars. You can determine how urgent a ticket is but selecting one or more stars on the ticket. You can do this in the Kanban view or on the ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:119 +#: ../../helpdesk/getting_started.rst:117 msgid "To set up a Service Level Agreement Policy for your employees, first activate the setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:125 +#: ../../helpdesk/getting_started.rst:123 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"." msgstr "" -#: ../../helpdesk/helpdesk.rst:127 +#: ../../helpdesk/getting_started.rst:125 msgid "You will fill in information like the Helpdesk team, what the minimum priority is on the ticket (the stars) and the targets for the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:134 +#: ../../helpdesk/getting_started.rst:132 msgid "What if a ticket is blocked or is ready to be worked on?" msgstr "" -#: ../../helpdesk/helpdesk.rst:136 +#: ../../helpdesk/getting_started.rst:134 msgid "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban State\" on the ticket. You have 3 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:139 +#: ../../helpdesk/getting_started.rst:137 msgid "Grey - Normal State" msgstr "" -#: ../../helpdesk/helpdesk.rst:141 +#: ../../helpdesk/getting_started.rst:139 msgid "Red - Blocked" msgstr "" -#: ../../helpdesk/helpdesk.rst:143 +#: ../../helpdesk/getting_started.rst:141 msgid "Green - Ready for next stage" msgstr "" -#: ../../helpdesk/helpdesk.rst:145 +#: ../../helpdesk/getting_started.rst:143 msgid "Like the urgency stars you can adjust the state in the Kanban or on the Ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:152 +#: ../../helpdesk/getting_started.rst:150 msgid "How can my employees log time against a ticket?" msgstr "" -#: ../../helpdesk/helpdesk.rst:154 +#: ../../helpdesk/getting_started.rst:152 msgid "First, head over to \"Settings\" and select the option for \"Timesheet on Ticket\". You will see a field appear where you can select the project the timesheets will log against." msgstr "" -#: ../../helpdesk/helpdesk.rst:161 +#: ../../helpdesk/getting_started.rst:159 msgid "Now that you have selected a project, you can save. If you move back to your tickets, you will see a new tab called \"Timesheets\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:167 +#: ../../helpdesk/getting_started.rst:165 msgid "Here you employees can add a line to add work they have done for this ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:171 +#: ../../helpdesk/getting_started.rst:169 msgid "How to allow your customers to rate the service they received" msgstr "" -#: ../../helpdesk/helpdesk.rst:173 +#: ../../helpdesk/getting_started.rst:171 msgid "First, you will need to activate the ratings setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:178 +#: ../../helpdesk/getting_started.rst:176 msgid "Now, when a ticket is moved to its solved or completed stage, it will send an email to the customer asking how their service went." msgstr "" +#: ../../helpdesk/invoice_time.rst:3 +msgid "Record and invoice time for tickets" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:5 +msgid "You may have service contracts with your clients to provide them assistance in case of a problem. For this purpose, Odoo will help you record the time spent fixing the issue and most importantly, to invoice it to your clients." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:11 +msgid "The modules needed" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:13 +msgid "In order to record and invoice time for tickets, the following modules are needed : Helpdesk, Project, Timesheets, Sales. If you are missing one of them, go to the Apps module, search for it and then click on *Install*." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:19 +msgid "Get started to offer the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:22 +msgid "Step 1 : start a helpdesk project" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:24 +msgid "To start a dedicated project for the helpdesk service, first go to :menuselection:`Project --> Configuration --> Settings` and make sure that the *Timesheets* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:31 +msgid "Then, go to your dashboard, create the new project and allow timesheets for it." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:35 +msgid "Step 2 : gather a helpdesk team" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:37 +msgid "To set a team in charge of the helpdesk, go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams` and create a new team or select an existing one. On the form, tick the box in front of *Timesheet on Ticket* to activate the feature. Make sure to select the helpdesk project you have previously created as well." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:47 +msgid "Step 3 : launch the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:49 +msgid "Finally, to launch the new helpdesk service, first go to :menuselection:`Sales --> Configuration --> Settings` and make sure that the *Units of Measure* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:56 +msgid "Then, go to :menuselection:`Products --> Products` and create a new one. Make sure that the product is set as a service." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:63 +msgid "Here, we suggest that you set the *Unit of Measure* as *Hour(s)*, but any unit will do." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:66 +msgid "Finally, select the invoicing management you would like to have under the *Sales* tab of the product form. Here, we recommend the following configuration :" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:73 +msgid "Now, you are ready to start receiving tickets !" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:76 +msgid "Solve issues and record time spent" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:79 +msgid "Step 1 : place an order" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:81 +msgid "You are now in the Helpdesk module and you have just received a ticket from a client. To place a new order, go to :menuselection:`Sales --> Orders --> Orders` and create one for the help desk service product you have previously recorded. Set the number of hours needed to assist the client and confirm the sale." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:91 +msgid "Step 2 : link the task to the ticket" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:93 +msgid "If you access the dedicated helpdesk project, you will notice that a new task has automatically been generated with the order. To link this task with the client ticket, go to the Helpdesk module, access the ticket in question and select the task on its form." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:102 +msgid "Step 3 : record the time spent to help the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:104 +msgid "The job is done and the client's issue is sorted out. To record the hours performed for this task, go back to the ticket form and add them under the *Timesheets* tab." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:112 +msgid "The hours recorded on the ticket will also automatically appear in the Timesheet module and on the dedicated task." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:116 +msgid "Step 4 : invoice the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:118 +msgid "To invoice the client, go back to the Sales module and select the order that had been placed. Notice that the hours recorded on the ticket form now appear as the delivered quantity." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:125 +msgid "All that is left to do, is to create the invoice from the order and then validate it. Now you just have to wait for the client's payment !" +msgstr "" + diff --git a/locale/sources/point_of_sale.pot b/locale/sources/point_of_sale.pot index 89cfd3545..403f21b6c 100644 --- a/locale/sources/point_of_sale.pot +++ b/locale/sources/point_of_sale.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -773,7 +773,7 @@ msgid "POSBox Setup Guide" msgstr "" #: ../../point_of_sale/overview/setup.rst:11 -#: ../../point_of_sale/overview/setup.rst:206 +#: ../../point_of_sale/overview/setup.rst:205 msgid "Prerequisites" msgstr "" @@ -802,23 +802,23 @@ msgid "A local network set up with DHCP (this is the default setting)" msgstr "" #: ../../point_of_sale/overview/setup.rst:21 -msgid "An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter" -msgstr "" - -#: ../../point_of_sale/overview/setup.rst:22 msgid "An Epson USB TM-T20 Printer or another ESC/POS compatible printer (officially supported printers are listed at the `POS Hardware page `_)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:25 +#: ../../point_of_sale/overview/setup.rst:24 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" msgstr "" -#: ../../point_of_sale/overview/setup.rst:26 +#: ../../point_of_sale/overview/setup.rst:25 msgid "An Epson compatible cash drawer" msgstr "" +#: ../../point_of_sale/overview/setup.rst:26 +msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)" +msgstr "" + #: ../../point_of_sale/overview/setup.rst:29 -#: ../../point_of_sale/overview/setup.rst:214 +#: ../../point_of_sale/overview/setup.rst:213 msgid "Step By Step Setup Guide" msgstr "" @@ -855,520 +855,520 @@ msgid "**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable msgstr "" #: ../../point_of_sale/overview/setup.rst:60 -msgid "**Wi-Fi**: If you do not wish to use Ethernet, plug in a Linux compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 chipset. Make sure not to plug in an Ethernet cable, because all Wi-Fi functionality will be bypassed when a wired network connection is available." +msgid "**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure not to plug in an Ethernet cable, because all Wi-Fi functionality will be bypassed when a wired network connection is available." msgstr "" -#: ../../point_of_sale/overview/setup.rst:68 +#: ../../point_of_sale/overview/setup.rst:66 msgid "Power the POSBox" msgstr "" -#: ../../point_of_sale/overview/setup.rst:70 +#: ../../point_of_sale/overview/setup.rst:68 msgid "Plug the power adapter into the POSBox, a bright red status led should light up." msgstr "" -#: ../../point_of_sale/overview/setup.rst:74 +#: ../../point_of_sale/overview/setup.rst:72 msgid "Make sure the POSBox is ready" msgstr "" -#: ../../point_of_sale/overview/setup.rst:76 +#: ../../point_of_sale/overview/setup.rst:74 msgid "Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it should print a status receipt with its IP address. Also the status LED, just next to the red power LED, should be permanently lit green." msgstr "" -#: ../../point_of_sale/overview/setup.rst:82 -#: ../../point_of_sale/overview/setup.rst:293 +#: ../../point_of_sale/overview/setup.rst:80 +#: ../../point_of_sale/overview/setup.rst:292 msgid "Setup the Point of Sale" msgstr "" -#: ../../point_of_sale/overview/setup.rst:84 +#: ../../point_of_sale/overview/setup.rst:82 msgid "To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale --> Configuration --> Settings` and select your Point of Sale. Scroll down to the ``Hardware Proxy / POSBox`` section and activate the options for the hardware you want to use through the POSBox. Specifying the IP of the POSBox is recommended (it is printed on the receipt that gets printed after booting up the POSBox). When the IP is not specified the Point of Sale will attempt to find it on the local network." msgstr "" -#: ../../point_of_sale/overview/setup.rst:93 +#: ../../point_of_sale/overview/setup.rst:91 msgid "If you are running multiple Point of Sales on the same POSBox, make sure that only one of them has Remote Scanning/Barcode Scanner activated." msgstr "" -#: ../../point_of_sale/overview/setup.rst:96 +#: ../../point_of_sale/overview/setup.rst:94 msgid "It might be a good idea to make sure the POSBox IP never changes in your network. Refer to your router documentation on how to achieve this." msgstr "" -#: ../../point_of_sale/overview/setup.rst:101 +#: ../../point_of_sale/overview/setup.rst:99 msgid "Launch the Point of Sale" msgstr "" -#: ../../point_of_sale/overview/setup.rst:103 +#: ../../point_of_sale/overview/setup.rst:101 msgid "If you didn't specify the POSBox's IP address in the configuration, the POS will need some time to perform a network scan to find the POSBox. This is only done once." msgstr "" -#: ../../point_of_sale/overview/setup.rst:107 +#: ../../point_of_sale/overview/setup.rst:105 msgid "The Point of Sale is now connected to the POSBox and your hardware should be ready to use." msgstr "" -#: ../../point_of_sale/overview/setup.rst:111 +#: ../../point_of_sale/overview/setup.rst:109 msgid "Wi-Fi configuration" msgstr "" -#: ../../point_of_sale/overview/setup.rst:113 -msgid "The POSBox is Wi-Fi-capable. In order to use it you'll need a Linux compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 chipset." +#: ../../point_of_sale/overview/setup.rst:111 +msgid "The most recent version of the POSBox has Wi-Fi built in. If you're using an older version you'll need a Linux compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 chipset." msgstr "" -#: ../../point_of_sale/overview/setup.rst:118 +#: ../../point_of_sale/overview/setup.rst:117 msgid "Make sure not to plug in an Ethernet cable, as all Wi-Fi related functionality will be disabled when a wired network connection is available." msgstr "" -#: ../../point_of_sale/overview/setup.rst:122 +#: ../../point_of_sale/overview/setup.rst:121 msgid "When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi Access Point called \"Posbox\" you can connect to. The receipt that gets printed when the POSBox starts will reflect this. In order to make the POSBox connect to an already existing Wi-Fi network, go to the homepage of the POSBox (indicated on the receipt) and go to the Wi-Fi configuration page. On there you can choose a network to connect to. Note that we only support open and WPA(2)-PSK networks. When connecting to a WPA-secured network, fill in the password field. The POSBox will attempt to connect to the specified network and will print a new POSBox status receipt after it has connected." msgstr "" -#: ../../point_of_sale/overview/setup.rst:133 +#: ../../point_of_sale/overview/setup.rst:132 msgid "If you plan on permanently setting up the POSBox with Wi-Fi, you can use the \"persistent\" checkbox on the Wi-Fi configuration page when connecting to a network. This will make the network choice persist across reboots. This means that instead of starting up its own \"Posbox\" network it will always attempt to connect to the specified network after it boots." msgstr "" -#: ../../point_of_sale/overview/setup.rst:140 +#: ../../point_of_sale/overview/setup.rst:139 msgid "When the POSBox fails to connect to a network it will fall back to starting it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network after connecting to it, the POSBox will attempt to re-establish connection automatically." msgstr "" -#: ../../point_of_sale/overview/setup.rst:146 +#: ../../point_of_sale/overview/setup.rst:145 msgid "Multi-POS Configuration" msgstr "" -#: ../../point_of_sale/overview/setup.rst:148 +#: ../../point_of_sale/overview/setup.rst:147 msgid "The advised way to setup a multi Point of Sale shop is to have one POSBox per Point of Sale. In this case it is mandatory to manually specify the IP address of each POSBox in each Point of Sale. You must also configure your network to make sure the POSBox's IP addresses don't change. Please refer to your router documentation." msgstr "" -#: ../../point_of_sale/overview/setup.rst:155 +#: ../../point_of_sale/overview/setup.rst:154 msgid "POSBoxless Guide (advanced)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:159 +#: ../../point_of_sale/overview/setup.rst:158 msgid "If you are running your Point of Sale on a Debian-based Linux distribution, you do not need the POSBox as you can run its software locally. However the installation process is not foolproof. You'll need at least to know how to install and run Odoo. You may also run into issues specific to your distribution or to your particular setup and hardware configuration." msgstr "" -#: ../../point_of_sale/overview/setup.rst:166 +#: ../../point_of_sale/overview/setup.rst:165 msgid "Drivers for the various types of supported hardware are provided as Odoo modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale communicates with. The instance of Odoo running on the POSBox is very different from a 'real' Odoo instance however. It does not handle *any* business data (eg. POS orders), but only serves as a gateway between the Point of Sale and the hardware." msgstr "" -#: ../../point_of_sale/overview/setup.rst:173 +#: ../../point_of_sale/overview/setup.rst:172 msgid "The goal of this section will be to set up a local Odoo instance that behaves like the Odoo instance running on the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:177 +#: ../../point_of_sale/overview/setup.rst:176 msgid "Image building process" msgstr "" -#: ../../point_of_sale/overview/setup.rst:179 +#: ../../point_of_sale/overview/setup.rst:178 msgid "We generate the official POSBox images using the scripts in https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. More specifically, we run `posbox_create_image.sh `_. This builds an image called ``posbox.img``, which we zip and upload to `nightly.odoo.com `_ for users to download." msgstr "" -#: ../../point_of_sale/overview/setup.rst:187 +#: ../../point_of_sale/overview/setup.rst:186 msgid "The scripts in this directory might be useful as a reference if you get stuck or want more detail about something." msgstr "" -#: ../../point_of_sale/overview/setup.rst:191 +#: ../../point_of_sale/overview/setup.rst:190 msgid "Summary of the image creation process" msgstr "" -#: ../../point_of_sale/overview/setup.rst:193 +#: ../../point_of_sale/overview/setup.rst:192 msgid "The image creation process starts by downloading the latest `Raspbian `_ image. It then locally mounts this Raspbian image and copies over some files and scripts that will make the Raspbian image turn itself into a POSBox when it boots. These scripts will update Raspbian, remove non-essential packages and install required packages. In order to boot Raspbian we use qemu, which is capable of providing ARM emulation. After this, the emulated Raspbian OS will shut itself down. We then once again locally mount the image, remove the scripts that were used to initialize the image at boot and we copy over some extra configuration files. The resulting image is then ready to be tested and used." msgstr "" -#: ../../point_of_sale/overview/setup.rst:208 +#: ../../point_of_sale/overview/setup.rst:207 msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)" msgstr "" -#: ../../point_of_sale/overview/setup.rst:209 +#: ../../point_of_sale/overview/setup.rst:208 msgid "A running Odoo instance you connect to to load the Point of Sale" msgstr "" -#: ../../point_of_sale/overview/setup.rst:210 +#: ../../point_of_sale/overview/setup.rst:209 msgid "You must uninstall any ESC/POS printer driver as it will conflict with Odoo's built-in driver" msgstr "" -#: ../../point_of_sale/overview/setup.rst:217 +#: ../../point_of_sale/overview/setup.rst:216 msgid "Extra dependencies" msgstr "" -#: ../../point_of_sale/overview/setup.rst:219 +#: ../../point_of_sale/overview/setup.rst:218 msgid "Because Odoo runs on Python 2, you need to check which version of pip you need to use." msgstr "" -#: ../../point_of_sale/overview/setup.rst:222 +#: ../../point_of_sale/overview/setup.rst:221 msgid "``# pip --version``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:224 -#: ../../point_of_sale/overview/setup.rst:230 +#: ../../point_of_sale/overview/setup.rst:223 +#: ../../point_of_sale/overview/setup.rst:229 msgid "If it returns something like::" msgstr "" -#: ../../point_of_sale/overview/setup.rst:228 +#: ../../point_of_sale/overview/setup.rst:227 msgid "You need to try pip2 instead." msgstr "" -#: ../../point_of_sale/overview/setup.rst:234 +#: ../../point_of_sale/overview/setup.rst:233 msgid "You can use pip." msgstr "" -#: ../../point_of_sale/overview/setup.rst:236 +#: ../../point_of_sale/overview/setup.rst:235 msgid "The driver modules requires the installation of new python modules:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:238 +#: ../../point_of_sale/overview/setup.rst:237 msgid "``# pip install pyserial``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:240 +#: ../../point_of_sale/overview/setup.rst:239 msgid "``# pip install pyusb==1.0.0b1``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:242 +#: ../../point_of_sale/overview/setup.rst:241 msgid "``# pip install qrcode``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:245 +#: ../../point_of_sale/overview/setup.rst:244 msgid "Access Rights" msgstr "" -#: ../../point_of_sale/overview/setup.rst:247 +#: ../../point_of_sale/overview/setup.rst:246 msgid "The drivers need raw access to the printer and barcode scanner devices. Doing so requires a bit system administration. First we are going to create a group that has access to USB devices" msgstr "" -#: ../../point_of_sale/overview/setup.rst:251 +#: ../../point_of_sale/overview/setup.rst:250 msgid "``# groupadd usbusers``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:253 +#: ../../point_of_sale/overview/setup.rst:252 msgid "Then we add the user who will run the OpenERP server to ``usbusers``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:255 +#: ../../point_of_sale/overview/setup.rst:254 msgid "``# usermod -a -G usbusers USERNAME``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:257 +#: ../../point_of_sale/overview/setup.rst:256 msgid "Then we need to create a udev rule that will automatically allow members of ``usbusers`` to access raw USB devices. To do so create a file called ``99-usbusers.rules`` in the ``/etc/udev/rules.d/`` directory with the following content::" msgstr "" -#: ../../point_of_sale/overview/setup.rst:265 +#: ../../point_of_sale/overview/setup.rst:264 msgid "Then you need to reboot your machine." msgstr "" -#: ../../point_of_sale/overview/setup.rst:268 +#: ../../point_of_sale/overview/setup.rst:267 msgid "Start the local Odoo instance" msgstr "" -#: ../../point_of_sale/overview/setup.rst:270 +#: ../../point_of_sale/overview/setup.rst:269 msgid "We must launch the Odoo server with the correct settings" msgstr "" -#: ../../point_of_sale/overview/setup.rst:272 +#: ../../point_of_sale/overview/setup.rst:271 msgid "``$ ./odoo.py --load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:275 +#: ../../point_of_sale/overview/setup.rst:274 msgid "Test the instance" msgstr "" -#: ../../point_of_sale/overview/setup.rst:277 +#: ../../point_of_sale/overview/setup.rst:276 msgid "Plug all your hardware to your machine's USB ports, and go to ``http://localhost:8069/hw_proxy/status`` refresh the page a few times and see if all your devices are indicated as *Connected*. Possible source of errors are: The paths on the distribution differ from the paths expected by the drivers, another process has grabbed exclusive access to the devices, the udev rules do not apply or a superseded by others." msgstr "" -#: ../../point_of_sale/overview/setup.rst:285 +#: ../../point_of_sale/overview/setup.rst:284 msgid "Automatically start Odoo" msgstr "" -#: ../../point_of_sale/overview/setup.rst:287 +#: ../../point_of_sale/overview/setup.rst:286 msgid "You must now make sure that this Odoo install is automatically started after boot. There are various ways to do so, and how to do it depends on your particular setup. Using the init system provided by your distribution is probably the easiest way to accomplish this." msgstr "" -#: ../../point_of_sale/overview/setup.rst:295 +#: ../../point_of_sale/overview/setup.rst:294 msgid "The IP address field in the POS configuration must be either ``127.0.0.1`` or ``localhost`` if you're running the created Odoo server on the machine that you'll use as the Point of Sale device. You can also leave it empty." msgstr "" -#: ../../point_of_sale/overview/setup.rst:301 +#: ../../point_of_sale/overview/setup.rst:300 msgid "POSBox Technical Documentation" msgstr "" -#: ../../point_of_sale/overview/setup.rst:304 +#: ../../point_of_sale/overview/setup.rst:303 msgid "Technical Overview" msgstr "" -#: ../../point_of_sale/overview/setup.rst:307 +#: ../../point_of_sale/overview/setup.rst:306 msgid "The POSBox Hardware" msgstr "" -#: ../../point_of_sale/overview/setup.rst:309 +#: ../../point_of_sale/overview/setup.rst:308 msgid "The POSBox's Hardware is based on a `Raspberry Pi 2 `_, a popular single-board computer. The Raspberry Pi 2 is powered with a 2A micro-usb power adapter. 2A is needed to give enough power to the barcode scanners. The Software is installed on a 8Gb Class 10 or Higher SD Card. All this hardware is easily available worldwide from independent vendors." msgstr "" -#: ../../point_of_sale/overview/setup.rst:318 +#: ../../point_of_sale/overview/setup.rst:317 msgid "Compatible Peripherals" msgstr "" -#: ../../point_of_sale/overview/setup.rst:320 +#: ../../point_of_sale/overview/setup.rst:319 msgid "Officially supported hardware is listed on the `POS Hardware page `_." msgstr "" -#: ../../point_of_sale/overview/setup.rst:324 +#: ../../point_of_sale/overview/setup.rst:323 msgid "The POSBox Software" msgstr "" -#: ../../point_of_sale/overview/setup.rst:326 +#: ../../point_of_sale/overview/setup.rst:325 msgid "The POSBox runs a heavily modified Raspbian Linux installation, a Debian derivative for the Raspberry Pi. It also runs a barebones installation of Odoo which provides the webserver and the drivers. The hardware drivers are implemented as Odoo modules. Those modules are all prefixed with ``hw_*`` and they are the only modules that are running on the POSBox. Odoo is only used for the framework it provides. No business data is processed or stored on the POSBox. The Odoo instance is a shallow git clone of the ``11.0`` branch." msgstr "" -#: ../../point_of_sale/overview/setup.rst:335 +#: ../../point_of_sale/overview/setup.rst:334 msgid "The root partition on the POSBox is mounted read-only, ensuring that we don't wear out the SD card by writing to it too much. It also ensures that the filesystem cannot be corrupted by cutting the power to the POSBox. Linux applications expect to be able to write to certain directories though. So we provide a ramdisk for /etc and /var (Raspbian automatically provides one for /tmp). These ramdisks are setup by ``setup_ramdisks.sh``, which we run before all other init scripts by running it in ``/etc/init.d/rcS``. The ramdisks are named /etc_ram and /var_ram respectively. Most data from /etc and /var is copied to these tmpfs ramdisks. In order to restrict the size of the ramdisks, we do not copy over certain things to them (eg. apt related data). We then bind mount them over the original directories. So when an application writes to /etc/foo/bar it's actually writing to /etc_ram/foo/bar. We also bind mount / to /root_bypass_ramdisks to be able to get to the real /etc and /var during development." msgstr "" -#: ../../point_of_sale/overview/setup.rst:351 +#: ../../point_of_sale/overview/setup.rst:350 msgid "Logs of the running Odoo server can be found at:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:353 +#: ../../point_of_sale/overview/setup.rst:352 msgid "``/var/log/odoo/odoo.log``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:355 +#: ../../point_of_sale/overview/setup.rst:354 msgid "Various POSBox related scripts (eg. wifi-related scripts) running on the POSBox will log to /var/log/syslog and those messages are tagged with ``posbox_*``." msgstr "" -#: ../../point_of_sale/overview/setup.rst:360 +#: ../../point_of_sale/overview/setup.rst:359 msgid "Accessing the POSBox" msgstr "" -#: ../../point_of_sale/overview/setup.rst:363 +#: ../../point_of_sale/overview/setup.rst:362 msgid "Local Access" msgstr "" -#: ../../point_of_sale/overview/setup.rst:365 +#: ../../point_of_sale/overview/setup.rst:364 msgid "If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if you connect a computer monitor to the *HDMI* port of the POSBox, you can use it as a small GNU/Linux computer and perform various administration tasks, like viewing some logs." msgstr "" -#: ../../point_of_sale/overview/setup.rst:370 +#: ../../point_of_sale/overview/setup.rst:369 msgid "The POSBox will automatically log in as root on the default tty." msgstr "" -#: ../../point_of_sale/overview/setup.rst:373 +#: ../../point_of_sale/overview/setup.rst:372 msgid "Remote Access" msgstr "" -#: ../../point_of_sale/overview/setup.rst:375 +#: ../../point_of_sale/overview/setup.rst:374 msgid "If you have the POSBox's IP address and an SSH client you can access the POSBox's system remotely. The login credentials are ``pi``/``raspberry``." msgstr "" -#: ../../point_of_sale/overview/setup.rst:380 +#: ../../point_of_sale/overview/setup.rst:379 msgid "Updating The POSBox Software" msgstr "" -#: ../../point_of_sale/overview/setup.rst:382 +#: ../../point_of_sale/overview/setup.rst:381 msgid "Only upgrade the POSBox if you experience problems or want to use newly implemented features." msgstr "" -#: ../../point_of_sale/overview/setup.rst:385 +#: ../../point_of_sale/overview/setup.rst:384 msgid "The best way to update the POSBox software is to download a new version of the image and flash the SD-Card with it. This operation is described in detail in `this tutorial `_, just replace the standard Raspberry Pi image with the latest one found at `the official POSBox image page `_. This method of upgrading will ensure that you're running the latest version of the POSBox software." msgstr "" -#: ../../point_of_sale/overview/setup.rst:394 +#: ../../point_of_sale/overview/setup.rst:393 msgid "The second way of upgrading is through the built in upgrade interface that can be reached through the POSBox homepage. The nice thing about upgrading like this is that you don't have to flash a new image. This upgrade method is limited to what it can do however. It can not eg. update installed configuration files (like eg. /etc/hostapd.conf). It can only upgrade:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:401 +#: ../../point_of_sale/overview/setup.rst:400 msgid "The internal Odoo application" msgstr "" -#: ../../point_of_sale/overview/setup.rst:402 +#: ../../point_of_sale/overview/setup.rst:401 msgid "Scripts in the folder ``odoo/addons/point_of_sale/tools/posbox/configuration/``" msgstr "" -#: ../../point_of_sale/overview/setup.rst:404 +#: ../../point_of_sale/overview/setup.rst:403 msgid "When in doubt, always use the first method of upgrading." msgstr "" -#: ../../point_of_sale/overview/setup.rst:407 +#: ../../point_of_sale/overview/setup.rst:406 msgid "Troubleshoot" msgstr "" -#: ../../point_of_sale/overview/setup.rst:410 +#: ../../point_of_sale/overview/setup.rst:409 msgid "The POS cannot connect to the POSBox" msgstr "" -#: ../../point_of_sale/overview/setup.rst:412 +#: ../../point_of_sale/overview/setup.rst:411 msgid "The easiest way to make sure the POSBox is properly set-up is to turn it on with the printer plugged in as it will print a receipt indicating any error if encountered or the POSBox's IP address in case of success. If no receipt is printed, check the following steps:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:416 +#: ../../point_of_sale/overview/setup.rst:415 msgid "Make sure the POSBox is powered on, indicated by a brightly lit red status LED." msgstr "" -#: ../../point_of_sale/overview/setup.rst:418 +#: ../../point_of_sale/overview/setup.rst:417 msgid "Make sure the POSBox is ready, this is indicated by a brightly lit green status LED just next to the red power status LED. The POSBox should be ready ~2 minutes after it is started." msgstr "" -#: ../../point_of_sale/overview/setup.rst:421 +#: ../../point_of_sale/overview/setup.rst:420 msgid "Make sure the POSBox is connected to the same network as your POS device. Both the device and the POSBox should be visible in the list of connected devices on your network router." msgstr "" -#: ../../point_of_sale/overview/setup.rst:424 +#: ../../point_of_sale/overview/setup.rst:423 msgid "Make sure that your LAN is set up with DHCP, and gives IP addresses in the range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that way, you must manually set up your POSBox's IP address." msgstr "" -#: ../../point_of_sale/overview/setup.rst:428 +#: ../../point_of_sale/overview/setup.rst:427 msgid "If you have specified the POSBox's IP address in the configuration, make sure it correspond to the printed on the POSBox's status receipt." msgstr "" -#: ../../point_of_sale/overview/setup.rst:431 +#: ../../point_of_sale/overview/setup.rst:430 msgid "Make sure that the POS is not loaded over HTTPS." msgstr "" -#: ../../point_of_sale/overview/setup.rst:432 +#: ../../point_of_sale/overview/setup.rst:431 msgid "A bug in Firefox's HTTP implementation prevents the autodiscovery from working reliably. When using Firefox you should manually set up the POSBox's IP address in the POS configuration." msgstr "" -#: ../../point_of_sale/overview/setup.rst:437 +#: ../../point_of_sale/overview/setup.rst:436 msgid "The Barcode Scanner is not working" msgstr "" -#: ../../point_of_sale/overview/setup.rst:439 +#: ../../point_of_sale/overview/setup.rst:438 msgid "The barcode scanner must be configured in US QWERTY and emit an Enter after each barcode. This is the default configuration of most barcode readers. Refer to the barcode reader documentation for more information." msgstr "" -#: ../../point_of_sale/overview/setup.rst:443 +#: ../../point_of_sale/overview/setup.rst:442 msgid "The POSBox needs a 2A power supply to work with some barcode scanners. If you are not using the provided power supply, make sure the one you use has enough power." msgstr "" -#: ../../point_of_sale/overview/setup.rst:446 +#: ../../point_of_sale/overview/setup.rst:445 msgid "Some barcode scanners will need more than 2A and will not work, or will work unreliably, even with the provided power supply. In those case you can plug the barcode scanner in a self-powered USB hub." msgstr "" -#: ../../point_of_sale/overview/setup.rst:449 +#: ../../point_of_sale/overview/setup.rst:448 msgid "Some poorly built barcode scanners do not advertise themselves as barcode scanners but as a usb keyboard instead, and will not be recognized by the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:454 +#: ../../point_of_sale/overview/setup.rst:453 msgid "The Barcode Scanner is not working reliably" msgstr "" -#: ../../point_of_sale/overview/setup.rst:456 +#: ../../point_of_sale/overview/setup.rst:455 msgid "Make sure that no more than one device with 'Scan via Proxy'/'Barcode Scanner' enabled are connected to the POSBox at the same time." msgstr "" -#: ../../point_of_sale/overview/setup.rst:461 +#: ../../point_of_sale/overview/setup.rst:460 msgid "Printing the receipt takes too much time" msgstr "" -#: ../../point_of_sale/overview/setup.rst:463 +#: ../../point_of_sale/overview/setup.rst:462 msgid "A small delay before the first print is expected, as the POSBox will do some preprocessing to speed up the next printings. If you suffer delays afterwards it is most likely due to poor network connection between the POS and the POSBox." msgstr "" -#: ../../point_of_sale/overview/setup.rst:469 +#: ../../point_of_sale/overview/setup.rst:468 msgid "Some characters are not correctly printed on the receipt" msgstr "" -#: ../../point_of_sale/overview/setup.rst:471 +#: ../../point_of_sale/overview/setup.rst:470 msgid "The POSBox does not support all languages and characters. It currently supports Latin and Cyrillic based scripts, with basic Japanese support." msgstr "" -#: ../../point_of_sale/overview/setup.rst:476 +#: ../../point_of_sale/overview/setup.rst:475 msgid "The printer is offline" msgstr "" -#: ../../point_of_sale/overview/setup.rst:478 +#: ../../point_of_sale/overview/setup.rst:477 msgid "Make sure the printer is connected, powered, has enough paper and has its lid closed, and is not reporting an error. If the error persists, please contact support." msgstr "" -#: ../../point_of_sale/overview/setup.rst:483 +#: ../../point_of_sale/overview/setup.rst:482 msgid "The cashdrawer does not open" msgstr "" -#: ../../point_of_sale/overview/setup.rst:485 +#: ../../point_of_sale/overview/setup.rst:484 msgid "The cashdrawer should be connected to the printer and should be activated in the POS configuration." msgstr "" -#: ../../point_of_sale/overview/setup.rst:489 +#: ../../point_of_sale/overview/setup.rst:488 msgid "Credits" msgstr "" -#: ../../point_of_sale/overview/setup.rst:490 +#: ../../point_of_sale/overview/setup.rst:489 msgid "The POSBox project was developed by Frédéric van der Essen with the kind help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del Marmol, Joren Van Onder and Antony Lesuisse." msgstr "" -#: ../../point_of_sale/overview/setup.rst:494 +#: ../../point_of_sale/overview/setup.rst:493 msgid "This development would not have been possible without the Indiegogo campaign and those who contributed to it. Special thanks goes to the partners who backed the campaign with founding partner bundles:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:498 +#: ../../point_of_sale/overview/setup.rst:497 msgid "Camptocamp" msgstr "" -#: ../../point_of_sale/overview/setup.rst:499 +#: ../../point_of_sale/overview/setup.rst:498 msgid "BHC" msgstr "" -#: ../../point_of_sale/overview/setup.rst:500 +#: ../../point_of_sale/overview/setup.rst:499 msgid "openBig" msgstr "" -#: ../../point_of_sale/overview/setup.rst:501 +#: ../../point_of_sale/overview/setup.rst:500 msgid "Eeezee-IT" msgstr "" -#: ../../point_of_sale/overview/setup.rst:502 +#: ../../point_of_sale/overview/setup.rst:501 msgid "Solarsis LDA" msgstr "" -#: ../../point_of_sale/overview/setup.rst:503 +#: ../../point_of_sale/overview/setup.rst:502 msgid "ACSONE" msgstr "" -#: ../../point_of_sale/overview/setup.rst:504 +#: ../../point_of_sale/overview/setup.rst:503 msgid "Vauxoo" msgstr "" -#: ../../point_of_sale/overview/setup.rst:505 +#: ../../point_of_sale/overview/setup.rst:504 msgid "Ekomurz" msgstr "" -#: ../../point_of_sale/overview/setup.rst:506 +#: ../../point_of_sale/overview/setup.rst:505 msgid "Datalp" msgstr "" -#: ../../point_of_sale/overview/setup.rst:507 +#: ../../point_of_sale/overview/setup.rst:506 msgid "Dao Systems" msgstr "" -#: ../../point_of_sale/overview/setup.rst:508 +#: ../../point_of_sale/overview/setup.rst:507 msgid "Eggs Solutions" msgstr "" -#: ../../point_of_sale/overview/setup.rst:509 +#: ../../point_of_sale/overview/setup.rst:508 msgid "OpusVL" msgstr "" -#: ../../point_of_sale/overview/setup.rst:511 +#: ../../point_of_sale/overview/setup.rst:510 msgid "And also the partners who've backed the development with the Founding POSBox Bundle:" msgstr "" -#: ../../point_of_sale/overview/setup.rst:514 +#: ../../point_of_sale/overview/setup.rst:513 msgid "Willow IT" msgstr "" -#: ../../point_of_sale/overview/setup.rst:515 +#: ../../point_of_sale/overview/setup.rst:514 msgid "E\\. Akhalwaya & Sons" msgstr "" -#: ../../point_of_sale/overview/setup.rst:516 +#: ../../point_of_sale/overview/setup.rst:515 msgid "Multibase" msgstr "" -#: ../../point_of_sale/overview/setup.rst:517 +#: ../../point_of_sale/overview/setup.rst:516 msgid "Mindesa" msgstr "" -#: ../../point_of_sale/overview/setup.rst:518 +#: ../../point_of_sale/overview/setup.rst:517 msgid "bpso.biz" msgstr "" -#: ../../point_of_sale/overview/setup.rst:519 +#: ../../point_of_sale/overview/setup.rst:518 msgid "Shine IT." msgstr "" diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index ce5ff4d30..1e530b57b 100644 --- a/locale/sources/sales.pot +++ b/locale/sources/sales.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,38 +37,38 @@ msgid "A portal access is given to a user who has the necessity to have access t msgstr "" #: ../../sales/advanced/portal.rst:12 -msgid "For Example: 1. A long term client who needs to view online quotations. 2. Accounting consultant who needs to keep track of the company's financials." +msgid "For Example, a long term client who needs to view online quotations." msgstr "" -#: ../../sales/advanced/portal.rst:16 +#: ../../sales/advanced/portal.rst:14 msgid "A portal user has only read/view access. He or she will not be able to edit any document in the system." msgstr "" -#: ../../sales/advanced/portal.rst:20 +#: ../../sales/advanced/portal.rst:18 msgid "How to give portal access to customers?" msgstr "" -#: ../../sales/advanced/portal.rst:23 +#: ../../sales/advanced/portal.rst:21 msgid "From Contacts Module" msgstr "" -#: ../../sales/advanced/portal.rst:25 +#: ../../sales/advanced/portal.rst:23 msgid "From the main menu, select **Contacts** menu. If the contact is not yet created in the system, click on the create button to create new contact. Enter details of the contact and click \"save\"." msgstr "" -#: ../../sales/advanced/portal.rst:35 +#: ../../sales/advanced/portal.rst:33 msgid "Choose a contact, click on the **Action** menu in the top-center of the interface and from the drop down." msgstr "" -#: ../../sales/advanced/portal.rst:38 +#: ../../sales/advanced/portal.rst:36 msgid "Select **Portal Access Management**. A pop up window appears." msgstr "" -#: ../../sales/advanced/portal.rst:43 +#: ../../sales/advanced/portal.rst:41 msgid "Enter the login **email ID**, check the box under **In Portal** and add the content to be included in the email in the text field box below. Click on **Apply** when you're done." msgstr "" -#: ../../sales/advanced/portal.rst:49 +#: ../../sales/advanced/portal.rst:47 msgid "An email will be sent to the specified email address, indicating that the contact is now a portal user of the respective instance." msgstr "" diff --git a/locale/sources/website.pot b/locale/sources/website.pot index fe33ce568..14fd5777a 100644 --- a/locale/sources/website.pot +++ b/locale/sources/website.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-07 09:30+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -888,67 +888,67 @@ msgstr "" msgid "Feel free to buy an email server to have email addresses using your domain name. However don't buy any extra service to create or host your website. This is Odoo's job!" msgstr "" -#: ../../website/publish/domain_name.rst:42 +#: ../../website/publish/domain_name.rst:45 msgid "How to apply my domain name to my Odoo instance" msgstr "" -#: ../../website/publish/domain_name.rst:43 +#: ../../website/publish/domain_name.rst:46 msgid "First let's authorize the redirection (yourcompany.com -> yourcompany.odoo.com):" msgstr "" -#: ../../website/publish/domain_name.rst:45 +#: ../../website/publish/domain_name.rst:48 msgid "Open your Odoo.com account from your homepage." msgstr "" -#: ../../website/publish/domain_name.rst:50 +#: ../../website/publish/domain_name.rst:53 msgid "Go to the *Manage Databases* page." msgstr "" -#: ../../website/publish/domain_name.rst:55 +#: ../../website/publish/domain_name.rst:58 msgid "Click on *Domains* to the right of the database you would like to redirect." msgstr "" -#: ../../website/publish/domain_name.rst:60 +#: ../../website/publish/domain_name.rst:63 msgid "A database domain prompt will appear. Enter your custom domain (e.g. www.yourcompany.com)." msgstr "" -#: ../../website/publish/domain_name.rst:67 +#: ../../website/publish/domain_name.rst:70 msgid "We can now apply the redirection from your domain name's manager account:" msgstr "" -#: ../../website/publish/domain_name.rst:69 +#: ../../website/publish/domain_name.rst:72 msgid "Log in to your account and search for the DNS Zones management page." msgstr "" -#: ../../website/publish/domain_name.rst:71 +#: ../../website/publish/domain_name.rst:74 msgid "Create a CNAME record *www.yourdomain.com* pointing to *mywebsite.odoo.com*. If you want to use the naked domain (e.g. yourdomain.com), you need to redirect *yourdomain.com* to *www.yourdomain.com*." msgstr "" -#: ../../website/publish/domain_name.rst:75 +#: ../../website/publish/domain_name.rst:78 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "" -#: ../../website/publish/domain_name.rst:77 +#: ../../website/publish/domain_name.rst:80 msgid "`GoDaddy `__" msgstr "" -#: ../../website/publish/domain_name.rst:78 +#: ../../website/publish/domain_name.rst:81 msgid "`Namecheap `__" msgstr "" -#: ../../website/publish/domain_name.rst:79 +#: ../../website/publish/domain_name.rst:82 msgid "`OVH `__" msgstr "" -#: ../../website/publish/domain_name.rst:82 +#: ../../website/publish/domain_name.rst:85 msgid "How to enable SSL (HTTPS) for my Odoo instance" msgstr "" -#: ../../website/publish/domain_name.rst:84 +#: ../../website/publish/domain_name.rst:87 msgid "To enable SSL, please use a third-party CDN service provider such as CloudFlare.com." msgstr "" -#: ../../website/publish/domain_name.rst:90 +#: ../../website/publish/domain_name.rst:93 msgid ":doc:`../../discuss/email_servers`" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po index ed4bcc854..43b1664f6 100644 --- a/locale/zh_CN/LC_MESSAGES/accounting.po +++ b/locale/zh_CN/LC_MESSAGES/accounting.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: xiaobin wu , 2017\n" +"Last-Translator: 菜小蛇 , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -216,7 +216,6 @@ msgstr "手工登记银行对账单" #: ../../accounting/bank/reconciliation/use_cases.rst:6 #: ../../accounting/others/adviser/budget.rst:6 #: ../../accounting/others/analytic/purchases_expenses.rst:6 -#: ../../accounting/others/multicurrencies.rst:3 #: ../../accounting/others/multicurrencies/exchange.rst:6 #: ../../accounting/others/multicurrencies/how_it_works.rst:6 #: ../../accounting/others/multicurrencies/invoices_payments.rst:6 @@ -1156,7 +1155,6 @@ msgstr "" #: ../../accounting/bank/reconciliation.rst:3 #: ../../accounting/others/reporting/main_reports.rst:153 #: ../../accounting/overview/main_concepts/memento.rst:177 -#: ../../accounting/overview/main_concepts/terminologies.rst:19 msgid "Bank Reconciliation" msgstr "银行调节" @@ -1719,7 +1717,7 @@ msgstr "在杂项业务日记账中选择‘通用’。" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Use in Point of Sale" -msgstr "" +msgstr "在销售点中使用" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" @@ -1787,7 +1785,7 @@ msgstr "退款分录序列" msgid "" "This field contains the information related to the numbering of the credit " "note entries of this journal." -msgstr "" +msgstr "该字段包含此日记账中与信用清单目录数量相关的信息。" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Default Debit Account" @@ -1932,7 +1930,7 @@ msgstr "下个打印支票的序列编号" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Creation of bank statement" -msgstr "" +msgstr "创建银行对账单" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "This field is used for the online synchronization:" @@ -2406,6 +2404,7 @@ msgid "Balance Sheet" msgstr "资产负债表" #: ../../accounting/localizations/germany.rst:24 +#: ../../accounting/localizations/nederlands.rst:19 msgid "Profit & Loss" msgstr "" @@ -3291,6 +3290,41 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/nederlands.rst:2 +msgid "Netherlands" +msgstr "荷兰" + +#: ../../accounting/localizations/nederlands.rst:5 +msgid "XAF Export" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:7 +msgid "" +"With the Dutch accounting localization installed, you will be able to export" +" all your accounting entries in XAF format. For this, you have to go in " +":menuselection:`Accounting --> Reporting --> General Ledger`, you define the" +" entries you want to export using the filters (period, journals, ...) and " +"then you click on the button **EXPORT (XAF)**." +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:14 +msgid "Dutch Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:16 +msgid "" +"If you install the Dutch accounting localization, you will have access to " +"some reports that are specific to the Netherlands such as :" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:21 +msgid "Tax Report (Aangifte omzetbelasting)" +msgstr "" + +#: ../../accounting/localizations/nederlands.rst:23 +msgid "Intrastat Report (ICP)" +msgstr "" + #: ../../accounting/localizations/spain.rst:3 msgid "Spain" msgstr "西班牙" @@ -5428,7 +5462,6 @@ msgid "Prepayments" msgstr "预付" #: ../../accounting/others/configuration/account_type.rst:39 -#: ../../accounting/overview/main_concepts/terminologies.rst:77 msgid "Fixed Assets" msgstr "固定资产" @@ -5966,6 +5999,10 @@ msgid "" msgstr "" "供应商退款将使用原始的购买价格, 所以退货时会零差异, 我们需要重用原来的价格。产品类别上的价格差异, 用于记录平均成本和原购买价格之间的差异。" +#: ../../accounting/others/multicurrencies.rst:3 +msgid "Multicurrency" +msgstr "" + #: ../../accounting/others/multicurrencies/exchange.rst:3 msgid "Record exchange rates at payments" msgstr "在付款时登记汇率" @@ -8319,7 +8356,6 @@ msgstr "银行账户 :在相关的银行存款日记帐定义" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/overview/main_concepts/terminologies.rst:26 msgid "Reconciliation" msgstr "调节" @@ -8600,159 +8636,6 @@ msgstr "银行对账单" msgid "Statement XYZ" msgstr "对账单XYZ" -#: ../../accounting/overview/main_concepts/terminologies.rst:3 -msgid "Accounting Terminologies" -msgstr "会计术语" - -#: ../../accounting/overview/main_concepts/terminologies.rst:6 -msgid "Journal" -msgstr "日记账" - -#: ../../accounting/overview/main_concepts/terminologies.rst:9 -msgid "" -"A journal is like a folder in which you record all transactions of the same " -"type: all the statements of a bank account, all customer invoices, all " -"supplier bills. It's used to organize similar transactions together." -msgstr "账簿就像一个文件夹, 将相同类型的所有交易都记录在里面:所有银行科目的记录,所有客户发票,供应商账单。它用于归类类似的交易。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:13 -msgid "Payment Terms" -msgstr "付款条款" - -#: ../../accounting/overview/main_concepts/terminologies.rst:16 -msgid "" -"Payment terms describe how and when a customer invoice (or supplier bill) " -"should be paid over the time. Example: 30% direct payment, balance due in " -"two months." -msgstr "付款条件用于客户发票(或供应商发票)应支付的时间和方式。例如:直接支付30%,在两个月内支付余款。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:22 -msgid "" -"Bank reconciliation is the process of matching transactions from your bank " -"records with existing journal items or creating new journal items on the " -"fly. It is a process of verification to ensure that your bank and your " -"records in Odoo say the same thing." -msgstr "银行核销的过程其实就是将银行交易和已存在的分录核销。它是一个验证的过程,以确保银行和Odoo的记录相匹配。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:29 -msgid "" -"Journal items reconciliation is the process of linking several journal items" -" together like an invoice and a payment. This allows you to mark invoices as" -" paid. It is also useful when comparing values of 'goods received not " -"invoiced' and 'goods shipped not billed' accounts." -msgstr "分录的核销是多个分录匹配的过程, 就如发票和付款。这可以将发票标记为已付. 这也可用于标注'商品已收但未开票'和'货已发但未开票'。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:33 -msgid "Deposit Ticket" -msgstr "存款单" - -#: ../../accounting/overview/main_concepts/terminologies.rst:36 -msgid "" -"Deposit tickets group several payment orders (usually checks) that are " -"deposited together at the bank at the same time. This allows an easy " -"reconciliation with the bank statement line if the line has one line per " -"deposit." -msgstr "存单组是指银行同时收到多笔付款(通常是支票)。如果每行一个存单的话, 核销就很容易了。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:40 -msgid "Journal Entry" -msgstr "日记账分录" - -#: ../../accounting/overview/main_concepts/terminologies.rst:43 -msgid "" -"A journal entry is an accounting transaction, usually related to a financial" -" document: invoice, payment, receipt, etc. A journal entry always consists " -"of at least two lines, described here as journal items, which credit or " -"debit specific accounts. The sum of the credits of all journal items of a " -"journal entry must be equal to the sum of their debits for the entry to be " -"valid." -msgstr "分录是一个会计事务,通常涉及:发票,付款,收据,等。会计凭证至少包含两行,就是两条分录,分别为借贷科目。借贷之和必须平。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:50 -msgid "Journal Item" -msgstr "日记账项目" - -#: ../../accounting/overview/main_concepts/terminologies.rst:53 -msgid "" -"A line of a journal entry, with a monetary debit or credit associated with a" -" specific account." -msgstr "分录的行, 借方或贷方与科目相关联。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:55 -msgid "Analytic Accounts" -msgstr "分析账户" - -#: ../../accounting/overview/main_concepts/terminologies.rst:58 -msgid "" -"Sometimes called **Cost Accounts**, are accounts that are not part of the " -"chart of accounts and that allow you to track costs and revenues. Analytic " -"accounts are usually grouped by projects, departments, etc. for analysis of " -"a company's expenditures. Every journal item is posted in a regular account " -"in the chart of account and can be posted to an analytic account for the " -"purpose of reporting or analysis." -msgstr "" -"* *成本科目 * *, 有时可能不是会计科目表的一部分,但需要分析成本和收入。分析账户通常是按项目, 部门分组, " -"分析一个公司的支出。每条分录可归集到科目表,可同时过账到分析可目表, 用于生成报表和分析。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:65 -msgid "Analytic Entries" -msgstr "分析分录" - -#: ../../accounting/overview/main_concepts/terminologies.rst:68 -msgid "" -"Costs or revenues posted to analytic accounts, usually related to journal " -"entries." -msgstr "营收或者成本过账到成本账户, 通常和会计分录相关。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:70 -msgid "Sales Receipt" -msgstr "销售收据" - -#: ../../accounting/overview/main_concepts/terminologies.rst:73 -msgid "" -"A receipt or other slip of paper issued by a store or other vendor " -"describing the details of a purchase (amount, date, department, etc.). Sales" -" receipt are usually used instead of invoices if the sale is paid in cash in" -" a store." -msgstr "收据或是其他纸质凭证通常包含细节描述(金额、日期、部门等)。如果商店收取的是现金, 销售收据通常用来代替发票。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:80 -msgid "" -"Property owned by the company, usually with a useful life greater than one " -"reporting period. Odoo Asset management is used to manage the depreciation /" -" amortization of the asset over the time. Typical examples would be capital " -"equipment, vehicles, and real estate." -msgstr "通常资产的使用寿命大于一个会计期间。Odoo资产管理用来管理资产的折旧/摊销的时间。典型的例子是资本设备、车辆和房地产。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:84 -msgid "Deferred Revenues" -msgstr "递延收入" - -#: ../../accounting/overview/main_concepts/terminologies.rst:87 -msgid "" -"Are used to recognize revenues for sales of services that are provided over " -"a long period of time. If you sell a 3 year maintenance contract, you can " -"use the deferred revenue mechanism to recognize 1/36 of the revenue every " -"month until the contract expires, rather than taking it all initially or at " -"the end." -msgstr "" -"用于确认长时间提供的服务的收入。如果一个3年的维护合同, 可以使用递延收入机制, 每个月收入为1/36, 直到合同到期, 而不是开始时或结束时入账。" - -#: ../../accounting/overview/main_concepts/terminologies.rst:93 -msgid "Fiscal Position" -msgstr "财政状况" - -#: ../../accounting/overview/main_concepts/terminologies.rst:96 -msgid "" -"Define the taxes that should be applied for a specific customer/vendor or " -"invoice. Example: If some customers benefit from specific taxes (government," -" construction companies, EU companies that are VAT subjected,…), you can " -"assign a fiscal position to them and the right tax will be selected " -"according to the products they buy." -msgstr "" -"客户/供应商或发票上可定义税率。例如:如有些客户受益于特定的税收(政府、建筑公司、增值税受到欧盟企业,…),您可以指定一个财政状况, " -"根据他们购买的产品选择正确的税。" - #: ../../accounting/overview/process_overview.rst:3 msgid "Process overview" msgstr "过程概述" @@ -12746,7 +12629,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/payment_sepa.rst:32 msgid "Direct Debit Mandates" -msgstr "" +msgstr "直接借记的授权范围" #: ../../accounting/receivables/customer_payments/payment_sepa.rst:34 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/crm.po b/locale/zh_CN/LC_MESSAGES/crm.po index 59a4f9496..e14c13a9b 100644 --- a/locale/zh_CN/LC_MESSAGES/crm.po +++ b/locale/zh_CN/LC_MESSAGES/crm.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-21 09:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: zpq001 , 2017\n" +"Last-Translator: Army Hu , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" #: ../../crm/calendar/google_calendar_credentials.rst:14 msgid "Go to the API & Services page." -msgstr "" +msgstr "进入API和服务页面" #: ../../crm/calendar/google_calendar_credentials.rst:19 msgid "Search for *Google Calendar API* and select it." diff --git a/locale/zh_CN/LC_MESSAGES/db_management.po b/locale/zh_CN/LC_MESSAGES/db_management.po index 2bcdab301..a50f5fc30 100644 --- a/locale/zh_CN/LC_MESSAGES/db_management.po +++ b/locale/zh_CN/LC_MESSAGES/db_management.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: liAnGjiA , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -22,27 +22,101 @@ msgstr "" msgid "Online Database management" msgstr "在线数据库管理" -#: ../../db_management/db_online.rst:13 -msgid "Duplicating a database" -msgstr "复制数据库" - -#: ../../db_management/db_online.rst:15 +#: ../../db_management/db_online.rst:10 msgid "" -"Database duplication, renaming, custom DNS, etc. is not available to free " -"customers of our Online platform." -msgstr "我们平台上的免费用户没有权限进行数据库的复制,重命名,客户化DNS等操作." +"To manage your databases, access the `database management page " +"`__ (you will have to sign in). Then " +"click on the `Manage Your Databases " +"`__ button." +msgstr "" #: ../../db_management/db_online.rst:18 msgid "" -"Access the `database management page `__ " -"(you will have to sign in). Next, make sure you are connected as the " -"administrator of the database you want to duplicate. After that, click on " -"the **Manage Your Databases** button." +"Make sure you are connected as the administrator of the database you want to" +" manage - many operations depends on indentifying you remotely to that " +"database." msgstr "" -"访问`数据库管理页面`__ (你必须先登入sign in). 下一步, " -"在复制数据库前先确保你拥有管理员权限. 然后, 点击**管理你的数据库** 按钮." -#: ../../db_management/db_online.rst:26 +#: ../../db_management/db_online.rst:22 +msgid "Several actions are available:" +msgstr "" + +#: ../../db_management/db_online.rst:28 +msgid "Upgrade" +msgstr "升级" + +#: ../../db_management/db_online.rst:28 +msgid "" +"Upgrade your database to the latest Odoo version to enjoy cutting-edge " +"features" +msgstr "" + +#: ../../db_management/db_online.rst:32 +msgid ":ref:`Duplicate `" +msgstr "" + +#: ../../db_management/db_online.rst:31 +msgid "" +"Make an exact copy of your database, if you want to try out new apps or new " +"flows without compromising your daily operations" +msgstr "" + +#: ../../db_management/db_online.rst:34 +msgid "Rename" +msgstr "" + +#: ../../db_management/db_online.rst:35 +msgid "Rename your database (and its URL)" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "**Backup**" +msgstr "" + +#: ../../db_management/db_online.rst:37 +msgid "" +"Download an instant backup of your database; note that we back up databases " +"daily according to our Odoo Cloud SLA" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid ":ref:`Domains `" +msgstr "" + +#: ../../db_management/db_online.rst:40 +msgid "Configure custom domains to access your database via another URL" +msgstr "" + +#: ../../db_management/db_online.rst:42 +msgid ":ref:`Delete `" +msgstr "" + +#: ../../db_management/db_online.rst:43 +msgid "Delete a database instantly" +msgstr "" + +#: ../../db_management/db_online.rst:47 +msgid "Contact Support" +msgstr "" + +#: ../../db_management/db_online.rst:45 +msgid "" +"Access our `support page `__ with the correct " +"database already selected" +msgstr "" + +#: ../../db_management/db_online.rst:52 +msgid "Duplicating a database" +msgstr "复制数据库" + +#: ../../db_management/db_online.rst:54 +msgid "" +"Database duplication, renaming, custom DNS, etc. is not available for trial " +"databases on our Online platform. Paid Databases and \"One App Free\" " +"database can duplicate without problem." +msgstr "" + +#: ../../db_management/db_online.rst:59 msgid "" "In the line of the database you want to duplicate, you will have a few " "buttons. To duplicate your database, just click **Duplicate**. You will have" @@ -50,43 +124,92 @@ msgid "" msgstr "" "在你想要复制数据库的那一行,你会发现几个按钮.请点击**Duplicate**复制你的数据库.在弹出的窗口中输入数据库副本名字,然后点击**Continue**." -#: ../../db_management/db_online.rst:36 -msgid "A duplicated database has the same behaviour as a real one:" -msgstr "数据库副本的执行内容和正式数据库一样:" +#: ../../db_management/db_online.rst:66 +msgid "" +"If you do not check the \"For testing purposes\" checkbox when duplicating a" +" database, all external communication will remain active:" +msgstr "" -#: ../../db_management/db_online.rst:38 +#: ../../db_management/db_online.rst:69 msgid "Emails are sent" msgstr "电子邮件已送出" -#: ../../db_management/db_online.rst:40 -msgid "Payments are processed (in the e-commerce, for example)" -msgstr "付款已处理（例如，电子商务）" +#: ../../db_management/db_online.rst:71 +msgid "" +"Payments are processed (in the e-commerce or Subscriptions apps, for " +"example)" +msgstr "" -#: ../../db_management/db_online.rst:42 +#: ../../db_management/db_online.rst:74 msgid "Delivery orders (shipping providers) are sent" msgstr "发运单据(承运人)已经发送" -#: ../../db_management/db_online.rst:44 +#: ../../db_management/db_online.rst:76 msgid "Etc." msgstr "等等." -#: ../../db_management/db_online.rst:46 +#: ../../db_management/db_online.rst:78 msgid "" -"It is **strongly** advised to test behaviour using sample customers/products" -" (with a `disposable e-mail `__ address, for " -"example)" -msgstr "强烈建议使用客户/产品等样本数据进行测试,邮件地址也建议使用`临时地址`." +"Make sure to check the checkbox \"For testing purposes\" if you want these " +"behaviours to be disabled." +msgstr "" -#: ../../db_management/db_online.rst:50 +#: ../../db_management/db_online.rst:81 msgid "" "After a few seconds, you will be logged in your duplicated database. Notice " "that the url uses the name you chose for your duplicated database." msgstr "几秒钟之后你就可以登录数据库副本了.请注意你可以在浏览器地址栏里看到数据库副本的名字." -#: ../../db_management/db_online.rst:54 +#: ../../db_management/db_online.rst:85 msgid "Duplicate databases expire automatically after 15 days." msgstr "数据库副本将在15天后自动过期." +#: ../../db_management/db_online.rst:93 +msgid "Deleting a Database" +msgstr "" + +#: ../../db_management/db_online.rst:95 +msgid "You can only delete databases of which you are the administrator." +msgstr "" + +#: ../../db_management/db_online.rst:97 +msgid "" +"When you delete your database all the data will be permanently lost. The " +"deletion is instant and for all the Users. We advise you to do an instant " +"backup of your database before deleting it, since the last automated daily " +"backup may be several hours old at that point." +msgstr "" + +#: ../../db_management/db_online.rst:103 +msgid "" +"From the `database management page `__, " +"on the line of the database you want to delete, click on the \"Delete\" " +"button." +msgstr "" + +#: ../../db_management/db_online.rst:110 +msgid "" +"Read carefully the warning message that will appear and proceed only if you " +"fully understand the implications of deleting a database:" +msgstr "" + +#: ../../db_management/db_online.rst:116 +msgid "" +"After a few seconds, the database will be deleted and the page will reload " +"automatically." +msgstr "" + +#: ../../db_management/db_online.rst:120 +msgid "" +"If you need to re-use this database name, it will be immediately available." +msgstr "" + +#: ../../db_management/db_online.rst:122 +msgid "" +"If you want to delete your Account, please contact `Odoo Support " +"`__" +msgstr "" + #: ../../db_management/db_premise.rst:7 msgid "On-premise Database management" msgstr "预置数据库管理" diff --git a/locale/zh_CN/LC_MESSAGES/discuss.po b/locale/zh_CN/LC_MESSAGES/discuss.po index e0a1273c5..631ee7a59 100644 --- a/locale/zh_CN/LC_MESSAGES/discuss.po +++ b/locale/zh_CN/LC_MESSAGES/discuss.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-08 17:10+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: fausthuang , 2018\n" +"Last-Translator: fausthuang, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -432,6 +432,57 @@ msgstr "" "odoo讨论是一个对于团队易于使用的消息应用, 将组织的全部通讯带入到一个地方, 并且与odoo平台无缝集成。讨论让你在odoo任何地方发送接收消息, " "以及在应用中容易的管理消息和通知。讨论允许在一个简单可查询的界面创建 **渠道** , 用于关于项目的聊天, 对话, 会议协调, 以及更多。" +#: ../../discuss/plan_activities.rst:3 +msgid "Get organized by planning activities" +msgstr "" + +#: ../../discuss/plan_activities.rst:5 +msgid "" +"Planning activities is the perfect way to keep on track with your work. Get " +"reminded of what needs to be done and schedule the next activities to " +"undertake." +msgstr "" + +#: ../../discuss/plan_activities.rst:9 +msgid "" +"Your activities are available wherever you are in Odoo. It is easy to manage" +" your priorities." +msgstr "" + +#: ../../discuss/plan_activities.rst:15 +msgid "" +"Activities can be planned and managed from the chatters or in the kanban " +"views. Here is an example for opportunities :" +msgstr "" + +#: ../../discuss/plan_activities.rst:22 +msgid "Set your activity types" +msgstr "" + +#: ../../discuss/plan_activities.rst:24 +msgid "" +"A number of generic activities types are available by default in Odoo (e.g. " +"call, email, meeting, etc.). If you would like to set new ones, go to " +":menuselection:`Settings --> General settings --> Activity types`." +msgstr "" + +#: ../../discuss/plan_activities.rst:29 +msgid "Schedule meetings" +msgstr "" + +#: ../../discuss/plan_activities.rst:31 +msgid "" +"Activities are planned for specific days. If you need to set hours, go with " +"the *Meeting* activity type. When scheduling one, the calendar will simply " +"open to let you select a time slot." +msgstr "" + +#: ../../discuss/plan_activities.rst:36 +msgid "" +"If you need to use other activity types with a calendar planning, make sure " +"their *Category* is set as *Meeting*." +msgstr "" + #: ../../discuss/team_communication.rst:3 msgid "How to efficiently communicate in team using channels" msgstr "如何通过频道与团队进行有效沟通" diff --git a/locale/zh_CN/LC_MESSAGES/ecommerce.po b/locale/zh_CN/LC_MESSAGES/ecommerce.po index 54412bf90..93bb678be 100644 --- a/locale/zh_CN/LC_MESSAGES/ecommerce.po +++ b/locale/zh_CN/LC_MESSAGES/ecommerce.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-10 09:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: fausthuang , 2017\n" +"Last-Translator: e2f_cn c5 , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -668,7 +668,7 @@ msgstr "付款" #: ../../ecommerce/shopper_experience/authorize.rst:3 msgid "How to get paid with Authorize.Net" -msgstr "" +msgstr "如何使用 Authorize.Net 付款" #: ../../ecommerce/shopper_experience/authorize.rst:5 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/expenses.po b/locale/zh_CN/LC_MESSAGES/expenses.po index 69557c977..866a1f04f 100644 --- a/locale/zh_CN/LC_MESSAGES/expenses.po +++ b/locale/zh_CN/LC_MESSAGES/expenses.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Jeffery CHEN , 2017\n" +"Last-Translator: Jeffery CHEN Fan , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/zh_CN/LC_MESSAGES/general.po b/locale/zh_CN/LC_MESSAGES/general.po index ec5538339..3aee01a98 100644 --- a/locale/zh_CN/LC_MESSAGES/general.po +++ b/locale/zh_CN/LC_MESSAGES/general.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-10 09:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Jeffery CHEN , 2017\n" +"Last-Translator: Jeffery CHEN Fan , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/zh_CN/LC_MESSAGES/helpdesk.po b/locale/zh_CN/LC_MESSAGES/helpdesk.po index 3f13ce73f..9b8e6b4b3 100644 --- a/locale/zh_CN/LC_MESSAGES/helpdesk.po +++ b/locale/zh_CN/LC_MESSAGES/helpdesk.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: Martin Trigaux, 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,41 +18,45 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../../helpdesk/helpdesk.rst:5 +#: ../../helpdesk.rst:5 msgid "Helpdesk" msgstr "服务台" -#: ../../helpdesk/helpdesk.rst:8 +#: ../../helpdesk/getting_started.rst:3 +msgid "Get started with Odoo Helpdesk" +msgstr "" + +#: ../../helpdesk/getting_started.rst:6 msgid "Overview" msgstr "概述" -#: ../../helpdesk/helpdesk.rst:11 +#: ../../helpdesk/getting_started.rst:9 msgid "Getting started with Odoo Helpdesk" msgstr "" -#: ../../helpdesk/helpdesk.rst:13 +#: ../../helpdesk/getting_started.rst:11 msgid "Installing Odoo Helpdesk:" msgstr "" -#: ../../helpdesk/helpdesk.rst:15 +#: ../../helpdesk/getting_started.rst:13 msgid "Open the Apps module, search for \"Helpdesk\", and click install" msgstr "" -#: ../../helpdesk/helpdesk.rst:21 +#: ../../helpdesk/getting_started.rst:19 msgid "Set up Helpdesk teams" msgstr "" -#: ../../helpdesk/helpdesk.rst:23 +#: ../../helpdesk/getting_started.rst:21 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:28 +#: ../../helpdesk/getting_started.rst:26 msgid "" "To modify this team, or create additional teams, select \"Configuration\" in" " the purple bar and select \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:34 +#: ../../helpdesk/getting_started.rst:32 msgid "" "Here you can create new teams, decide what team members to add to this team," " how your customers can submit tickets and set up SLA policies and ratings. " @@ -60,18 +64,18 @@ msgid "" " or manually." msgstr "" -#: ../../helpdesk/helpdesk.rst:40 +#: ../../helpdesk/getting_started.rst:38 msgid "How to set up different stages for each team" msgstr "" -#: ../../helpdesk/helpdesk.rst:42 +#: ../../helpdesk/getting_started.rst:40 msgid "" "First you will need to activate the developer mode. To do this go to your " "settings module, and select the link for \"Activate the developer mode\" on " "the lower right-hand side." msgstr "" -#: ../../helpdesk/helpdesk.rst:49 +#: ../../helpdesk/getting_started.rst:47 msgid "" "Now, when you return to your Helpdesk module and select \"Configuration\" in" " the purple bar you will find additional options, like \"Stages\". Here you " @@ -79,52 +83,52 @@ msgid "" "allowing for customizable stages for each team!" msgstr "" -#: ../../helpdesk/helpdesk.rst:55 +#: ../../helpdesk/getting_started.rst:53 msgid "Start receiving tickets" msgstr "" -#: ../../helpdesk/helpdesk.rst:58 +#: ../../helpdesk/getting_started.rst:56 msgid "How can my customers submit tickets?" msgstr "" -#: ../../helpdesk/helpdesk.rst:60 +#: ../../helpdesk/getting_started.rst:58 msgid "" "Select \"Configuration\" in the purple bar and select \"Settings\", select " "your Helpdesk team. Under \"Channels you will find 4 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:66 +#: ../../helpdesk/getting_started.rst:64 msgid "" "Email Alias allows for customers to email the alias you choose to create a " "ticket. The subject line of the email with become the Subject on the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:73 +#: ../../helpdesk/getting_started.rst:71 msgid "" "Website Form allows your customer to go to " "yourwebsite.com/helpdesk/support-1/submit and submit a ticket via a website " "form - much like odoo.com/help!" msgstr "" -#: ../../helpdesk/helpdesk.rst:80 +#: ../../helpdesk/getting_started.rst:78 msgid "" "Live Chat allows your customers to submit a ticket via Live Chat on your " "website. Your customer will begin the live chat and your Live Chat Operator " "can create the ticket by using the command /helpdesk Subject of Ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:88 +#: ../../helpdesk/getting_started.rst:86 msgid "" "The final option to submit tickets is thru an API connection. View the " "documentation `*here* " "`__." msgstr "" -#: ../../helpdesk/helpdesk.rst:93 +#: ../../helpdesk/getting_started.rst:91 msgid "Tickets have been created, now what?" msgstr "" -#: ../../helpdesk/helpdesk.rst:95 +#: ../../helpdesk/getting_started.rst:93 msgid "" "Now your employees can start working on them! If you have selecting a manual" " assignation method then your employees will need to assign themselves to " @@ -132,106 +136,259 @@ msgid "" "adding themselves to the \"Assigned to\" field." msgstr "" -#: ../../helpdesk/helpdesk.rst:103 +#: ../../helpdesk/getting_started.rst:101 msgid "" "If you have selected \"Random\" or \"Balanced\" assignation method, your " "tickets will be assigned to a member of that Helpdesk team." msgstr "" -#: ../../helpdesk/helpdesk.rst:106 +#: ../../helpdesk/getting_started.rst:104 msgid "" "From there they will begin working on resolving the tickets! When they are " "completed, they will move the ticket to the solved stage." msgstr "" -#: ../../helpdesk/helpdesk.rst:110 +#: ../../helpdesk/getting_started.rst:108 msgid "How do I mark this ticket as urgent?" msgstr "" -#: ../../helpdesk/helpdesk.rst:112 +#: ../../helpdesk/getting_started.rst:110 msgid "" "On your tickets you will see stars. You can determine how urgent a ticket is" " but selecting one or more stars on the ticket. You can do this in the " "Kanban view or on the ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:119 +#: ../../helpdesk/getting_started.rst:117 msgid "" "To set up a Service Level Agreement Policy for your employees, first " "activate the setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:125 +#: ../../helpdesk/getting_started.rst:123 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"." msgstr "" -#: ../../helpdesk/helpdesk.rst:127 +#: ../../helpdesk/getting_started.rst:125 msgid "" "You will fill in information like the Helpdesk team, what the minimum " "priority is on the ticket (the stars) and the targets for the ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:134 +#: ../../helpdesk/getting_started.rst:132 msgid "What if a ticket is blocked or is ready to be worked on?" msgstr "" -#: ../../helpdesk/helpdesk.rst:136 +#: ../../helpdesk/getting_started.rst:134 msgid "" "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban " "State\" on the ticket. You have 3 options:" msgstr "" -#: ../../helpdesk/helpdesk.rst:139 +#: ../../helpdesk/getting_started.rst:137 msgid "Grey - Normal State" msgstr "" -#: ../../helpdesk/helpdesk.rst:141 +#: ../../helpdesk/getting_started.rst:139 msgid "Red - Blocked" msgstr "" -#: ../../helpdesk/helpdesk.rst:143 +#: ../../helpdesk/getting_started.rst:141 msgid "Green - Ready for next stage" msgstr "" -#: ../../helpdesk/helpdesk.rst:145 +#: ../../helpdesk/getting_started.rst:143 msgid "" "Like the urgency stars you can adjust the state in the Kanban or on the " "Ticket form." msgstr "" -#: ../../helpdesk/helpdesk.rst:152 +#: ../../helpdesk/getting_started.rst:150 msgid "How can my employees log time against a ticket?" msgstr "" -#: ../../helpdesk/helpdesk.rst:154 +#: ../../helpdesk/getting_started.rst:152 msgid "" "First, head over to \"Settings\" and select the option for \"Timesheet on " "Ticket\". You will see a field appear where you can select the project the " "timesheets will log against." msgstr "" -#: ../../helpdesk/helpdesk.rst:161 +#: ../../helpdesk/getting_started.rst:159 msgid "" "Now that you have selected a project, you can save. If you move back to your" " tickets, you will see a new tab called \"Timesheets\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:167 +#: ../../helpdesk/getting_started.rst:165 msgid "" "Here you employees can add a line to add work they have done for this " "ticket." msgstr "" -#: ../../helpdesk/helpdesk.rst:171 +#: ../../helpdesk/getting_started.rst:169 msgid "How to allow your customers to rate the service they received" msgstr "" -#: ../../helpdesk/helpdesk.rst:173 +#: ../../helpdesk/getting_started.rst:171 msgid "First, you will need to activate the ratings setting under \"Settings\"" msgstr "" -#: ../../helpdesk/helpdesk.rst:178 +#: ../../helpdesk/getting_started.rst:176 msgid "" "Now, when a ticket is moved to its solved or completed stage, it will send " "an email to the customer asking how their service went." msgstr "" + +#: ../../helpdesk/invoice_time.rst:3 +msgid "Record and invoice time for tickets" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:5 +msgid "" +"You may have service contracts with your clients to provide them assistance " +"in case of a problem. For this purpose, Odoo will help you record the time " +"spent fixing the issue and most importantly, to invoice it to your clients." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:11 +msgid "The modules needed" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:13 +msgid "" +"In order to record and invoice time for tickets, the following modules are " +"needed : Helpdesk, Project, Timesheets, Sales. If you are missing one of " +"them, go to the Apps module, search for it and then click on *Install*." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:19 +msgid "Get started to offer the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:22 +msgid "Step 1 : start a helpdesk project" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:24 +msgid "" +"To start a dedicated project for the helpdesk service, first go to " +":menuselection:`Project --> Configuration --> Settings` and make sure that " +"the *Timesheets* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:31 +msgid "" +"Then, go to your dashboard, create the new project and allow timesheets for " +"it." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:35 +msgid "Step 2 : gather a helpdesk team" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:37 +msgid "" +"To set a team in charge of the helpdesk, go to :menuselection:`Helpdesk --> " +"Configuration --> Helpdesk Teams` and create a new team or select an " +"existing one. On the form, tick the box in front of *Timesheet on Ticket* to" +" activate the feature. Make sure to select the helpdesk project you have " +"previously created as well." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:47 +msgid "Step 3 : launch the helpdesk service" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:49 +msgid "" +"Finally, to launch the new helpdesk service, first go to " +":menuselection:`Sales --> Configuration --> Settings` and make sure that the" +" *Units of Measure* feature is activated." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:56 +msgid "" +"Then, go to :menuselection:`Products --> Products` and create a new one. " +"Make sure that the product is set as a service." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:63 +msgid "" +"Here, we suggest that you set the *Unit of Measure* as *Hour(s)*, but any " +"unit will do." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:66 +msgid "" +"Finally, select the invoicing management you would like to have under the " +"*Sales* tab of the product form. Here, we recommend the following " +"configuration :" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:73 +msgid "Now, you are ready to start receiving tickets !" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:76 +msgid "Solve issues and record time spent" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:79 +msgid "Step 1 : place an order" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:81 +msgid "" +"You are now in the Helpdesk module and you have just received a ticket from " +"a client. To place a new order, go to :menuselection:`Sales --> Orders --> " +"Orders` and create one for the help desk service product you have previously" +" recorded. Set the number of hours needed to assist the client and confirm " +"the sale." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:91 +msgid "Step 2 : link the task to the ticket" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:93 +msgid "" +"If you access the dedicated helpdesk project, you will notice that a new " +"task has automatically been generated with the order. To link this task with" +" the client ticket, go to the Helpdesk module, access the ticket in question" +" and select the task on its form." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:102 +msgid "Step 3 : record the time spent to help the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:104 +msgid "" +"The job is done and the client's issue is sorted out. To record the hours " +"performed for this task, go back to the ticket form and add them under the " +"*Timesheets* tab." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:112 +msgid "" +"The hours recorded on the ticket will also automatically appear in the " +"Timesheet module and on the dedicated task." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:116 +msgid "Step 4 : invoice the client" +msgstr "" + +#: ../../helpdesk/invoice_time.rst:118 +msgid "" +"To invoice the client, go back to the Sales module and select the order that" +" had been placed. Notice that the hours recorded on the ticket form now " +"appear as the delivered quantity." +msgstr "" + +#: ../../helpdesk/invoice_time.rst:125 +msgid "" +"All that is left to do, is to create the invoice from the order and then " +"validate it. Now you just have to wait for the client's payment !" +msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/livechat.po b/locale/zh_CN/LC_MESSAGES/livechat.po new file mode 100644 index 000000000..1d1d61a3f --- /dev/null +++ b/locale/zh_CN/LC_MESSAGES/livechat.po @@ -0,0 +1,194 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2015-TODAY, Odoo S.A. +# This file is distributed under the same license as the Odoo Business package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Odoo Business 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: William Qi , 2018\n" +"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../../livechat/livechat.rst:5 +msgid "Live Chat" +msgstr "在线聊天" + +#: ../../livechat/livechat.rst:8 +msgid "Chat in live with website visitors" +msgstr "与网站访客在线实时沟通" + +#: ../../livechat/livechat.rst:10 +msgid "" +"With Odoo Live Chat, you can establish a direct contact with your website " +"visitors. A simple dialog box will be available on their screen and will " +"allow them to get in touch with one of your sales representatives. This way," +" you can easily turn prospects into potential business opportunities. You " +"will also be able to provide assistance to your customers. Overall, this is " +"the perfect tool to improve customer satisfaction." +msgstr "" + +#: ../../livechat/livechat.rst:19 +msgid "Configuration" +msgstr "配置" + +#: ../../livechat/livechat.rst:21 +msgid "" +"To get the Live Chat feature, open the Apps module, search for \"Live Chat\"" +" and then click on install." +msgstr "使用在线聊天功能，打开应用界面，找到“聊天功能”，点击安装。" + +#: ../../livechat/livechat.rst:27 +msgid "" +"The Live Chat module provides you a direct access to your channels. There, " +"operators can easily join and leave the chat." +msgstr "在线聊天模块提供了一个直接聊天的工具，因此，您可以轻松加入，离开聊天。" + +#: ../../livechat/livechat.rst:34 +msgid "Add the live chat to an Odoo website" +msgstr "将在线聊天模块添加到Odoo网站" + +#: ../../livechat/livechat.rst:36 +msgid "" +"If your website was created with Odoo, then the live chat is automatically " +"added to it. All that is left to do, is to go to :menuselection:`Website -->" +" Configuration --> Settings` to select the channel to be linked to the " +"website." +msgstr "" + +#: ../../livechat/livechat.rst:45 +msgid "Add the live chat to an external website" +msgstr "添加在线聊天模块到外部网站" + +#: ../../livechat/livechat.rst:47 +msgid "" +"If your website was not created with Odoo, go to the Live Chat module and " +"then select the channel to be linked. There, you can simply copy paste the " +"code available into your website. A specific url you can send to customers " +"or suppliers for them to access the live chat is also provided." +msgstr "" + +#: ../../livechat/livechat.rst:54 +msgid "Hide / display the live chat according to rules" +msgstr "根据规则可隐藏/显示在线聊天窗口" + +#: ../../livechat/livechat.rst:56 +msgid "" +"Rules for the live chat can be defined on the channel form. For instance, " +"you can choose to display the chat in the countries you speak the language " +"of. On the contrary, you are able to hide the chat in countries your company" +" does not sell in. If you select *Auto popup*, you can also set the length " +"of time it takes for the chat to appear." +msgstr "" + +#: ../../livechat/livechat.rst:66 +msgid "Prepare automatic messages" +msgstr "设置自动回复消息" + +#: ../../livechat/livechat.rst:68 +msgid "" +"On the channel form, in the *Options* section, several messages can be typed" +" to appear automatically on the chat. This will entice visitors to reach you" +" through the live chat." +msgstr "" + +#: ../../livechat/livechat.rst:76 +msgid "Start chatting with customers" +msgstr "与客户开始聊天" + +#: ../../livechat/livechat.rst:78 +msgid "" +"In order to start chatting with customers, first make sure that the channel " +"is published on your website. To do so, select *Unpublished on Website* on " +"the top right corner of the channel form to toggle the *Published* setting. " +"Then, the live chat can begin once an operator has joined the channel." +msgstr "" + +#: ../../livechat/livechat.rst:88 +msgid "" +"If no operator is available and/or if the channel is unpublished on the " +"website, then the live chat button will not appear to visitors." +msgstr "" + +#: ../../livechat/livechat.rst:92 +msgid "" +"In practice, the conversations initiated by the visitors will appear in the " +"Discuss module and will also pop up as a direct message. Therefore, " +"inquiries can be answered wherever you are in Odoo." +msgstr "" + +#: ../../livechat/livechat.rst:96 +msgid "" +"If there several operators in charge of a channel, the system will dispatch " +"sessions randomly between them." +msgstr "" + +#: ../../livechat/livechat.rst:100 +msgid "Use commands" +msgstr "" + +#: ../../livechat/livechat.rst:102 +msgid "" +"Commands are useful shortcuts for completing certain actions or to access " +"information you might need. To use this feature, simply type the commands " +"into the chat. The following actions are available :" +msgstr "" + +#: ../../livechat/livechat.rst:106 +msgid "**/help** : show a helper message." +msgstr "**/help** ：提示帮助消息" + +#: ../../livechat/livechat.rst:108 +msgid "**/helpdesk** : create a helpdesk ticket." +msgstr "" + +#: ../../livechat/livechat.rst:110 +msgid "**/helpdesk\\_search** : search for a helpdesk ticket." +msgstr "" + +#: ../../livechat/livechat.rst:112 +msgid "**/history** : see 15 last visited pages." +msgstr "**/history**：可以看到最近访问的15个页面" + +#: ../../livechat/livechat.rst:114 +msgid "**/lead** : create a new lead." +msgstr "" + +#: ../../livechat/livechat.rst:116 +msgid "**/leave** : leave the channel." +msgstr "" + +#: ../../livechat/livechat.rst:119 +msgid "" +"If a helpdesk ticket is created from the chat, then the conversation it was " +"generated from will automatically appear as the description of the ticket. " +"The same goes for the creation of a lead." +msgstr "" + +#: ../../livechat/livechat.rst:124 +msgid "Send canned responses" +msgstr "" + +#: ../../livechat/livechat.rst:126 +msgid "" +"Canned responses allow you to create substitutes to generic sentences you " +"frequently use. Typing a word instead of several will save you a lot of " +"time. To add canned responses, go to :menuselection:`LIVE CHAT --> " +"Configuration --> Canned Responses` and create as many as you need to. Then," +" to use them during a chat, simply type \":\" followed by the shortcut you " +"assigned." +msgstr "" + +#: ../../livechat/livechat.rst:136 +msgid "" +"You now have all of the tools needed to chat in live with your website " +"visitors, enjoy !" +msgstr "恭喜！您已经拥有了所有与访客聊天的工具，尽情体验一下吧！" diff --git a/locale/zh_CN/LC_MESSAGES/point_of_sale.po b/locale/zh_CN/LC_MESSAGES/point_of_sale.po index 842074f3b..660182453 100644 --- a/locale/zh_CN/LC_MESSAGES/point_of_sale.po +++ b/locale/zh_CN/LC_MESSAGES/point_of_sale.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Rona Lin , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -975,7 +975,7 @@ msgid "POSBox Setup Guide" msgstr "收银台(POSBox) 配置向导" #: ../../point_of_sale/overview/setup.rst:11 -#: ../../point_of_sale/overview/setup.rst:206 +#: ../../point_of_sale/overview/setup.rst:205 msgid "Prerequisites" msgstr "先决条件" @@ -1006,10 +1006,6 @@ msgid "A local network set up with DHCP (this is the default setting)" msgstr "设置了DHCP(这是默认设置)的本地网络" #: ../../point_of_sale/overview/setup.rst:21 -msgid "An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter" -msgstr "一个RJ45以太网电缆或兼容Linux的USB Wi-Fi适配器" - -#: ../../point_of_sale/overview/setup.rst:22 msgid "" "An Epson USB TM-T20 Printer or another ESC/POS compatible printer " "(officially supported printers are listed at the `POS Hardware page " @@ -1018,16 +1014,20 @@ msgstr "" "一台 Epson USB TM-T20 打印机或其他兼容的 ESC/POS 打印机 (官方的 `POS 硬件支持列表 " "`_)" -#: ../../point_of_sale/overview/setup.rst:25 +#: ../../point_of_sale/overview/setup.rst:24 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" msgstr "霍尼韦尔的Eclipse USB条码扫描仪或其他兼容的扫描仪" -#: ../../point_of_sale/overview/setup.rst:26 +#: ../../point_of_sale/overview/setup.rst:25 msgid "An Epson compatible cash drawer" msgstr "爱普生兼容钱箱" +#: ../../point_of_sale/overview/setup.rst:26 +msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)" +msgstr "" + #: ../../point_of_sale/overview/setup.rst:29 -#: ../../point_of_sale/overview/setup.rst:214 +#: ../../point_of_sale/overview/setup.rst:213 msgid "Step By Step Setup Guide" msgstr "一步一步的安装指南" @@ -1082,30 +1082,26 @@ msgstr " **以太网**: 如果你不希望使用Wi-Fi, 插上以太网电缆。 #: ../../point_of_sale/overview/setup.rst:60 msgid "" -"**Wi-Fi**: If you do not wish to use Ethernet, plug in a Linux compatible " -"USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are Linux " -"compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 " -"chipset. Make sure not to plug in an Ethernet cable, because all Wi-Fi " -"functionality will be bypassed when a wired network connection is available." +"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure " +"not to plug in an Ethernet cable, because all Wi-Fi functionality will be " +"bypassed when a wired network connection is available." msgstr "" -" **Wi-Fi**: 如果你不希望使用以太网, 插上一个Linux兼容的USB Wi-Fi适配器。大多数商用的Wi-Fi适配器的Linux兼容" -"。官方支持的是具有Ralink5370芯片组的Wi-Fi适配器。确保不要插以太网电缆插头, 因为当一个有线网络连接可用时所有Wi-Fi功能将被忽略。" -#: ../../point_of_sale/overview/setup.rst:68 +#: ../../point_of_sale/overview/setup.rst:66 msgid "Power the POSBox" msgstr "POSBox通电" -#: ../../point_of_sale/overview/setup.rst:70 +#: ../../point_of_sale/overview/setup.rst:68 msgid "" "Plug the power adapter into the POSBox, a bright red status led should light" " up." msgstr "将电源适配器插入POSBox, 红色的状态灯应该亮起。" -#: ../../point_of_sale/overview/setup.rst:74 +#: ../../point_of_sale/overview/setup.rst:72 msgid "Make sure the POSBox is ready" msgstr "确保POSBox已准备就绪" -#: ../../point_of_sale/overview/setup.rst:76 +#: ../../point_of_sale/overview/setup.rst:74 msgid "" "Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it" " should print a status receipt with its IP address. Also the status LED, " @@ -1114,12 +1110,12 @@ msgstr "" "一旦供电, POSBox需要一段时间才能启动。一旦POSBox准备就绪, 就应该打印带IP地址的状态条。另外, LED状态指示灯, " "旁边的红色电源指示灯应常亮绿色。" -#: ../../point_of_sale/overview/setup.rst:82 -#: ../../point_of_sale/overview/setup.rst:293 +#: ../../point_of_sale/overview/setup.rst:80 +#: ../../point_of_sale/overview/setup.rst:292 msgid "Setup the Point of Sale" msgstr "设置零售点" -#: ../../point_of_sale/overview/setup.rst:84 +#: ../../point_of_sale/overview/setup.rst:82 msgid "" "To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale" " --> Configuration --> Settings` and select your Point of Sale. Scroll down " @@ -1133,56 +1129,54 @@ msgstr "" "\\ \"部分并激活您想要通过POSBox使用硬件的选项。推荐指定POSBox的IP(印在启动后的POSBox后打印收据上)。如果未指定IP, " "销售点会试图在本地网络上寻找。" -#: ../../point_of_sale/overview/setup.rst:93 +#: ../../point_of_sale/overview/setup.rst:91 msgid "" "If you are running multiple Point of Sales on the same POSBox, make sure " "that only one of them has Remote Scanning/Barcode Scanner activated." msgstr "如果您在同一POSBox运行多个销售点, 确保只有其中一个零售店了激活远程扫描/条码扫描枪。" -#: ../../point_of_sale/overview/setup.rst:96 +#: ../../point_of_sale/overview/setup.rst:94 msgid "" "It might be a good idea to make sure the POSBox IP never changes in your " "network. Refer to your router documentation on how to achieve this." msgstr "如果在你的网络中固定POSBox的IP地址, 是个比较好的注意。请参阅您的路由器文档就如何实现这一目标。" -#: ../../point_of_sale/overview/setup.rst:101 +#: ../../point_of_sale/overview/setup.rst:99 msgid "Launch the Point of Sale" msgstr "启动销售点" -#: ../../point_of_sale/overview/setup.rst:103 +#: ../../point_of_sale/overview/setup.rst:101 msgid "" "If you didn't specify the POSBox's IP address in the configuration, the POS " "will need some time to perform a network scan to find the POSBox. This is " "only done once." msgstr "如果没有在配置指定POSBox的IP地址, POS将需要一些时间来执行网络扫描来寻找POSBox。这种扫描只进行一次。" -#: ../../point_of_sale/overview/setup.rst:107 +#: ../../point_of_sale/overview/setup.rst:105 msgid "" "The Point of Sale is now connected to the POSBox and your hardware should be" " ready to use." msgstr "销售点已经连接到POSBox, 你的硬件应该可以使用。" -#: ../../point_of_sale/overview/setup.rst:111 +#: ../../point_of_sale/overview/setup.rst:109 msgid "Wi-Fi configuration" msgstr "Wi-Fi 配置" -#: ../../point_of_sale/overview/setup.rst:113 +#: ../../point_of_sale/overview/setup.rst:111 msgid "" -"The POSBox is Wi-Fi-capable. In order to use it you'll need a Linux " -"compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are" -" Linux compatible. Officially supported are Wi-Fi adapters with a Ralink " -"5370 chipset." +"The most recent version of the POSBox has Wi-Fi built in. If you're using an" +" older version you'll need a Linux compatible USB Wi-Fi adapter. Most " +"commercially available Wi-Fi adapters are Linux compatible. Officially " +"supported are Wi-Fi adapters with a Ralink 5370 chipset." msgstr "" -"POSBox是支持WiFi的。为了使用它, 你会需要一个Linux兼容的USB Wi-Fi适配器。大多数商用的Wi-Fi适配器兼容Linux" -"。官方支持的是具有Ralink5370芯片组的Wi-Fi适配器。" -#: ../../point_of_sale/overview/setup.rst:118 +#: ../../point_of_sale/overview/setup.rst:117 msgid "" "Make sure not to plug in an Ethernet cable, as all Wi-Fi related " "functionality will be disabled when a wired network connection is available." msgstr "确保不要插以太网电缆插头, 因为当有线网络连接可用时所有Wi-Fi相关的功能将被禁用。" -#: ../../point_of_sale/overview/setup.rst:122 +#: ../../point_of_sale/overview/setup.rst:121 msgid "" "When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi " "Access Point called \"Posbox\" you can connect to. The receipt that gets " @@ -1200,7 +1194,7 @@ msgstr "" "并进入Wi-Fi配置页面。在那里, 你可以选择网络连接。请注意, 我们只支持开放式和WPA(2)-PSK网络。当连接到一个WPA保护的网络, " "填写密码字段。该POSBox将尝试连接到指定的网络, 连接后将打印新的POSBox状态条。 " -#: ../../point_of_sale/overview/setup.rst:133 +#: ../../point_of_sale/overview/setup.rst:132 msgid "" "If you plan on permanently setting up the POSBox with Wi-Fi, you can use the" " \"persistent\" checkbox on the Wi-Fi configuration page when connecting to " @@ -1211,7 +1205,7 @@ msgstr "" "如果你打算永久设置POSBox 为Wi-Fi连接, 你可以在Wi-Fi配置页上选择复选框为“一直\" " "。这将在重新启动时网络选择一直选择WIFI。这意味着, 在启动后它将始终尝试连接到指定的网络而不是自己的“Posbox \"网络。" -#: ../../point_of_sale/overview/setup.rst:140 +#: ../../point_of_sale/overview/setup.rst:139 msgid "" "When the POSBox fails to connect to a network it will fall back to starting " "it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network" @@ -1220,11 +1214,11 @@ msgid "" msgstr "" "当POSBox无法连接到网络时, 它将退回到开始了自己的“Posbox\" 接入点。如果与Wi-Fi网络丢失, POSBox会尝试自动重新建立连接。 " -#: ../../point_of_sale/overview/setup.rst:146 +#: ../../point_of_sale/overview/setup.rst:145 msgid "Multi-POS Configuration" msgstr "多POS 设置" -#: ../../point_of_sale/overview/setup.rst:148 +#: ../../point_of_sale/overview/setup.rst:147 msgid "" "The advised way to setup a multi Point of Sale shop is to have one POSBox " "per Point of Sale. In this case it is mandatory to manually specify the IP " @@ -1235,11 +1229,11 @@ msgstr "" "建议设置多个零售点的商店是每个零售点一个POSBox. 在这个例子中, 必须为每个POSBox手动指定IP " "地址.你还必须配置你的网络保证每个POSBox 的IP 地址不会改变。请参考你的路由文档。" -#: ../../point_of_sale/overview/setup.rst:155 +#: ../../point_of_sale/overview/setup.rst:154 msgid "POSBoxless Guide (advanced)" msgstr "没有POSBox的指南(高级)" -#: ../../point_of_sale/overview/setup.rst:159 +#: ../../point_of_sale/overview/setup.rst:158 msgid "" "If you are running your Point of Sale on a Debian-based Linux distribution, " "you do not need the POSBox as you can run its software locally. However the " @@ -1250,7 +1244,7 @@ msgstr "" "如果您运行在基于Debian的Linux的销售点, 你可以不用POSBox, " "你可以运行本地软件。然而安装过程并不是万无一失的。你必须知道如何安装和运行Odoo.你也许会遇到关于版本的, 或特定设置和硬件配置的问题。" -#: ../../point_of_sale/overview/setup.rst:166 +#: ../../point_of_sale/overview/setup.rst:165 msgid "" "Drivers for the various types of supported hardware are provided as Odoo " "modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale" @@ -1262,17 +1256,17 @@ msgstr "" "Odoo模块提供了对于不同类型的硬件的驱动支持。事实上, POSBox运行Odoo的销售点通信。在POSBox运行Odoo是一个和“真正的\" " "Odoo有很大的不同的例子。它不处理任何 **业务数据(如POS订单), 仅仅是作为销售点和硬件之间的网关。 " -#: ../../point_of_sale/overview/setup.rst:173 +#: ../../point_of_sale/overview/setup.rst:172 msgid "" "The goal of this section will be to set up a local Odoo instance that " "behaves like the Odoo instance running on the POSBox." msgstr "本节的目标是要建立一个当地Odoo演示数据, 模拟在POSBox 上运行。" -#: ../../point_of_sale/overview/setup.rst:177 +#: ../../point_of_sale/overview/setup.rst:176 msgid "Image building process" msgstr "镜像建立过程" -#: ../../point_of_sale/overview/setup.rst:179 +#: ../../point_of_sale/overview/setup.rst:178 msgid "" "We generate the official POSBox images using the scripts in " "https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. " @@ -1282,17 +1276,17 @@ msgid "" "`nightly.odoo.com `_ for users to download." msgstr "" -#: ../../point_of_sale/overview/setup.rst:187 +#: ../../point_of_sale/overview/setup.rst:186 msgid "" "The scripts in this directory might be useful as a reference if you get " "stuck or want more detail about something." msgstr "在此目录中的脚本对于你碰到问题或想了解更多是很有用的。" -#: ../../point_of_sale/overview/setup.rst:191 +#: ../../point_of_sale/overview/setup.rst:190 msgid "Summary of the image creation process" msgstr "映像创建过程总结" -#: ../../point_of_sale/overview/setup.rst:193 +#: ../../point_of_sale/overview/setup.rst:192 msgid "" "The image creation process starts by downloading the latest `Raspbian " "`_ image. It then locally mounts this Raspbian " @@ -1311,87 +1305,87 @@ msgstr "" "仿真Raspbian操作系统将自行关闭。然后, 我们再一次在本地挂载镜像, 删除被用来初始化在启动镜像的脚本, " "我们复制了一些额外的配置文件。所产生的镜像, 然后可以被用来进行测试和使用。" -#: ../../point_of_sale/overview/setup.rst:208 +#: ../../point_of_sale/overview/setup.rst:207 msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)" msgstr "基于Debian内核的Linux 版本(Debian, Ubuntu, Mint, etc)" -#: ../../point_of_sale/overview/setup.rst:209 +#: ../../point_of_sale/overview/setup.rst:208 msgid "A running Odoo instance you connect to to load the Point of Sale" msgstr "一个运行的Odoo来装载零售点" -#: ../../point_of_sale/overview/setup.rst:210 +#: ../../point_of_sale/overview/setup.rst:209 msgid "" "You must uninstall any ESC/POS printer driver as it will conflict with " "Odoo's built-in driver" msgstr "你必须卸载任何ESC/POS 打印机驱动, 因为它会和Odoo内置的驱动冲突。" -#: ../../point_of_sale/overview/setup.rst:217 +#: ../../point_of_sale/overview/setup.rst:216 msgid "Extra dependencies" msgstr "额外的依赖" -#: ../../point_of_sale/overview/setup.rst:219 +#: ../../point_of_sale/overview/setup.rst:218 msgid "" "Because Odoo runs on Python 2, you need to check which version of pip you " "need to use." msgstr "由于Odoo在Python2上运行, 你需要检查你需要使用的PIP的版本。" -#: ../../point_of_sale/overview/setup.rst:222 +#: ../../point_of_sale/overview/setup.rst:221 msgid "``# pip --version``" msgstr "``# pip --version``" -#: ../../point_of_sale/overview/setup.rst:224 -#: ../../point_of_sale/overview/setup.rst:230 +#: ../../point_of_sale/overview/setup.rst:223 +#: ../../point_of_sale/overview/setup.rst:229 msgid "If it returns something like::" msgstr "如果它返回例如 :" -#: ../../point_of_sale/overview/setup.rst:228 +#: ../../point_of_sale/overview/setup.rst:227 msgid "You need to try pip2 instead." msgstr "你需要PIP2" -#: ../../point_of_sale/overview/setup.rst:234 +#: ../../point_of_sale/overview/setup.rst:233 msgid "You can use pip." msgstr "使用 pip 工具." -#: ../../point_of_sale/overview/setup.rst:236 +#: ../../point_of_sale/overview/setup.rst:235 msgid "The driver modules requires the installation of new python modules:" msgstr "驱动模块需要安装新的python模块" -#: ../../point_of_sale/overview/setup.rst:238 +#: ../../point_of_sale/overview/setup.rst:237 msgid "``# pip install pyserial``" msgstr "``# pip install pyserial``" -#: ../../point_of_sale/overview/setup.rst:240 +#: ../../point_of_sale/overview/setup.rst:239 msgid "``# pip install pyusb==1.0.0b1``" msgstr "``# pip install pyusb==1.0.0b1``" -#: ../../point_of_sale/overview/setup.rst:242 +#: ../../point_of_sale/overview/setup.rst:241 msgid "``# pip install qrcode``" msgstr "``# pip install qrcode``" -#: ../../point_of_sale/overview/setup.rst:245 +#: ../../point_of_sale/overview/setup.rst:244 msgid "Access Rights" msgstr "访问权" -#: ../../point_of_sale/overview/setup.rst:247 +#: ../../point_of_sale/overview/setup.rst:246 msgid "" "The drivers need raw access to the printer and barcode scanner devices. " "Doing so requires a bit system administration. First we are going to create " "a group that has access to USB devices" msgstr "驱动需要获得打印机和条码扫描仪设备的原始访问。这样做需要一点系统管理。首先我们要创建一个访问USB设备的组" -#: ../../point_of_sale/overview/setup.rst:251 +#: ../../point_of_sale/overview/setup.rst:250 msgid "``# groupadd usbusers``" msgstr "``# groupadd usbusers``" -#: ../../point_of_sale/overview/setup.rst:253 +#: ../../point_of_sale/overview/setup.rst:252 msgid "Then we add the user who will run the OpenERP server to ``usbusers``" msgstr "然后, 我们添加谁将会运行OpenERP的服务器\" USB users \\ \"用户" -#: ../../point_of_sale/overview/setup.rst:255 +#: ../../point_of_sale/overview/setup.rst:254 msgid "``# usermod -a -G usbusers USERNAME``" msgstr "``# usermod -a -G usbusers 用户名``" -#: ../../point_of_sale/overview/setup.rst:257 +#: ../../point_of_sale/overview/setup.rst:256 msgid "" "Then we need to create a udev rule that will automatically allow members of " "``usbusers`` to access raw USB devices. To do so create a file called " @@ -1401,19 +1395,19 @@ msgstr "" "允许“usbusers“自动访问USB设备, 需要创建一个udev规则。为此, 在``/etc/udev/rules.d/`` 下直接创建一个名为“99" " - usbusers的文件, 文件包含以下内容:" -#: ../../point_of_sale/overview/setup.rst:265 +#: ../../point_of_sale/overview/setup.rst:264 msgid "Then you need to reboot your machine." msgstr "然后你需啊重启你的机器。" -#: ../../point_of_sale/overview/setup.rst:268 +#: ../../point_of_sale/overview/setup.rst:267 msgid "Start the local Odoo instance" msgstr "开始本地Odoo实例。" -#: ../../point_of_sale/overview/setup.rst:270 +#: ../../point_of_sale/overview/setup.rst:269 msgid "We must launch the Odoo server with the correct settings" msgstr "我们必须用正确的设置启动Odoo服务器" -#: ../../point_of_sale/overview/setup.rst:272 +#: ../../point_of_sale/overview/setup.rst:271 msgid "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" @@ -1421,11 +1415,11 @@ msgstr "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" -#: ../../point_of_sale/overview/setup.rst:275 +#: ../../point_of_sale/overview/setup.rst:274 msgid "Test the instance" msgstr "测试实例。" -#: ../../point_of_sale/overview/setup.rst:277 +#: ../../point_of_sale/overview/setup.rst:276 msgid "" "Plug all your hardware to your machine's USB ports, and go to " "``http://localhost:8069/hw_proxy/status`` refresh the page a few times and " @@ -1438,11 +1432,11 @@ msgstr "" "刷新页面几次, 看看是否所有的设备都显示为 *连接* 。错误的可能来源是 :linux上的路径和驱动所期望的路径不同, " "另一个进程已经抢到了设备的独占访问时, udev规则不适用或他被人取代。 " -#: ../../point_of_sale/overview/setup.rst:285 +#: ../../point_of_sale/overview/setup.rst:284 msgid "Automatically start Odoo" msgstr "自动启动Odoo" -#: ../../point_of_sale/overview/setup.rst:287 +#: ../../point_of_sale/overview/setup.rst:286 msgid "" "You must now make sure that this Odoo install is automatically started after" " boot. There are various ways to do so, and how to do it depends on your " @@ -1451,7 +1445,7 @@ msgid "" msgstr "" "你必须确保Odoo 安装是在启动后自动开始。有多种方式可以实现, 如何做取决于你的特定设置.使用你的操作系统提供的安装系统可能使最简单的方式。" -#: ../../point_of_sale/overview/setup.rst:295 +#: ../../point_of_sale/overview/setup.rst:294 msgid "" "The IP address field in the POS configuration must be either ``127.0.0.1`` " "or ``localhost`` if you're running the created Odoo server on the machine " @@ -1460,19 +1454,19 @@ msgstr "" "在POS的IP地址字段必须配置\" 127.0.0.1 \\ \"or\" localhost \\ \", 如果你将在作为零售点的Odoo " "服务器的机器上运行, 你也可以留空。" -#: ../../point_of_sale/overview/setup.rst:301 +#: ../../point_of_sale/overview/setup.rst:300 msgid "POSBox Technical Documentation" msgstr "POSBox 技术文档" -#: ../../point_of_sale/overview/setup.rst:304 +#: ../../point_of_sale/overview/setup.rst:303 msgid "Technical Overview" msgstr "技术总览" -#: ../../point_of_sale/overview/setup.rst:307 +#: ../../point_of_sale/overview/setup.rst:306 msgid "The POSBox Hardware" msgstr "收银机(POSBox) 硬件" -#: ../../point_of_sale/overview/setup.rst:309 +#: ../../point_of_sale/overview/setup.rst:308 msgid "" "The POSBox's Hardware is based on a `Raspberry Pi 2 " "`_, a popular " @@ -1485,11 +1479,11 @@ msgstr "" "/raspberry-pi-2-model-b/>` _, 一个普遍的单片机。Raspberry PI " "2使用2A微型USB电源适配器。需要提供2A的足够电源给条码扫描器。软件安装在8G的10级或更高的SD卡。所有这些硬件都很容易从世界性的独立供应商处获得。" -#: ../../point_of_sale/overview/setup.rst:318 +#: ../../point_of_sale/overview/setup.rst:317 msgid "Compatible Peripherals" msgstr "兼容外设" -#: ../../point_of_sale/overview/setup.rst:320 +#: ../../point_of_sale/overview/setup.rst:319 msgid "" "Officially supported hardware is listed on the `POS Hardware page " "`_." @@ -1497,11 +1491,11 @@ msgstr "" "官方支持的硬件, 列在'POS硬件页 " "`_上。" -#: ../../point_of_sale/overview/setup.rst:324 +#: ../../point_of_sale/overview/setup.rst:323 msgid "The POSBox Software" msgstr "收银机(POSBox) 软件" -#: ../../point_of_sale/overview/setup.rst:326 +#: ../../point_of_sale/overview/setup.rst:325 msgid "" "The POSBox runs a heavily modified Raspbian Linux installation, a Debian " "derivative for the Raspberry Pi. It also runs a barebones installation of " @@ -1513,7 +1507,7 @@ msgid "" "branch." msgstr "" -#: ../../point_of_sale/overview/setup.rst:335 +#: ../../point_of_sale/overview/setup.rst:334 msgid "" "The root partition on the POSBox is mounted read-only, ensuring that we " "don't wear out the SD card by writing to it too much. It also ensures that " @@ -1537,15 +1531,15 @@ msgstr "" "相关数据)。然后将数据与原来的目录绑定。当应用程序写入/etc/foo/bar时, 其实是写入/ etc_ram / foo / " "bar。我们也将mount / 绑定 /root_bypass_ramdisks, 以便在开发中能得到真正的/ etc、/ var。" -#: ../../point_of_sale/overview/setup.rst:351 +#: ../../point_of_sale/overview/setup.rst:350 msgid "Logs of the running Odoo server can be found at:" msgstr "Odoo服务器的运行Log可以在如下地方找到 :" -#: ../../point_of_sale/overview/setup.rst:353 +#: ../../point_of_sale/overview/setup.rst:352 msgid "``/var/log/odoo/odoo.log``" msgstr "\" /var/log/odoo/odoo.log \\ \"" -#: ../../point_of_sale/overview/setup.rst:355 +#: ../../point_of_sale/overview/setup.rst:354 msgid "" "Various POSBox related scripts (eg. wifi-related scripts) running on the " "POSBox will log to /var/log/syslog and those messages are tagged with " @@ -1554,15 +1548,15 @@ msgstr "" "各种在POSBox运行的相关的脚本(如无线网络相关的脚本)将记录到/ var / log / syslog上, 那些消息都标有\" posbox_ * " "\\ \"。" -#: ../../point_of_sale/overview/setup.rst:360 +#: ../../point_of_sale/overview/setup.rst:359 msgid "Accessing the POSBox" msgstr "访问POSBox" -#: ../../point_of_sale/overview/setup.rst:363 +#: ../../point_of_sale/overview/setup.rst:362 msgid "Local Access" msgstr "本地访问" -#: ../../point_of_sale/overview/setup.rst:365 +#: ../../point_of_sale/overview/setup.rst:364 msgid "" "If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if" " you connect a computer monitor to the *HDMI* port of the POSBox, you can " @@ -1572,31 +1566,31 @@ msgstr "" "如果你插入一个QWERTY USB的键盘到POSBox的USB端口中, 如果你的计算机显示器连接到 * HDMI * 的POSBox的端口, " "你可以使用它作为一个小的GNU / Linux计算机并执行各种管理任务, 如查看一些日志。" -#: ../../point_of_sale/overview/setup.rst:370 +#: ../../point_of_sale/overview/setup.rst:369 msgid "The POSBox will automatically log in as root on the default tty." msgstr "POSBox 将自动登入作为默认终端设备。" -#: ../../point_of_sale/overview/setup.rst:373 +#: ../../point_of_sale/overview/setup.rst:372 msgid "Remote Access" msgstr "远程访问" -#: ../../point_of_sale/overview/setup.rst:375 +#: ../../point_of_sale/overview/setup.rst:374 msgid "" "If you have the POSBox's IP address and an SSH client you can access the " "POSBox's system remotely. The login credentials are ``pi``/``raspberry``." msgstr "如果你有POSBox的IP地址和SSH客户端, 你可以远程访问POSBox的系统。登录凭据\" pi \\ \"/\" raspberry \\ \"。" -#: ../../point_of_sale/overview/setup.rst:380 +#: ../../point_of_sale/overview/setup.rst:379 msgid "Updating The POSBox Software" msgstr "升级POSBox 软件" -#: ../../point_of_sale/overview/setup.rst:382 +#: ../../point_of_sale/overview/setup.rst:381 msgid "" "Only upgrade the POSBox if you experience problems or want to use newly " "implemented features." msgstr "当你遇到问题或想要使用新实施的功能升级POSBox。" -#: ../../point_of_sale/overview/setup.rst:385 +#: ../../point_of_sale/overview/setup.rst:384 msgid "" "The best way to update the POSBox software is to download a new version of " "the image and flash the SD-Card with it. This operation is described in " @@ -1611,7 +1605,7 @@ msgstr "" "只需用最新一期的'官方POSBox镜像页面找到替换的标准Raspberry Pi 镜像 `_。这种升级方法将确保您正在运行最新版本的POSBox软件。" -#: ../../point_of_sale/overview/setup.rst:394 +#: ../../point_of_sale/overview/setup.rst:393 msgid "" "The second way of upgrading is through the built in upgrade interface that " "can be reached through the POSBox homepage. The nice thing about upgrading " @@ -1622,29 +1616,29 @@ msgstr "" "升级的第二个方法是通过内置的升级界面访问POSBox主页。这样升级的好处是, " "你不必换一个新镜像。这种升级方法受限于有些不能做。例如不能更新安装配置文件(/etc/hostapd.conf)。它只能升级 :" -#: ../../point_of_sale/overview/setup.rst:401 +#: ../../point_of_sale/overview/setup.rst:400 msgid "The internal Odoo application" msgstr "内部Odoo应用" -#: ../../point_of_sale/overview/setup.rst:402 +#: ../../point_of_sale/overview/setup.rst:401 msgid "" "Scripts in the folder " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" msgstr "脚本在文件夹\" odoo/addons/point_of_sale/tools/posbox/configuration/ \\ \"" -#: ../../point_of_sale/overview/setup.rst:404 +#: ../../point_of_sale/overview/setup.rst:403 msgid "When in doubt, always use the first method of upgrading." msgstr "如有疑问, 一定要使用升级的第一个方法。" -#: ../../point_of_sale/overview/setup.rst:407 +#: ../../point_of_sale/overview/setup.rst:406 msgid "Troubleshoot" msgstr "疑难解答" -#: ../../point_of_sale/overview/setup.rst:410 +#: ../../point_of_sale/overview/setup.rst:409 msgid "The POS cannot connect to the POSBox" msgstr "该POS无法连接到POSBox" -#: ../../point_of_sale/overview/setup.rst:412 +#: ../../point_of_sale/overview/setup.rst:411 msgid "" "The easiest way to make sure the POSBox is properly set-up is to turn it on " "with the printer plugged in as it will print a receipt indicating any error " @@ -1654,27 +1648,27 @@ msgstr "" "最简单的方法确保POSBox是正确的设置, 是把它与打印机插入, " "因为它会在POSBox的IP地址设置成功的情况下打印收据显示任何遇到的错误。如果不打印收据, 请执行下列步骤 :" -#: ../../point_of_sale/overview/setup.rst:416 +#: ../../point_of_sale/overview/setup.rst:415 msgid "" "Make sure the POSBox is powered on, indicated by a brightly lit red status " "LED." msgstr "确保POSBox是通电的, 明亮的红色状态指示灯亮。" -#: ../../point_of_sale/overview/setup.rst:418 +#: ../../point_of_sale/overview/setup.rst:417 msgid "" "Make sure the POSBox is ready, this is indicated by a brightly lit green " "status LED just next to the red power status LED. The POSBox should be ready" " ~2 minutes after it is started." msgstr "确保POSBox已经准备好, 这是由一个红色电源状态指示灯后面的绿色状态指示灯指示。在启动后的POSBox应该准备〜2分钟。" -#: ../../point_of_sale/overview/setup.rst:421 +#: ../../point_of_sale/overview/setup.rst:420 msgid "" "Make sure the POSBox is connected to the same network as your POS device. " "Both the device and the POSBox should be visible in the list of connected " "devices on your network router." msgstr "确保POSBox连接到POS设备的相同网络。无论是设备和POSBox应该在你的网络中路由器连接的设备的列表中可见。" -#: ../../point_of_sale/overview/setup.rst:424 +#: ../../point_of_sale/overview/setup.rst:423 msgid "" "Make sure that your LAN is set up with DHCP, and gives IP addresses in the " "range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that " @@ -1683,70 +1677,70 @@ msgstr "" "确保你的局域网已用DHCP设置,并赋予IP地址范围 192.168.0.X, 192.168.1.X, 10.0.0.X. 如果不能这样设置, " "那就手动设置POSBox的IP地址。" -#: ../../point_of_sale/overview/setup.rst:428 +#: ../../point_of_sale/overview/setup.rst:427 msgid "" "If you have specified the POSBox's IP address in the configuration, make " "sure it correspond to the printed on the POSBox's status receipt." msgstr "如果你在配置中指定POSBox的IP地址, 确保它符合POSBox上的收据打印需求。" -#: ../../point_of_sale/overview/setup.rst:431 +#: ../../point_of_sale/overview/setup.rst:430 msgid "Make sure that the POS is not loaded over HTTPS." msgstr "确认 POS 部分未开启 HTTPS 访问." -#: ../../point_of_sale/overview/setup.rst:432 +#: ../../point_of_sale/overview/setup.rst:431 msgid "" "A bug in Firefox's HTTP implementation prevents the autodiscovery from " "working reliably. When using Firefox you should manually set up the POSBox's" " IP address in the POS configuration." msgstr "Firefox的HTTP实施时的一个故障可防止自动运行。使用火狐浏览器时, 你应在POS配置中手动设置POSBox 的IP地址。" -#: ../../point_of_sale/overview/setup.rst:437 +#: ../../point_of_sale/overview/setup.rst:436 msgid "The Barcode Scanner is not working" msgstr "条码枪不能使用" -#: ../../point_of_sale/overview/setup.rst:439 +#: ../../point_of_sale/overview/setup.rst:438 msgid "" "The barcode scanner must be configured in US QWERTY and emit an Enter after " "each barcode. This is the default configuration of most barcode readers. " "Refer to the barcode reader documentation for more information." msgstr "在US QWERTY中配置条形码扫描仪, 扫码后输入。这是大多数条形码扫描仪的默认配置。有关更多信息,请参阅条形码文档。" -#: ../../point_of_sale/overview/setup.rst:443 +#: ../../point_of_sale/overview/setup.rst:442 msgid "" "The POSBox needs a 2A power supply to work with some barcode scanners. If " "you are not using the provided power supply, make sure the one you use has " "enough power." msgstr "POSBox需要2A电源和一些条形码扫描仪。如果你不使用提供的电源,确保你使用电源的功率。" -#: ../../point_of_sale/overview/setup.rst:446 +#: ../../point_of_sale/overview/setup.rst:445 msgid "" "Some barcode scanners will need more than 2A and will not work, or will work" " unreliably, even with the provided power supply. In those case you can plug" " the barcode scanner in a self-powered USB hub." msgstr "一些条形码扫描仪将需要超过2A的电源, 有时即使提供了电源也不可靠。在这些情况下,你可以把条形码扫描器连接在自供电的USB集线器上。" -#: ../../point_of_sale/overview/setup.rst:449 +#: ../../point_of_sale/overview/setup.rst:448 msgid "" "Some poorly built barcode scanners do not advertise themselves as barcode " "scanners but as a usb keyboard instead, and will not be recognized by the " "POSBox." msgstr "一些简陋的条形码扫描仪是作为usb键盘, 而不是条形码扫描仪, 这将不被POSBox认可。" -#: ../../point_of_sale/overview/setup.rst:454 +#: ../../point_of_sale/overview/setup.rst:453 msgid "The Barcode Scanner is not working reliably" msgstr "条码枪确实不能使用" -#: ../../point_of_sale/overview/setup.rst:456 +#: ../../point_of_sale/overview/setup.rst:455 msgid "" "Make sure that no more than one device with 'Scan via Proxy'/'Barcode " "Scanner' enabled are connected to the POSBox at the same time." msgstr "确保不超过一个设备同时与'Scan via Proxy'/'Barcode Scanner'连接到POSBox使用。" -#: ../../point_of_sale/overview/setup.rst:461 +#: ../../point_of_sale/overview/setup.rst:460 msgid "Printing the receipt takes too much time" msgstr "打印小票太慢" -#: ../../point_of_sale/overview/setup.rst:463 +#: ../../point_of_sale/overview/setup.rst:462 msgid "" "A small delay before the first print is expected, as the POSBox will do some" " preprocessing to speed up the next printings. If you suffer delays " @@ -1754,42 +1748,42 @@ msgid "" "and the POSBox." msgstr "打印前有稍许延迟是正常的, POSBox接下来会做一些预处理加快打印。如果之后再有延迟, 很可能是POS和POSBox之间网络连接的问题。" -#: ../../point_of_sale/overview/setup.rst:469 +#: ../../point_of_sale/overview/setup.rst:468 msgid "Some characters are not correctly printed on the receipt" msgstr "收据上打印出来的字母有些错误" -#: ../../point_of_sale/overview/setup.rst:471 +#: ../../point_of_sale/overview/setup.rst:470 msgid "" "The POSBox does not support all languages and characters. It currently " "supports Latin and Cyrillic based scripts, with basic Japanese support." msgstr "POSBox不支持所有的语言和文字。基于日语的支持, 目前支持拉丁文和斯拉夫语。" -#: ../../point_of_sale/overview/setup.rst:476 +#: ../../point_of_sale/overview/setup.rst:475 msgid "The printer is offline" msgstr "打印机处于离线" -#: ../../point_of_sale/overview/setup.rst:478 +#: ../../point_of_sale/overview/setup.rst:477 msgid "" "Make sure the printer is connected, powered, has enough paper and has its " "lid closed, and is not reporting an error. If the error persists, please " "contact support." msgstr "确保打印机是连接, 有电源,有足够的纸, 它的盖子是关闭的, 并且没有报告错误。如果错误出现, 请联系技术支持。" -#: ../../point_of_sale/overview/setup.rst:483 +#: ../../point_of_sale/overview/setup.rst:482 msgid "The cashdrawer does not open" msgstr "钱箱无法打开" -#: ../../point_of_sale/overview/setup.rst:485 +#: ../../point_of_sale/overview/setup.rst:484 msgid "" "The cashdrawer should be connected to the printer and should be activated in" " the POS configuration." msgstr "现金盒应该连到打印机, 在POS中应将设置激活。" -#: ../../point_of_sale/overview/setup.rst:489 +#: ../../point_of_sale/overview/setup.rst:488 msgid "Credits" msgstr "信用" -#: ../../point_of_sale/overview/setup.rst:490 +#: ../../point_of_sale/overview/setup.rst:489 msgid "" "The POSBox project was developed by Frédéric van der Essen with the kind " "help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del " @@ -1799,88 +1793,88 @@ msgstr "" "Nicolas Wisniewsky, Dimitri Del Marmol, Joren Van Onder 和 Antony " "Lesuisse的帮助." -#: ../../point_of_sale/overview/setup.rst:494 +#: ../../point_of_sale/overview/setup.rst:493 msgid "" "This development would not have been possible without the Indiegogo campaign" " and those who contributed to it. Special thanks goes to the partners who " "backed the campaign with founding partner bundles:" msgstr "没有 Indiegogo和其他人的贡献, 开发不可能完成。特别感谢支持参加活动的创始合伙人:" -#: ../../point_of_sale/overview/setup.rst:498 +#: ../../point_of_sale/overview/setup.rst:497 msgid "Camptocamp" msgstr "Camptocamp" -#: ../../point_of_sale/overview/setup.rst:499 +#: ../../point_of_sale/overview/setup.rst:498 msgid "BHC" msgstr "BHC" -#: ../../point_of_sale/overview/setup.rst:500 +#: ../../point_of_sale/overview/setup.rst:499 msgid "openBig" msgstr "openBig" -#: ../../point_of_sale/overview/setup.rst:501 +#: ../../point_of_sale/overview/setup.rst:500 msgid "Eeezee-IT" msgstr "Eeezee-IT" -#: ../../point_of_sale/overview/setup.rst:502 +#: ../../point_of_sale/overview/setup.rst:501 msgid "Solarsis LDA" msgstr "Solarsis LDA" -#: ../../point_of_sale/overview/setup.rst:503 +#: ../../point_of_sale/overview/setup.rst:502 msgid "ACSONE" msgstr "ACSONE" -#: ../../point_of_sale/overview/setup.rst:504 +#: ../../point_of_sale/overview/setup.rst:503 msgid "Vauxoo" msgstr "Vauxoo" -#: ../../point_of_sale/overview/setup.rst:505 +#: ../../point_of_sale/overview/setup.rst:504 msgid "Ekomurz" msgstr "Ekomurz" -#: ../../point_of_sale/overview/setup.rst:506 +#: ../../point_of_sale/overview/setup.rst:505 msgid "Datalp" msgstr "Datalp" -#: ../../point_of_sale/overview/setup.rst:507 +#: ../../point_of_sale/overview/setup.rst:506 msgid "Dao Systems" msgstr "Dao 系统" -#: ../../point_of_sale/overview/setup.rst:508 +#: ../../point_of_sale/overview/setup.rst:507 msgid "Eggs Solutions" msgstr "鸡蛋方案" -#: ../../point_of_sale/overview/setup.rst:509 +#: ../../point_of_sale/overview/setup.rst:508 msgid "OpusVL" msgstr "OpusVL" -#: ../../point_of_sale/overview/setup.rst:511 +#: ../../point_of_sale/overview/setup.rst:510 msgid "" "And also the partners who've backed the development with the Founding POSBox" " Bundle:" msgstr "也感谢一直支持发展POSBox的合作伙伴:" -#: ../../point_of_sale/overview/setup.rst:514 +#: ../../point_of_sale/overview/setup.rst:513 msgid "Willow IT" msgstr "Willow IT" -#: ../../point_of_sale/overview/setup.rst:515 +#: ../../point_of_sale/overview/setup.rst:514 msgid "E\\. Akhalwaya & Sons" msgstr "E\\. Akhalwaya & Sons" -#: ../../point_of_sale/overview/setup.rst:516 +#: ../../point_of_sale/overview/setup.rst:515 msgid "Multibase" msgstr "Multibase" -#: ../../point_of_sale/overview/setup.rst:517 +#: ../../point_of_sale/overview/setup.rst:516 msgid "Mindesa" msgstr "Mindesa" -#: ../../point_of_sale/overview/setup.rst:518 +#: ../../point_of_sale/overview/setup.rst:517 msgid "bpso.biz" msgstr "bpso.biz" -#: ../../point_of_sale/overview/setup.rst:519 +#: ../../point_of_sale/overview/setup.rst:518 msgid "Shine IT." msgstr "上海先安信息科技(Shine IT)." @@ -2014,7 +2008,7 @@ msgstr "POS名称" #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale." -msgstr "" +msgstr "销售点的内部确认。" #: ../../point_of_sale/overview/start.rst:0 msgid "Sales Channel" @@ -2030,7 +2024,7 @@ msgstr "餐馆楼层" #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale." -msgstr "" +msgstr "此销售点提供的餐厅最低标准。" #: ../../point_of_sale/overview/start.rst:0 msgid "Orderline Notes" @@ -2038,7 +2032,7 @@ msgstr "订单行批注" #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines." -msgstr "" +msgstr "允许在 Orderlines 上进行自定义注释。" #: ../../point_of_sale/overview/start.rst:0 msgid "Display Category Pictures" @@ -2050,13 +2044,13 @@ msgstr "在图片上会显示商品类别" #: ../../point_of_sale/overview/start.rst:0 msgid "Initial Category" -msgstr "" +msgstr "初始类别" #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown." -msgstr "" +msgstr "销售点将默认显示此产品类别。" #: ../../point_of_sale/overview/start.rst:0 msgid "Virtual KeyBoard" @@ -2077,7 +2071,7 @@ msgstr "大滚动条" #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens." -msgstr "" +msgstr "对于不精确的工业用触摸屏。" #: ../../point_of_sale/overview/start.rst:0 msgid "IP Address" @@ -2087,7 +2081,7 @@ msgstr "IP地址" msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty." -msgstr "" +msgstr "将自动检测是否留空硬件代理的主机名或 IP 地址" #: ../../point_of_sale/overview/start.rst:0 msgid "Scan via Proxy" @@ -2095,7 +2089,7 @@ msgstr "通过代理浏览" #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner." -msgstr "" +msgstr "使用远程连接的条码扫描器进行条码扫描。" #: ../../point_of_sale/overview/start.rst:0 msgid "Electronic Scale" @@ -2103,7 +2097,7 @@ msgstr "电子秤" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration." -msgstr "" +msgstr "启用电子秤集成。" #: ../../point_of_sale/overview/start.rst:0 msgid "Cashdrawer" @@ -2111,7 +2105,7 @@ msgstr "收银机" #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer." -msgstr "" +msgstr "自动打开收银箱。" #: ../../point_of_sale/overview/start.rst:0 msgid "Print via Proxy" @@ -2119,21 +2113,21 @@ msgstr "通过代理打印" #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy." -msgstr "" +msgstr "绕过浏览器打印，通过硬件代理进行打印。" #: ../../point_of_sale/overview/start.rst:0 msgid "Customer Facing Display" -msgstr "" +msgstr "面向客户的显示" #: ../../point_of_sale/overview/start.rst:0 msgid "Show checkout to customers with a remotely-connected screen." -msgstr "" +msgstr "通过远程连接的屏幕向客户显示结账。" #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers." -msgstr "" +msgstr "定义可用的条码并且分配给产品，客户和收银员" #: ../../point_of_sale/overview/start.rst:0 msgid "Fiscal Positions" @@ -2143,7 +2137,7 @@ msgstr "替换规则" msgid "" "This is useful for restaurants with onsite and take-away services that imply" " specific tax rates." -msgstr "" +msgstr "这对于提供具有特定税率的上门服务和外卖服务的餐厅十分有用。" #: ../../point_of_sale/overview/start.rst:0 msgid "Available Pricelists" @@ -2155,7 +2149,7 @@ msgid "" " pricelist to specific customers from their contact form (in Sales tab). To " "be valid, this pricelist must be listed here as an available pricelist. " "Otherwise the default pricelist will apply." -msgstr "" +msgstr "使多个价目表可用于销售点。否则，将应用默认价目表。" #: ../../point_of_sale/overview/start.rst:0 msgid "Default Pricelist" @@ -2165,17 +2159,17 @@ msgstr "默认价格表" msgid "" "The pricelist used if no customer is selected or if the customer has no Sale" " Pricelist configured." -msgstr "" +msgstr "如果未选择客户或者客户未配置销售价目表，则使用该价目表。" #: ../../point_of_sale/overview/start.rst:0 msgid "Restrict Price Modifications to Managers" -msgstr "" +msgstr "限制管理器进行价格修改" #: ../../point_of_sale/overview/start.rst:0 msgid "" "Only users with Manager access rights for PoS app can modify the product " "prices on orders." -msgstr "" +msgstr "仅具有 PoS 应用的管理器访问权限的用户能够修改订单上的产品价格。" #: ../../point_of_sale/overview/start.rst:0 msgid "Cash Control" @@ -2193,7 +2187,7 @@ msgstr "预先填好现金付款" msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount." -msgstr "" +msgstr "该支付输入与银行支付输入类似，将通过准确到期金额预填充。" #: ../../point_of_sale/overview/start.rst:0 msgid "Order IDs Sequence" @@ -2227,11 +2221,11 @@ msgstr "自动收据打印" #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order." -msgstr "" +msgstr "在每个订单结束时将自动打印收据。" #: ../../point_of_sale/overview/start.rst:0 msgid "Skip Preview Screen" -msgstr "" +msgstr "跳过预览屏幕" #: ../../point_of_sale/overview/start.rst:0 msgid "" @@ -2245,7 +2239,7 @@ msgstr "账单打印" #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment." -msgstr "" +msgstr "允许在付款前打印账单。" #: ../../point_of_sale/overview/start.rst:0 msgid "Bill Splitting" @@ -2253,7 +2247,7 @@ msgstr "账单拆分" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale." -msgstr "" +msgstr "销售点中允许账单拆分。" #: ../../point_of_sale/overview/start.rst:0 msgid "Tip Product" @@ -2261,7 +2255,7 @@ msgstr "提示产品" #: ../../point_of_sale/overview/start.rst:0 msgid "This product is used as reference on customer receipts." -msgstr "" +msgstr "本产品用作客户收据的参考。" #: ../../point_of_sale/overview/start.rst:0 msgid "Invoicing" @@ -2269,7 +2263,7 @@ msgstr "开票" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale." -msgstr "" +msgstr "通过销售点启用发票生成。" #: ../../point_of_sale/overview/start.rst:0 msgid "Invoice Journal" @@ -2295,7 +2289,7 @@ msgstr "分组日记账项目" msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session." -msgstr "" +msgstr "如果您想要在关闭会话时按产品分组日记账项目，则对其进行检查。" #: ../../point_of_sale/overview/start.rst:100 msgid "Now you are ready to make your first steps with your point of sale." diff --git a/locale/zh_CN/LC_MESSAGES/purchase.po b/locale/zh_CN/LC_MESSAGES/purchase.po index b7906c84d..fea93d635 100644 --- a/locale/zh_CN/LC_MESSAGES/purchase.po +++ b/locale/zh_CN/LC_MESSAGES/purchase.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-22 15:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n" +"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1789,7 +1789,7 @@ msgstr "源单据" msgid "" "Reference of the document that generated this purchase order request (e.g. a" " sales order)" -msgstr "" +msgstr "生成此采购订单请求的文档的引用（例如销售订单）" #: ../../purchase/purchases/rfq/create.rst:0 msgid "Deliver To" @@ -1797,7 +1797,7 @@ msgstr "交货到" #: ../../purchase/purchases/rfq/create.rst:0 msgid "This will determine operation type of incoming shipment" -msgstr "" +msgstr "这将决定进货的操作类型。" #: ../../purchase/purchases/rfq/create.rst:0 msgid "Drop Ship Address" diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index bda2d2d27..eda95f56e 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-20 11:50+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: udcs , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -41,26 +41,24 @@ msgid "" msgstr "拥有门户登陆权限的用户能够登陆Odoo的环境。在系统中查看一些文档或者信息。" #: ../../sales/advanced/portal.rst:12 -msgid "" -"For Example: 1. A long term client who needs to view online quotations. 2." -" Accounting consultant who needs to keep track of the company's financials." -msgstr "例如 :1．一个长期客户需要查看在线报价单。2．财务经理需要对公司的财务进行管理。" +msgid "For Example, a long term client who needs to view online quotations." +msgstr "" -#: ../../sales/advanced/portal.rst:16 +#: ../../sales/advanced/portal.rst:14 msgid "" "A portal user has only read/view access. He or she will not be able to edit " "any document in the system." msgstr "门户用户只有读/查看的权限。没有在系统中进行编辑的权限。" -#: ../../sales/advanced/portal.rst:20 +#: ../../sales/advanced/portal.rst:18 msgid "How to give portal access to customers?" msgstr "如何允许客户访问门户网站？" -#: ../../sales/advanced/portal.rst:23 +#: ../../sales/advanced/portal.rst:21 msgid "From Contacts Module" msgstr "从联系人模块" -#: ../../sales/advanced/portal.rst:25 +#: ../../sales/advanced/portal.rst:23 msgid "" "From the main menu, select **Contacts** menu. If the contact is not yet " "created in the system, click on the create button to create new contact. " @@ -69,24 +67,24 @@ msgstr "" "从主菜单中点击 **联系人** , 如果该联系人在系统中不存在, 则需要点创建按钮来创建新的联系人, 并在联系人页面中录入详细的数据并点击 \" " "保存\\ \\ \\ \"。" -#: ../../sales/advanced/portal.rst:35 +#: ../../sales/advanced/portal.rst:33 msgid "" "Choose a contact, click on the **Action** menu in the top-center of the " "interface and from the drop down." msgstr "要选择联系人, 点击页面上方的 **动作** 下拉列表按钮。" -#: ../../sales/advanced/portal.rst:38 +#: ../../sales/advanced/portal.rst:36 msgid "Select **Portal Access Management**. A pop up window appears." msgstr "选择了 **门户访问管理** 。会有窗口弹出。" -#: ../../sales/advanced/portal.rst:43 +#: ../../sales/advanced/portal.rst:41 msgid "" "Enter the login **email ID**, check the box under **In Portal** and add the " "content to be included in the email in the text field box below. Click on " "**Apply** when you're done." msgstr "进入登陆 **电子邮件地址** , 在 **门户中** 的下方选择勾选框并且在下方的文本框中添加邮件的内容。完成后点击 **应用** 。" -#: ../../sales/advanced/portal.rst:49 +#: ../../sales/advanced/portal.rst:47 msgid "" "An email will be sent to the specified email address, indicating that the " "contact is now a portal user of the respective instance." diff --git a/locale/zh_CN/LC_MESSAGES/website.po b/locale/zh_CN/LC_MESSAGES/website.po index 0601f3fee..8551cfde6 100644 --- a/locale/zh_CN/LC_MESSAGES/website.po +++ b/locale/zh_CN/LC_MESSAGES/website.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-07 09:30+0200\n" +"POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: xiaobin wu , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -1317,45 +1317,45 @@ msgid "" "This is Odoo's job!" msgstr "随意购买一个邮件服务器，从而拥有带自己域名的邮件地址。但不要购买任何额外服务以创建或托管你的网址，因为这是Odoo的工作！" -#: ../../website/publish/domain_name.rst:42 +#: ../../website/publish/domain_name.rst:45 msgid "How to apply my domain name to my Odoo instance" msgstr "如何将我的域名应用到Odoo实例中" -#: ../../website/publish/domain_name.rst:43 +#: ../../website/publish/domain_name.rst:46 msgid "" "First let's authorize the redirection (yourcompany.com -> " "yourcompany.odoo.com):" msgstr "首先，对转向路径进行授权" -#: ../../website/publish/domain_name.rst:45 +#: ../../website/publish/domain_name.rst:48 msgid "Open your Odoo.com account from your homepage." msgstr "从你自己的主页中打开你的Odoo.com账户" -#: ../../website/publish/domain_name.rst:50 +#: ../../website/publish/domain_name.rst:53 msgid "Go to the *Manage Databases* page." msgstr "进入*管理数据库*页面。" -#: ../../website/publish/domain_name.rst:55 +#: ../../website/publish/domain_name.rst:58 msgid "" "Click on *Domains* to the right of the database you would like to redirect." msgstr "点击数据库右边的*域名*即可转向。" -#: ../../website/publish/domain_name.rst:60 +#: ../../website/publish/domain_name.rst:63 msgid "" "A database domain prompt will appear. Enter your custom domain (e.g. " "www.yourcompany.com)." msgstr "出现数据库域名提示符。输入你自定义的域名（例如www.yourcompany.com）。" -#: ../../website/publish/domain_name.rst:67 +#: ../../website/publish/domain_name.rst:70 msgid "" "We can now apply the redirection from your domain name's manager account:" msgstr "现在可以从你的域名管理器账号应用转向了。" -#: ../../website/publish/domain_name.rst:69 +#: ../../website/publish/domain_name.rst:72 msgid "Log in to your account and search for the DNS Zones management page." msgstr "登录你的帐户，搜索DNS区管理页面。" -#: ../../website/publish/domain_name.rst:71 +#: ../../website/publish/domain_name.rst:74 msgid "" "Create a CNAME record *www.yourdomain.com* pointing to *mywebsite.odoo.com*." " If you want to use the naked domain (e.g. yourdomain.com), you need to " @@ -1363,16 +1363,16 @@ msgid "" msgstr "" "创建一个指向*mywebsite.odoo.com*的CNAME记录*www.yourdomain.com*。如你要使用裸域名（如yourdomain.com），你需要将*yourdomain.com*重定向到*www.yourdomain.com*。" -#: ../../website/publish/domain_name.rst:75 +#: ../../website/publish/domain_name.rst:78 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "以下是一些创建CNAME记录的特定指引：" -#: ../../website/publish/domain_name.rst:77 +#: ../../website/publish/domain_name.rst:80 msgid "`GoDaddy `__" msgstr "" "`GoDaddy狗爹官方网站 `__" -#: ../../website/publish/domain_name.rst:78 +#: ../../website/publish/domain_name.rst:81 msgid "" "`Namecheap " "`__" -#: ../../website/publish/domain_name.rst:79 +#: ../../website/publish/domain_name.rst:82 msgid "" "`OVH " "`__" @@ -1390,17 +1390,17 @@ msgstr "" "`OVH官网 " "`__" -#: ../../website/publish/domain_name.rst:82 +#: ../../website/publish/domain_name.rst:85 msgid "How to enable SSL (HTTPS) for my Odoo instance" msgstr "如何从我的Odoo实例中启用SSL (HTTPS)。" -#: ../../website/publish/domain_name.rst:84 +#: ../../website/publish/domain_name.rst:87 msgid "" "To enable SSL, please use a third-party CDN service provider such as " "CloudFlare.com." msgstr "如要启用SSL，请使用第三方CDN服务提供者，如CloudFlare.com。" -#: ../../website/publish/domain_name.rst:90 +#: ../../website/publish/domain_name.rst:93 msgid ":doc:`../../discuss/email_servers`" msgstr ":doc:`../../discuss/email_servers`" diff --git a/odoo_sh/advanced.rst b/odoo_sh/advanced.rst new file mode 100644 index 000000000..fd2b1a0fe --- /dev/null +++ b/odoo_sh/advanced.rst @@ -0,0 +1,11 @@ +:banner: banners/odoo-sh.jpg + +================= +Advanced +================= + +.. toctree:: + :titlesonly: + + advanced/containers + advanced/submodules diff --git a/odoo_sh/advanced/containers.rst b/odoo_sh/advanced/containers.rst new file mode 100644 index 000000000..1592ca655 --- /dev/null +++ b/odoo_sh/advanced/containers.rst @@ -0,0 +1,188 @@ +:banner: banners/odoo-sh.jpg + +================================== +Containers +================================== + +Overview +======== + +Each build is isolated within its own container (Linux namespaced container). + +The base is an Ubuntu 16.04 system, where all of Odoo's required dependencies, +as well as common useful packages, are installed. + +The Odoo.sh team is open to install any system packages +as long as they are distributed in the official Ubuntu repositories. +`Leave us a feedback `_ if you would like a package not yet installed. + +If your project requires additional Python dependencies, or more recent releases, +you can define a :file:`requirements.txt` file in the root of your branches listing them. +The platform will take care to install these dependencies in your containers. +`The pip requirements specifiers `_ +documentation can help you write a :file:`requirements.txt` file. +To have a concrete example, +check out the `requirements.txt file of Odoo `_. + +The :file:`requirements.txt` files of submodules are taken into account as well. The platform +looks for :file:`requirements.txt` files in each folder containing Odoo modules: Not in the module folder itself, +but in their parent folder. + +Directory structure +=================== + +As the containers are Ubuntu based, their directory structure follows the linux Filesystem Hierarchy Standard. +`Ubuntu's filesystem tree overview `_ +explains the main directories. + +Here are the Odoo.sh pertinent directories: + +:: + + . + ├── home + │ └── odoo + │ ├── src + │ │ ├── odoo Odoo Community source code + │ │ │ └── odoo-bin Odoo server executable + │ │ ├── enterprise Odoo Enterprise source code + │ │ ├── themes Odoo Themes source code + │ │ └── user Your repository branch source code + │ ├── data + │ │ ├── filestore database attachments, as well as the files of binary fields + │ │ └── sessions visitors and users sessions + │ └── logs + │ ├── install.log Database installation logs + │ ├── odoo.log Running server logs + │ ├── update.log Database updates logs + │ └── pip.log Python packages installation logs + └── usr + ├── lib + │ ├── python2.7 + │ └── dist-packages Python 2.7 standard libraries + │ ├── python3 + │ └── dist-packages Python 3 standard libraries + │ └── python3.5 + │ └── dist-packages Python 3.5 standard libraries + ├── local + │ └── lib + │ ├── python2.7 + │ │ └── dist-packages Python 2.7 third-party libraries + │ └── python3.5 + │ └── dist-packages Python 3.5 third-party libraries + └── usr + └── bin + ├── python2.7 Python 2.7 executable + └── python3.5 Python 3.5 executable + +Both Python 2.7 and 3.5 are installed in the containers. However: + +* If your project is configured to use Odoo 10.0, the Odoo server runs with Python 2.7. +* If your project is configured to use Odoo 11.0, the Odoo server runs with Python 3.5. + +Database shell +============== + +While accessing a container with the shell, you can access the database using *psql*. + +.. code-block:: bash + + odoo@odoo-addons-master-1.odoo.sh:~$ psql + psql (9.5.2, server 9.5.11) + SSL connection (protocol: TLSv1.2, cipher: ECDHE-RSA-AES256-GCM-SHA384, bits: 256, compression: off) + Type "help" for help. + + odoo-addons-master-1=> + +**Be careful !** +`Use transactions `_ (*BEGIN...COMMIT/ROLLBACK*) +for every *sql* statements leading to changes +(*UPDATE*, *DELETE*, *ALTER*, ...), especially for your production database. + +The transaction mechanism is your safety net in case of mistake. +You simply have to rollback your changes to revert your database to its previous state. + +For example, it may happen that you forget to set your *WHERE* condition. + +.. code-block:: sql + + odoo-addons-master-1=> BEGIN; + BEGIN + odoo-addons-master-1=> UPDATE res_users SET password = '***'; + UPDATE 457 + odoo-addons-master-1=> ROLLBACK; + ROLLBACK + +In such a case, you can rollback to revert the unwanted changes that you just mistakenly did, and rewrite the statement: + +.. code-block:: sql + + odoo-addons-master-1=> BEGIN; + BEGIN + odoo-addons-master-1=> UPDATE res_users SET password = '***' WHERE id = 1; + UPDATE 1 + odoo-addons-master-1=> COMMIT; + COMMIT + +However, do not forget to either commit or rollback your transaction after having done it. +Open transactions may lock records in your tables +and your running database may wait for them to be released. It can cause a server to hang indefinitely. + +In addition, when possible, use your staging databases to test your statements first. It gives you an extra safety net. + +Run an Odoo server +================== + +You can start an Odoo server instance from a container shell. You won't be able to access it from the outside world +with a browser, but you can for instance: + +* use the Odoo shell, + +.. code-block:: bash + + $ odoo-bin shell + >>> partner = env['res.partner'].search([('email', '=', 'asusteK@yourcompany.example.com')], limit=1) + >>> partner.name + 'ASUSTeK' + >>> partner.name = 'Odoo' + >>> env['res.partner'].search([('email', '=', 'asusteK@yourcompany.example.com')], limit=1).name + 'Odoo' + +* install a module, + +.. code-block:: bash + + $ odoo-bin -i sale --without-demo=all --stop-after-init + +* update a module, + +.. code-block:: bash + + $ odoo-bin -u sale --stop-after-init + +* run the tests for a module, + +.. code-block:: bash + + $ odoo-bin -i sale --test-enable --log-level=test --stop-after-init + +In the above commands, the argument: + +* ``--without-demo=all`` prevents demo data to be loaded for all modules +* ``--stop-after-init`` will immediately shutdown the server instance after it completed the operations you asked. + +More options are available and detailed in the +`CLI documentation `_. + +You can find in the logs (*~/logs/odoo.log*) the addons path used by Odoo.sh to run your server. +Look for "*odoo: addons paths*": + +:: + + 2018-02-19 10:51:39,267 4 INFO ? odoo: Odoo version 11.0 + 2018-02-19 10:51:39,268 4 INFO ? odoo: Using configuration file at /home/odoo/.config/odoo/odoo.conf + 2018-02-19 10:51:39,268 4 INFO ? odoo: addons paths: ['/home/odoo/data/addons/11.0', '/home/odoo/src/user', '/home/odoo/src/enterprise', '/home/odoo/src/themes', '/home/odoo/src/odoo/addons', '/home/odoo/src/odoo/odoo/addons'] + +**Be careful**, especially with your production database. +Operations that you perform running this Odoo server instance are not isolated: +Changes will be effective in the database. Always, make your tests in your staging databases. diff --git a/odoo_sh/advanced/media/advanced-submodules-button.png b/odoo_sh/advanced/media/advanced-submodules-button.png new file mode 100644 index 000000000..d884b0346 Binary files /dev/null and b/odoo_sh/advanced/media/advanced-submodules-button.png differ diff --git a/odoo_sh/advanced/media/advanced-submodules-dialog.png b/odoo_sh/advanced/media/advanced-submodules-dialog.png new file mode 100644 index 000000000..3a15d9098 Binary files /dev/null and b/odoo_sh/advanced/media/advanced-submodules-dialog.png differ diff --git a/odoo_sh/advanced/media/advanced-submodules-github-sshurl.png b/odoo_sh/advanced/media/advanced-submodules-github-sshurl.png new file mode 100644 index 000000000..9fd3bdc23 Binary files /dev/null and b/odoo_sh/advanced/media/advanced-submodules-github-sshurl.png differ diff --git a/odoo_sh/advanced/submodules.rst b/odoo_sh/advanced/submodules.rst new file mode 100644 index 000000000..4f279f079 --- /dev/null +++ b/odoo_sh/advanced/submodules.rst @@ -0,0 +1,104 @@ +:banner: banners/odoo-sh.jpg + +.. _odoosh-advanced-submodules: + +================================== +Submodules +================================== + +Overview +======== + +A `Git submodule `_ allows you to integrate other Git projects +into your code, without the need to copy-paste all their code. + +Indeed, your custom modules can depend on modules from other repositories. +Regarding Odoo, this feature allows you to add modules from other Git repositories into the branches of your repository. +Adding these dependencies in your branch through submodules makes the deployment of your code and servers easier, +as you can clone the repositories added as submodules at the same time you clone your own repository. + +Besides, you can choose the branch of the repository added as submodule +and you have the control of the revision you want. +It's up to you to decide whether you want to pin the submodule to a specific revision and when you want to update +to a newer revision. + +In Odoo.sh, the submodules gives you the possibility to use and depend on modules available in other repositories. +The platform will detect that you added modules through submodules in your branches +and add them to your addons path automatically so you can install them in your databases. + +If you add private repositories as submodules in your branches, +you need to configure a deploy key in your Odoo.sh project settings and in your repository settings. +Otherwise Odoo.sh won't be allowed to download them. +The procedure is detailed in the chapter :ref:`Settings > Submodules `. + +Adding a submodule +================== + +With Odoo.sh (simple) +--------------------- + +On Odoo.sh, in the branches view of your project, choose the branch in which you want to add a submodule. + +In the upper right corner, click on the *Submodule* button, and then on *Run*. + +.. image:: ./media/advanced-submodules-button.png + :align: center + +A dialog with a form is shown. Fill the inputs as follows: + +* Repository URL: The SSH URL of the repository. +* Branch: The branch you want to use. +* Path: The folder in which you want to add this submodule in your branch. + +.. image:: ./media/advanced-submodules-dialog.png + :align: center + +On Github, you can get the repository URL with the *Clone or download* button of the repository. Make sure to *use SSH*. + +.. image:: ./media/advanced-submodules-github-sshurl.png + :align: center + +For now it is not possible to add **private** repositories with this method. +You can nevertheless do so :ref:`with Git `. + +.. _odoosh-advanced-submodules-withgit: + +With Git (advanced) +--------------------- + +In a terminal, in the folder where your Git repository is cloned, +checkout the branch in which you want to add a submodule: + +.. code-block:: bash + + $ git checkout + +Then, add the submodule using the command below: + +.. code-block:: bash + + $ git submodule add -b : + +Replace + +* *:* by the SSH URL of the repository you want to add as submodule, +* ** by the branch you want to use in the above repository, +* ** by the folder in which you want to add this submodule. + +Commit and push your changes: + +.. code-block:: bash + + $ git commit -a && git push -u + +Replace + +* by the repository on which you want to push your changes. For a standard Git setup, this is *origin*. +* by the branch on which you want to push your changes. + Most likely the branch you used :code:`git checkout` on in the first step. + +You can read the `git-scm.com documentation `_ +for more details about the Git submodules. +For instance, if you would like to update your submodules to have their latest revision, +you can follow the chapter +`Pulling in Upstream changes `_. diff --git a/odoo_sh/documentation.rst b/odoo_sh/documentation.rst new file mode 100644 index 000000000..76c6c4abc --- /dev/null +++ b/odoo_sh/documentation.rst @@ -0,0 +1,12 @@ +:banner: banners/odoo-sh.jpg + +========================== +Odoo.sh +========================== + +.. toctree:: + :titlesonly: + + overview + getting_started + advanced diff --git a/odoo_sh/getting_started.rst b/odoo_sh/getting_started.rst new file mode 100644 index 000000000..8193c6a88 --- /dev/null +++ b/odoo_sh/getting_started.rst @@ -0,0 +1,15 @@ +:banner: banners/odoo-sh.jpg + +================= +Get started +================= + +.. toctree:: + :titlesonly: + + getting_started/create + getting_started/branches + getting_started/builds + getting_started/status + getting_started/settings + getting_started/first_module diff --git a/odoo_sh/getting_started/branches.rst b/odoo_sh/getting_started/branches.rst new file mode 100644 index 000000000..8be0a11b2 --- /dev/null +++ b/odoo_sh/getting_started/branches.rst @@ -0,0 +1,334 @@ +:banner: banners/odoo-sh.jpg + +================================== +Branches +================================== + +Overview +======== + +The branches view gives you an overview of the different branches your repository has. + +.. image:: ./media/interface-branches.png + :align: center + +.. _odoosh-gettingstarted-branches-stages: + +Stages +=============== + +Odoo.sh offers three different stages for your branches: production, staging and development. + +You can change the stage of a branch by drag and dropping it on the stage section title. + +.. image:: ./media/interface-branches-stagechange.png + :align: center + +Production +---------- +This is the branch holding the code on which your production database run. +There can be only one production branch. + +When you push a new commit in this branch, +your production server is updated with the code of the new revision and is then restarted. + +If your changes require the update of a module, such as a change in a form view, +and you want it to be performed automatically, +increase the version number of the module in its manifest (*__manifest__.py*). +The platform will then take care to perform the update during which the +instance will be held temporarily unavailable for maintenance reason. + + +This method is equivalent to perform an upgrade of the module through the Apps menu, +or through the :code:`-u` switch of +`the command line `_. + +In the case the changes in the commit prevent the server to restart, +or if the modules update fails, +the server is automatically reverted to the previous successful code revision and +the database is roll-backed as it was before the update. +You still have access to the log of the failed update, so you can troubleshoot it. + +The demo data is not loaded, as it is not meant to be used in a production database. +The unit tests are not performed, as it would increase the unavailabity time of the production database during the updates. + +Staging +------- +Staging branches are meant to test your new features using the production data. + +When you push a new commit in one of these branches, +a new server is started, using a duplicate of the production database and the new revision of the branch. + +You can therefore test your latest features using the production data without compromising the actual +production database with test records. + +The outgoing emails are not sent: They are intercepted by the mailcatcher, +which provides an interface to preview the emails sent by your database. +That way, you do not have to worry about sending test emails to your contacts. + +Scheduled actions are disabled. If you want to test them, you have to enable them or trigger their action manually. +Be careful though: If these actions perform changes on third-party services (FTP servers, email servers, ...) +used by your production database as well, +you might cause unwanted changes in your production. + +The databases created for staging branches are meant to live around two weeks. +After that, they can be garbage collected automatically. +If you make configuration changes or view changes in these branches, make sure to document them or write them directly +in the modules of the branch, using XML data files overriding the default configuration or views. + +The unit tests are not performed as, in Odoo, they currently rely on the demo data, which is not loaded in the +production database. In the future, if Odoo supports to run the unit tests without the demo data, +Odoo.sh will then consider running the tests on staging databases. + + +Development +----------- +Development branches create new databases using the demo data to run the unit tests. +The modules installed and tested by default are the ones included in your branches. +You can change this list of modules to install in your projects settings. + +When you push a new commit in one of these branches, +a new server is started, with a database created from scratch and the new revision of the branch. +The demo data is loaded, and the unit tests are performed. +This verifies your changes do not break any of the features tested by them. + +Similar to staging branches, the emails are not sent: They are intercepted by the mailcatcher. + +The databases created for development branches are meant to live around three days. +After that, they can be garbage collected automatically. + +.. _odoosh-gettingstarted-branches-mergingbranches: + +Merging your branches +--------------------- +You can merge your branches easily by drag and dropping them on each other. + +.. image:: ./media/interface-branches-merge.png + :align: center + +When you want to test the changes of your development branches with the production data, +you can either: + +* merge the development branch into your staging branch, by drag and dropping it onto the desired staging branch, +* drag and dropping the development branch on the staging section title, to make it become a staging branch. + +When your latest changes are ready for production, +you can drag and drop your staging branch onto your production branch +to merge and deploy in production your newest features. + +If you are bold enough, +you can merge your development branches into your production branch as well. +It just means you skip the validation of your changes with the production data through a staging branch. + +You can merge your development branches into each other, and your staging branches into each other. + +Of course, you can also use :code:`git merge` directly on your workstation to merge your branches. +Odoo.sh will be notified when new revisions have been pushed in your branches. + +Merging a staging branch in the production branch only merges the source code: Any configuration changes you made in the +staging databases are not passed to the production database. + +If you test configuration changes in staging branches, and want them to be applied in the production, you have to either: + +* write the configuration changes in XML data files + overriding the default configuration or views in your branches, + and then increase the version of your module in its manifest (*__manifest__.py*) to trigger the update of the module + when you merge your staging branch in your production branch. + This is the best practice for a better scalability of your developments as you will use the Git versioning features + for all your configuration changes, and therefore have a traceability for your changes. +* pass them manually from your staging to your production database, by copy/pasting them. + +.. _odoosh-gettingstarted-branches-tabs: + +Tabs +============= + +History +------- +An overview of your branch history: + +* The messages of the commits and their authors, +* The various events linked to the platform, such as stage changes, database imports, backup restores. + +.. image:: ./media/interface-branches-history.png + :align: center + +For each event, a status is displayed in the top right-hand corner. +It can provide information about the ongoing operation on the database (installation, update, backup import, ...), +or its result (tests feedback, successful backup import, ...). +When an operation is successful, you can access the database thanks to the *connect* button. + +Mails +----- +This tab contains the mail catcher. It displays an overview of the emails sent by your database. +The mail catcher is available for your development and +staging branches as the emails of your production database are really sent instead of being intercepted. + +.. image:: ./media/interface-branches-mails.png + :align: center + :scale: 50% + +Shell +----- +A shell access to your container. You can perform basic linux command (:code:`ls`, :code:`top`) +and open a shell on your database by typing :code:`psql`. + +.. image:: ./media/interface-branches-shell.png + :align: center + + +.. Note:: + Long running shell instances are not guaranteed. Idle shells can be + disconnected at anytime in order to free up resources. + +Logs +---- +A viewer to have a look to your server logs. + +.. image:: ./media/interface-branches-logs.png + :align: center + +Different logs are available: + +* install.log: The logs of the database installation. In a development branch, the logs of the tests are included. +* pip.log: The logs of the Python dependencies installation. +* odoo.log: The logs of the running server. +* update.log: The logs of the database updates. This is available only for the production database. + +If new lines are added in the logs, they will be displayed automatically. +If you scroll to the bottom, the browser will scroll automatically each time a new line is added. + +You can pause the logs fetching by clicking on the according button in the upper right corner of the view. +The fetching is automatically stopped after 5 minutes. You can restart it using the play button. + +Backups +------- +A list of the backups available for download and restore, as well as the ability to import a database. + +.. image:: ./media/interface-branches-backups.png + :align: center + +Odoo.sh keeps backups for production databases: 7 daily, 4 weekly and 3 monthly. +Each backup includes the database dump, the filestore (attachments, binary fields), logs and sessions. + +Staging databases and development databases are not backed up.. +You nevertheless have the possibility to restore a backup of the production database on your staging databases, for +testing purposes, or to manually recover data that has been deleted unexpectedly from the production database. + +The list contains the backups kept on the server your production database is hosted on. +This server only keeps one month of backups: 7 daily and 4 weekly backups. + +Dedicated backup servers keep the same backups, as well as 3 additional monthly backups. +To restore or download one of these monthly backups, please `contact us `_. + +The *import database* feature accepts database archives in the format provided by: + +* the standard Odoo databases manager, + (available for on-premise Odoo servers under :code:`/web/database/manager`) +* the Odoo online databases manager, +* the Odoo.sh backup download button of this *Backups* tab, +* the Odoo.sh dump download button in the :ref:`Builds view `. + +Git commands +============ +In the top right-hand corner of the view, different Git commands are available. + +.. image:: ./media/interface-branches-gitcommands.png + :align: center + +Each command can be copied in the clipboard to be used in a terminal, +and some of them can be used directly from Odoo.sh by clicking the *run* button +in such case a popup will prompt the user in order to define eventual placeholders +such as ````, ````, ... + +Clone +----- +Download the Git repository. + +.. code-block:: bash + + $ git clone --recurse-submodules --branch master git@github.com:odoo/odoo.git + +Clones the repository *odoo/odoo*. + +* :code:`--recurse-submodules`: Downloads the submodules of your repository. Submodules included in the submodules are downloaded as well. +* :code:`--branch`: checks out a specific branch of the repository, in this case *master*. + +The *run* button is not available for this command, as it is meant to be used on your machines. + +Fork +---- +Create a new branch based on the current branch. + +.. code-block:: bash + + $ git checkout -b feature-1 master + +Creates a new branch called *feature-1* based on the branch *master*, and then checkouts it. + +.. code-block:: bash + + $ git push -u origin feature-1 + +Uploads the new branch *feature-1* on your remote repository. + +Merge +----- +Merge the current branch in another branch. + +.. code-block:: bash + + $ git merge staging-1 + +Merges the branch *staging-1* in the current branch. + +.. code-block:: bash + + $ git push -u origin master + +Uploads the changes you just added in the *master* branch on your remote repository. + +Submodule +--------- + +Add a branch from another repository in your current branch as a *submodule*. + +*Submodules* allows you to use modules from other repositories in your project. + +The submodules feature is detailed in the chapter +:ref:`Submodules ` of this documentation. + +.. code-block:: bash + + $ git submodule add -b master + +Adds the branch *master* of the repository ** as a submodule under the path ** in your current branch. + +.. code-block:: bash + + $ git commit -a + +Commits all your current changes. + +.. code-block:: bash + + $ git push -u origin master + +Uploads the changes you just added in the *master* branch on your remote repository. + +Delete +------ + +Delete a branch from your repository. + +.. code-block:: bash + + $ git push origin :master + +Deletes the branch in your remote repository. + +.. code-block:: bash + + $ git branch -D master + +Deletes the branch in your local copy of the repository. diff --git a/odoo_sh/getting_started/builds.rst b/odoo_sh/getting_started/builds.rst new file mode 100644 index 000000000..e8302a456 --- /dev/null +++ b/odoo_sh/getting_started/builds.rst @@ -0,0 +1,120 @@ +:banner: banners/odoo-sh.jpg + +.. _odoosh-gettingstarted-builds: + +================================== +Builds +================================== + +Overview +======== + +In Odoo.sh, a build is considered as a database loaded by an Odoo server +(`odoo/odoo `_ & `odoo/enterprise `_) +running on a specific revision of your project repository in a containerized environment. +Its purpose is to test the well-behavior of the server, the database and the features with this revision. + +.. image:: ./media/interface-builds.png + :align: center + +In this view, a row represents a branch, and a cell of a row represents a build of this branch. + +Most of the time, builds are created following pushes on your Github repository branches. +They can be created as well when you do other operations, +such as importing a database on Odoo.sh or asking a rebuild for a branch in your project. + +A build is considered successful if no errors or warnings come up during its creation. +A successful build is highlighted in green. + +A build is considered failed if errors come up during its creation. +A failed build is highlighted in red. + +If warnings come up during the creation, but there are no errors, the build is considered almost successful. +It is highlighted in yellow to notify the developer warnings were raised. + +Builds do not always create a database from scratch. +For instance, when pushing a change on the production branch, the build created just starts the server +with your new revision and tries to load the current production database on it. +If no errors come up, the build is considered successful, and otherwise failed. + +Stages +====== + +Production +---------- + +The first build of a production branch creates a database from scratch. +If this build is successful, this database is considered as the production database of your project. + +From then, pushes on the production branch will create new builds that attempt to load the database +using a server running with the new revision. + +If the build is successful, or has warnings but no errors, the production database will now run with this build, along +with the revision associated to this build. + +If the build fails to load or update the database, then the previous successful build is re-used to load the database, +and therefore the database will run using a server running with the previous successful revision. + +The build used to run the production database is always the first of the builds list. If a build fails, it is +put after the build currently running the production database. + +Staging +------- + +Staging builds duplicate the production database, +and try to load this duplicate with the revisions of the staging branches. + +Each time you push a new revision on a staging branch, the build created uses a new copy of the production database. +The databases are not re-used between builds of the same branch. This ensures: + +* staging builds use databases that are close to what the production looks like, + so you do not make your tests with outdated data, + +* you can play around as much as you want in the same staging database, + and you can then ask for a rebuild when you want to restart with a new copy of the production. + +Nevertheless, this means that if you make configuration changes in staging databases +and do not apply them in the production, +they will not be passed on the next build of the same staging branch. + +Development +----------- + +Development builds create new databases, load the demo data and run the unit tests. + +A build will be considered failed and highlighted in red if tests fail during the installation, +as they are meant to raise errors if something wrong occurs. + +If all tests pass, and there is no error, the build will be considered successful. + +According to the list of modules to install and test, a development build can take up to 1 hour to be ready. +This is due to the large number of tests set in the default Odoo modules suite. + +Features +======== + +The production branch will always appear first, +and then the other branches are ordered by last build created. You can filter out the branches. + +.. image:: ./media/interface-builds-branches.png + :align: center + +For each branch, you can access the last build's database using the *Connect* link and jump to the branch code using +the *Github* link. For other branches than the production, you can create a new build which will use the latest revision +of the branch using the link *rebuild*. This last link is not available when there is already a build in progress for +the branch. + +.. image:: ./media/interface-builds-build.png + :align: center + +For each build, you can access the revision changes using the button with the Github icon. +You can access the build's database as the administrator using the *Connect* button. +Also, you can access the database with another user using the *Connect as* button, +in the dropdown menu of the *Connect* button. + +.. image:: ./media/interface-builds-build-dropdown.png + :align: center + +In the dropdown menu of the build, you can access the same features than in :ref:`the branches view `: +*Logs*, *Web Shell*, *Outgoing e-mails*. +You also have the possibility to *Download a dump* of the build's database. diff --git a/odoo_sh/getting_started/create.rst b/odoo_sh/getting_started/create.rst new file mode 100644 index 000000000..b4100852b --- /dev/null +++ b/odoo_sh/getting_started/create.rst @@ -0,0 +1,185 @@ +:banner: banners/odoo-sh.jpg + +.. _odoosh-gettingstarted-create: + +================================== +Create your project +================================== + +Deploy your platform +==================== + +Go to `Odoo.sh `_ and hit the *Deploy your platform* button. + +.. image:: ./media/deploy.png + :align: center + +Sign in with Github +=================== + +Sign in with your Github account. If you do not have an account yet, hit the *Create an account* link. + +.. image:: ./media/github-signin.png + :align: center + +Authorize Odoo.sh +================= + +Grant Odoo.sh the required accesses to your account by clicking the *Authorize* button. + +.. image:: ./media/github-authorize.png + :align: center + +Odoo.sh basically needs: + +* to know your Github login and email, +* to create a new repository in case you decide to start from scratch, +* to read your existing repositories, including the ones of your organizations, in case you want to start from an existing repository, +* to create a webhook to be notified each time you push changes, +* to commit changes to make your deployment easier, merging branches or adding new `submodules `_ for example. + +Submit your project +=================== + +Choose if you want to start from scratch by creating a new repository, or if you want to use an existing repository. + +Then, choose a name or select the repository you want to use. + +Choose the Odoo version you want to use. If you plan to import an existing database or an existing set of applications, you might need to choose the according version. If you start from scratch, use the latest version. + +Enter your *subscription code*. This is also called *subscription referral* or *contract number*. + +For partners, Odoo.sh is free. If the free offer changes in the future, we guarantee that any project created under this offer will remain free for the same set of features. + +For customers, your Enterprise subscription needs to include Odoo.sh. +Contact your sales representative or account manager in order to get it. + +When submitting the form, if you are notified your subscription is not valid, it either means: + +* it is not an existing subscription, +* it is not a partnership subscription, +* it is an enterprise subscription, but which does not include Odoo.sh, +* it is neither a partnership subscription or an enterprise subscription (e.g. an online subscription). + +In case of doubt with your subscription, please contact the `Odoo support `_. + +.. image:: ./media/deploy-form.png + :align: center + +You're done ! +============= + +You can begin to use Odoo.sh. Your first build is about to be created. You will soon be able to connect to your first database. + +.. image:: ./media/deploy-done.png + :align: center + +Import your database +==================== + +You can import your database in your Odoo.sh project as long as this is an Odoo 10.0 or 11.0 database. + +Push your modules in production +------------------------------- + +If you use community or custom modules, add them in a branch in your Github repository. +Databases hosted on the Odoo.com online platform do not have any custom modules. +Users of these databases can therefore skip this step. + +You can structure your modules as you wish, Odoo.sh will automatically detect the folders containing Odoo addons. +For instance, you can put all your modules folder in the root directory of your repository, +or group the modules in folders by categories that you define (accounting, project, ...). + +For community modules available in public Git repositories, +you can also consider to add them using :ref:`Submodules `. + +Then, either :ref:`make this branch the production branch `, +or :ref:`merge it into your production branch `. + +Download a backup +----------------- + +On-premise databases +~~~~~~~~~~~~~~~~~~~~ + +Access the URL :file:`/web/database/manager` of your on-premise database and download a backup. + +.. Warning:: + + If you cannot access the database manager, it may have been disabled by your system administrator. + See the `database manager security documentation + `_. + +You will need the master password of your database server. If you do not have it, contact your system administrator. + +.. image:: ./media/create-import-onpremise-backup.png + :align: center + +Choose a zip including the filestore as the backup format. + +.. image:: ./media/create-import-onpremise-backup-dialog.png + :align: center + +Odoo Online databases +~~~~~~~~~~~~~~~~~~~~~ + +`Access your databases manager `_ and download a backup of your database. + +.. image:: ./media/create-import-online-backup.png + :align: center + +.. Warning:: + + Saas releases (e.g. *saas-**) are not supported on Odoo.sh. + +Upload the backup +----------------- + +Then, in your Odoo.sh project, in the backups tab of your production branch, import the backup you just downloaded. + +.. image:: ./media/create-import-production.png + :align: center + +Once the backup imported, you can access the database using the *Connect* button in the history of the branch. + +.. image:: ./media/create-import-production-done.png + :align: center + +Check your outgoing email servers +--------------------------------- + +There is a default mail server provided with Odoo.sh. +To use it, there must be no enabled outgoing mail server configured in your database in +:menuselection:`Settings --> Technical --> Outgoing Mail Servers` (Developer mode must be activated). + +After the import of your database, +all outgoing email servers are disabled so you use the Odoo.sh email server provided by default. + +.. Warning:: + + Ports 25, 465 and 587 are blocked. If you want to use your own email servers, they must be configured on other ports. + +Check your scheduled actions +---------------------------- + +All scheduled actions are disabled after the import. + +This is to prevent your newly imported database to perform actions that could impact your running production, +such as sending the mails remaining in the queue, processing mass mailings, or third-party services synchronization +(Calendars, files hosting, ...). + +If you plan to make the imported database your production, enable the scheduled actions you need. +You can check what is enabled in the database of origin and enable the same actions in the imported database. +Scheduled actions are located under :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions`. + +Register your subscription +-------------------------- + +Your subscription is unlinked after the import. + +The imported database is considered a duplicate by default and the enterprise subscription is therefore removed, +as you can only have one database linked per subscription. + +If you plan to make it your production, +unlink your former database from the subscription, and register the newly imported database. +Read the :ref:`database registration documentation ` for instructions. diff --git a/odoo_sh/getting_started/first_module.rst b/odoo_sh/getting_started/first_module.rst new file mode 100644 index 000000000..2967700a5 --- /dev/null +++ b/odoo_sh/getting_started/first_module.rst @@ -0,0 +1,454 @@ +:banner: banners/odoo-sh.jpg + +================================== +Your first module +================================== + +Overview +======== + +This chapter helps you to create your first Odoo module and deploy it in your Odoo.sh project. + +This tutorial requires :ref:`you created a project on Odoo.sh `, and you know your Github repository's URL. + +Basic use of Git and Github is explained. + +The below assumptions are made: + +* *~/src* is the directory where are located the Git repositories related to your Odoo projects, +* *odoo* is the Github user, +* *odoo-addons* is the Github repository, +* *feature-1* is the name of a development branch, +* *master* is the name of the production branch, +* *my_module* is the name of the module. + +Replace these by the values of your choice. + +Create the development branch +============================= + +Clone your Github repository on your machine: + +.. code-block:: bash + + $ mkdir ~/src + $ cd ~/src + $ git clone https://github.com/odoo/odoo-addons.git + $ cd ~/src/odoo-addons + +Create a new branch: + +.. code-block:: bash + + $ git checkout -b feature-1 master + + +Create the module structure +=========================== + +Scaffolding the module +---------------------- + +While not necessary, scaffolding avoids the tedium of setting the basic Odoo module structure. +It nevertheless requires *odoo-bin*, and therefore the +`installation of Odoo `_ on your machine. + +If you do not want to bother installing Odoo on your machine, +you can also :download:`download this module structure template ` in which you replace every occurrences of +*my_module* to the name of your choice. + +Use *odoo-bin scaffold* to generate the module structure in your repository: + +.. code-block:: bash + + $ ./odoo-bin scaffold my_module ~/src/odoo-addons/ + +This will generate the below structure: + +:: + + my_module + ├── __init__.py + ├── __manifest__.py + ├── controllers + │   ├── __init__.py + │   └── controllers.py + ├── demo + │   └── demo.xml + ├── models + │   ├── __init__.py + │   └── models.py + ├── security + │   └── ir.model.access.csv + └── views + ├── templates.xml + └── views.xml + +.. Warning:: + + Do not use special characters other than the underscore ( _ ) for your module name, not even an hyphen ( - ). + This name is used for the Python classes of your module, + and having classes name with special characters other than the underscore is not valid in Python. + +Uncomment the content of the files: + +* *models/models.py*, + an example of model with its fields, +* *views/views.xml*, + a tree and a form view, with the menus opening them, +* *demo/demo.xml*, + demo records for the above example model, +* *controllers/controllers.py*, + an example of controller implementing some routes, +* *views/templates.xml*, + two example qweb views used by the above controller routes, +* *__manifest__.py*, + the manifest of your module, including for instance its title, description and data files to load. + You just need to uncomment the access control list data file: + + .. code-block:: xml + + # 'security/ir.model.access.csv', + +Manually +-------- + +If you want to create your module structure manually, +you can follow `Build an Odoo module `_ to understand +the structure of a module and the content of each file. + +Push the development branch +=========================== + +Stage the changes to be committed + +.. code-block:: bash + + $ git add my_module + +Commit your changes + +.. code-block:: bash + + $ git commit -m "My first module" + +Push your changes to your remote repository + +.. code-block:: bash + + $ git push -u origin feature-1 + +You need to specify *-u origin feature-1* for the first push only. +From that point, to push your future changes, you can simply use + +.. code-block:: bash + + $ git push + +Test your module +================ + +Your branch should appear in your development branches in your project. + +.. image:: ./media/firstmodule-test-branch.png + :align: center + +In the branches view of your project, +you can click on your branch name in the left navigation panel to access its history. + +.. image:: ./media/firstmodule-test-branch-history.png + :align: center + +You can see here the changes you just pushed, including the comment you set. +Once the database ready, you can access it by clicking the *Connect* button. + +.. image:: ./media/firstmodule-test-database.png + :align: center + +If your Odoo.sh project is configured to install your module automatically, +you will directly see it amongst the database apps. Otherwise, it will be available in the apps to install. + +You can then play around with your module, create new records and test your features and buttons. + + +Test with the production data +============================= + +You need to have a production database for this step. You can create it if you do not have it yet. + +Once you tested your module in a development build with the demo data and believe it is ready, +you can test it with the production data using a staging branch. + +You can either: + +* Make your development branch a staging branch, by drag and dropping it onto the *staging* section title. + + .. image:: ./media/firstmodule-test-devtostaging.png + :align: center + +* Merge it in an existing staging branch, by drag and dropping it onto the given staging branch. + + .. image:: ./media/firstmodule-test-devinstaging.png + :align: center + +You can also use the :code:`git merge` command to merge your branches. + +This will create a new staging build, which will duplicate the production database and make it run using a server +updated with your latest changes of your branch. + +.. image:: ./media/firstmodule-test-mergedinstaging.png + :align: center + +Once the database ready, you can access it using the *Connect* button. + +.. _odoosh-gettingstarted-firstmodule-productiondata-install: + +Install your module +------------------- + +Your module will not be installed automatically, you have to install it from the apps menu. +Indeed, the purpose of the staging build is to test the behavior of your changes as it would be on your production, +and on your production you would not like your module to be installed automatically, but on demand. + +Your module may not appear directly in your apps to install either, you need to update your apps list first: + +* activate the developer mode from the Settings, + + .. image:: ./media/firstmodule-test-developermode.png + :align: center + +* in the apps menu, click the *Update Apps List* button, +* in the dialog that appears, click the *Update* button. + + .. image:: ./media/firstmodule-test-updateappslist.png + :align: center + +Your module will then appear in the list of available apps. + +.. image:: ./media/firstmodule-test-mymoduleinapps.png + :align: center + +Deploy in production +==================== + +Once you tested your module in a staging branch with your production data, +and believe it is ready for production, you can merge your branch in the production branch. + +Drag and drop your staging branch on the production branch. + +.. image:: ./media/firstmodule-test-mergeinproduction.png + :align: center + +You can also use the :code:`git merge` command to merge your branches. + +This will merge the latest changes of your staging branch in the production branch, +and update your production server with these latest changes. + +.. image:: ./media/firstmodule-test-mergedinproduction.png + :align: center + +Once the database ready, you can access it using the *Connect* button. + +Install your module +------------------- + +Your module will not be installed automatically, +you have to install it manually as explained in the +:ref:`above section about installing your module in staging databases +`. + +Add a change +============ + +This section explains how to add a change in your module by adding a new field in a model and deploy it. + +In your module, edit the file *models/models.py* + +.. code-block:: bash + + $ nano ~/src/odoo-addons/my_module/models/models.py + +We encourage you to use the editor of your choice, such as *Atom*, *Sublime Text*, *PyCharm*, instead of *nano*. + +Then, after the description field + +.. code-block:: python + + description = fields.Text() + +Add a datetime field + +.. code-block:: python + + start_datetime = fields.Datetime('Start time', default=lambda self: fields.Datetime.now()) + +Then, edit the file *views/views.xml* + +.. code-block:: bash + + $ nano ~/src/odoo-addons/my_module/views/views.xml + +After + +.. code-block:: xml + + + +Add + +.. code-block:: xml + + + +These changes alter the database structure by adding a column in a table, +and modify a view stored in database. + +In order to be applied in existing databases, such as your production database, +these changes requires the module to be updated. + +If you would like the update to be performed automatically by the Odoo.sh platform when you push your changes, +increase your module version in its manifest. + +Edit the module manifest + +.. code-block:: bash + + $ nano ~/src/odoo-addons/my_module/__manifest__.py + +Replace + +.. code-block:: python + + 'version': '0.1', + +with + +.. code-block:: python + + 'version': '0.2', + +The platform will detect the change of version and trigger the update of the module upon the new revision deployment. + +Stage your changes to be committed + +.. code-block:: bash + + $ cd ~/src/odoo-addons/ + $ git add my_module + +Commit your changes + +.. code-block:: bash + + $ git commit -m "[ADD] my_module: add the start_datetime field to the model my_module.my_module" + +Push your changes + +.. code-block:: bash + + $ git push + +The platform will then create a new build for the branch *feature-1*. + +.. image:: ./media/firstmodule-test-addachange-build.png + :align: center + +Once you tested your changes, you can merge your changes in the production branch, for instance by drag-and-dropping the +branch on the production branch in the Odoo.sh interface. As you increased the module version in the manifest, +the platform will update the module automatically and your new field will be directly available. +Otherwise you can manually update the module within the apps list. + +Use an external Python library +============================== + +If you would like to use an external Python library which is not installed by default, +you can define a *requirements.txt* file listing the external libraries your modules depends on. + +The platform will use this file to automatically install the Python libraries your project needs. + +The feature is explained in this section by using the `Unidecode library `_ in +your module. + +Create a file *requirements.txt* in the root folder of your repository + +.. code-block:: bash + + $ nano ~/src/odoo-addons/requirements.txt + +Add + +.. code-block:: text + + unidecode + +Then use the library in your module, for instance to remove any special characters in the name field of your +model. + +Edit the file *models/models.py* + +.. code-block:: bash + + $ nano ~/src/odoo-addons/my_module/models/models.py + +Before + +.. code-block:: python + + from odoo import models, fields, api + +Add + +.. code-block:: python + + from unidecode import unidecode + +After + +.. code-block:: python + + start_datetime = fields.Datetime('Start time', default=lambda self: fields.Datetime.now()) + +Add + +.. code-block:: python + + @api.model + def create(self, values): + if 'name' in values: + values['name'] = unidecode(values['name']) + return super(my_module, self).create(values) + + @api.multi + def write(self, values): + if 'name' in values: + values['name'] = unidecode(values['name']) + return super(my_module, self).write(values) + +Adding a Python dependency requires a module version increase for the platform to install it. + +Edit the module manifest + +.. code-block:: bash + + $ nano ~/src/odoo-addons/my_module/__manifest__.py + +Replace + +.. code-block:: python + + 'version': '0.2', + +with + +.. code-block:: python + + 'version': '0.3', + +Then stage, commit and push your changes + +.. code-block:: bash + + $ git add requirements.txt + $ git add my_module + $ git commit -m "[IMP] my_module: automatically remove special chars in my_module.my_module name field" + $ git push diff --git a/odoo_sh/getting_started/media/create-import-online-backup.png b/odoo_sh/getting_started/media/create-import-online-backup.png new file mode 100644 index 000000000..5c45e213b Binary files /dev/null and b/odoo_sh/getting_started/media/create-import-online-backup.png differ diff --git a/odoo_sh/getting_started/media/create-import-onpremise-backup-dialog.png b/odoo_sh/getting_started/media/create-import-onpremise-backup-dialog.png new file mode 100644 index 000000000..95d51ba91 Binary files /dev/null and b/odoo_sh/getting_started/media/create-import-onpremise-backup-dialog.png differ diff --git a/odoo_sh/getting_started/media/create-import-onpremise-backup.png b/odoo_sh/getting_started/media/create-import-onpremise-backup.png new file mode 100644 index 000000000..a3cadc2a3 Binary files /dev/null and b/odoo_sh/getting_started/media/create-import-onpremise-backup.png differ diff --git a/odoo_sh/getting_started/media/create-import-production-done.png b/odoo_sh/getting_started/media/create-import-production-done.png new file mode 100644 index 000000000..c327f04c1 Binary files /dev/null and b/odoo_sh/getting_started/media/create-import-production-done.png differ diff --git a/odoo_sh/getting_started/media/create-import-production.png b/odoo_sh/getting_started/media/create-import-production.png new file mode 100644 index 000000000..6f560be84 Binary files /dev/null and b/odoo_sh/getting_started/media/create-import-production.png differ diff --git a/odoo_sh/getting_started/media/deploy-done.png b/odoo_sh/getting_started/media/deploy-done.png new file mode 100644 index 000000000..e85fa58d8 Binary files /dev/null and b/odoo_sh/getting_started/media/deploy-done.png differ diff --git a/odoo_sh/getting_started/media/deploy-form.png b/odoo_sh/getting_started/media/deploy-form.png new file mode 100644 index 000000000..2cb2c2451 Binary files /dev/null and b/odoo_sh/getting_started/media/deploy-form.png differ diff --git a/odoo_sh/getting_started/media/deploy.png b/odoo_sh/getting_started/media/deploy.png new file mode 100644 index 000000000..84c21323f Binary files /dev/null and b/odoo_sh/getting_started/media/deploy.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-addachange-build.png b/odoo_sh/getting_started/media/firstmodule-test-addachange-build.png new file mode 100644 index 000000000..25a6e78aa Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-addachange-build.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-branch-history.png b/odoo_sh/getting_started/media/firstmodule-test-branch-history.png new file mode 100644 index 000000000..497de1534 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-branch-history.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-branch.png b/odoo_sh/getting_started/media/firstmodule-test-branch.png new file mode 100644 index 000000000..cb4f403a5 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-branch.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-database.png b/odoo_sh/getting_started/media/firstmodule-test-database.png new file mode 100644 index 000000000..c76d39839 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-database.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-developermode.png b/odoo_sh/getting_started/media/firstmodule-test-developermode.png new file mode 100644 index 000000000..ce287ba64 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-developermode.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-devinstaging.png b/odoo_sh/getting_started/media/firstmodule-test-devinstaging.png new file mode 100644 index 000000000..df1c80236 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-devinstaging.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-devtostaging.png b/odoo_sh/getting_started/media/firstmodule-test-devtostaging.png new file mode 100644 index 000000000..64b420e8f Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-devtostaging.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-mergedinproduction.png b/odoo_sh/getting_started/media/firstmodule-test-mergedinproduction.png new file mode 100644 index 000000000..3d74a6870 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-mergedinproduction.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-mergedinstaging.png b/odoo_sh/getting_started/media/firstmodule-test-mergedinstaging.png new file mode 100644 index 000000000..1836e9799 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-mergedinstaging.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-mergeinproduction.png b/odoo_sh/getting_started/media/firstmodule-test-mergeinproduction.png new file mode 100644 index 000000000..13b12b80c Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-mergeinproduction.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-mymoduleinapps.png b/odoo_sh/getting_started/media/firstmodule-test-mymoduleinapps.png new file mode 100644 index 000000000..f40584ed7 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-mymoduleinapps.png differ diff --git a/odoo_sh/getting_started/media/firstmodule-test-updateappslist.png b/odoo_sh/getting_started/media/firstmodule-test-updateappslist.png new file mode 100644 index 000000000..acf5e3350 Binary files /dev/null and b/odoo_sh/getting_started/media/firstmodule-test-updateappslist.png differ diff --git a/odoo_sh/getting_started/media/github-authorize.png b/odoo_sh/getting_started/media/github-authorize.png new file mode 100644 index 000000000..398a96d41 Binary files /dev/null and b/odoo_sh/getting_started/media/github-authorize.png differ diff --git a/odoo_sh/getting_started/media/github-signin.png b/odoo_sh/getting_started/media/github-signin.png new file mode 100644 index 000000000..b06441707 Binary files /dev/null and b/odoo_sh/getting_started/media/github-signin.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-backups.png b/odoo_sh/getting_started/media/interface-branches-backups.png new file mode 100644 index 000000000..5c6d91bcf Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-backups.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-gitcommands.png b/odoo_sh/getting_started/media/interface-branches-gitcommands.png new file mode 100644 index 000000000..cd3a041d3 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-gitcommands.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-history.png b/odoo_sh/getting_started/media/interface-branches-history.png new file mode 100644 index 000000000..9bd0cda0e Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-history.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-logs.png b/odoo_sh/getting_started/media/interface-branches-logs.png new file mode 100644 index 000000000..0088a1f80 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-logs.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-mails.png b/odoo_sh/getting_started/media/interface-branches-mails.png new file mode 100644 index 000000000..287bb8cf4 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-mails.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-merge.png b/odoo_sh/getting_started/media/interface-branches-merge.png new file mode 100644 index 000000000..1f1958466 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-merge.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-shell.png b/odoo_sh/getting_started/media/interface-branches-shell.png new file mode 100644 index 000000000..0403a84e1 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-shell.png differ diff --git a/odoo_sh/getting_started/media/interface-branches-stagechange.png b/odoo_sh/getting_started/media/interface-branches-stagechange.png new file mode 100644 index 000000000..61f5e7d89 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-stagechange.png differ diff --git a/odoo_sh/getting_started/media/interface-branches.png b/odoo_sh/getting_started/media/interface-branches.png new file mode 100644 index 000000000..156a2ed4f Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches.png differ diff --git a/odoo_sh/getting_started/media/interface-builds-branches.png b/odoo_sh/getting_started/media/interface-builds-branches.png new file mode 100644 index 000000000..a2fc04077 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-builds-branches.png differ diff --git a/odoo_sh/getting_started/media/interface-builds-build-connect.png b/odoo_sh/getting_started/media/interface-builds-build-connect.png new file mode 100644 index 000000000..726b0a568 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-builds-build-connect.png differ diff --git a/odoo_sh/getting_started/media/interface-builds-build-dropdown.png b/odoo_sh/getting_started/media/interface-builds-build-dropdown.png new file mode 100644 index 000000000..1626ea5c6 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-builds-build-dropdown.png differ diff --git a/odoo_sh/getting_started/media/interface-builds-build.png b/odoo_sh/getting_started/media/interface-builds-build.png new file mode 100644 index 000000000..afb1ec653 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-builds-build.png differ diff --git a/odoo_sh/getting_started/media/interface-builds.png b/odoo_sh/getting_started/media/interface-builds.png new file mode 100644 index 000000000..b82859595 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-builds.png differ diff --git a/odoo_sh/getting_started/media/interface-settings-collaborators.png b/odoo_sh/getting_started/media/interface-settings-collaborators.png new file mode 100644 index 000000000..3c0f07eab Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings-collaborators.png differ diff --git a/odoo_sh/getting_started/media/interface-settings-customdomains.png b/odoo_sh/getting_started/media/interface-settings-customdomains.png new file mode 100644 index 000000000..e0f3499b4 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings-customdomains.png differ diff --git a/odoo_sh/getting_started/media/interface-settings-modulesinstallation.png b/odoo_sh/getting_started/media/interface-settings-modulesinstallation.png new file mode 100644 index 000000000..ef4e3cec6 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings-modulesinstallation.png differ diff --git a/odoo_sh/getting_started/media/interface-settings-projectname.png b/odoo_sh/getting_started/media/interface-settings-projectname.png new file mode 100644 index 000000000..2ef44eaf1 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings-projectname.png differ diff --git a/odoo_sh/getting_started/media/interface-settings-public.png b/odoo_sh/getting_started/media/interface-settings-public.png new file mode 100644 index 000000000..7bf144b7c Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings-public.png differ diff --git a/odoo_sh/getting_started/media/interface-settings-submodules.png b/odoo_sh/getting_started/media/interface-settings-submodules.png new file mode 100644 index 000000000..5d1453e07 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings-submodules.png differ diff --git a/odoo_sh/getting_started/media/interface-settings.png b/odoo_sh/getting_started/media/interface-settings.png new file mode 100644 index 000000000..f6d830c60 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-settings.png differ diff --git a/odoo_sh/getting_started/media/interface-status.png b/odoo_sh/getting_started/media/interface-status.png new file mode 100644 index 000000000..010b7a470 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-status.png differ diff --git a/odoo_sh/getting_started/media/my_module.zip b/odoo_sh/getting_started/media/my_module.zip new file mode 100644 index 000000000..bea2d9223 Binary files /dev/null and b/odoo_sh/getting_started/media/my_module.zip differ diff --git a/odoo_sh/getting_started/settings.rst b/odoo_sh/getting_started/settings.rst new file mode 100644 index 000000000..a9f95564f --- /dev/null +++ b/odoo_sh/getting_started/settings.rst @@ -0,0 +1,194 @@ +:banner: banners/odoo-sh.jpg + +================================== +Settings +================================== + +Overview +======== + +The settings allows you to manage the configuration of your project. + +.. image:: ./media/interface-settings.png + :align: center + +Project name +============ + +The name of your project. + +.. image:: ./media/interface-settings-projectname.png + :align: center + +This defines the address that will be used to access your production database. + +Addresses of your staging and development builds are derived from this name and assigned automatically. +However, when you change your project name, only future builds will use the new name. + +Collaborators +============= + +Manage the Github users who can access your project. + +.. image:: ./media/interface-settings-collaborators.png + :align: center + +There are two levels of users: + +* Admin: has access to all features of Odoo.sh. +* User: does not have access to the project settings nor to the production and staging databases. + +The user group is meant for developers who can make modifications in your code but are not allowed to access the +production data. +Users of this group cannot connect to the production and staging databases using the *1-click connect* feature, +but they can of course use their regular account on these databases if they have one, using their regular credentials. + +In addition, they cannot use the webshell nor have access to the server logs. + ++---------------------+-----------------+-----------+-----------+ +| | | User | Admin | ++=====================+=================+===========+===========+ +|Development | History | X | X | ++---------------------+-----------------+-----------+-----------+ +| | 1-click connect | X | X | ++---------------------+-----------------+-----------+-----------+ +| | Logs | X | X | ++---------------------+-----------------+-----------+-----------+ +| | Shell | X | X | ++---------------------+-----------------+-----------+-----------+ +| | Mails | X | X | ++---------------------+-----------------+-----------+-----------+ +|Production & Staging | History | X | X | ++---------------------+-----------------+-----------+-----------+ +| | 1-click connect | | X | ++---------------------+-----------------+-----------+-----------+ +| | Logs | | X | ++---------------------+-----------------+-----------+-----------+ +| | Shell | | X | ++---------------------+-----------------+-----------+-----------+ +| | Mails | | X | ++---------------------+-----------------+-----------+-----------+ +|Status | | X | X | ++---------------------+-----------------+-----------+-----------+ +|Settings | | | X | ++---------------------+-----------------+-----------+-----------+ + +Public Access +============= + +Allow public access to your development builds. + +.. image:: ./media/interface-settings-public.png + :align: center + +If activated, this option exposes the Builds page publicly, allowing visitors to connect to your development builds. + +In addition, visitors have access to the logs, shell and mails of your development builds. + +Production and staging builds are excluded, visitors can only see their status. + +Modules installation +==================== + +Choose the modules to install automatically for your development builds. + +.. image:: ./media/interface-settings-modulesinstallation.png + :align: center + +* *Install only my modules* will install the modules of the branch only. + The :ref:`submodules ` are excluded. +* *Full installation (all modules)* will install the modules of the branch, the modules included in the submodules + and all standard modules of Odoo. +* *Install a list of modules* will install the modules specified in the input just below this option. + The names are the technical name of the modules, and they must be comma-separated. + +All installed modules will be tested. +The tests in the standard Odoo modules suite can take up to 1 hour. +This setting applies to development builds only. +Staging builds duplicate the production build and the production build only installs base. + +Custom domains +============== + +Configure your own domain name. + +.. image:: ./media/interface-settings-customdomains.png + :align: center + +If you would like to access your production database using your own domain name, you have to: + +* own or purchase the domain name, +* add the domain name in this list, +* in your registrar's domain name manager, + configure the domain name with a ``CNAME`` record set to your production database domain name. + +For instance, to associate *www.mycompany.com* to your database *mycompany.odoo.com*: + +* in Odoo.sh, add *www.mycompany.com* in the custom domains of your project settings, +* in your domain name manager (e.g. *godaddy.com*, *gandi.net*, *ovh.com*), + configure *www.mycompany.com* with a ``CNAME`` record with as value *mycompany.odoo.com*. + +Bare domains (e.g. *mycompany.com*) are not accepted: + +* they can only be configured using ``A`` records, +* ``A`` records only accept IP addresses as value, +* the IP address of your database can change, following an upgrade, a hardware failure or + your wish to host your database in another country or continent. + +Therefore, bare domains could suddenly no longer work because of this change of IP address. + +In addition, if you would like both *mycompany.com* and *www.mycompany.com* to work with your database, +having the first redirecting to the second is amongst the +`SEO best practices `_ +(See *Provide one version of a URL to reach a document*) +in order to have one dominant URL. You can therefore just configure *mycompany.com* to redirect to *www.mycompany.com*. +Most domain managers have the feature to configure this redirection. This is commonly called a web redirection. + +HTTPS/SSL +--------- + +You can use a third-party CDN such as *Cloudflare.com* to enable the *HTTPS* support for your custom domain: + +* `Create a Cloudflare account `_ +* `Change your domain name servers to Cloudflare `_ +* `Choose an SSL mode `_ +* `Redirect your visitors to HTTPS `_ + +.. _odoosh-gettingstarted-settings-submodules: + +Submodules +========== + +Configure the deploy keys for the private repositories you use +as submodules in your branches to allow Odoo.sh to download them. + +.. Warning:: + These settings are required for **private repositories** only. + If you are looking on how to set up your submodules, + instructions are available in the chapter :ref:`Submodules ` of this documentation. + +.. image:: ./media/interface-settings-submodules.png + :align: center + +When a repository is private, this is not possible to publicly download its branches and revisions. +For that reason, you need to configure a deploy key for Odoo.sh, +so the remote Git server allows our platform to download the revisions +of this private repository. + +To configure the deploy key for a private repository, proceed as follow: + +* in the input, paste the SSH URL of your private sub-repository and click on *Add*, + + * e.g. *git@github.com:USERNAME/REPOSITORY.git* + * it can be another Git server than Github, such as Bitbucket, Gitlab or even your own self-hosted server + +* copy the public key, + + * it should look like *ssh-rsa some...random...characters...here...==* + +* in the settings of the private sub-repository, add the public key amongst the deploy keys. + + * Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key` + * Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key` + * Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys` + * Self-hosted: append the key to the git user’s authorized_keys file in its .ssh directory diff --git a/odoo_sh/getting_started/status.rst b/odoo_sh/getting_started/status.rst new file mode 100644 index 000000000..ee5ed71e6 --- /dev/null +++ b/odoo_sh/getting_started/status.rst @@ -0,0 +1,13 @@ +:banner: banners/odoo-sh.jpg + +================================== +Status +================================== + +Overview +======== + +The status page shows statistics regarding the servers your project uses. It includes the servers availability. + +.. image:: ./media/interface-status.png + :align: center diff --git a/odoo_sh/overview.rst b/odoo_sh/overview.rst new file mode 100644 index 000000000..33657f9fe --- /dev/null +++ b/odoo_sh/overview.rst @@ -0,0 +1,10 @@ +:banner: banners/odoo-sh.jpg + +================= +Overview +================= + +.. toctree:: + :titlesonly: + + overview/introduction diff --git a/odoo_sh/overview/introduction.rst b/odoo_sh/overview/introduction.rst new file mode 100644 index 000000000..80f7e0e0d --- /dev/null +++ b/odoo_sh/overview/introduction.rst @@ -0,0 +1,15 @@ +:banner: banners/odoo-sh.jpg + +============================== +Introduction to Odoo.sh +============================== + +.. youtube:: QuNsa9n9PMg + :align: right + :width: 700 + :height: 394 + +The documentation will help you go live with your Odoo.sh project in no time. + +You can suggest new documentation topics +or report typos and inaccuracies by `contacting us `_. diff --git a/practical.rst b/practical.rst index 312ad4d5b..9e4524a37 100644 --- a/practical.rst +++ b/practical.rst @@ -6,6 +6,7 @@ Practical Information :titlesonly: getting_started/documentation + odoo_sh/documentation db_management/documentation db_management/db_online db_management/db_premise diff --git a/website/publish/domain_name.rst b/website/publish/domain_name.rst index a881f17dd..530753fc2 100644 --- a/website/publish/domain_name.rst +++ b/website/publish/domain_name.rst @@ -38,6 +38,9 @@ Buy your domain name at a popular registrar: However don't buy any extra service to create or host your website. This is Odoo's job! +.. _custom_domain: + + How to apply my domain name to my Odoo instance =============================================== First let's authorize the redirection (yourcompany.com -> yourcompany.odoo.com):