diff --git a/accounting/localizations.rst b/accounting/localizations.rst index f7ed7a7af..3c2526e69 100644 --- a/accounting/localizations.rst +++ b/accounting/localizations.rst @@ -8,5 +8,6 @@ Localizations localizations/france localizations/germany localizations/mexico + localizations/nederlands localizations/spain localizations/switzerland \ No newline at end of file diff --git a/accounting/localizations/france.rst b/accounting/localizations/france.rst index a6b915de2..2a25d6272 100644 --- a/accounting/localizations/france.rst +++ b/accounting/localizations/france.rst @@ -28,7 +28,7 @@ As of January 1st 2018, a new anti-fraud legislation comes into effect in France and DOM-TOM. This new legislation stipulates certain criteria concerning the inalterability, security, storage and archiving of sales data. These legal requirements are implemented in Odoo, version 9 onward, -through an add-on and a certificate of conformity to download. +through a module and a certificate of conformity to download. Is my company required to use an anti-fraud software? ----------------------------------------------------- @@ -45,7 +45,7 @@ VAT and therefore are not affected. Get certified with Odoo ----------------------- -Getting compliant with Odoo is vey easy. +Getting compliant with Odoo is very easy. Your company is requested by the tax administration to deliver a certificate of conformity testifying that your software complies with the anti-fraud @@ -54,13 +54,12 @@ legislation. This certificate is granted by Odoo SA to Odoo Enterprise users If you use Odoo Community, you should `upgrade to Odoo Enterprise `__ or contact your Odoo service provider. -`Get the certificate here `__. In case of non-conformity, your company risks a fine of €7,500. To get the certification just follow the following steps: -* Install the anti-fraud add-on fitting your Odoo environment from the +* Install the anti-fraud module fitting your Odoo environment from the *Apps* menu: * if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) @@ -72,24 +71,24 @@ To get the certification just follow the following steps: Select a country from the list; Do not create a new country. * Download the mandatory certificate of conformity delivered by Odoo SA `here `__. -.. note:: * To get the module available in any system created before +.. note:: * To install the module in any system created before December 18th 2017, you should update the modules list. To do so, activate the developer mode from the *Settings* menu. Then go to the *Apps* menu and press *Update Modules List* in the top-menu. * In case you run Odoo on-premise, you need to update your installation and restart your server beforehand. - * If you have installed the initial version of the anti-fraud add-on + * If you have installed the initial version of the anti-fraud module (prior to December 18th 2017), you need to update it. - The add-on's name was *France - Accounting - Certified CGI 286 I-3 bis*. + The module's name was *France - Accounting - Certified CGI 286 I-3 bis*. After an update of the modules list, search for the updated module in *Apps*, select it and click *Upgrade*. - Finally, make sure the following add-on *l10n_fr_sale_closing* + Finally, make sure the following module *l10n_fr_sale_closing* is installed. -Anti-fraud features of Odoo ---------------------------- +Anti-fraud features +------------------- -The anti-fraud add-on introduces the following features: +The anti-fraud module introduces the following features: * **Inalterability**: deactivation of all the ways to cancel or modify key data of POS orders, invoices and journal entries; @@ -115,7 +114,7 @@ upon validation. This number (or hash) is calculated from the key data of the document as well as from the hash of the precedent documents. -The add-on introduces an interface to test the data inalterability. +The module introduces an interface to test the data inalterability. If any information is modified on a document after its validation, the test will fail. The algorithm recomputes all the hashes and compares them against the initial ones. In case of failure, the system points out the first @@ -146,7 +145,7 @@ Invoicing and Accounting apps. * POS orders are posted as journal entries at the closing of the POS session. Closing a POS session can be done anytime. - To prompt users to do it on a daily basis, the add-on prevents from resuming + To prompt users to do it on a daily basis, the module prevents from resuming a session opened more than 24 hours ago. Such a session must be closed before selling again. @@ -172,7 +171,7 @@ due diligence. It is not permitted to modify the source code which guarantees the inalterability of data. Odoo absolves itself of all and any responsibility in case of changes -in the add-on’s functions caused by 3rd party applications not certified by Odoo. +in the module’s functions caused by 3rd party applications not certified by Odoo. More Information diff --git a/accounting/localizations/nederlands.rst b/accounting/localizations/nederlands.rst new file mode 100644 index 000000000..df962850b --- /dev/null +++ b/accounting/localizations/nederlands.rst @@ -0,0 +1,23 @@ +Netherlands +=========== + +XAF Export +---------- + +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)**. + +Dutch Accounting Reports +------------------------ + +If you install the Dutch accounting localization, you will have access +to some reports that are specific to the Netherlands such as : + +- Profit & Loss + +- Tax Report (Aangifte omzetbelasting) + +- Intrastat Report (ICP) diff --git a/accounting/others/multicurrencies.rst b/accounting/others/multicurrencies.rst index 3e33bfa0c..15354d20d 100644 --- a/accounting/others/multicurrencies.rst +++ b/accounting/others/multicurrencies.rst @@ -1,6 +1,6 @@ -======== -Overview -======== +============= +Multicurrency +============= .. toctree:: :titlesonly: diff --git a/accounting/overview/main_concepts.rst b/accounting/overview/main_concepts.rst index 0c6a1d4c2..0dda677d1 100644 --- a/accounting/overview/main_concepts.rst +++ b/accounting/overview/main_concepts.rst @@ -8,4 +8,3 @@ Main Concepts main_concepts/intro main_concepts/in_odoo main_concepts/memento - main_concepts/terminologies diff --git a/accounting/overview/main_concepts/terminologies.rst b/accounting/overview/main_concepts/terminologies.rst deleted file mode 100644 index 526803bf8..000000000 --- a/accounting/overview/main_concepts/terminologies.rst +++ /dev/null @@ -1,101 +0,0 @@ -======================== -Accounting Terminologies -======================== - -.. glossary:: - - Journal - - 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. - - Payment Terms - - 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. - - Bank Reconciliation - - 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. - - Reconciliation - - 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. - - Deposit Ticket - - 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. - - Journal Entry - - 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. - - Journal Item - - A line of a journal entry, with a monetary debit or credit - associated with a specific account. - - Analytic Accounts - - 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. - - Analytic Entries - - Costs or revenues posted to analytic accounts, - usually related to journal entries. - - Sales Receipt - - 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. - - Fixed Assets - - 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. - - Deferred Revenues - - 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. - - Fiscal Position - - 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. diff --git a/discuss/email_servers.rst b/discuss/email_servers.rst index 61eacc753..47983d1f2 100644 --- a/discuss/email_servers.rst +++ b/discuss/email_servers.rst @@ -1,128 +1,60 @@ -================================================================= -How to use my own email servers to send and receive email in Odoo -================================================================= +============================================================ +How to use my mail server to send and receive emails in Odoo +============================================================ -When is it needed -================= -Using your own email servers is required to send and receive messages -in Odoo Community or Enterprise. Odoo Online embeds an out-of-box -email solution that works straight away. However you can still use -your own email servers with the online edition. Some insights -are provided here below. +This document is mainly dedicated to Odoo on-premise users who don't +benefit from an out-of-the-box solution to send and receive emails in Odoo, +unlike in `Odoo Online `__ & `Odoo.sh `__. + +If no one in your company is used to manage email servers, we strongly recommend that +you opt for such convenient Odoo hosting solutions. Indeed their email system +works instantly and is monitored by professionals. +Nevertheless you can still use your own email servers if you want +to manage your email server's reputation yourself. + +You will find here below some useful +information to do so by integrating your own email solution with Odoo. + +How to manage outbound messages +=============================== -How to set it up -================ As a system admin, go to :menuselection:`Settings --> General Settings` -and check *External Email Servers* -(watch out: this checkbox only shows up after Odoo 10). -Then, go through the following steps. - -.. note:: - Office 365 email servers don't allow to send external emails - from hosts like Odoo. - Consequently you can only use such email servers for incoming messages. - -Set an outgoing email server for outbound messages --------------------------------------------------- -You need the SMTP data of your email provider (Gmail, Outlook, -Yahoo, AOL, etc.) as well as your admin credentials. +and check *External Email Servers*. +Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. Once all the information has been filled out, click on *Test Connection*. +Here is a typical configuration for a G Suite server. + .. image:: media/outgoing_server.png :align: center -Set an incoming email server for inbound messages -------------------------------------------------- -Fill out the form according to your email provider’s settings. -Leave the *Actions to Perform on Incoming Mails* blank. Once all the -information has been filled out, click on *TEST & CONFIRM*. +Then set your email domain name in the General Settings. -.. image:: media/incoming_server.png - :align: center +Can I use an Office 365 server +------------------------------ +You can use an Office 365 server if you run Odoo on-premise. +Office 365 SMTP relays are not compatible with Odoo Online. -.. note:: By default inbound messages are fetched every 5 minutes. - You can change this value in developer mode. - Go to :menuselection:`Settings --> Technical --> Automation --> - Scheduled Actions` and look for *Mail: Fetchmail Service*. +Please refer to `Microsoft's documentation `__ +to configure a SMTP relay for your Odoo's IP address. -Set the domain name -------------------- -Enter the domain name of your email servers (e.g. mycompany.com) -in General Settings. +How to use a G Suite server +--------------------------- +You can use an G Suite server for any Odoo hosting type. +To do so you need to enable a SMTP relay and to allow *Any addresses* +in the *Allowed senders* section. The configuration steps are explained in +`Google documentation `__. -.. image:: media/alias_domain.png - :align: center +Be SPF-compliant +---------------- +In case you use SPF (Sender Policy Framework) to increase the deliverability +of your outgoing emails, don't forget to authorize Odoo as a sending host in your +domain name settings. Here is the configuration for Odoo Online: -Create a catchall address -------------------------- -When a contact replies to an email sent from Odoo, the *reply-to* address -is a generic address used to route the reply to the right discussion thread -in Odoo (opportunity, order, task, etc.) and to the inbox of all its followers. -By default this address is "catchall@" but it can be changed. - -Create a catchall address in your email server settings. We advise -you to use "catchall@" so that everything works out straight away. -If you want to use another alias, you have extra steps in Odoo: - -- Activate the developer mode from your Settings Dashboard. - -.. image:: media/developer_mode.png - :align: center - -- Refresh your screen. Then go to :menuselection:`Settings --> Technical - --> Parameters --> System Parameters` and enter your custom catchall alias - in *mail.catchall.alias*. - -.. image:: media/system_parameters.png - :align: center - -.. note:: You can edit the email alias used for bounced messages the same way. - -How to use my own email servers with Odoo Online -================================================ -Odoo Online comes up with an embedded and ready-to-use email -solution with *@yourcompany.odoo.com* as domain. -We recommend to keep this default setup as it is really convenient. - -Nevertheless you can still use your own email servers if you want -to manage your email server's reputation (blacklisting, etc). -The configuration for both incoming and outgoing mail servers is -given here above. - -However when it comes to incoming messages, we don't recommend -to exclusively use your own email server. Indeed, Odoo Online is fetching -incoming messages from the email server once every hour only. -To receive emails in real time, you should rather use -a **catchall redirection** (your server -> Odoo server). To do so: - -* Create a catchall address in your email server settings (e.g. catchall). -* Still from such settings, set a redirection - from this catchall address to Odoo's one: - catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. -* In Odoo check *External Email Servers* in :menuselection:`Settings --> General Settings` - and enter your email domain name (i.e. yourdomain.ext). -* No need to set up an incoming email server in such a case. - - -How to be SPF-compliant when using external email servers in Odoo -================================================================= -Sender Policy Framework (SPF) is an email-validation system that checks that -incoming mail from a domain comes from a host authorized by that domain's -administrator. Such a security system is used in most email servers. -If you don't comply with it, your emails sent from Odoo will be likely -flagged as spam. - -To be SPF-compliant, you need to authorize Odoo as a sending host -in your domain name settings: - -* Sign in to your domain’s account at your domain host. -* Locate the page for updating your domain’s DNS records. -* If no TXT record is set, create one with following definition: +* If no TXT record is set for SPF, create one with following definition: v=spf1 include:_spf.odoo.com ~all -* In case a TXT record is already set, add "include:_spf.odoo.com". - - e.g. for a Gmail server it should be: - +* In case a SPF TXT record is already set, add "include:_spf.odoo.com". + e.g. for a domain name that sends emails via Odoo Online and via G Suite it could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all Find `here `__ the exact procedure to @@ -135,16 +67,84 @@ but this usually happens more quickly. with mail delivery and spam classification. Instead, we recommend using only one SPF record by modifying it to authorize Odoo. -How to choose between Odoo and my traditional email box -======================================================= -Odoo Discuss is a perfect tool to send and read messages related to -business documents. However it doesn't aim to replace a full-featured email -solution (Gmail, Outlook, Yahoo, AOL, etc.). -We recommend to take the most out of both systems without mingling them: -What is related to Odoo business objects or applications goes into Odoo; -What is not can be managed into your external email box. +Allow DKIM +---------- +You should do the same thing if DKIM (Domain Keys Identified Mail) +is enabled on your email server. In the case of Odoo Online & Odoo.sh, +you should add a DNS "odoo._domainkey" CNAME record to +"odoo._domainkey.odoo.com". +For example, for "foo.com" they should have a record "odoo._domainkey.foo.com" +that is a CNAME with the value "odoo._domainkey.odoo.com". -To do so, create specific email aliases to use in Odoo (to generate leads -or opportunities, helpdesk tickets, etc.). If you take an email alias -already used for messaging outside of Odoo, incoming messages will land -into both systems. This will negatively impact your productivity. +How to manage inbound messages +============================== + +Odoo relies on generic email aliases to fetch incoming messages. + +* **Reply messages** of messages sent from Odoo are routed to their original + discussion thread (and to the inbox of all its followers) by the + catchall alias (**catchall@**). + +* **Bounced messages** are routed to **bounce@** in order to track them in Odoo. + This is especially used in `Odoo Email Marketing `__ + to opt-out invalid recipients. + +* **Original messages**: Several business objects have their own alias to + create new records in Odoo from incoming emails: + + * Sales Channel (to create Leads or Opportunities in `Odoo CRM `__), + + * Support Channel (to create Tickets in `Odoo Helpdesk `__), + + * Projects (to create new Tasks in `Odoo Project `__), + + * Job Positions (to create Applicants in `Odoo Recruitment `__), + + * etc. + +Depending on your mail server, there might be several methods to fetch emails. +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.). +* Set your domain name in the General Settings. + + .. image:: media/alias_domain.png + :align: center + +* If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for each alias. + You can do it from the General Settings as well. Fill out the form according + to your email provider’s settings. + Leave the *Actions to Perform on Incoming Mails* blank. Once all the + information has been filled out, click on *TEST & CONFIRM*. + +.. image:: media/incoming_server.png + :align: center + +* If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming messages + to Odoo's domain name rather than exclusively use your own email server. + That way you will receive incoming messages without delay. Indeed, Odoo Online is fetching + incoming messages of external servers once per hour only. + You should set redirections for all the email addresses to Odoo's domain name in your + email server (e.g. *catchall@mydomain.ext* to *catchall@mycompany.odoo.com*). + +.. tip:: All the aliases are customizable in Odoo. + Object aliases can be edited from their respective configuration view. + To edit catchall and bounce aliases, you first need to activate the + developer mode from the Settings Dashboard. + + .. image:: media/developer_mode.png + :align: center + + Then refresh your screen and go to + :menuselection:`Settings --> Technical --> Parameters --> System Parameters` + to customize the aliases (*mail.catchall.alias* & * mail.bounce.alias*). + + .. image:: media/system_parameters.png + :align: center + +.. 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 diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index c7ea8689e..dfbe393a7 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/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: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Inigo Zuluaga , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -93,6 +93,7 @@ msgstr "" #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30 #: ../../accounting/payables/supplier_bills/manage.rst:31 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15 +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19 @@ -814,6 +815,86 @@ msgstr "" "Una vez que usted llenó con sus tarjetas, sus entradas bancarias se " "sincronizarán cada 4 horas." +#: ../../accounting/bank/feeds/synchronize.rst:73 +#: ../../accounting/localizations/mexico.rst:501 +msgid "FAQ" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:76 +msgid "The synchronization is not working in real time, is it normal?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:78 +msgid "" +"Yodlee tries to get the data from a bank account once a day. However, this " +"doesn't always happen at the same time. And sometimes the process can fail. " +"In that case, Yodlee retries one hour or two later. This is why in Odoo " +"there is a cron that is running every 4 hours to fetch the information from " +"Yodlee." +msgstr "" + +#: ../../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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:86 +msgid "" +"Moreover, a transaction can be visible in your bank account but not being " +"fetched by Yodlee. Indeed, the transaction in your bank account can have the" +" 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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:91 +msgid "" +"What is important to remember is that Yodlee is not a service fetching " +"transactions in real time. This is a service to facilitate the import of the" +" bank statement in the database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:95 +msgid "Is the Yodlee feature included in my contract?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:97 +msgid "" +"Enterprise Version: Yes, if you have a valid enterprise contract linked to " +"your database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:98 +msgid "" +"Community Version: No, this feature is not included in the Community " +"Version." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:99 +msgid "" +"Online Version: Yes, even if you benefit from the One App Free contract." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:102 +msgid "Some banks have a status \"Beta\", what does it mean?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:104 +msgid "" +"This means that Yodlee is only currently working on developing the " +"synchronization with this bank. The synchronization could already work or it" +" may need a bit more time to have a 100% working synchronization. " +"Unfortunately, there is not much to do about except being patient." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:110 +msgid "All my past transactions are not in Odoo, why?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:112 +msgid "Yodlee only allows to fetch up transactions to 3 months in the past." +msgstr "" + #: ../../accounting/bank/misc.rst:3 ../../accounting/payables/misc.rst:3 #: ../../accounting/payables/misc/employee_expense.rst:187 msgid "Miscellaneous" @@ -2020,7 +2101,7 @@ msgstr "Seleccioina \"General\" para operaciones misceláneas de registros." #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Use in Point of Sale" -msgstr "" +msgstr "Utilizar en el TPV" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" @@ -2359,88 +2440,128 @@ msgstr "Localizaciones" msgid "France" msgstr "Francia" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:3 +#: ../../accounting/localizations/france.rst:6 +msgid "FEC" +msgstr "" + +#: ../../accounting/localizations/france.rst:8 +msgid "" +"If you have installed the French Accounting, you will be able to download " +"the FEC. For this, go in :menuselection:`Accounting --> Reporting --> France" +" --> FEC`." +msgstr "" + +#: ../../accounting/localizations/france.rst:12 +msgid "" +"If you do not see the submenu **FEC**, go in **Apps** and search for the " +"module called **France-FEC** and verify if it is well installed." +msgstr "" + +#: ../../accounting/localizations/france.rst:16 +msgid "French Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/france.rst:18 +msgid "" +"If you have installed the French Accounting, you will have access to some " +"accounting reports specific to France:" +msgstr "" + +#: ../../accounting/localizations/france.rst:20 +msgid "Bilan comptable" +msgstr "" + +#: ../../accounting/localizations/france.rst:21 +msgid "Compte de résultats" +msgstr "" + +#: ../../accounting/localizations/france.rst:22 +msgid "Plan de Taxes France" +msgstr "" + +#: ../../accounting/localizations/france.rst:25 msgid "Get the VAT anti-fraud certification with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:5 +#: ../../accounting/localizations/france.rst:27 msgid "" -"As of January 1st 2018, a new anti-fraud legislation will come into effect " -"in France and DOM-TOM. This new legislation stipulates certain criteria " +"As of January 1st 2018, a new anti-fraud legislation comes into effect in " +"France and DOM-TOM. This new legislation stipulates certain criteria " "concerning the inalterability, security, storage and archiving of sales " "data. These legal requirements are implemented in Odoo, version 9 onward, " -"through an add-on." +"through a module and a certificate of conformity to download." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:12 +#: ../../accounting/localizations/france.rst:34 msgid "Is my company required to use an anti-fraud software?" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:13 +#: ../../accounting/localizations/france.rst:36 msgid "" "Your company is required to use an anti-fraud cash register software like " "Odoo (CGI art. 286, I. 3° bis) if:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:16 +#: ../../accounting/localizations/france.rst:39 msgid "You are taxable (not VAT exempt) in France or any DOM-TOM," msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:17 +#: ../../accounting/localizations/france.rst:40 msgid "Some of your customers are private individuals (B2C)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:19 +#: ../../accounting/localizations/france.rst:42 msgid "" "This rule applies to any company size. Auto-entrepreneurs are exempted from " "VAT and therefore are not affected." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:23 +#: ../../accounting/localizations/france.rst:46 msgid "Get certified with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:24 -msgid "Getting compliant with Odoo is vey easy." +#: ../../accounting/localizations/france.rst:48 +msgid "Getting compliant with Odoo is very easy." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:26 +#: ../../accounting/localizations/france.rst:50 msgid "" -"Your company is requested by the tax administration to deliver a Certificate" -" of Conformity testifying that your software complies with the anti-fraud " -"legislation. This certificate is granted by Odoo SA to Odoo Enterprise " -"users. If you use Odoo Community, you should `upgrade to Odoo Enterprise " +"Your company is requested by the tax administration to deliver a certificate" +" of conformity testifying that your software complies with the anti-fraud " +"legislation. This certificate is granted by Odoo SA to Odoo Enterprise users" +" `here `__. If you " +"use Odoo Community, you should `upgrade to Odoo Enterprise " "`__ or " -"contact your Odoo service provider. `Get the certificate here " -"`__." +"contact your Odoo service provider." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:34 +#: ../../accounting/localizations/france.rst:58 msgid "In case of non-conformity, your company risks a fine of €7,500." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:36 +#: ../../accounting/localizations/france.rst:60 msgid "To get the certification just follow the following steps:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:38 +#: ../../accounting/localizations/france.rst:62 msgid "" -"Install the anti-fraud add-on fitting your Odoo environment from the *Apps* " +"Install the anti-fraud module fitting your Odoo environment from the *Apps* " "menu:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:41 +#: ../../accounting/localizations/france.rst:65 msgid "" -"France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) " -"(if you use Odoo Point of Sale)" +"if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud " +"Certification for Point of Sale (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:43 +#: ../../accounting/localizations/france.rst:67 msgid "" -"France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) (in any other case)" +"in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud " +"Certification (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:44 +#: ../../accounting/localizations/france.rst:68 msgid "" "Make sure a country is set on your company, otherwise your entries won’t be " "encrypted for the inalterability check. To edit your company’s data, go to " @@ -2448,82 +2569,98 @@ msgid "" "country from the list; Do not create a new country." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:48 +#: ../../accounting/localizations/france.rst:72 msgid "" -"Download the mandatory Certificate of Conformity delivered by Odoo SA from " -"`here `__." +"Download the mandatory certificate of conformity delivered by Odoo SA `here " +"`__." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:50 +#: ../../accounting/localizations/france.rst:74 msgid "" -"If case you run Odoo on-premise, you should update your installation and " -"restart your server to get such new add-ons available in your Apps " -"repository. For any issue you can still download the modules from `Odoo's " -"Apps store `__." +"To install the module in any system created before December 18th 2017, you " +"should update the modules list. To do so, activate the developer mode from " +"the *Settings* menu. Then go to the *Apps* menu and press *Update Modules " +"List* in the top-menu." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:56 -msgid "Anti-fraud features of Odoo" +#: ../../accounting/localizations/france.rst:78 +msgid "" +"In case you run Odoo on-premise, you need to update your installation and " +"restart your server beforehand." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:57 -msgid "The anti-fraud add-on introduces the following features:" +#: ../../accounting/localizations/france.rst:80 +msgid "" +"If you have installed the initial version of the anti-fraud module (prior to" +" December 18th 2017), you need to update it. The module's name was *France -" +" Accounting - Certified CGI 286 I-3 bis*. After an update of the modules " +"list, search for the updated module in *Apps*, select it and click " +"*Upgrade*. Finally, make sure the following module *l10n_fr_sale_closing* is" +" installed." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:59 +#: ../../accounting/localizations/france.rst:89 +msgid "Anti-fraud features" +msgstr "" + +#: ../../accounting/localizations/france.rst:91 +msgid "The anti-fraud module introduces the following features:" +msgstr "" + +#: ../../accounting/localizations/france.rst:93 msgid "" "**Inalterability**: deactivation of all the ways to cancel or modify key " "data of POS orders, invoices and journal entries;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:61 +#: ../../accounting/localizations/france.rst:95 msgid "**Security**: chaining algorithm to verify the inalterability;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:62 +#: ../../accounting/localizations/france.rst:96 msgid "" "**Storage**: automatic sales closings with computation of both period and " "cumulative totals (daily, monthly, annually)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:66 +#: ../../accounting/localizations/france.rst:100 msgid "Inalterability" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:67 +#: ../../accounting/localizations/france.rst:102 msgid "" "All the possible ways to cancel and modify key data of paid POS orders, " "confirmed invoices and journal entries are deactivated, if the company is " "located in France or in any DOM-TOM." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:71 +#: ../../accounting/localizations/france.rst:106 msgid "" "If you run a multi-companies environment, only the documents of such " "companies are impacted." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:75 +#: ../../accounting/localizations/france.rst:110 msgid "Security" msgstr "Seguridad" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:76 +#: ../../accounting/localizations/france.rst:112 msgid "" "To ensure the inalterability, every order or journal entry is encrypted upon" " validation. This number (or hash) is calculated from the key data of the " "document as well as from the hash of the precedent documents." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:81 +#: ../../accounting/localizations/france.rst:117 msgid "" -"The add-on introduces an interface to test the data inalterability. If any " +"The module introduces an interface to test the data inalterability. If any " "information is modified on a document after its validation, the test will " "fail. The algorithm recomputes all the hashes and compares them against the " "initial ones. In case of failure, the system points out the first corrupted " "document recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:87 +#: ../../accounting/localizations/france.rst:123 msgid "" "Users with *Manager* access rights can launch the inalterability check. For " "POS orders, go to :menuselection:`Point of Sales --> Reporting --> French " @@ -2531,11 +2668,11 @@ msgid "" ":menuselection:`Invoicing/Accounting --> Reporting --> French Statements`." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:94 +#: ../../accounting/localizations/france.rst:130 msgid "Storage" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:95 +#: ../../accounting/localizations/france.rst:132 msgid "" "The system also processes automatic sales closings on a daily, monthly and " "annual basis. Such closings distinctly compute the sales total of the period" @@ -2543,32 +2680,32 @@ msgid "" "recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:101 +#: ../../accounting/localizations/france.rst:138 msgid "" "Closings can be found in the *French Statements* menu of Point of Sale, " "Invoicing and Accounting apps." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:105 +#: ../../accounting/localizations/france.rst:142 msgid "" "Closings compute the totals for journal entries of sales journals (Journal " "Type = Sales)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:107 +#: ../../accounting/localizations/france.rst:144 msgid "" "For multi-companies environments, such closings are performed by company." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:109 +#: ../../accounting/localizations/france.rst:146 msgid "" "POS orders are posted as journal entries at the closing of the POS session. " "Closing a POS session can be done anytime. To prompt users to do it on a " -"daily basis, the add-on prevents from resuming a session opened more than 24" +"daily basis, the module prevents from resuming a session opened more than 24" " hours ago. Such a session must be closed before selling again." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:115 +#: ../../accounting/localizations/france.rst:152 msgid "" "A period’s total is computed from all the journal entries posted after the " "previous closing of the same type, regardless of their posting date. If you " @@ -2576,65 +2713,133 @@ msgid "" "counted in the very next closing." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:120 +#: ../../accounting/localizations/france.rst:157 msgid "" "For test & audit purposes such closings can be manually generated in the " "developer mode. Go to :menuselection:`Settings --> Technical --> Automation " "--> Scheduled Actions` to do so." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:127 +#: ../../accounting/localizations/france.rst:164 msgid "Responsibilities" msgstr "Responsabilidades" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:128 +#: ../../accounting/localizations/france.rst:166 msgid "" "Do not uninstall the module! If you do so, the hashes will be reset and none" " of your past data will be longer guaranteed as being inalterable." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:131 +#: ../../accounting/localizations/france.rst:169 msgid "" "Users remain responsible for their Odoo instance and must use it with due " "diligence. It is not permitted to modify the source code which guarantees " "the inalterability of data." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:135 +#: ../../accounting/localizations/france.rst:173 msgid "" "Odoo absolves itself of all and any responsibility in case of changes in the" -" add-on’s functions caused by 3rd party applications not certified by Odoo." +" module’s functions caused by 3rd party applications not certified by Odoo." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:140 +#: ../../accounting/localizations/france.rst:178 msgid "More Information" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:141 +#: ../../accounting/localizations/france.rst:180 msgid "" "You will find more information about this legislation in the official " "documents:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:143 +#: ../../accounting/localizations/france.rst:182 msgid "" "`Frequently Asked Questions " "`__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:144 +#: ../../accounting/localizations/france.rst:183 msgid "" "`Official Statement " "`__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:145 +#: ../../accounting/localizations/france.rst:184 msgid "" "`Item 88 of Finance Law 2016 " "`__" msgstr "" +#: ../../accounting/localizations/germany.rst:3 +msgid "Germany" +msgstr "Alemania" + +#: ../../accounting/localizations/germany.rst:6 +msgid "German Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/germany.rst:8 +msgid "" +"The chart of accounts SKR03 and SKR04 are both supported in Odoo. You can " +"choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the Fiscal Localization " +"section." +msgstr "" + +#: ../../accounting/localizations/germany.rst:12 +#: ../../accounting/localizations/spain.rst:17 +msgid "" +"Be careful, you can only change the accounting package as long as you have " +"not created any accounting entry." +msgstr "" + +#: ../../accounting/localizations/germany.rst:16 +msgid "" +"When you create a new SaaS database, the SKR03 is installed by default." +msgstr "" + +#: ../../accounting/localizations/germany.rst:19 +msgid "German Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/germany.rst:21 +msgid "" +"Here is the list of German-specific reports available on Odoo Enterprise:" +msgstr "" + +#: ../../accounting/localizations/germany.rst:23 +#: ../../accounting/localizations/spain.rst:27 +#: ../../accounting/others/reporting/main_reports.rst:30 +msgid "Balance Sheet" +msgstr "Balance de Situación" + +#: ../../accounting/localizations/germany.rst:24 +msgid "Profit & Loss" +msgstr "" + +#: ../../accounting/localizations/germany.rst:25 +msgid "Tax Report (Umsatzsteuervoranmeldung)" +msgstr "" + +#: ../../accounting/localizations/germany.rst:26 +msgid "Partner VAT Intra" +msgstr "Empresa de IVA Intra" + +#: ../../accounting/localizations/germany.rst:29 +msgid "Export from Odoo to Datev" +msgstr "" + +#: ../../accounting/localizations/germany.rst:31 +msgid "" +"It is possible to export your accounting entries from Odoo to Datev. To be " +"able to use this feature, the german accounting localization needs to be " +"installed on your Odoo Enterprise database. Then you can go in " +":menuselection:`Accounting --> Reporting --> General Ledger` then click on " +"the **Export Datev (csv)** button." +msgstr "" + #: ../../accounting/localizations/mexico.rst:3 msgid "Mexico" msgstr "México" @@ -3405,10 +3610,6 @@ msgid "" "generic one with no explanation." msgstr "" -#: ../../accounting/localizations/mexico.rst:501 -msgid "FAQ" -msgstr "" - #: ../../accounting/localizations/mexico.rst:503 msgid "**Error message** (Only applicable on CFDI 3.3):" msgstr "" @@ -3545,6 +3746,67 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/spain.rst:3 +msgid "Spain" +msgstr "España" + +#: ../../accounting/localizations/spain.rst:6 +msgid "Spanish Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/spain.rst:8 +msgid "" +"In Odoo, there are several Spanish Chart of Accounts that are available by " +"default:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:10 +msgid "PGCE PYMEs 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:11 +msgid "PGCE Completo 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:12 +msgid "PGCE Entitades" +msgstr "" + +#: ../../accounting/localizations/spain.rst:14 +msgid "" +"You can choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the **Fiscal " +"Localization** section." +msgstr "" + +#: ../../accounting/localizations/spain.rst:20 +msgid "" +"When you create a new SaaS database, the PGCE PYMEs 2008 is installed by " +"default." +msgstr "" + +#: ../../accounting/localizations/spain.rst:23 +msgid "Spanish Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/spain.rst:25 +msgid "" +"If the Spanish Accounting Localization is installed, you will have access to" +" accounting reports specific to Spain:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:28 +msgid "Tax Report (Modelo 111)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:29 +msgid "Tax Report (Modelo 115)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:30 +msgid "Tax Report (Modelo 303)" +msgstr "" + #: ../../accounting/localizations/switzerland.rst:3 msgid "Switzerland" msgstr "Suiza" @@ -3873,6 +4135,13 @@ msgid "" "odoo.com/help." msgstr "" +#: ../../accounting/localizations/switzerland.rst:128 +msgid "" +"Don't forget to update your fiscal positions. If you have a version 11.1 (or" +" higher), there is nothing to do. Otherwise, you will also have to update " +"your fiscal positions accordingly." +msgstr "" + #: ../../accounting/others.rst:3 #: ../../accounting/receivables/customer_invoices/overview.rst:108 msgid "Others" @@ -4331,22 +4600,11 @@ msgstr "" "de contabilidad --> Configuración --> Ajustes` y habilite la función " "**administracion de presupuesto**" -#: ../../accounting/others/adviser/budget.rst:34 -msgid "" -"If we want to be precise and point specific invoices and vendors bills to " -"our budget, you should enable the Analytic accounting as well. If we don't " -"we will only be able to budget the total amount of general accounts." -msgstr "" -"SI queremos ser precisos y señalar facturas especificas y facturas de " -"proveedor a nuestro presupuesto, debe habilitar la Contabilidad analítica " -"también. Si no solo podremos presupuestar el momento total de las cuentas " -"generales." - -#: ../../accounting/others/adviser/budget.rst:40 +#: ../../accounting/others/adviser/budget.rst:35 msgid "Budgetary Positions" msgstr "Posiciones Presupuestarias" -#: ../../accounting/others/adviser/budget.rst:42 +#: ../../accounting/others/adviser/budget.rst:37 msgid "" "Budgetary positions are the general accounts for which you want to keep " "budgets (typically expense or income accounts). They need to be defined so " @@ -4359,7 +4617,7 @@ msgstr "" "sacar la información de presupuesto. Algunas debieron ser ya instaladas con " "su plan de cuentas." -#: ../../accounting/others/adviser/budget.rst:48 +#: ../../accounting/others/adviser/budget.rst:43 msgid "" "To define the positions enter the :menuselection:`Accounting module --> " "Configuration --> Budgetary Positions`." @@ -4367,7 +4625,7 @@ msgstr "" "Para definir las posiciones entre al :menuselection:`módulo de Contabilidad " "--> Configuración --> Posiciones Presupuestales`." -#: ../../accounting/others/adviser/budget.rst:51 +#: ../../accounting/others/adviser/budget.rst:46 msgid "" "For our example we need to define what accounts relates to our project's " "expenses. Create a position and add items to select the accounts." @@ -4376,7 +4634,7 @@ msgstr "" "gastos de nuestro proyecto. Crear una posición y agregar ítems para " "seleccionar las cuentas." -#: ../../accounting/others/adviser/budget.rst:57 +#: ../../accounting/others/adviser/budget.rst:52 msgid "" "In this case we select the three relevant accounts used wherein we will book" " our expenses." @@ -4384,15 +4642,15 @@ msgstr "" "En este caso seleccionamos las tres cuentas relevantes usadas en donde " "registraremos nuestros gastos." -#: ../../accounting/others/adviser/budget.rst:63 +#: ../../accounting/others/adviser/budget.rst:58 msgid "Click on *Select*." msgstr "Haga clicn en *Seleccionar*." -#: ../../accounting/others/adviser/budget.rst:68 +#: ../../accounting/others/adviser/budget.rst:63 msgid "Save the changes to confirm your Budgetary position." msgstr "Guarde los cambios para confirmar su posición presupuestal." -#: ../../accounting/others/adviser/budget.rst:70 +#: ../../accounting/others/adviser/budget.rst:65 msgid "" "Repeat this steps to create a revenue budgetary position. Only in this case " "select the relevant income accounts." @@ -4400,34 +4658,25 @@ msgstr "" "Repita estos pasos para crear una posición de renta presupuestal. Solo en " "este caso seleccione las cuentas de ingreso relevantes." -#: ../../accounting/others/adviser/budget.rst:74 +#: ../../accounting/others/adviser/budget.rst:69 msgid "Analytical account" msgstr "Contabilidad Analítica" -#: ../../accounting/others/adviser/budget.rst:76 +#: ../../accounting/others/adviser/budget.rst:71 msgid "" -"If you wish to point specific invoices or vendor bills to your budget you " -"need to use analytical accounting. Odoo needs to know which costs or " -"expenses are relevant to a specified budget. To do so we need to link our " -"invoices and expenses to a defined analytical account. Create an analytical " -"account by entering the Accounting module and clicking " -":menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a " -"new Account called Smith&Co project and select the related partner." +"Odoo needs to know which costs or expenses are relevant to a specified " +"budget. To do so we need to link our invoices and expenses to a defined " +"analytical account. Create an analytical account by entering the Accounting " +"module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open " +"Charts`. Create a new Account called Smith&Co project and select the related" +" partner." msgstr "" -"Si desea señalar facturas especificas o facturas de proveedor a su " -"presupuesto, necesita usar contabilidad analítica. Odoo necesita saber " -"cuáles costos o gastos son relevantes en un presupuesto especifico. Para " -"hacerlo debemos vincular nuestras facturas y gastos a una cuenta analítica " -"definida. Crear una cuenta analítica ingresando al módulo Contabilidad y " -"dando clic :menuselection:`Asesores --> Cuentas Analíticas --> Abrir " -"Planes`. Cree una nueva Cuenta llamada proyecto Smith&Co y seleccione el " -"asociado relacionado." -#: ../../accounting/others/adviser/budget.rst:88 +#: ../../accounting/others/adviser/budget.rst:82 msgid "Set a budget" msgstr "Configurar un presupuesto" -#: ../../accounting/others/adviser/budget.rst:90 +#: ../../accounting/others/adviser/budget.rst:84 msgid "" "Let's now set our targets for our budget. We specified that we expect to " "gain 1000 with this project and we would like not to spend more than 700." @@ -4436,7 +4685,7 @@ msgstr "" " que esperamos ganar 1000 con este proyecto y que nos gustaría no gastar mas" " de 700." -#: ../../accounting/others/adviser/budget.rst:94 +#: ../../accounting/others/adviser/budget.rst:88 msgid "" "To set those targets, enter the accounting app, select " ":menuselection:`Advisers --> Budgets` and create a new Budget." @@ -4445,7 +4694,7 @@ msgstr "" "seleccione :menuselection:`Consejeros --> Presupuestos` y cree un nuevo " "Presupuesto." -#: ../../accounting/others/adviser/budget.rst:97 +#: ../../accounting/others/adviser/budget.rst:91 msgid "" "We have to give a name to the budget. In this case we'll call it \"Smith " "Project\". Select the period wherein the budget will be applicable. Next add" @@ -4456,7 +4705,7 @@ msgstr "" "Seguidamente agregue un ítem para especificar sus objetivos en la Línea de " "Presupuesto." -#: ../../accounting/others/adviser/budget.rst:104 +#: ../../accounting/others/adviser/budget.rst:98 msgid "" "Select the Budgetary Position related to the Budget Line. In other words, " "select the position that points to the accounts you want to budget. In this " @@ -4473,7 +4722,7 @@ msgstr "" "**monto negativo**. Finalmente, seleccione la cuenta analítica " "correspondiente. " -#: ../../accounting/others/adviser/budget.rst:114 +#: ../../accounting/others/adviser/budget.rst:108 msgid "" "Click on **Save & new** to input the revenue budget. The Budgetary Position " "is Revenue and the Planned Amount is 1000. Save and close" @@ -4482,15 +4731,15 @@ msgstr "" "posición Presupuestal es Ingreso y el Monto Planeado es 1000. Guarde y " "cierre" -#: ../../accounting/others/adviser/budget.rst:117 +#: ../../accounting/others/adviser/budget.rst:111 msgid "You'll need to **Confirm** and **Approve** the budget." msgstr "Necesitará **Confirmar** y **Aprobar** el presupuesto." -#: ../../accounting/others/adviser/budget.rst:120 +#: ../../accounting/others/adviser/budget.rst:114 msgid "Check your budget" msgstr "Revisar su presupuesto" -#: ../../accounting/others/adviser/budget.rst:122 +#: ../../accounting/others/adviser/budget.rst:116 msgid "" "You can check your budget at any time. To see the evolution, let's book some" " Invoices and Vendors Bills." @@ -4498,7 +4747,7 @@ msgstr "" "Puede revisar su presupuesto en cualquier momento. Para ver la evolución, " "registremos algunas Facturas y Facturas de Proveedor." -#: ../../accounting/others/adviser/budget.rst:127 +#: ../../accounting/others/adviser/budget.rst:121 msgid "" "if you use analytical accounts remember that you need to specify the account" " in the invoice and / or purchase line." @@ -4506,25 +4755,25 @@ msgstr "" "si usa cuentas analíticas recuerd que necesita especificar la cuenta en la " "factura y/o línea de compra." -#: ../../accounting/others/adviser/budget.rst:131 +#: ../../accounting/others/adviser/budget.rst:125 msgid "for more information about booking invoices and purchase orders see:" msgstr "" "para más información acerca de reservación de facturas y órdenes de compra " "vea:" -#: ../../accounting/others/adviser/budget.rst:133 +#: ../../accounting/others/adviser/budget.rst:127 msgid ":doc:`../../receivables/customer_invoices/overview`" msgstr ":doc:`../../cuentas por cobrar/cliente_facturas/resumen`" -#: ../../accounting/others/adviser/budget.rst:134 +#: ../../accounting/others/adviser/budget.rst:128 msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`" msgstr ":doc:`../../../compra/resumen/proceso/desde_oc_a_factura`" -#: ../../accounting/others/adviser/budget.rst:136 +#: ../../accounting/others/adviser/budget.rst:130 msgid "Go back in the budget list and find the Smith Project." msgstr "Regrese en la lista de presupuesto y encuentre el Proyecto Smith." -#: ../../accounting/others/adviser/budget.rst:138 +#: ../../accounting/others/adviser/budget.rst:132 msgid "" "Via the analytical account, Odoo can account the invoice lines and purchase " "lines booked in the accounts and will display them in the **Practical " @@ -4534,7 +4783,7 @@ msgstr "" "factura y las líneas de compra reservadas en las cuentas y las mostrará en " "la columna **Monto Práctico**." -#: ../../accounting/others/adviser/budget.rst:147 +#: ../../accounting/others/adviser/budget.rst:141 msgid "" "The theoretical amount represents the amount of money you theoretically " "could have spend / should have received in function of the date. When your " @@ -7406,10 +7655,6 @@ msgstr "" "anteriores desde la fecha del reporte si no quiere usar la opción por " "defecto **Período 1 Anterior**." -#: ../../accounting/others/reporting/main_reports.rst:30 -msgid "Balance Sheet" -msgstr "Balance de Situación" - #: ../../accounting/others/reporting/main_reports.rst:32 msgid "" "The **Balance Sheet** shows a snapshot of the assets, liabilities and equity" @@ -12859,6 +13104,78 @@ msgstr "" msgid ":doc:`overview`" msgstr ":doc:`resumen`" +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2 +msgid "Set up cash roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:4 +msgid "" +"In some currencies, the smallest coins do not exist. For example, in " +"Switzerland, there is no coin for 0.01 CHF. For this reason, if invoices are" +" paid in cash, you have to round their total amount to the smallest coin " +"that exist in the currency. For the CHF, the smallest coin is 0.05 CHF." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:10 +msgid "There are two strategies for the rounding:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:12 +msgid "Add a line on the invoice for the rounding" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:14 +msgid "Add the rounding in the tax amount" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:16 +msgid "Both strategies are applicable in Odoo." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:21 +msgid "" +"First, you have to activate the feature. For this, go in " +":menuselection:`Accounting --> Configuration --> Settings` and activate the " +"Cash Rounding." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:28 +msgid "" +"There is a new menu to manage cash roundings in :menuselection:`Accounting " +"--> Configuration --> Management --> Cash roundings`." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:31 +msgid "" +"Now, you can create cash roundings. You can choose between two rounding " +"strategies:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:34 +msgid "" +"**Add a rounding line**: if a rounding is necessary, Odoo will add a line on" +" your customer invoice to take this rounding into account. You also have to " +"define the account in which the rounding will go." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:39 +msgid "" +"**Modify tax amount:** Odoo will add the rounding to the amount of the " +"highest tax." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:46 +msgid "Apply roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:48 +msgid "" +"Once your roundings are created, you can apply them on customer invoices. On" +" the customer invoices, there is a new field called **Cash Rounding Method**" +" where you can simply choose one of the rounding methods created previously." +" If needed, a rounding will be applied to the invoice." +msgstr "" + #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:3 msgid "Deferred revenues: how to automate them?" msgstr "Ingresos diferidos: ¿cómo automatizarlos?" @@ -13231,109 +13548,6 @@ msgstr "" msgid ":doc:`payment_terms`" msgstr ":doc:`términos_de_pago`" -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:3 -msgid "How to modify a validated invoice?" -msgstr "¿Cómo modificar una factura validada?" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:5 -msgid "" -"In most accounting legislation over the word, it's not allowed to modify an " -"invoice that is validated and sent to the customer. However, you sometimes " -"need to change an invoice for different reasons: the sale has changed, the " -"made a mistake while recording the invoice, etc." -msgstr "" -"En la mayoría de legislaciones contables alrededor del mundo, no es " -"permitido modificar una factura que es validada y enviada al cliente. Sin " -"embargo, a veces Ud. necesita cambiar una factura por diferentes razones: la" -" venta ha cambiado, se tuvo un error mientras se grabó la factura, etc." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:10 -msgid "Thus, the right way to modify an invoice is to:" -msgstr "Así, la mejor forma de modificar una factura es:" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:12 -msgid "Refund the original invoice" -msgstr "Reembolsar la factura original" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:13 -msgid "Create a new invoice" -msgstr "Crear una nueva factura" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:15 -msgid "" -"Odoo's refund mechanism helps you handle the whole process in just a few " -"clicks." -msgstr "" -"El mecanismo de reembolso de Odoo le ayuda a manejar todo el proceso en solo" -" unos pocos clics." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:19 -msgid "Modify an invoice" -msgstr "Modificar una factura" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:21 -msgid "" -"If your invoice is still in draft, you can modify it the way you want. " -"However, if your invoice is validated, you can not change it anymore. If you" -" need to modify it, the right operations to do are:" -msgstr "" -"Si su factura todavía esta en borrador, puede modificarla de la forma que " -"quiera. Sin embargo, si su factura esta validada, ya no puede cambiarla. Si " -"necesita modificarla, las operaciones correctas a realizar son:" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:25 -msgid "Refund the original invoice;" -msgstr "Reembolsar la factura original;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:26 -msgid "Reconcile the original invoice with the refund to void them;" -msgstr "Conciliar la factura original con el reembolso para evitarlos;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:27 -msgid "Create a new draft invoice, a copy of the original;" -msgstr "Crear una nueva factura borrador, una copia de la original;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:28 -msgid "Validate the new invoice." -msgstr "Validar la nueva factura." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:30 -msgid "" -"All those steps are automated by Odoo. All you have to do is to click on the" -" Refund button on an invoice." -msgstr "" -"Todos estos pasos están automatizados por Odoo. Todo lo que tiene que hacer " -"es dar clic en el botón Reembolsar en una factura." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:36 -msgid "" -"In the refund dialog, select the option \"Modify: create a refund, reconcile" -" and create a draft invoice\". Once you click on the \"Create Refund\" " -"button, Odoo will void your existing invoice and create a new draft invoice " -"that is a duplicate of the original one." -msgstr "" -"En el diálogo de devolución, seleccione la opción \"Modificar: crear un " -"reembolso, conciliar y crear una factura borrador\". Una vez de clic en el " -"botón \"Crear Reembolso\", Odoo evitará su factura existente y creará una " -"nueva factura borrador que es un duplicado de la original." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:41 -msgid "Edit this new draft invoice and validate it when it's correct." -msgstr "Edite esta nueva factura borrador y valídelo cuando este correcto." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:45 -msgid "" -"if you already sent the original invoice to your customer, you should send " -"the new invoice and the refund to the customer so that he gets all the " -"documents." -msgstr "" -"si ya envió la factura original a su cliente, debe enviar la nueva factura y" -" el reembolso al cliente así el obtiene todos los documentos." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:50 -msgid ":doc:`refund`" -msgstr ":doc:`refund`" - #: ../../accounting/receivables/customer_invoices/overview.rst:3 msgid "Overview of the invoicing process" msgstr "Descripción general del proceso de facturación" diff --git a/locale/es/LC_MESSAGES/discuss.po b/locale/es/LC_MESSAGES/discuss.po index e9e4a1cea..a8fe20e3f 100644 --- a/locale/es/LC_MESSAGES/discuss.po +++ b/locale/es/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: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Antonio Trueba , 2017\n" +"Last-Translator: Pablo Rojas , 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" @@ -23,244 +23,253 @@ msgid "Discuss" msgstr "Debates" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive email in Odoo" +msgid "How to use my mail server to send and receive emails in Odoo" msgstr "" -#: ../../discuss/email_servers.rst:6 -msgid "When is it needed" -msgstr "Cuando sea necesario" - -#: ../../discuss/email_servers.rst:7 +#: ../../discuss/email_servers.rst:5 msgid "" -"Using your own email servers is required to send and receive messages in " -"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " -"solution that works straight away. However you can still use your own email " -"servers with the online edition. Some insights are provided here below." +"This document is mainly dedicated to Odoo on-premise users who don't benefit" +" from an out-of-the-box solution to send and receive emails in Odoo, unlike " +"in `Odoo Online `__ & `Odoo.sh " +"`__." msgstr "" -#: ../../discuss/email_servers.rst:14 -msgid "How to set it up" +#: ../../discuss/email_servers.rst:9 +msgid "" +"If no one in your company is used to manage email servers, we strongly " +"recommend that you opt for such convenient Odoo hosting solutions. Indeed " +"their email system works instantly and is monitored by professionals. " +"Nevertheless you can still use your own email servers if you want to manage " +"your email server's reputation yourself." msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"As a system admin, go to :menuselection:`Settings --> General Settings` and " -"check *External Email Servers* (watch out: this checkbox only shows up after" -" Odoo 10). Then, go through the following steps." +"You will find here below some useful information to do so by integrating " +"your own email solution with Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:19 +msgid "How to manage outbound messages" msgstr "" #: ../../discuss/email_servers.rst:21 msgid "" -"Office 365 email servers don't allow to send external emails from hosts like" -" Odoo. Consequently you can only use such email servers for incoming " -"messages." +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers*. Then, click *Outgoing Mail Servers* to " +"create one and reference the SMTP data of your email server. Once all the " +"information has been filled out, click on *Test Connection*." msgstr "" #: ../../discuss/email_servers.rst:26 -msgid "Set an outgoing email server for outbound messages" +msgid "Here is a typical configuration for a G Suite server." msgstr "" -#: ../../discuss/email_servers.rst:27 -msgid "" -"You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " -"etc.) as well as your admin credentials. Once all the information has been " -"filled out, click on *Test Connection*." +#: ../../discuss/email_servers.rst:31 +msgid "Then set your email domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:34 +msgid "Can I use an Office 365 server" msgstr "" #: ../../discuss/email_servers.rst:35 -msgid "Set an incoming email server for inbound messages" +msgid "" +"You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP" +" relays are not compatible with Odoo Online." msgstr "" -#: ../../discuss/email_servers.rst:36 +#: ../../discuss/email_servers.rst:38 msgid "" -"Fill out the form according to your email provider’s settings. Leave the " -"*Actions to Perform on Incoming Mails* blank. Once all the information has " -"been filled out, click on *TEST & CONFIRM*." +"Please refer to `Microsoft's documentation `__ to configure" +" a SMTP relay for your Odoo's IP address." +msgstr "" + +#: ../../discuss/email_servers.rst:42 +msgid "How to use a G Suite server" msgstr "" #: ../../discuss/email_servers.rst:43 msgid "" -"By default inbound messages are fetched every 5 minutes. You can change this" -" value in developer mode. Go to :menuselection:`Settings --> Technical --> " -"Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." +"You can use an G Suite server for any Odoo hosting type. To do so you need " +"to enable a SMTP relay and to allow *Any addresses* in the *Allowed senders*" +" section. The configuration steps are explained in `Google documentation " +"`__." msgstr "" #: ../../discuss/email_servers.rst:49 -msgid "Set the domain name" +msgid "Be SPF-compliant" msgstr "" #: ../../discuss/email_servers.rst:50 msgid "" -"Enter the domain name of your email servers (e.g. mycompany.com) in General " -"Settings." +"In case you use SPF (Sender Policy Framework) to increase the deliverability" +" of your outgoing emails, don't forget to authorize Odoo as a sending host " +"in your domain name settings. Here is the configuration for Odoo Online:" msgstr "" -#: ../../discuss/email_servers.rst:57 -msgid "Create a catchall address" -msgstr "" - -#: ../../discuss/email_servers.rst:58 +#: ../../discuss/email_servers.rst:54 msgid "" -"When a contact replies to an email sent from Odoo, the *reply-to* address is" -" a generic address used to route the reply to the right discussion thread in" -" Odoo (opportunity, order, task, etc.) and to the inbox of all its " -"followers. By default this address is \"catchall@\" but it can be changed." +"If no TXT record is set for SPF, create one with following definition: " +"v=spf1 include:_spf.odoo.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:63 +#: ../../discuss/email_servers.rst:56 msgid "" -"Create a catchall address in your email server settings. We advise you to " -"use \"catchall@\" so that everything works out straight away. If you want to" -" use another alias, you have extra steps in Odoo:" +"In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g." +" for a domain name that sends emails via Odoo Online and via G Suite it " +"could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:67 -msgid "Activate the developer mode from your Settings Dashboard." -msgstr "" - -#: ../../discuss/email_servers.rst:72 -msgid "" -"Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " -"Parameters --> System Parameters` and enter your custom catchall alias in " -"*mail.catchall.alias*." -msgstr "" - -#: ../../discuss/email_servers.rst:79 -msgid "You can edit the email alias used for bounced messages the same way." -msgstr "" - -#: ../../discuss/email_servers.rst:82 -msgid "How to use my own email servers with Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:83 -msgid "" -"Odoo Online comes up with an embedded and ready-to-use email solution with " -"*@yourcompany.odoo.com* as domain. We recommend to keep this default setup " -"as it is really convenient." -msgstr "" - -#: ../../discuss/email_servers.rst:87 -msgid "" -"Nevertheless you can still use your own email servers if you want to manage " -"your email server's reputation (blacklisting, etc). The configuration for " -"both incoming and outgoing mail servers is given here above." -msgstr "" - -#: ../../discuss/email_servers.rst:92 -msgid "" -"However when it comes to incoming messages, we don't recommend to " -"exclusively use your own email server. Indeed, Odoo Online is fetching " -"incoming messages from the email server once every hour only. To receive " -"emails in real time, you should rather use a **catchall redirection** (your " -"server -> Odoo server). To do so:" -msgstr "" - -#: ../../discuss/email_servers.rst:98 -msgid "" -"Create a catchall address in your email server settings (e.g. catchall)." -msgstr "" - -#: ../../discuss/email_servers.rst:99 -msgid "" -"Still from such settings, set a redirection from this catchall address to " -"Odoo's one: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com." -msgstr "" - -#: ../../discuss/email_servers.rst:102 -msgid "" -"In Odoo check *External Email Servers* in :menuselection:`Settings --> " -"General Settings` and enter your email domain name (i.e. yourdomain.ext)." -msgstr "" - -#: ../../discuss/email_servers.rst:104 -msgid "No need to set up an incoming email server in such a case." -msgstr "" - -#: ../../discuss/email_servers.rst:108 -msgid "How to be SPF-compliant when using external email servers in Odoo" -msgstr "" - -#: ../../discuss/email_servers.rst:109 -msgid "" -"Sender Policy Framework (SPF) is an email-validation system that checks that" -" incoming mail from a domain comes from a host authorized by that domain's " -"administrator. Such a security system is used in most email servers. If you " -"don't comply with it, your emails sent from Odoo will be likely flagged as " -"spam." -msgstr "" - -#: ../../discuss/email_servers.rst:115 -msgid "" -"To be SPF-compliant, you need to authorize Odoo as a sending host in your " -"domain name settings:" -msgstr "" - -#: ../../discuss/email_servers.rst:118 -msgid "Sign in to your domain’s account at your domain host." -msgstr "" - -#: ../../discuss/email_servers.rst:119 -msgid "Locate the page for updating your domain’s DNS records." -msgstr "" - -#: ../../discuss/email_servers.rst:120 -msgid "" -"If no TXT record is set, create one with following definition: v=spf1 " -"include:_spf.odoo.com ~all" -msgstr "" - -#: ../../discuss/email_servers.rst:122 -msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." -msgstr "" - -#: ../../discuss/email_servers.rst:124 -msgid "e.g. for a Gmail server it should be:" -msgstr "" - -#: ../../discuss/email_servers.rst:126 -msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" -msgstr "" - -#: ../../discuss/email_servers.rst:128 +#: ../../discuss/email_servers.rst:60 msgid "" "Find `here `__ the exact procedure to " "create or modify TXT records in your own domain registrar." msgstr "" -#: ../../discuss/email_servers.rst:131 +#: ../../discuss/email_servers.rst:63 msgid "" "Your new SPF record can take up to 48 hours to go into effect, but this " "usually happens more quickly." msgstr "" -#: ../../discuss/email_servers.rst:134 +#: ../../discuss/email_servers.rst:66 msgid "" "Adding more than one SPF record for a domain can cause problems with mail " "delivery and spam classification. Instead, we recommend using only one SPF " "record by modifying it to authorize Odoo." msgstr "" -#: ../../discuss/email_servers.rst:139 -msgid "How to choose between Odoo and my traditional email box" +#: ../../discuss/email_servers.rst:71 +msgid "Allow DKIM" +msgstr "" + +#: ../../discuss/email_servers.rst:72 +msgid "" +"You should do the same thing if DKIM (Domain Keys Identified Mail) is " +"enabled on your email server. In the case of Odoo Online & Odoo.sh, you " +"should add a DNS \"odoo._domainkey\" CNAME record to " +"\"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have " +"a record \"odoo._domainkey.foo.com\" that is a CNAME with the value " +"\"odoo._domainkey.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:80 +msgid "How to manage inbound messages" +msgstr "" + +#: ../../discuss/email_servers.rst:82 +msgid "Odoo relies on generic email aliases to fetch incoming messages." +msgstr "" + +#: ../../discuss/email_servers.rst:84 +msgid "" +"**Reply messages** of messages sent from Odoo are routed to their original " +"discussion thread (and to the inbox of all its followers) by the catchall " +"alias (**catchall@**)." +msgstr "" + +#: ../../discuss/email_servers.rst:88 +msgid "" +"**Bounced messages** are routed to **bounce@** in order to track them in " +"Odoo. This is especially used in `Odoo Email Marketing " +"`__ to opt-out invalid " +"recipients." +msgstr "" + +#: ../../discuss/email_servers.rst:92 +msgid "" +"**Original messages**: Several business objects have their own alias to " +"create new records in Odoo from incoming emails:" +msgstr "" + +#: ../../discuss/email_servers.rst:95 +msgid "" +"Sales Channel (to create Leads or Opportunities in `Odoo CRM " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:97 +msgid "" +"Support Channel (to create Tickets in `Odoo Helpdesk " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:99 +msgid "" +"Projects (to create new Tasks in `Odoo Project `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:101 +msgid "" +"Job Positions (to create Applicants in `Odoo Recruitment " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:103 +msgid "etc." +msgstr "etc." + +#: ../../discuss/email_servers.rst:105 +msgid "" +"Depending on your mail server, there might be several methods to fetch " +"emails. The easiest and most recommended method is to manage one email " +"address per Odoo alias in your mail server." +msgstr "" + +#: ../../discuss/email_servers.rst:109 +msgid "" +"Create the corresponding email addresses in your mail server (catcall@, " +"bounce@, sales@, etc.)." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "Set your domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:116 +msgid "" +"If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for " +"each alias. You can do it from the General Settings as well. Fill out the " +"form according to your email provider’s settings. Leave the *Actions to " +"Perform on Incoming Mails* blank. Once all the information has been filled " +"out, click on *TEST & CONFIRM*." +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "" +"If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming " +"messages to Odoo's domain name rather than exclusively use your own email " +"server. That way you will receive incoming messages without delay. Indeed, " +"Odoo Online is fetching incoming messages of external servers once per hour " +"only. You should set redirections for all the email addresses to Odoo's " +"domain name in your email server (e.g. *catchall@mydomain.ext* to " +"*catchall@mycompany.odoo.com*)." +msgstr "" + +#: ../../discuss/email_servers.rst:132 +msgid "" +"All the aliases are customizable in Odoo. Object aliases can be edited from " +"their respective configuration view. To edit catchall and bounce aliases, " +"you first need to activate the developer mode from the Settings Dashboard." msgstr "" #: ../../discuss/email_servers.rst:140 msgid "" -"Odoo Discuss is a perfect tool to send and read messages related to business" -" documents. However it doesn't aim to replace a full-featured email solution" -" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " -"both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not can be managed into your " -"external email box." +"Then refresh your screen and go to :menuselection:`Settings --> Technical " +"--> Parameters --> System Parameters` to customize the aliases " +"(*mail.catchall.alias* & * mail.bounce.alias*)." msgstr "" #: ../../discuss/email_servers.rst:147 msgid "" -"To do so, create specific email aliases to use in Odoo (to generate leads or" -" opportunities, helpdesk tickets, etc.). If you take an email alias already " -"used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity." +"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*." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/es/LC_MESSAGES/inventory.po b/locale/es/LC_MESSAGES/inventory.po index fca90b258..a77be85bc 100644 --- a/locale/es/LC_MESSAGES/inventory.po +++ b/locale/es/LC_MESSAGES/inventory.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-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Raquel Iciarte , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -887,8 +887,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:18 #: ../../inventory/routes/strategies/putaway.rst:23 #: ../../inventory/routes/strategies/removal.rst:18 -#: ../../inventory/settings/products/packages.rst:17 -#: ../../inventory/settings/products/packages.rst:66 #: ../../inventory/settings/products/strategies.rst:30 #: ../../inventory/settings/products/uom.rst:17 #: ../../inventory/settings/products/variants.rst:114 @@ -1089,7 +1087,6 @@ msgstr "¿Cómo cancelo una órden de entrega?" #: ../../inventory/routes/costing/landed_costs.rst:6 #: ../../inventory/routes/strategies/putaway.rst:6 #: ../../inventory/routes/strategies/removal.rst:6 -#: ../../inventory/settings/products/packages.rst:6 #: ../../inventory/settings/products/uom.rst:6 #: ../../inventory/shipping/operation/cancel.rst:6 #: ../../inventory/shipping/operation/invoicing.rst:6 @@ -3499,6 +3496,65 @@ msgstr "" msgid "Miscellaneous Operations" msgstr "Operaciones varias" +#: ../../inventory/management/misc/immediate_planned_transfers.rst:2 +msgid "Immediate & Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:4 +msgid "" +"In Odoo, you can create two types of transfers: immediate or planned " +"transfers." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:8 +msgid "Immediate Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:10 +msgid "" +"When you create a transfer manually, it is by default an immediate transfer." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:13 +msgid "" +"In the case of an immediate transfer, you directly encode the products and " +"quantities you are processing, there is no reservation that applies. This is" +" why the column \"Initial Demand\" is not editable. You only fill in the " +"column \"Done\" for the quantities." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:18 +msgid "" +"This is for example used when you are transferring goods from a location A " +"to a location B and that this is not planned (you are processing the " +"transfer right now)." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:23 +msgid "Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:25 +msgid "" +"When a transfer is generated automatically (from a sales order or purchase " +"order for example), it is a planned transfer. This means that there is an " +"initial demand and that reservation applies on this initial demand." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:30 +msgid "" +"If you want to create a planned transfer manually, you can do it from the " +"inventory dashboard." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:36 +msgid "" +"In that case, you will have to enter the initial demand first (how many " +"units are you supposed to proceed), then to mark your transfer as to do. " +"Once this is done, you will be able to reserve the products and to process " +"the transfer." +msgstr "" + #: ../../inventory/management/misc/owned_stock.rst:3 msgid "How to manage stock that you don't own?" msgstr "¿Cómo administrar existencias que no le pertenecen?" @@ -7490,183 +7546,6 @@ msgstr "Ajustes" msgid "Products" msgstr "Productos" -#: ../../inventory/settings/products/packages.rst:3 -msgid "How to use packages?" -msgstr "¿Cómo usar paquetes?" - -#: ../../inventory/settings/products/packages.rst:8 -#: ../../inventory/settings/products/usage.rst:31 -msgid "" -"The package is the physical container in which you put one or several " -"product." -msgstr "" -"El paquete es el contenedor físico en el cual Ud. coloca uno o varios " -"productos." - -#: ../../inventory/settings/products/packages.rst:11 -msgid "By default, Odoo does not take into account the use of it." -msgstr "Por defecto, Odoo no toma en cuenta el uso del mismo." - -#: ../../inventory/settings/products/packages.rst:13 -msgid "" -"Once you activate the option, you will be able to manage one or several " -"packages when doing your transfers." -msgstr "" -"Una vez Ud. active la opción, podrá administrar uno o más paquetes cuando " -"haga sus transferencias." - -#: ../../inventory/settings/products/packages.rst:19 -msgid "" -"To configure the use of packages, go to the menu :menuselection:`Inventory " -"--> Configuration --> Settings`. µ Locate the **Packages** section and tick " -"**Record packages used on packing: pallets, boxes,...**" -msgstr "" -"Para configurar el uso de paquetes, vaya al menú :menuselection:`Inventario " -"--> Configuración --> Ajustes`. Localice la sección **Paquetes** y marque " -"**Registrar paquetes usados en empaque: pallets, cajas,...**" - -#: ../../inventory/settings/products/packages.rst:27 -#: ../../inventory/shipping/operation/multipack.rst:23 -msgid "Click on **Apply** when you are done." -msgstr "De clic en **Aplicar** cuando finalice." - -#: ../../inventory/settings/products/packages.rst:30 -msgid "Pack products" -msgstr "Empacar productos" - -#: ../../inventory/settings/products/packages.rst:32 -msgid "" -"Putting products in packs is usually done when processing warehouses " -"transfers (receipt, internals or deliveries)." -msgstr "" -"Poner productos en paquetes es finalizado usualmente cuando se procesan " -"transferencias entre bodegas (recibo, internos o entregas)." - -#: ../../inventory/settings/products/packages.rst:35 -msgid "" -"To be able to put products in pack, the status of your transfer has to be " -"**Available**." -msgstr "" -"Para poder poner productos en paquetes, el estado de su transferencia tiene " -"que ser **Disponible**." - -#: ../../inventory/settings/products/packages.rst:41 -msgid "" -"In the operation tab, you can put your products into one or multiple " -"packages." -msgstr "" -"En la pestaña de operaciones, puede poner sus productos dentro de uno o " -"multiples paquetes." - -#: ../../inventory/settings/products/packages.rst:44 -#: ../../inventory/shipping/operation/multipack.rst:50 -msgid "" -"Choose the quantity you want to put in the first pack in the **Done** " -"column, then click on the link **Put in Pack**." -msgstr "" -"Elija la cantidad que desea poner en el primer paquete en la columna " -"**Realizado**, luego de clic en el vinculo **Ponerlo en Paquete**." - -#: ../../inventory/settings/products/packages.rst:50 -#: ../../inventory/shipping/operation/multipack.rst:56 -msgid "It will automatically create a pack with the requested quantity." -msgstr "Automáticamente creará un paquete con la cantidad requerida." - -#: ../../inventory/settings/products/packages.rst:52 -#: ../../inventory/shipping/operation/multipack.rst:58 -msgid "Do the same steps for the other pieces you want to pack in." -msgstr "Realice los mismos pasos para las otras piezas que desea empacar." - -#: ../../inventory/settings/products/packages.rst:57 -#: ../../inventory/shipping/operation/multipack.rst:63 -msgid "Click on **Validate** when you are done." -msgstr "De clic en **Validar** una vez que este listo." - -#: ../../inventory/settings/products/packages.rst:60 -msgid "Whole packages transfers" -msgstr "Transferencias de paquetes completos" - -#: ../../inventory/settings/products/packages.rst:62 -msgid "" -"If you are using several locations and/or warehouses, it is possible to " -"transfer packages with its contents." -msgstr "" -"Si esta utilizando varias ubicaciones y/o bodegas, es posible transferir " -"paquetes con sus contenidos." - -#: ../../inventory/settings/products/packages.rst:68 -msgid "" -"You need to configure the **Operation Type** to allow moving packages. Go to" -" :menuselection:`Configuration --> Operations Types`. Tick **Allow moving " -"packs**:" -msgstr "" -"Debe configurar el **Tipo de Operación** para permitir el movimiento de " -"paquetes. Vaya a :menuselection:`Configuración --> Tipos de Operaciones`. " -"Marque **Permitir movimiento de paquetes**: " - -#: ../../inventory/settings/products/packages.rst:75 -msgid "Transfer packages" -msgstr "Transferir paquetes" - -#: ../../inventory/settings/products/packages.rst:77 -msgid "" -"Create a transfer order. Choose the source and the destination locations, " -"then click on **Mark as todo**. Do not put anything under the **Initial " -"Demand** tab." -msgstr "" -"Cree una órden de transferencia. Elija las ubicaciones de origen y destino, " -"luego de clic en **Marcar como realizado**. No ubique nada bajo la pestaña " -"**Demanda Inicial**." - -#: ../../inventory/settings/products/packages.rst:84 -msgid "" -"In the Operation tab, click on **Add an item** under the **Package To Move**" -" section." -msgstr "" -"En la pestaña de Operaciones, de clic en **Agregar un ítem** bajo la sección" -" **Paquete a Mover**." - -#: ../../inventory/settings/products/packages.rst:87 -msgid "Tick the **Done** checkbox to confirm the move of the package :" -msgstr "" -"Marque la casilla de verificación **Realizado** para confirmar el movimiento" -" del paquete :" - -#: ../../inventory/settings/products/packages.rst:92 -msgid "When it is finished, click on **Validate**." -msgstr "Cuando esté finalizado, de clic en **Validar**." - -#: ../../inventory/settings/products/packages.rst:95 -msgid "Packages traceability" -msgstr "Trazabilidad de paquetes" - -#: ../../inventory/settings/products/packages.rst:97 -msgid "" -"To trace a package or check its content, go to :menuselection:`Inventory " -"Control --> Packages`." -msgstr "" -"Para rastrear un paquete o revisar su contenido, vaya a " -":menuselection:`Control de Inventario --> Paquetes`." - -#: ../../inventory/settings/products/packages.rst:103 -msgid "Click on **Package Transfers** to see all its moves." -msgstr "" -"De clic en **Transferencias de Paquetes** para ver todos sus movimientos." - -#: ../../inventory/settings/products/packages.rst:106 -#: ../../inventory/settings/products/usage.rst:70 -msgid ":doc:`../../overview/start/setup`" -msgstr ":doc:`../../resumen/inicio/configurar`" - -#: ../../inventory/settings/products/packages.rst:107 -msgid ":doc:`usage`" -msgstr ":doc:`uso`" - -#: ../../inventory/settings/products/packages.rst:108 -#: ../../inventory/settings/products/usage.rst:71 -msgid ":doc:`uom`" -msgstr ":doc:`uom`" - #: ../../inventory/settings/products/strategies.rst:3 msgid "How to select the right replenishment strategy" msgstr "" @@ -7972,6 +7851,14 @@ msgstr "" msgid "Packages" msgstr "Paquetes" +#: ../../inventory/settings/products/usage.rst:31 +msgid "" +"The package is the physical container in which you put one or several " +"product." +msgstr "" +"El paquete es el contenedor físico en el cual Ud. coloca uno o varios " +"productos." + #: ../../inventory/settings/products/usage.rst:38 msgid "Packaging" msgstr "Empaquetado" @@ -8038,6 +7925,14 @@ msgstr "" "Cuando vende varias bandejas, podría envolver todas las bandejas en una " "``caja`` o en un ``plástico`` envoltorio. Esto es el **paquete**." +#: ../../inventory/settings/products/usage.rst:70 +msgid ":doc:`../../overview/start/setup`" +msgstr ":doc:`../../resumen/inicio/configurar`" + +#: ../../inventory/settings/products/usage.rst:71 +msgid ":doc:`uom`" +msgstr ":doc:`uom`" + #: ../../inventory/settings/products/usage.rst:72 msgid ":doc:`packages`" msgstr ":doc:`paquetes`" @@ -9145,6 +9040,10 @@ msgstr "" "--> Configuración --> Ajustes`. Localice la sección **Paquetes** y marque " "**Registrar paquetes usados en empaque: pallets, cajas,...**" +#: ../../inventory/shipping/operation/multipack.rst:23 +msgid "Click on **Apply** when you are done." +msgstr "De clic en **Aplicar** cuando finalice." + #: ../../inventory/shipping/operation/multipack.rst:29 #: ../../inventory/shipping/setup/delivery_method.rst:77 #: ../../inventory/shipping/setup/third_party_shipper.rst:110 @@ -9171,6 +9070,26 @@ msgstr "" msgid "From here, you can split your delivery into multiple packages." msgstr "Desde aquí, puede dividir su entrega en múltiples paquetes." +#: ../../inventory/shipping/operation/multipack.rst:50 +msgid "" +"Choose the quantity you want to put in the first pack in the **Done** " +"column, then click on the link **Put in Pack**." +msgstr "" +"Elija la cantidad que desea poner en el primer paquete en la columna " +"**Realizado**, luego de clic en el vinculo **Ponerlo en Paquete**." + +#: ../../inventory/shipping/operation/multipack.rst:56 +msgid "It will automatically create a pack with the requested quantity." +msgstr "Automáticamente creará un paquete con la cantidad requerida." + +#: ../../inventory/shipping/operation/multipack.rst:58 +msgid "Do the same steps for the other pieces you want to pack in." +msgstr "Realice los mismos pasos para las otras piezas que desea empacar." + +#: ../../inventory/shipping/operation/multipack.rst:63 +msgid "Click on **Validate** when you are done." +msgstr "De clic en **Validar** una vez que este listo." + #: ../../inventory/shipping/operation/multipack.rst:66 msgid "Multi-packages with a 3rd party-shipper" msgstr "Múlti-paquetes con un 3ra parte-transportista" diff --git a/locale/es/LC_MESSAGES/point_of_sale.po b/locale/es/LC_MESSAGES/point_of_sale.po index 4540fd5c6..85c39bff8 100644 --- a/locale/es/LC_MESSAGES/point_of_sale.po +++ b/locale/es/LC_MESSAGES/point_of_sale.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: Carles Antoli , 2017\n" +"Last-Translator: Gustavo Valverde , 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" @@ -2538,7 +2538,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Available Pricelists" -msgstr "" +msgstr "Listas de Precio Disponibles" #: ../../point_of_sale/overview/start.rst:0 msgid "" @@ -2664,7 +2664,7 @@ msgstr "Facturación" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale." -msgstr "" +msgstr "Habilita la generación de facturas desde el Punto de Venta." #: ../../point_of_sale/overview/start.rst:0 msgid "Invoice Journal" diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po index f7f01cfbc..6b85cfd00 100644 --- a/locale/fr/LC_MESSAGES/accounting.po +++ b/locale/fr/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: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: leemannd , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -93,6 +93,7 @@ msgstr "" #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30 #: ../../accounting/payables/supplier_bills/manage.rst:31 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15 +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19 @@ -829,6 +830,86 @@ msgstr "" "Une fois que vous aurez rempli vos informations d'identification, vos flux " "bancaires seront synchronisés toutes les 4 heures." +#: ../../accounting/bank/feeds/synchronize.rst:73 +#: ../../accounting/localizations/mexico.rst:501 +msgid "FAQ" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:76 +msgid "The synchronization is not working in real time, is it normal?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:78 +msgid "" +"Yodlee tries to get the data from a bank account once a day. However, this " +"doesn't always happen at the same time. And sometimes the process can fail. " +"In that case, Yodlee retries one hour or two later. This is why in Odoo " +"there is a cron that is running every 4 hours to fetch the information from " +"Yodlee." +msgstr "" + +#: ../../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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:86 +msgid "" +"Moreover, a transaction can be visible in your bank account but not being " +"fetched by Yodlee. Indeed, the transaction in your bank account can have the" +" 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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:91 +msgid "" +"What is important to remember is that Yodlee is not a service fetching " +"transactions in real time. This is a service to facilitate the import of the" +" bank statement in the database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:95 +msgid "Is the Yodlee feature included in my contract?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:97 +msgid "" +"Enterprise Version: Yes, if you have a valid enterprise contract linked to " +"your database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:98 +msgid "" +"Community Version: No, this feature is not included in the Community " +"Version." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:99 +msgid "" +"Online Version: Yes, even if you benefit from the One App Free contract." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:102 +msgid "Some banks have a status \"Beta\", what does it mean?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:104 +msgid "" +"This means that Yodlee is only currently working on developing the " +"synchronization with this bank. The synchronization could already work or it" +" may need a bit more time to have a 100% working synchronization. " +"Unfortunately, there is not much to do about except being patient." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:110 +msgid "All my past transactions are not in Odoo, why?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:112 +msgid "Yodlee only allows to fetch up transactions to 3 months in the past." +msgstr "" + #: ../../accounting/bank/misc.rst:3 ../../accounting/payables/misc.rst:3 #: ../../accounting/payables/misc/employee_expense.rst:187 msgid "Miscellaneous" @@ -2348,31 +2429,71 @@ msgstr "Localisation" msgid "France" msgstr "France" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:3 -msgid "Get the VAT anti-fraud certification with Odoo" -msgstr "Obtenir la certification anti-fraude à la TVA avec Odoo" +#: ../../accounting/localizations/france.rst:6 +msgid "FEC" +msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:5 +#: ../../accounting/localizations/france.rst:8 msgid "" -"As of January 1st 2018, a new anti-fraud legislation will come into effect " -"in France and DOM-TOM. This new legislation stipulates certain criteria " +"If you have installed the French Accounting, you will be able to download " +"the FEC. For this, go in :menuselection:`Accounting --> Reporting --> France" +" --> FEC`." +msgstr "" + +#: ../../accounting/localizations/france.rst:12 +msgid "" +"If you do not see the submenu **FEC**, go in **Apps** and search for the " +"module called **France-FEC** and verify if it is well installed." +msgstr "" + +#: ../../accounting/localizations/france.rst:16 +msgid "French Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/france.rst:18 +msgid "" +"If you have installed the French Accounting, you will have access to some " +"accounting reports specific to France:" +msgstr "" + +#: ../../accounting/localizations/france.rst:20 +msgid "Bilan comptable" +msgstr "" + +#: ../../accounting/localizations/france.rst:21 +msgid "Compte de résultats" +msgstr "" + +#: ../../accounting/localizations/france.rst:22 +msgid "Plan de Taxes France" +msgstr "" + +#: ../../accounting/localizations/france.rst:25 +msgid "Get the VAT anti-fraud certification with Odoo" +msgstr "Se conformer à la législation anti-fraude à la TVA avec Odoo" + +#: ../../accounting/localizations/france.rst:27 +msgid "" +"As of January 1st 2018, a new anti-fraud legislation comes into effect in " +"France and DOM-TOM. This new legislation stipulates certain criteria " "concerning the inalterability, security, storage and archiving of sales " "data. These legal requirements are implemented in Odoo, version 9 onward, " -"through an add-on." +"through a module and a certificate of conformity to download." msgstr "" -"Au 1er janvier 2018, une nouvelle législation anti-fraude entre en vigueur " -"en France Métropolitaine et dans les DOM-TOM. Cette nouvelle législation " -"impose l'utilisation par les entreprises concernées d'un logiciel de caisse " -"respectant des critères d'inaltérabilité, de sécurité, de stockage et " -"d'archivage des données de vente. Ces exigences légales sont implémentées " -"dans Odoo, de la version 9 aux plus récentes, via un module additionnel à " -"installer." +"Depuis 1er janvier 2018, une nouvelle législation anti-fraude est " +"d'application en France Métropolitaine et dans les DOM-TOM. Cette nouvelle " +"législation impose l'utilisation par les entreprises concernées d'un " +"logiciel de caisse respectant des critères d'inaltérabilité, de sécurité, de" +" stockage et d'archivage des données de vente. Ces exigences légales sont " +"implémentées dans Odoo, de la version 9 aux plus récentes, via un module " +"additionnel à installer et une attestation de conformité individuelle à " +"télécharger." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:12 +#: ../../accounting/localizations/france.rst:34 msgid "Is my company required to use an anti-fraud software?" msgstr "Mon entreprise doit-elle utiliser un logiciel anti-fraude?" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:13 +#: ../../accounting/localizations/france.rst:36 msgid "" "Your company is required to use an anti-fraud cash register software like " "Odoo (CGI art. 286, I. 3° bis) if:" @@ -2380,17 +2501,17 @@ msgstr "" "Votre entreprise est tenue d'utiliser un logiciel de caisse anti-fraude " "comme Odoo (CGI article 286, I. 3 ° bis) si:" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:16 +#: ../../accounting/localizations/france.rst:39 msgid "You are taxable (not VAT exempt) in France or any DOM-TOM," msgstr "" "Vous êtes assujetti à la TVA et n'êtes pas concerné par le régime de " "franchise de la TVA," -#: ../../accounting/localizations/france/vat-anti-fraud.rst:17 +#: ../../accounting/localizations/france.rst:40 msgid "Some of your customers are private individuals (B2C)." msgstr "Certains de vos clients sont des particuliers (B2C)." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:19 +#: ../../accounting/localizations/france.rst:42 msgid "" "This rule applies to any company size. Auto-entrepreneurs are exempted from " "VAT and therefore are not affected." @@ -2398,65 +2519,69 @@ msgstr "" "Cette règle s'applique à toute taille d'entreprise. Les auto-entrepreneurs " "sont exemptés de la TVA et ne sont donc pas affectés." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:23 +#: ../../accounting/localizations/france.rst:46 msgid "Get certified with Odoo" -msgstr "Obtenir la certification avec Odoo" +msgstr "Se conformer à la législation" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:24 -msgid "Getting compliant with Odoo is vey easy." -msgstr "Se conformer à la nouvelle législation est très simple dans Odoo." +#: ../../accounting/localizations/france.rst:48 +msgid "Getting compliant with Odoo is very easy." +msgstr "Se conformer à cette nouvelle législation est très facile." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:26 +#: ../../accounting/localizations/france.rst:50 msgid "" -"Your company is requested by the tax administration to deliver a Certificate" -" of Conformity testifying that your software complies with the anti-fraud " -"legislation. This certificate is granted by Odoo SA to Odoo Enterprise " -"users. If you use Odoo Community, you should `upgrade to Odoo Enterprise " +"Your company is requested by the tax administration to deliver a certificate" +" of conformity testifying that your software complies with the anti-fraud " +"legislation. This certificate is granted by Odoo SA to Odoo Enterprise users" +" `here `__. If you " +"use Odoo Community, you should `upgrade to Odoo Enterprise " "`__ or " -"contact your Odoo service provider. `Get the certificate here " -"`__." +"contact your Odoo service provider." msgstr "" -" Votre entreprise pourra être sollicitée par l'administration fiscale afin " -"de délivrer un certificat de conformité attestant que votre logiciel est " -"conforme à la législation anti-fraude. Ce certificat sera délivré par Odoo " -"SA aux utilisateurs d'Odoo Enterprise. Si vous utilisez Odoo Community, vous" -" devez `souscrire à Odoo Enterprise " +"Votre entreprise doit être en mesure de délivrer à l'administration fiscale " +"une attestation de conformité attestant que votre logiciel est conforme à la" +" législation anti-fraude. Cette attestation est délivrée par Odoo SA aux " +"utilisateurs d'Odoo Enterprise `ici `__. Si vous utilisez Odoo Community, vous devez " +"`souscrire à Odoo Enterprise " "`__ ou " -"contactez votre prestataire de services Odoo. `Cliquez ici pour obtenir " -"votre certificat `__." +"contacter votre prestataire de services Odoo." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:34 +#: ../../accounting/localizations/france.rst:58 msgid "In case of non-conformity, your company risks a fine of €7,500." msgstr "" "En cas de non-conformité, votre entreprise risque une amende de 7500€." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:36 +#: ../../accounting/localizations/france.rst:60 msgid "To get the certification just follow the following steps:" -msgstr "Pour obtenir la certification veuillez suivre les étapes suivantes:" +msgstr "" +"Pour être en conformité avec la législation, veuillez suivre les étapes " +"suivantes:" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:38 +#: ../../accounting/localizations/france.rst:62 msgid "" -"Install the anti-fraud add-on fitting your Odoo environment from the *Apps* " +"Install the anti-fraud module fitting your Odoo environment from the *Apps* " "menu:" msgstr "" -"Installer le module anti-fraude qui correspond à votre environnement Odoo:" +"Installez le module anti-fraude qui correspond à votre environnement Odoo " +"depuis le menu *Applications*:" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:41 +#: ../../accounting/localizations/france.rst:65 msgid "" -"France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) " -"(if you use Odoo Point of Sale)" +"if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud " +"Certification for Point of Sale (CGI 286 I-3 bis)" msgstr "" -"France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) " -"(si vous utilisez Odoo Point de Vente)" +"if vous utilisez Odoo Point de Vente: *l10n_fr_pos_cert*: France - VAT Anti-" +"Fraud Certification for Point of Sale (CGI 286 I-3 bis)" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:43 +#: ../../accounting/localizations/france.rst:67 msgid "" -"France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) (in any other case)" +"in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud " +"Certification (CGI 286 I-3 bis)" msgstr "" -"France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) (dans les autres " -"cas)" +"dans les autres cas: *l10n_fr_certification*: France - VAT Anti-Fraud " +"Certification (CGI 286 I-3 bis)" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:44 +#: ../../accounting/localizations/france.rst:68 msgid "" "Make sure a country is set on your company, otherwise your entries won’t be " "encrypted for the inalterability check. To edit your company’s data, go to " @@ -2466,39 +2591,63 @@ msgstr "" "Assurez-vous qu'un pays est bien défini sur votre société, sinon vos entrées" " ne seront pas cryptées pour la vérification de l'inaltérabilité. Pour " "modifier les données de votre société, allez dans " -":menuselection:`Paramètres --> Utilisateurs & Sociétés --> Sociétés`. " +":menuselection:`Configuration --> Utilisateurs & Sociétés --> Sociétés`. " "Sélectionnez un pays parmis la liste; Ne créez pas un nouveau pays." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:48 +#: ../../accounting/localizations/france.rst:72 msgid "" -"Download the mandatory Certificate of Conformity delivered by Odoo SA from " -"`here `__." +"Download the mandatory certificate of conformity delivered by Odoo SA `here " +"`__." msgstr "" -"Télécharger le Certificat de Conformité obligatoire délivré par Odoo SA " -"`ici`__." +"Téléchargez votre attestation de conformité délivrée par SA `ici " +"`__." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:50 +#: ../../accounting/localizations/france.rst:74 msgid "" -"If case you run Odoo on-premise, you should update your installation and " -"restart your server to get such new add-ons available in your Apps " -"repository. For any issue you can still download the modules from `Odoo's " -"Apps store `__." +"To install the module in any system created before December 18th 2017, you " +"should update the modules list. To do so, activate the developer mode from " +"the *Settings* menu. Then go to the *Apps* menu and press *Update Modules " +"List* in the top-menu." msgstr "" -"Si vous hébergez Odoo sur site, vous devriez mettre à jour votre " -"installation et redémarrer votre serveur pour voir apparaître ces modules " -"anti-fraudes dans votre répertoire d'applications. En cas de problème vous " -"pouvez toujours les télécharger depuis `l'Apps store " -"d'Odoo`__." +"Si votre système Odoo a été créé avant le 18 décembre 2017, vous devez " +"mettre à jour la liste des modules pour pouvoir installer le module anti-" +"fraude. Pour ce faire, activez le mode développeur depuis le menu " +"*Configuration*. Ensuite, allez dans le menu *Applications* et cliquez sur " +"*Mettre à jour la liste des Applications* depuis le menu supérieur." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:56 -msgid "Anti-fraud features of Odoo" -msgstr "Description des fonctionnalités anti-fraude" +#: ../../accounting/localizations/france.rst:78 +msgid "" +"In case you run Odoo on-premise, you need to update your installation and " +"restart your server beforehand." +msgstr "" +"Si vous utilisez Odoo hébergé sur serveur propre, vous devez mettre à jour " +"votre installation Odoo et redémarrer votre serveur." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:57 -msgid "The anti-fraud add-on introduces the following features:" +#: ../../accounting/localizations/france.rst:80 +msgid "" +"If you have installed the initial version of the anti-fraud module (prior to" +" December 18th 2017), you need to update it. The module's name was *France -" +" Accounting - Certified CGI 286 I-3 bis*. After an update of the modules " +"list, search for the updated module in *Apps*, select it and click " +"*Upgrade*. Finally, make sure the following module *l10n_fr_sale_closing* is" +" installed." +msgstr "" +"Dans le cas où vous auriez installé la version initiale du module anti-" +"fraude (avant le 18 décembre 2017), you devez mettre à jour ce dernier. Le " +"nom initial du module était *France - Accounting - Certified CGI 286 I-3 " +"bis*. Après avoir mis à jour la liste des modules, sélectionnez le nouveau " +"module dans le menu *Applications* et cliquez sur le bouton *Mettre à jour*." +" Enfin, vérifiez que le module *l10n_fr_sale_closing* est installé." + +#: ../../accounting/localizations/france.rst:89 +msgid "Anti-fraud features" +msgstr "Fonctionnalités anti-fraude" + +#: ../../accounting/localizations/france.rst:91 +msgid "The anti-fraud module introduces the following features:" msgstr "Le module anti-fraude introduit les fonctionnalités suivantes:" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:59 +#: ../../accounting/localizations/france.rst:93 msgid "" "**Inalterability**: deactivation of all the ways to cancel or modify key " "data of POS orders, invoices and journal entries;" @@ -2507,11 +2656,11 @@ msgstr "" "modification des données clés des commandes de PdV, factures et entrées " "comptables." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:61 +#: ../../accounting/localizations/france.rst:95 msgid "**Security**: chaining algorithm to verify the inalterability;" msgstr "**Sécurité**: algorithme de chainage pour vérifier l'inaltérabilié;" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:62 +#: ../../accounting/localizations/france.rst:96 msgid "" "**Storage**: automatic sales closings with computation of both period and " "cumulative totals (daily, monthly, annually)." @@ -2519,11 +2668,11 @@ msgstr "" "**Stockage**: clôtures de ventes automatiques avec calculs des totaux " "périodiques et cumulatifs (journaliers, mensuels, annuels)." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:66 +#: ../../accounting/localizations/france.rst:100 msgid "Inalterability" msgstr "Inaltérabilité" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:67 +#: ../../accounting/localizations/france.rst:102 msgid "" "All the possible ways to cancel and modify key data of paid POS orders, " "confirmed invoices and journal entries are deactivated, if the company is " @@ -2533,7 +2682,7 @@ msgstr "" " de Point de Vente payés, factures confirmées ou entrées comptables sont " "désactivées, si la société est localisée en France ou dans les DOM-TOM." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:71 +#: ../../accounting/localizations/france.rst:106 msgid "" "If you run a multi-companies environment, only the documents of such " "companies are impacted." @@ -2541,11 +2690,11 @@ msgstr "" "Si vous utilisez un environnement multi-sociétés, seuls les documents des " "sociétés françaises ou DOM-TOM sont cryptés." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:75 +#: ../../accounting/localizations/france.rst:110 msgid "Security" msgstr "Sécurité" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:76 +#: ../../accounting/localizations/france.rst:112 msgid "" "To ensure the inalterability, every order or journal entry is encrypted upon" " validation. This number (or hash) is calculated from the key data of the " @@ -2556,20 +2705,22 @@ msgstr "" "partir des données clés du document et à partir du hash des documents " "précédents." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:81 +#: ../../accounting/localizations/france.rst:117 msgid "" -"The add-on introduces an interface to test the data inalterability. If any " +"The module introduces an interface to test the data inalterability. If any " "information is modified on a document after its validation, the test will " "fail. The algorithm recomputes all the hashes and compares them against the " "initial ones. In case of failure, the system points out the first corrupted " "document recorded in the system." msgstr "" -"Le module introduit une interface pour tester l'inaltérabilité des données. " -"Si une donnée est modifiée sur un document validé, le test échouera. " -"L'algorithme recalcule tous les hash et les compare avec les hash initiaux. " -"En cas d'échec, le système indique le premier document corrompu." +"Le module permet à l'utilisateur ou le contrôleur fiscal de vérifier " +"l'inaltérabilité des données. Si une information clé est modfiée sur un " +"document après sa validation, le test échoue automatiquement. L'algorithme " +"recalcule toutes les clés de cryptage et les compare avec les clés " +"initiales. En cas de différence, le système fournit la référence du premier " +"document corrompu." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:87 +#: ../../accounting/localizations/france.rst:123 msgid "" "Users with *Manager* access rights can launch the inalterability check. For " "POS orders, go to :menuselection:`Point of Sales --> Reporting --> French " @@ -2582,11 +2733,11 @@ msgstr "" "françaises`. Pour les factures et entrées comptables, allez dans " ":menuselection:`Facturation --> Rapports --> Déclarations françaises`." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:94 +#: ../../accounting/localizations/france.rst:130 msgid "Storage" msgstr "Stockage" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:95 +#: ../../accounting/localizations/france.rst:132 msgid "" "The system also processes automatic sales closings on a daily, monthly and " "annual basis. Such closings distinctly compute the sales total of the period" @@ -2598,7 +2749,7 @@ msgstr "" "distincte le total de ventes d'une période ainsi que le grands total " "cumulatif depuis la première entrée enregistrée dans le système." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:101 +#: ../../accounting/localizations/france.rst:138 msgid "" "Closings can be found in the *French Statements* menu of Point of Sale, " "Invoicing and Accounting apps." @@ -2606,7 +2757,7 @@ msgstr "" "Les clôtures sont accessibles depuis le menu *Déclarations françaises* des " "modules Point de Vente et Facturation." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:105 +#: ../../accounting/localizations/france.rst:142 msgid "" "Closings compute the totals for journal entries of sales journals (Journal " "Type = Sales)." @@ -2614,28 +2765,28 @@ msgstr "" "Les clôtures calculent les totaux des entrées comptables des journaux de " "ventes (Type de Journal = Ventes)." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:107 +#: ../../accounting/localizations/france.rst:144 msgid "" "For multi-companies environments, such closings are performed by company." msgstr "" "Dans les environnements multi-sociétés, les clôtures sont effectuées par " "société." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:109 +#: ../../accounting/localizations/france.rst:146 msgid "" "POS orders are posted as journal entries at the closing of the POS session. " "Closing a POS session can be done anytime. To prompt users to do it on a " -"daily basis, the add-on prevents from resuming a session opened more than 24" +"daily basis, the module prevents from resuming a session opened more than 24" " hours ago. Such a session must be closed before selling again." msgstr "" -"Les commandes de PdV sont comptabilisées comme entrées comptables à la " -"clôture de la session PdV. Clôturer une session PdV peut être effectué à " -"n'importe quel moment. Pour inciter les utilisateurs à le faire de façon " -"quotidienne, le module empêche de reprendre une session ouverte depuis plus " -"de 24h. Une telle session doit être clôturée afin de pouvoir continuer à " -"vendre." +"Les commandes de PdV sont comptabilisées dans les pièces comptables à la " +"clôture de la session de PdV. Clôturer une session de PdV peut être fait à " +"tout moment. Pour inciter l'utilisateur à le faire de façon journalière et " +"ainsi permettre le calcul journalier des totaux de ventes, le module empêche" +" de reprendre une session de vente ouverte depuis plus de 24 heures. Une " +"telle session doit être clôturée pour pouvoir vendre à nouveau." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:115 +#: ../../accounting/localizations/france.rst:152 msgid "" "A period’s total is computed from all the journal entries posted after the " "previous closing of the same type, regardless of their posting date. If you " @@ -2646,7 +2797,7 @@ msgstr "" " comptabilisées après la précédente clôture du même type (journalier, " "mensuel, annuel), quelque soit la date de comptabilisation." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:120 +#: ../../accounting/localizations/france.rst:157 msgid "" "For test & audit purposes such closings can be manually generated in the " "developer mode. Go to :menuselection:`Settings --> Technical --> Automation " @@ -2657,11 +2808,11 @@ msgstr "" ":menuselection:`Configuration --> Technique --> Automatisation --> Actions " "planififées`." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:127 +#: ../../accounting/localizations/france.rst:164 msgid "Responsibilities" msgstr "Responsabilités" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:128 +#: ../../accounting/localizations/france.rst:166 msgid "" "Do not uninstall the module! If you do so, the hashes will be reset and none" " of your past data will be longer guaranteed as being inalterable." @@ -2670,7 +2821,7 @@ msgstr "" " toutes les données précedemment enregistrées ne seraient plus considérées " "comme étant inaltérées." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:131 +#: ../../accounting/localizations/france.rst:169 msgid "" "Users remain responsible for their Odoo instance and must use it with due " "diligence. It is not permitted to modify the source code which guarantees " @@ -2681,20 +2832,19 @@ msgstr "" "autorisé de modifier le code source qui guarantit l'inaltérabilité des " "données." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:135 +#: ../../accounting/localizations/france.rst:173 msgid "" "Odoo absolves itself of all and any responsibility in case of changes in the" -" add-on’s functions caused by 3rd party applications not certified by Odoo." +" module’s functions caused by 3rd party applications not certified by Odoo." msgstr "" -"Odoo se décharge de toute responsabilité en cas de changement appliqué au " -"fonctionnement du module anti-fraude causé par des modules tiers non " -"certifiés par Odoo SA." +"Odoo SA se décharge de toute responsabilité en cas d'altération des " +"fonctionnalités anti-fraude par des modules tiers non certifiés par Odoo SA." -#: ../../accounting/localizations/france/vat-anti-fraud.rst:140 +#: ../../accounting/localizations/france.rst:178 msgid "More Information" msgstr "Plus d'informations" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:141 +#: ../../accounting/localizations/france.rst:180 msgid "" "You will find more information about this legislation in the official " "documents:" @@ -2702,7 +2852,7 @@ msgstr "" "Vous trouverez plus d'informations sur la législation dans les documents " "officiels:" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:143 +#: ../../accounting/localizations/france.rst:182 msgid "" "`Frequently Asked Questions " "`__" @@ -2710,7 +2860,7 @@ msgstr "" "`Foire Aux Questions " "`__" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:144 +#: ../../accounting/localizations/france.rst:183 msgid "" "`Official Statement " "`__" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:145 +#: ../../accounting/localizations/france.rst:184 msgid "" "`Item 88 of Finance Law 2016 " "`__" @@ -2728,6 +2878,74 @@ msgstr "" "`Article 88 de la Loi sur les Finances de 2016 " "`__" +#: ../../accounting/localizations/germany.rst:3 +msgid "Germany" +msgstr "Allemagne" + +#: ../../accounting/localizations/germany.rst:6 +msgid "German Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/germany.rst:8 +msgid "" +"The chart of accounts SKR03 and SKR04 are both supported in Odoo. You can " +"choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the Fiscal Localization " +"section." +msgstr "" + +#: ../../accounting/localizations/germany.rst:12 +#: ../../accounting/localizations/spain.rst:17 +msgid "" +"Be careful, you can only change the accounting package as long as you have " +"not created any accounting entry." +msgstr "" + +#: ../../accounting/localizations/germany.rst:16 +msgid "" +"When you create a new SaaS database, the SKR03 is installed by default." +msgstr "" + +#: ../../accounting/localizations/germany.rst:19 +msgid "German Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/germany.rst:21 +msgid "" +"Here is the list of German-specific reports available on Odoo Enterprise:" +msgstr "" + +#: ../../accounting/localizations/germany.rst:23 +#: ../../accounting/localizations/spain.rst:27 +#: ../../accounting/others/reporting/main_reports.rst:30 +msgid "Balance Sheet" +msgstr "Bilan" + +#: ../../accounting/localizations/germany.rst:24 +msgid "Profit & Loss" +msgstr "" + +#: ../../accounting/localizations/germany.rst:25 +msgid "Tax Report (Umsatzsteuervoranmeldung)" +msgstr "" + +#: ../../accounting/localizations/germany.rst:26 +msgid "Partner VAT Intra" +msgstr "Numéro de TVA Intra du Partenaire" + +#: ../../accounting/localizations/germany.rst:29 +msgid "Export from Odoo to Datev" +msgstr "" + +#: ../../accounting/localizations/germany.rst:31 +msgid "" +"It is possible to export your accounting entries from Odoo to Datev. To be " +"able to use this feature, the german accounting localization needs to be " +"installed on your Odoo Enterprise database. Then you can go in " +":menuselection:`Accounting --> Reporting --> General Ledger` then click on " +"the **Export Datev (csv)** button." +msgstr "" + #: ../../accounting/localizations/mexico.rst:3 msgid "Mexico" msgstr "Mexique" @@ -3453,10 +3671,6 @@ msgid "" "generic one with no explanation." msgstr "" -#: ../../accounting/localizations/mexico.rst:501 -msgid "FAQ" -msgstr "" - #: ../../accounting/localizations/mexico.rst:503 msgid "**Error message** (Only applicable on CFDI 3.3):" msgstr "" @@ -3593,6 +3807,67 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/spain.rst:3 +msgid "Spain" +msgstr "Espagne" + +#: ../../accounting/localizations/spain.rst:6 +msgid "Spanish Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/spain.rst:8 +msgid "" +"In Odoo, there are several Spanish Chart of Accounts that are available by " +"default:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:10 +msgid "PGCE PYMEs 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:11 +msgid "PGCE Completo 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:12 +msgid "PGCE Entitades" +msgstr "" + +#: ../../accounting/localizations/spain.rst:14 +msgid "" +"You can choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the **Fiscal " +"Localization** section." +msgstr "" + +#: ../../accounting/localizations/spain.rst:20 +msgid "" +"When you create a new SaaS database, the PGCE PYMEs 2008 is installed by " +"default." +msgstr "" + +#: ../../accounting/localizations/spain.rst:23 +msgid "Spanish Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/spain.rst:25 +msgid "" +"If the Spanish Accounting Localization is installed, you will have access to" +" accounting reports specific to Spain:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:28 +msgid "Tax Report (Modelo 111)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:29 +msgid "Tax Report (Modelo 115)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:30 +msgid "Tax Report (Modelo 303)" +msgstr "" + #: ../../accounting/localizations/switzerland.rst:3 msgid "Switzerland" msgstr "Suisse" @@ -3921,6 +4196,13 @@ msgid "" "odoo.com/help." msgstr "" +#: ../../accounting/localizations/switzerland.rst:128 +msgid "" +"Don't forget to update your fiscal positions. If you have a version 11.1 (or" +" higher), there is nothing to do. Otherwise, you will also have to update " +"your fiscal positions accordingly." +msgstr "" + #: ../../accounting/others.rst:3 #: ../../accounting/receivables/customer_invoices/overview.rst:108 msgid "Others" @@ -4387,22 +4669,11 @@ msgstr "" ":menuselection:`Comptabilité --> Configuration --> Configuration` et activez" " la fonctionnalité **Gestion de budget**" -#: ../../accounting/others/adviser/budget.rst:34 -msgid "" -"If we want to be precise and point specific invoices and vendors bills to " -"our budget, you should enable the Analytic accounting as well. If we don't " -"we will only be able to budget the total amount of general accounts." -msgstr "" -"Si nous voulons être précis et pointer des factures clients et fournisseurs " -"spécifiques à notre budget, vous devez également activer la Comptabilité " -"analytique. Si nous ne le faisons pas, nous serons seulement en mesure de " -"budgetiser le montant total des comptes comptables." - -#: ../../accounting/others/adviser/budget.rst:40 +#: ../../accounting/others/adviser/budget.rst:35 msgid "Budgetary Positions" msgstr "Postes budgétaires" -#: ../../accounting/others/adviser/budget.rst:42 +#: ../../accounting/others/adviser/budget.rst:37 msgid "" "Budgetary positions are the general accounts for which you want to keep " "budgets (typically expense or income accounts). They need to be defined so " @@ -4415,7 +4686,7 @@ msgstr "" " quel compte il a besoin d'aller chercher l'information budgétaire. Certains" " peuvent être déjà installés avec votre plan comptable." -#: ../../accounting/others/adviser/budget.rst:48 +#: ../../accounting/others/adviser/budget.rst:43 msgid "" "To define the positions enter the :menuselection:`Accounting module --> " "Configuration --> Budgetary Positions`." @@ -4423,7 +4694,7 @@ msgstr "" "Pour définir les postes entrez dans :menuselection:`Comptabilité --> " "Configuration --> Postes budgétaires`." -#: ../../accounting/others/adviser/budget.rst:51 +#: ../../accounting/others/adviser/budget.rst:46 msgid "" "For our example we need to define what accounts relates to our project's " "expenses. Create a position and add items to select the accounts." @@ -4432,7 +4703,7 @@ msgstr "" "dépenses de notre projet. Créez un poste et ajoutez des éléments pour " "sélectionner les comptes." -#: ../../accounting/others/adviser/budget.rst:57 +#: ../../accounting/others/adviser/budget.rst:52 msgid "" "In this case we select the three relevant accounts used wherein we will book" " our expenses." @@ -4440,15 +4711,15 @@ msgstr "" "Dans cet exemple, nous sélectionnons les trois comptes pertinents utilisés " "dans lesquels nous comptabiliserons nos dépenses." -#: ../../accounting/others/adviser/budget.rst:63 +#: ../../accounting/others/adviser/budget.rst:58 msgid "Click on *Select*." msgstr "Cliquez sur *Selectionner*" -#: ../../accounting/others/adviser/budget.rst:68 +#: ../../accounting/others/adviser/budget.rst:63 msgid "Save the changes to confirm your Budgetary position." msgstr "Enregistrez les modifications pour confirmer votre poste budgétaire." -#: ../../accounting/others/adviser/budget.rst:70 +#: ../../accounting/others/adviser/budget.rst:65 msgid "" "Repeat this steps to create a revenue budgetary position. Only in this case " "select the relevant income accounts." @@ -4456,34 +4727,25 @@ msgstr "" "Répétez cette étape pour créer un poste budgétaire des recettes. Seulement " "dans ce cas sélectionnez les comptes de revenus appropriées." -#: ../../accounting/others/adviser/budget.rst:74 +#: ../../accounting/others/adviser/budget.rst:69 msgid "Analytical account" msgstr "Compte analytique" -#: ../../accounting/others/adviser/budget.rst:76 +#: ../../accounting/others/adviser/budget.rst:71 msgid "" -"If you wish to point specific invoices or vendor bills to your budget you " -"need to use analytical accounting. Odoo needs to know which costs or " -"expenses are relevant to a specified budget. To do so we need to link our " -"invoices and expenses to a defined analytical account. Create an analytical " -"account by entering the Accounting module and clicking " -":menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a " -"new Account called Smith&Co project and select the related partner." +"Odoo needs to know which costs or expenses are relevant to a specified " +"budget. To do so we need to link our invoices and expenses to a defined " +"analytical account. Create an analytical account by entering the Accounting " +"module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open " +"Charts`. Create a new Account called Smith&Co project and select the related" +" partner." msgstr "" -"Si vous souhaitez affecter des factures clients ou fournisseurs spécifiques " -"à votre budget, vous devez utiliser la comptabilité analytique. Odoo a " -"besoin de savoir quels coûts ou dépenses sont relatives à un budget " -"déterminé. Pour ce faire, nous devons lier nos factures client et " -"fournisseur à un compte analytique défini. Créez un compte analytique en " -"entrant dans la comptabilité et en cliquant sur :menuselection:`Conseiller " -"-> Comptes analytiques -> Ouvrir le plan comptable`. Créez un nouveau compte" -" appelé \"Projet Smith&Co et sélectionnez le partenaire concerné." -#: ../../accounting/others/adviser/budget.rst:88 +#: ../../accounting/others/adviser/budget.rst:82 msgid "Set a budget" msgstr "Définir un budget" -#: ../../accounting/others/adviser/budget.rst:90 +#: ../../accounting/others/adviser/budget.rst:84 msgid "" "Let's now set our targets for our budget. We specified that we expect to " "gain 1000 with this project and we would like not to spend more than 700." @@ -4492,7 +4754,7 @@ msgstr "" "nous nous attendons à gagner 1000 avec ce projet et nous aimerions ne pas " "dépenser plus de 700." -#: ../../accounting/others/adviser/budget.rst:94 +#: ../../accounting/others/adviser/budget.rst:88 msgid "" "To set those targets, enter the accounting app, select " ":menuselection:`Advisers --> Budgets` and create a new Budget." @@ -4501,7 +4763,7 @@ msgstr "" "sélectionnez :menuselection:`Conseiller -> Budgets` et créez un nouveau " "budget." -#: ../../accounting/others/adviser/budget.rst:97 +#: ../../accounting/others/adviser/budget.rst:91 msgid "" "We have to give a name to the budget. In this case we'll call it \"Smith " "Project\". Select the period wherein the budget will be applicable. Next add" @@ -4512,7 +4774,7 @@ msgstr "" "applicable. Ensuite, ajoutez un élément pour spécifier vos cibles dans les " "lignes de budget." -#: ../../accounting/others/adviser/budget.rst:104 +#: ../../accounting/others/adviser/budget.rst:98 msgid "" "Select the Budgetary Position related to the Budget Line. In other words, " "select the position that points to the accounts you want to budget. In this " @@ -4529,7 +4791,7 @@ msgstr "" "spécifier un **montant négatif**. Enfin, sélectionnez le compte analytique " "correspondant." -#: ../../accounting/others/adviser/budget.rst:114 +#: ../../accounting/others/adviser/budget.rst:108 msgid "" "Click on **Save & new** to input the revenue budget. The Budgetary Position " "is Revenue and the Planned Amount is 1000. Save and close" @@ -4538,15 +4800,15 @@ msgstr "" "poste budgétaire est Revenu et le montant prévu est 1000. Sauvegarder et " "fermer" -#: ../../accounting/others/adviser/budget.rst:117 +#: ../../accounting/others/adviser/budget.rst:111 msgid "You'll need to **Confirm** and **Approve** the budget." msgstr "Vous devrez confirmer et approuver le budget." -#: ../../accounting/others/adviser/budget.rst:120 +#: ../../accounting/others/adviser/budget.rst:114 msgid "Check your budget" msgstr "Vérifier votre budget" -#: ../../accounting/others/adviser/budget.rst:122 +#: ../../accounting/others/adviser/budget.rst:116 msgid "" "You can check your budget at any time. To see the evolution, let's book some" " Invoices and Vendors Bills." @@ -4554,7 +4816,7 @@ msgstr "" "Vous pouvez vérifier votre budget à tout moment. Pour voir l'évolution, " "enregistrons quelques factures clients et fournisseur." -#: ../../accounting/others/adviser/budget.rst:127 +#: ../../accounting/others/adviser/budget.rst:121 msgid "" "if you use analytical accounts remember that you need to specify the account" " in the invoice and / or purchase line." @@ -4562,25 +4824,25 @@ msgstr "" "si vous utilisez des comptes analytiques rappelez-vous que vous devez " "spécifier le compte sur la ligne de la facture client et/ou fournisseur." -#: ../../accounting/others/adviser/budget.rst:131 +#: ../../accounting/others/adviser/budget.rst:125 msgid "for more information about booking invoices and purchase orders see:" msgstr "" "pour plus d'informations sur l'enregistrement des factures clients et " "fournisseurs voir :" -#: ../../accounting/others/adviser/budget.rst:133 +#: ../../accounting/others/adviser/budget.rst:127 msgid ":doc:`../../receivables/customer_invoices/overview`" msgstr ":doc:`../../receivables/customer_invoices/overview`" -#: ../../accounting/others/adviser/budget.rst:134 +#: ../../accounting/others/adviser/budget.rst:128 msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`" msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice`" -#: ../../accounting/others/adviser/budget.rst:136 +#: ../../accounting/others/adviser/budget.rst:130 msgid "Go back in the budget list and find the Smith Project." msgstr "Revenez à la liste des budgets et trouvez le Projet Smith." -#: ../../accounting/others/adviser/budget.rst:138 +#: ../../accounting/others/adviser/budget.rst:132 msgid "" "Via the analytical account, Odoo can account the invoice lines and purchase " "lines booked in the accounts and will display them in the **Practical " @@ -4590,7 +4852,7 @@ msgstr "" "clients et fournisseurs enregistrées dans les comptes et les afficher dans " "la colonne **Montant réel**." -#: ../../accounting/others/adviser/budget.rst:147 +#: ../../accounting/others/adviser/budget.rst:141 msgid "" "The theoretical amount represents the amount of money you theoretically " "could have spend / should have received in function of the date. When your " @@ -7494,10 +7756,6 @@ msgstr "" " du rapport, si vous ne souhaitez pas utiliser l'option par défaut **Période" " Précédente**." -#: ../../accounting/others/reporting/main_reports.rst:30 -msgid "Balance Sheet" -msgstr "Bilan" - #: ../../accounting/others/reporting/main_reports.rst:32 msgid "" "The **Balance Sheet** shows a snapshot of the assets, liabilities and equity" @@ -12795,6 +13053,78 @@ msgstr "" msgid ":doc:`overview`" msgstr ":doc:`overview`" +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2 +msgid "Set up cash roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:4 +msgid "" +"In some currencies, the smallest coins do not exist. For example, in " +"Switzerland, there is no coin for 0.01 CHF. For this reason, if invoices are" +" paid in cash, you have to round their total amount to the smallest coin " +"that exist in the currency. For the CHF, the smallest coin is 0.05 CHF." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:10 +msgid "There are two strategies for the rounding:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:12 +msgid "Add a line on the invoice for the rounding" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:14 +msgid "Add the rounding in the tax amount" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:16 +msgid "Both strategies are applicable in Odoo." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:21 +msgid "" +"First, you have to activate the feature. For this, go in " +":menuselection:`Accounting --> Configuration --> Settings` and activate the " +"Cash Rounding." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:28 +msgid "" +"There is a new menu to manage cash roundings in :menuselection:`Accounting " +"--> Configuration --> Management --> Cash roundings`." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:31 +msgid "" +"Now, you can create cash roundings. You can choose between two rounding " +"strategies:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:34 +msgid "" +"**Add a rounding line**: if a rounding is necessary, Odoo will add a line on" +" your customer invoice to take this rounding into account. You also have to " +"define the account in which the rounding will go." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:39 +msgid "" +"**Modify tax amount:** Odoo will add the rounding to the amount of the " +"highest tax." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:46 +msgid "Apply roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:48 +msgid "" +"Once your roundings are created, you can apply them on customer invoices. On" +" the customer invoices, there is a new field called **Cash Rounding Method**" +" where you can simply choose one of the rounding methods created previously." +" If needed, a rounding will be applied to the invoice." +msgstr "" + #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:3 msgid "Deferred revenues: how to automate them?" msgstr "Revenus différés: comment les automatiser ?" @@ -13172,115 +13502,6 @@ msgstr "" msgid ":doc:`payment_terms`" msgstr ":doc:`payment_terms`" -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:3 -msgid "How to modify a validated invoice?" -msgstr "Comment modifier une facture validée ?" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:5 -msgid "" -"In most accounting legislation over the word, it's not allowed to modify an " -"invoice that is validated and sent to the customer. However, you sometimes " -"need to change an invoice for different reasons: the sale has changed, the " -"made a mistake while recording the invoice, etc." -msgstr "" -"Dans la plupart des législations comptables dans le monde, il est interdit " -"de modifier une facture qui a été validée et envoyée au client. Cependant, " -"vous avez parfois besoin de changer une facture pour différentes raisons : " -"la vente a changé, une erreur a été faite lors de l'enregistrement de la " -"facture, etc." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:10 -msgid "Thus, the right way to modify an invoice is to:" -msgstr "Ainsi, la bonne façon de modifier une facture est de :" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:12 -msgid "Refund the original invoice" -msgstr "Faire un avoir sur la facture originale" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:13 -msgid "Create a new invoice" -msgstr "Créer une nouvelle facture" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:15 -msgid "" -"Odoo's refund mechanism helps you handle the whole process in just a few " -"clicks." -msgstr "" -"Le mécanisme de remboursement d'Odoo vous aide à gérer l'ensemble du " -"processus en quelques clics." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:19 -msgid "Modify an invoice" -msgstr "Modifier une facture" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:21 -msgid "" -"If your invoice is still in draft, you can modify it the way you want. " -"However, if your invoice is validated, you can not change it anymore. If you" -" need to modify it, the right operations to do are:" -msgstr "" -"Si votre facture est toujours à l'état brouillon, vous pouvez la modifier " -"comme vous le souhaitez. Toutefois, si votre facture est validée, vous ne " -"pouvez plus la changer. Si vous devez la modifier, les bonnes opérations à " -"faire sont:" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:25 -msgid "Refund the original invoice;" -msgstr "Faire un avoir sur la facture originale;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:26 -msgid "Reconcile the original invoice with the refund to void them;" -msgstr "Rapprocher la facture orginale avec l'avoir pour les annuler" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:27 -msgid "Create a new draft invoice, a copy of the original;" -msgstr "Créer une nouvelle facture brouillon, copie de l'originale" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:28 -msgid "Validate the new invoice." -msgstr "Valider la nouvele facture" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:30 -msgid "" -"All those steps are automated by Odoo. All you have to do is to click on the" -" Refund button on an invoice." -msgstr "" -"Toutes ces étapes sont automatisées dans Odoo. Tout ce que vous avez à faire" -" est de cliquer sur le bouton Avoir sur une facture." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:36 -msgid "" -"In the refund dialog, select the option \"Modify: create a refund, reconcile" -" and create a draft invoice\". Once you click on the \"Create Refund\" " -"button, Odoo will void your existing invoice and create a new draft invoice " -"that is a duplicate of the original one." -msgstr "" -"Dans la fenêtre « Avoir », sélectionnez l'option « Modifier : Créer un " -"avoir, le rapprocher et créer une nouvelle facture ». Une fois que vous " -"aurez cliqué sur le bouton \"Créer avoir\", Odoo annulera votre facture " -"existante et créera une nouvelle facture brouillon qui sera une copie de " -"l'originale." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:41 -msgid "Edit this new draft invoice and validate it when it's correct." -msgstr "" -"Modifiez cette nouvelle facture brouillon et validez-la quand elle est " -"correcte." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:45 -msgid "" -"if you already sent the original invoice to your customer, you should send " -"the new invoice and the refund to the customer so that he gets all the " -"documents." -msgstr "" -"si vous avez déjà envoyé la facture originale à votre client, vous devez lui" -" envoyer la nouvelle facture et l'avoir afin qu'il dispose de tous les " -"documents." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:50 -msgid ":doc:`refund`" -msgstr ":doc:`refund`" - #: ../../accounting/receivables/customer_invoices/overview.rst:3 msgid "Overview of the invoicing process" msgstr "Vue d'ensemble du processus de facturation" diff --git a/locale/fr/LC_MESSAGES/discuss.po b/locale/fr/LC_MESSAGES/discuss.po index 6c6bd7c14..12b378381 100644 --- a/locale/fr/LC_MESSAGES/discuss.po +++ b/locale/fr/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: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Fabien Pinckaers , 2017\n" +"Last-Translator: Olivier Lenoir , 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" @@ -23,244 +23,253 @@ msgid "Discuss" msgstr "Messages" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive email in Odoo" +msgid "How to use my mail server to send and receive emails in Odoo" msgstr "" -#: ../../discuss/email_servers.rst:6 -msgid "When is it needed" -msgstr "" - -#: ../../discuss/email_servers.rst:7 +#: ../../discuss/email_servers.rst:5 msgid "" -"Using your own email servers is required to send and receive messages in " -"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " -"solution that works straight away. However you can still use your own email " -"servers with the online edition. Some insights are provided here below." +"This document is mainly dedicated to Odoo on-premise users who don't benefit" +" from an out-of-the-box solution to send and receive emails in Odoo, unlike " +"in `Odoo Online `__ & `Odoo.sh " +"`__." msgstr "" -#: ../../discuss/email_servers.rst:14 -msgid "How to set it up" +#: ../../discuss/email_servers.rst:9 +msgid "" +"If no one in your company is used to manage email servers, we strongly " +"recommend that you opt for such convenient Odoo hosting solutions. Indeed " +"their email system works instantly and is monitored by professionals. " +"Nevertheless you can still use your own email servers if you want to manage " +"your email server's reputation yourself." msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"As a system admin, go to :menuselection:`Settings --> General Settings` and " -"check *External Email Servers* (watch out: this checkbox only shows up after" -" Odoo 10). Then, go through the following steps." +"You will find here below some useful information to do so by integrating " +"your own email solution with Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:19 +msgid "How to manage outbound messages" msgstr "" #: ../../discuss/email_servers.rst:21 msgid "" -"Office 365 email servers don't allow to send external emails from hosts like" -" Odoo. Consequently you can only use such email servers for incoming " -"messages." +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers*. Then, click *Outgoing Mail Servers* to " +"create one and reference the SMTP data of your email server. Once all the " +"information has been filled out, click on *Test Connection*." msgstr "" #: ../../discuss/email_servers.rst:26 -msgid "Set an outgoing email server for outbound messages" +msgid "Here is a typical configuration for a G Suite server." msgstr "" -#: ../../discuss/email_servers.rst:27 -msgid "" -"You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " -"etc.) as well as your admin credentials. Once all the information has been " -"filled out, click on *Test Connection*." +#: ../../discuss/email_servers.rst:31 +msgid "Then set your email domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:34 +msgid "Can I use an Office 365 server" msgstr "" #: ../../discuss/email_servers.rst:35 -msgid "Set an incoming email server for inbound messages" +msgid "" +"You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP" +" relays are not compatible with Odoo Online." msgstr "" -#: ../../discuss/email_servers.rst:36 +#: ../../discuss/email_servers.rst:38 msgid "" -"Fill out the form according to your email provider’s settings. Leave the " -"*Actions to Perform on Incoming Mails* blank. Once all the information has " -"been filled out, click on *TEST & CONFIRM*." +"Please refer to `Microsoft's documentation `__ to configure" +" a SMTP relay for your Odoo's IP address." +msgstr "" + +#: ../../discuss/email_servers.rst:42 +msgid "How to use a G Suite server" msgstr "" #: ../../discuss/email_servers.rst:43 msgid "" -"By default inbound messages are fetched every 5 minutes. You can change this" -" value in developer mode. Go to :menuselection:`Settings --> Technical --> " -"Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." +"You can use an G Suite server for any Odoo hosting type. To do so you need " +"to enable a SMTP relay and to allow *Any addresses* in the *Allowed senders*" +" section. The configuration steps are explained in `Google documentation " +"`__." msgstr "" #: ../../discuss/email_servers.rst:49 -msgid "Set the domain name" +msgid "Be SPF-compliant" msgstr "" #: ../../discuss/email_servers.rst:50 msgid "" -"Enter the domain name of your email servers (e.g. mycompany.com) in General " -"Settings." +"In case you use SPF (Sender Policy Framework) to increase the deliverability" +" of your outgoing emails, don't forget to authorize Odoo as a sending host " +"in your domain name settings. Here is the configuration for Odoo Online:" msgstr "" -#: ../../discuss/email_servers.rst:57 -msgid "Create a catchall address" -msgstr "" - -#: ../../discuss/email_servers.rst:58 +#: ../../discuss/email_servers.rst:54 msgid "" -"When a contact replies to an email sent from Odoo, the *reply-to* address is" -" a generic address used to route the reply to the right discussion thread in" -" Odoo (opportunity, order, task, etc.) and to the inbox of all its " -"followers. By default this address is \"catchall@\" but it can be changed." +"If no TXT record is set for SPF, create one with following definition: " +"v=spf1 include:_spf.odoo.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:63 +#: ../../discuss/email_servers.rst:56 msgid "" -"Create a catchall address in your email server settings. We advise you to " -"use \"catchall@\" so that everything works out straight away. If you want to" -" use another alias, you have extra steps in Odoo:" +"In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g." +" for a domain name that sends emails via Odoo Online and via G Suite it " +"could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:67 -msgid "Activate the developer mode from your Settings Dashboard." -msgstr "" - -#: ../../discuss/email_servers.rst:72 -msgid "" -"Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " -"Parameters --> System Parameters` and enter your custom catchall alias in " -"*mail.catchall.alias*." -msgstr "" - -#: ../../discuss/email_servers.rst:79 -msgid "You can edit the email alias used for bounced messages the same way." -msgstr "" - -#: ../../discuss/email_servers.rst:82 -msgid "How to use my own email servers with Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:83 -msgid "" -"Odoo Online comes up with an embedded and ready-to-use email solution with " -"*@yourcompany.odoo.com* as domain. We recommend to keep this default setup " -"as it is really convenient." -msgstr "" - -#: ../../discuss/email_servers.rst:87 -msgid "" -"Nevertheless you can still use your own email servers if you want to manage " -"your email server's reputation (blacklisting, etc). The configuration for " -"both incoming and outgoing mail servers is given here above." -msgstr "" - -#: ../../discuss/email_servers.rst:92 -msgid "" -"However when it comes to incoming messages, we don't recommend to " -"exclusively use your own email server. Indeed, Odoo Online is fetching " -"incoming messages from the email server once every hour only. To receive " -"emails in real time, you should rather use a **catchall redirection** (your " -"server -> Odoo server). To do so:" -msgstr "" - -#: ../../discuss/email_servers.rst:98 -msgid "" -"Create a catchall address in your email server settings (e.g. catchall)." -msgstr "" - -#: ../../discuss/email_servers.rst:99 -msgid "" -"Still from such settings, set a redirection from this catchall address to " -"Odoo's one: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com." -msgstr "" - -#: ../../discuss/email_servers.rst:102 -msgid "" -"In Odoo check *External Email Servers* in :menuselection:`Settings --> " -"General Settings` and enter your email domain name (i.e. yourdomain.ext)." -msgstr "" - -#: ../../discuss/email_servers.rst:104 -msgid "No need to set up an incoming email server in such a case." -msgstr "" - -#: ../../discuss/email_servers.rst:108 -msgid "How to be SPF-compliant when using external email servers in Odoo" -msgstr "" - -#: ../../discuss/email_servers.rst:109 -msgid "" -"Sender Policy Framework (SPF) is an email-validation system that checks that" -" incoming mail from a domain comes from a host authorized by that domain's " -"administrator. Such a security system is used in most email servers. If you " -"don't comply with it, your emails sent from Odoo will be likely flagged as " -"spam." -msgstr "" - -#: ../../discuss/email_servers.rst:115 -msgid "" -"To be SPF-compliant, you need to authorize Odoo as a sending host in your " -"domain name settings:" -msgstr "" - -#: ../../discuss/email_servers.rst:118 -msgid "Sign in to your domain’s account at your domain host." -msgstr "" - -#: ../../discuss/email_servers.rst:119 -msgid "Locate the page for updating your domain’s DNS records." -msgstr "" - -#: ../../discuss/email_servers.rst:120 -msgid "" -"If no TXT record is set, create one with following definition: v=spf1 " -"include:_spf.odoo.com ~all" -msgstr "" - -#: ../../discuss/email_servers.rst:122 -msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." -msgstr "" - -#: ../../discuss/email_servers.rst:124 -msgid "e.g. for a Gmail server it should be:" -msgstr "" - -#: ../../discuss/email_servers.rst:126 -msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" -msgstr "" - -#: ../../discuss/email_servers.rst:128 +#: ../../discuss/email_servers.rst:60 msgid "" "Find `here `__ the exact procedure to " "create or modify TXT records in your own domain registrar." msgstr "" -#: ../../discuss/email_servers.rst:131 +#: ../../discuss/email_servers.rst:63 msgid "" "Your new SPF record can take up to 48 hours to go into effect, but this " "usually happens more quickly." msgstr "" -#: ../../discuss/email_servers.rst:134 +#: ../../discuss/email_servers.rst:66 msgid "" "Adding more than one SPF record for a domain can cause problems with mail " "delivery and spam classification. Instead, we recommend using only one SPF " "record by modifying it to authorize Odoo." msgstr "" -#: ../../discuss/email_servers.rst:139 -msgid "How to choose between Odoo and my traditional email box" +#: ../../discuss/email_servers.rst:71 +msgid "Allow DKIM" +msgstr "" + +#: ../../discuss/email_servers.rst:72 +msgid "" +"You should do the same thing if DKIM (Domain Keys Identified Mail) is " +"enabled on your email server. In the case of Odoo Online & Odoo.sh, you " +"should add a DNS \"odoo._domainkey\" CNAME record to " +"\"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have " +"a record \"odoo._domainkey.foo.com\" that is a CNAME with the value " +"\"odoo._domainkey.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:80 +msgid "How to manage inbound messages" +msgstr "" + +#: ../../discuss/email_servers.rst:82 +msgid "Odoo relies on generic email aliases to fetch incoming messages." +msgstr "" + +#: ../../discuss/email_servers.rst:84 +msgid "" +"**Reply messages** of messages sent from Odoo are routed to their original " +"discussion thread (and to the inbox of all its followers) by the catchall " +"alias (**catchall@**)." +msgstr "" + +#: ../../discuss/email_servers.rst:88 +msgid "" +"**Bounced messages** are routed to **bounce@** in order to track them in " +"Odoo. This is especially used in `Odoo Email Marketing " +"`__ to opt-out invalid " +"recipients." +msgstr "" + +#: ../../discuss/email_servers.rst:92 +msgid "" +"**Original messages**: Several business objects have their own alias to " +"create new records in Odoo from incoming emails:" +msgstr "" + +#: ../../discuss/email_servers.rst:95 +msgid "" +"Sales Channel (to create Leads or Opportunities in `Odoo CRM " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:97 +msgid "" +"Support Channel (to create Tickets in `Odoo Helpdesk " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:99 +msgid "" +"Projects (to create new Tasks in `Odoo Project `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:101 +msgid "" +"Job Positions (to create Applicants in `Odoo Recruitment " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:103 +msgid "etc." +msgstr "etc." + +#: ../../discuss/email_servers.rst:105 +msgid "" +"Depending on your mail server, there might be several methods to fetch " +"emails. The easiest and most recommended method is to manage one email " +"address per Odoo alias in your mail server." +msgstr "" + +#: ../../discuss/email_servers.rst:109 +msgid "" +"Create the corresponding email addresses in your mail server (catcall@, " +"bounce@, sales@, etc.)." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "Set your domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:116 +msgid "" +"If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for " +"each alias. You can do it from the General Settings as well. Fill out the " +"form according to your email provider’s settings. Leave the *Actions to " +"Perform on Incoming Mails* blank. Once all the information has been filled " +"out, click on *TEST & CONFIRM*." +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "" +"If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming " +"messages to Odoo's domain name rather than exclusively use your own email " +"server. That way you will receive incoming messages without delay. Indeed, " +"Odoo Online is fetching incoming messages of external servers once per hour " +"only. You should set redirections for all the email addresses to Odoo's " +"domain name in your email server (e.g. *catchall@mydomain.ext* to " +"*catchall@mycompany.odoo.com*)." +msgstr "" + +#: ../../discuss/email_servers.rst:132 +msgid "" +"All the aliases are customizable in Odoo. Object aliases can be edited from " +"their respective configuration view. To edit catchall and bounce aliases, " +"you first need to activate the developer mode from the Settings Dashboard." msgstr "" #: ../../discuss/email_servers.rst:140 msgid "" -"Odoo Discuss is a perfect tool to send and read messages related to business" -" documents. However it doesn't aim to replace a full-featured email solution" -" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " -"both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not can be managed into your " -"external email box." +"Then refresh your screen and go to :menuselection:`Settings --> Technical " +"--> Parameters --> System Parameters` to customize the aliases " +"(*mail.catchall.alias* & * mail.bounce.alias*)." msgstr "" #: ../../discuss/email_servers.rst:147 msgid "" -"To do so, create specific email aliases to use in Odoo (to generate leads or" -" opportunities, helpdesk tickets, etc.). If you take an email alias already " -"used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity." +"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*." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/fr/LC_MESSAGES/inventory.po b/locale/fr/LC_MESSAGES/inventory.po index 1a4190b5a..61b78bf0d 100644 --- a/locale/fr/LC_MESSAGES/inventory.po +++ b/locale/fr/LC_MESSAGES/inventory.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-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Micky Jault , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -764,8 +764,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:18 #: ../../inventory/routes/strategies/putaway.rst:23 #: ../../inventory/routes/strategies/removal.rst:18 -#: ../../inventory/settings/products/packages.rst:17 -#: ../../inventory/settings/products/packages.rst:66 #: ../../inventory/settings/products/strategies.rst:30 #: ../../inventory/settings/products/uom.rst:17 #: ../../inventory/settings/products/variants.rst:114 @@ -964,7 +962,6 @@ msgstr "Comment puis-je annuler un ordre de livraison" #: ../../inventory/routes/costing/landed_costs.rst:6 #: ../../inventory/routes/strategies/putaway.rst:6 #: ../../inventory/routes/strategies/removal.rst:6 -#: ../../inventory/settings/products/packages.rst:6 #: ../../inventory/settings/products/uom.rst:6 #: ../../inventory/shipping/operation/cancel.rst:6 #: ../../inventory/shipping/operation/invoicing.rst:6 @@ -3268,6 +3265,65 @@ msgstr "" msgid "Miscellaneous Operations" msgstr "Opérations diverses" +#: ../../inventory/management/misc/immediate_planned_transfers.rst:2 +msgid "Immediate & Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:4 +msgid "" +"In Odoo, you can create two types of transfers: immediate or planned " +"transfers." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:8 +msgid "Immediate Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:10 +msgid "" +"When you create a transfer manually, it is by default an immediate transfer." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:13 +msgid "" +"In the case of an immediate transfer, you directly encode the products and " +"quantities you are processing, there is no reservation that applies. This is" +" why the column \"Initial Demand\" is not editable. You only fill in the " +"column \"Done\" for the quantities." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:18 +msgid "" +"This is for example used when you are transferring goods from a location A " +"to a location B and that this is not planned (you are processing the " +"transfer right now)." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:23 +msgid "Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:25 +msgid "" +"When a transfer is generated automatically (from a sales order or purchase " +"order for example), it is a planned transfer. This means that there is an " +"initial demand and that reservation applies on this initial demand." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:30 +msgid "" +"If you want to create a planned transfer manually, you can do it from the " +"inventory dashboard." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:36 +msgid "" +"In that case, you will have to enter the initial demand first (how many " +"units are you supposed to proceed), then to mark your transfer as to do. " +"Once this is done, you will be able to reserve the products and to process " +"the transfer." +msgstr "" + #: ../../inventory/management/misc/owned_stock.rst:3 msgid "How to manage stock that you don't own?" msgstr "Comment gérer un stock que vous ne possédez pas ?" @@ -6866,179 +6922,6 @@ msgstr "Configuration" msgid "Products" msgstr "Articles" -#: ../../inventory/settings/products/packages.rst:3 -msgid "How to use packages?" -msgstr "Comment utiliser des emballages ?" - -#: ../../inventory/settings/products/packages.rst:8 -#: ../../inventory/settings/products/usage.rst:31 -msgid "" -"The package is the physical container in which you put one or several " -"product." -msgstr "" -"L'emballage est le conteneur physique dans lequel vous mettez un ou " -"plusieurs articles." - -#: ../../inventory/settings/products/packages.rst:11 -msgid "By default, Odoo does not take into account the use of it." -msgstr "Par défaut, Odoo ne les gère pas." - -#: ../../inventory/settings/products/packages.rst:13 -msgid "" -"Once you activate the option, you will be able to manage one or several " -"packages when doing your transfers." -msgstr "" -"Une fois l'option activée, vous pourrez gérer un ou plusieurs emballages " -"quand vous réaliserez vos transferts." - -#: ../../inventory/settings/products/packages.rst:19 -msgid "" -"To configure the use of packages, go to the menu :menuselection:`Inventory " -"--> Configuration --> Settings`. µ Locate the **Packages** section and tick " -"**Record packages used on packing: pallets, boxes,...**" -msgstr "" -"Pour configurer l'utilisation d'emballages, allez dans le menu " -":menuselection:`Inventaire --> Configuration --> Configuration`. Localisez " -"la section **Colis** et cochez **Enregistrer les emballages à utiliser au " -"colisage : palettes, boîtes,...**" - -#: ../../inventory/settings/products/packages.rst:27 -#: ../../inventory/shipping/operation/multipack.rst:23 -msgid "Click on **Apply** when you are done." -msgstr "Cliquez sur **Appliquer** quand vous avez terminé." - -#: ../../inventory/settings/products/packages.rst:30 -msgid "Pack products" -msgstr "Emballez des articles" - -#: ../../inventory/settings/products/packages.rst:32 -msgid "" -"Putting products in packs is usually done when processing warehouses " -"transfers (receipt, internals or deliveries)." -msgstr "" -"L'emballage des articles est habituellement réalisé lors des transferts en " -"entrepôt (à la réception, internes ou à la livraison)." - -#: ../../inventory/settings/products/packages.rst:35 -msgid "" -"To be able to put products in pack, the status of your transfer has to be " -"**Available**." -msgstr "" -"Pour pouvoir emballer des articles , votre transfert doit être à l'état " -"**Disponible**." - -#: ../../inventory/settings/products/packages.rst:41 -msgid "" -"In the operation tab, you can put your products into one or multiple " -"packages." -msgstr "" -"Dans l'onglet Opérations,ouvez mettre vos articles dans un ou plusieurs " -"emballages." - -#: ../../inventory/settings/products/packages.rst:44 -#: ../../inventory/shipping/operation/multipack.rst:50 -msgid "" -"Choose the quantity you want to put in the first pack in the **Done** " -"column, then click on the link **Put in Pack**." -msgstr "" -"Choisissez la quantité que vous voulez mettre dans le premier emballage dans" -" la colonne **Terminé**, puis cliquez sur le lien **Ajouter au colis**." - -#: ../../inventory/settings/products/packages.rst:50 -#: ../../inventory/shipping/operation/multipack.rst:56 -msgid "It will automatically create a pack with the requested quantity." -msgstr "Cela créera automatiquement un colis avec la quantité demandée." - -#: ../../inventory/settings/products/packages.rst:52 -#: ../../inventory/shipping/operation/multipack.rst:58 -msgid "Do the same steps for the other pieces you want to pack in." -msgstr "" -"Répétez les mêmes étapes pour les autres article que vous voulez emballer." - -#: ../../inventory/settings/products/packages.rst:57 -#: ../../inventory/shipping/operation/multipack.rst:63 -msgid "Click on **Validate** when you are done." -msgstr "Cliquez sur Valider lorsque vous avez terminé." - -#: ../../inventory/settings/products/packages.rst:60 -msgid "Whole packages transfers" -msgstr "Transferts de colis entriers" - -#: ../../inventory/settings/products/packages.rst:62 -msgid "" -"If you are using several locations and/or warehouses, it is possible to " -"transfer packages with its contents." -msgstr "" -"Si vous utilisez plusieurs emplacements et/ou entrepôts, il est possible de " -"transférer des colis et leur contenu." - -#: ../../inventory/settings/products/packages.rst:68 -msgid "" -"You need to configure the **Operation Type** to allow moving packages. Go to" -" :menuselection:`Configuration --> Operations Types`. Tick **Allow moving " -"packs**:" -msgstr "" -"Vous devez configurer le **Type d'opération** pour permettre les " -"déplacements de paquets. Aller à :menuselection:`Configuration --> Types " -"d'opérations`. Cochez **Autoriser les déplacements de paquets**:" - -#: ../../inventory/settings/products/packages.rst:75 -msgid "Transfer packages" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:77 -msgid "" -"Create a transfer order. Choose the source and the destination locations, " -"then click on **Mark as todo**. Do not put anything under the **Initial " -"Demand** tab." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:84 -msgid "" -"In the Operation tab, click on **Add an item** under the **Package To Move**" -" section." -msgstr "" -"Dans l'onglet Opérations, cliquez sur **Ajouter un élément** dans la section" -" **Paquet à déplacer**." - -#: ../../inventory/settings/products/packages.rst:87 -msgid "Tick the **Done** checkbox to confirm the move of the package :" -msgstr "Cochez la case **Terminé** pour confirmer le déplacement du paquet :" - -#: ../../inventory/settings/products/packages.rst:92 -msgid "When it is finished, click on **Validate**." -msgstr "Une fois terminé, cliquez sur **Valider**." - -#: ../../inventory/settings/products/packages.rst:95 -msgid "Packages traceability" -msgstr "Traçabilité des paquets" - -#: ../../inventory/settings/products/packages.rst:97 -msgid "" -"To trace a package or check its content, go to :menuselection:`Inventory " -"Control --> Packages`." -msgstr "" -"Pour tracer un colis ou vérifier son contenu, allez à " -":menuselection:`Gestion des stocks --> Colis`." - -#: ../../inventory/settings/products/packages.rst:103 -msgid "Click on **Package Transfers** to see all its moves." -msgstr "Cliquez sur **Transferts de paquets** pour voir tous ses mouvements." - -#: ../../inventory/settings/products/packages.rst:106 -#: ../../inventory/settings/products/usage.rst:70 -msgid ":doc:`../../overview/start/setup`" -msgstr ":doc:`../../overview/start/setup`" - -#: ../../inventory/settings/products/packages.rst:107 -msgid ":doc:`usage`" -msgstr ":doc:`usage`" - -#: ../../inventory/settings/products/packages.rst:108 -#: ../../inventory/settings/products/usage.rst:71 -msgid ":doc:`uom`" -msgstr ":doc:`uom`" - #: ../../inventory/settings/products/strategies.rst:3 msgid "How to select the right replenishment strategy" msgstr "" @@ -7347,6 +7230,14 @@ msgstr "" msgid "Packages" msgstr "Colis" +#: ../../inventory/settings/products/usage.rst:31 +msgid "" +"The package is the physical container in which you put one or several " +"product." +msgstr "" +"L'emballage est le conteneur physique dans lequel vous mettez un ou " +"plusieurs articles." + #: ../../inventory/settings/products/usage.rst:38 msgid "Packaging" msgstr "Conditionnement" @@ -7414,6 +7305,14 @@ msgstr "" "plateaux dans une ``boite`` ou dans un emballage en ``plastique``. C'est le " "**colis**." +#: ../../inventory/settings/products/usage.rst:70 +msgid ":doc:`../../overview/start/setup`" +msgstr ":doc:`../../overview/start/setup`" + +#: ../../inventory/settings/products/usage.rst:71 +msgid ":doc:`uom`" +msgstr ":doc:`uom`" + #: ../../inventory/settings/products/usage.rst:72 msgid ":doc:`packages`" msgstr ":doc:`packages`" @@ -8444,6 +8343,10 @@ msgid "" "**Record packages used on packing: pallets, boxes,...**" msgstr "" +#: ../../inventory/shipping/operation/multipack.rst:23 +msgid "Click on **Apply** when you are done." +msgstr "Cliquez sur **Appliquer** quand vous avez terminé." + #: ../../inventory/shipping/operation/multipack.rst:29 #: ../../inventory/shipping/setup/delivery_method.rst:77 #: ../../inventory/shipping/setup/third_party_shipper.rst:110 @@ -8468,6 +8371,27 @@ msgstr "" msgid "From here, you can split your delivery into multiple packages." msgstr "" +#: ../../inventory/shipping/operation/multipack.rst:50 +msgid "" +"Choose the quantity you want to put in the first pack in the **Done** " +"column, then click on the link **Put in Pack**." +msgstr "" +"Choisissez la quantité que vous voulez mettre dans le premier emballage dans" +" la colonne **Terminé**, puis cliquez sur le lien **Ajouter au colis**." + +#: ../../inventory/shipping/operation/multipack.rst:56 +msgid "It will automatically create a pack with the requested quantity." +msgstr "Cela créera automatiquement un colis avec la quantité demandée." + +#: ../../inventory/shipping/operation/multipack.rst:58 +msgid "Do the same steps for the other pieces you want to pack in." +msgstr "" +"Répétez les mêmes étapes pour les autres article que vous voulez emballer." + +#: ../../inventory/shipping/operation/multipack.rst:63 +msgid "Click on **Validate** when you are done." +msgstr "Cliquez sur Valider lorsque vous avez terminé." + #: ../../inventory/shipping/operation/multipack.rst:66 msgid "Multi-packages with a 3rd party-shipper" msgstr "" diff --git a/locale/nl/LC_MESSAGES/accounting.po b/locale/nl/LC_MESSAGES/accounting.po index c7d7c700e..b71e699fb 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: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+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" @@ -92,6 +92,7 @@ msgstr "" #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30 #: ../../accounting/payables/supplier_bills/manage.rst:31 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15 +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19 @@ -747,6 +748,86 @@ msgstr "" "Eenmaal u uw gegevens ingeeft zullen uw bankafschriften automatisch elke 4 " "uur gesynchroniseerd worden." +#: ../../accounting/bank/feeds/synchronize.rst:73 +#: ../../accounting/localizations/mexico.rst:501 +msgid "FAQ" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:76 +msgid "The synchronization is not working in real time, is it normal?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:78 +msgid "" +"Yodlee tries to get the data from a bank account once a day. However, this " +"doesn't always happen at the same time. And sometimes the process can fail. " +"In that case, Yodlee retries one hour or two later. This is why in Odoo " +"there is a cron that is running every 4 hours to fetch the information from " +"Yodlee." +msgstr "" + +#: ../../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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:86 +msgid "" +"Moreover, a transaction can be visible in your bank account but not being " +"fetched by Yodlee. Indeed, the transaction in your bank account can have the" +" 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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:91 +msgid "" +"What is important to remember is that Yodlee is not a service fetching " +"transactions in real time. This is a service to facilitate the import of the" +" bank statement in the database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:95 +msgid "Is the Yodlee feature included in my contract?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:97 +msgid "" +"Enterprise Version: Yes, if you have a valid enterprise contract linked to " +"your database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:98 +msgid "" +"Community Version: No, this feature is not included in the Community " +"Version." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:99 +msgid "" +"Online Version: Yes, even if you benefit from the One App Free contract." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:102 +msgid "Some banks have a status \"Beta\", what does it mean?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:104 +msgid "" +"This means that Yodlee is only currently working on developing the " +"synchronization with this bank. The synchronization could already work or it" +" may need a bit more time to have a 100% working synchronization. " +"Unfortunately, there is not much to do about except being patient." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:110 +msgid "All my past transactions are not in Odoo, why?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:112 +msgid "Yodlee only allows to fetch up transactions to 3 months in the past." +msgstr "" + #: ../../accounting/bank/misc.rst:3 ../../accounting/payables/misc.rst:3 #: ../../accounting/payables/misc/employee_expense.rst:187 msgid "Miscellaneous" @@ -1651,7 +1732,7 @@ msgstr "Type" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Select 'Sale' for customer invoices journals." -msgstr "" +msgstr "Selecteer 'Verkoop' voor klant factuur dagboeken." #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Select 'Purchase' for vendor bills journals." @@ -1996,88 +2077,128 @@ msgstr "" msgid "France" msgstr "Frankrijk" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:3 +#: ../../accounting/localizations/france.rst:6 +msgid "FEC" +msgstr "" + +#: ../../accounting/localizations/france.rst:8 +msgid "" +"If you have installed the French Accounting, you will be able to download " +"the FEC. For this, go in :menuselection:`Accounting --> Reporting --> France" +" --> FEC`." +msgstr "" + +#: ../../accounting/localizations/france.rst:12 +msgid "" +"If you do not see the submenu **FEC**, go in **Apps** and search for the " +"module called **France-FEC** and verify if it is well installed." +msgstr "" + +#: ../../accounting/localizations/france.rst:16 +msgid "French Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/france.rst:18 +msgid "" +"If you have installed the French Accounting, you will have access to some " +"accounting reports specific to France:" +msgstr "" + +#: ../../accounting/localizations/france.rst:20 +msgid "Bilan comptable" +msgstr "" + +#: ../../accounting/localizations/france.rst:21 +msgid "Compte de résultats" +msgstr "" + +#: ../../accounting/localizations/france.rst:22 +msgid "Plan de Taxes France" +msgstr "" + +#: ../../accounting/localizations/france.rst:25 msgid "Get the VAT anti-fraud certification with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:5 +#: ../../accounting/localizations/france.rst:27 msgid "" -"As of January 1st 2018, a new anti-fraud legislation will come into effect " -"in France and DOM-TOM. This new legislation stipulates certain criteria " +"As of January 1st 2018, a new anti-fraud legislation comes into effect in " +"France and DOM-TOM. This new legislation stipulates certain criteria " "concerning the inalterability, security, storage and archiving of sales " "data. These legal requirements are implemented in Odoo, version 9 onward, " -"through an add-on." +"through a module and a certificate of conformity to download." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:12 +#: ../../accounting/localizations/france.rst:34 msgid "Is my company required to use an anti-fraud software?" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:13 +#: ../../accounting/localizations/france.rst:36 msgid "" "Your company is required to use an anti-fraud cash register software like " "Odoo (CGI art. 286, I. 3° bis) if:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:16 +#: ../../accounting/localizations/france.rst:39 msgid "You are taxable (not VAT exempt) in France or any DOM-TOM," msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:17 +#: ../../accounting/localizations/france.rst:40 msgid "Some of your customers are private individuals (B2C)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:19 +#: ../../accounting/localizations/france.rst:42 msgid "" "This rule applies to any company size. Auto-entrepreneurs are exempted from " "VAT and therefore are not affected." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:23 +#: ../../accounting/localizations/france.rst:46 msgid "Get certified with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:24 -msgid "Getting compliant with Odoo is vey easy." +#: ../../accounting/localizations/france.rst:48 +msgid "Getting compliant with Odoo is very easy." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:26 +#: ../../accounting/localizations/france.rst:50 msgid "" -"Your company is requested by the tax administration to deliver a Certificate" -" of Conformity testifying that your software complies with the anti-fraud " -"legislation. This certificate is granted by Odoo SA to Odoo Enterprise " -"users. If you use Odoo Community, you should `upgrade to Odoo Enterprise " +"Your company is requested by the tax administration to deliver a certificate" +" of conformity testifying that your software complies with the anti-fraud " +"legislation. This certificate is granted by Odoo SA to Odoo Enterprise users" +" `here `__. If you " +"use Odoo Community, you should `upgrade to Odoo Enterprise " "`__ or " -"contact your Odoo service provider. `Get the certificate here " -"`__." +"contact your Odoo service provider." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:34 +#: ../../accounting/localizations/france.rst:58 msgid "In case of non-conformity, your company risks a fine of €7,500." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:36 +#: ../../accounting/localizations/france.rst:60 msgid "To get the certification just follow the following steps:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:38 +#: ../../accounting/localizations/france.rst:62 msgid "" -"Install the anti-fraud add-on fitting your Odoo environment from the *Apps* " +"Install the anti-fraud module fitting your Odoo environment from the *Apps* " "menu:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:41 +#: ../../accounting/localizations/france.rst:65 msgid "" -"France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) " -"(if you use Odoo Point of Sale)" +"if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud " +"Certification for Point of Sale (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:43 +#: ../../accounting/localizations/france.rst:67 msgid "" -"France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) (in any other case)" +"in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud " +"Certification (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:44 +#: ../../accounting/localizations/france.rst:68 msgid "" "Make sure a country is set on your company, otherwise your entries won’t be " "encrypted for the inalterability check. To edit your company’s data, go to " @@ -2085,82 +2206,98 @@ msgid "" "country from the list; Do not create a new country." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:48 +#: ../../accounting/localizations/france.rst:72 msgid "" -"Download the mandatory Certificate of Conformity delivered by Odoo SA from " -"`here `__." +"Download the mandatory certificate of conformity delivered by Odoo SA `here " +"`__." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:50 +#: ../../accounting/localizations/france.rst:74 msgid "" -"If case you run Odoo on-premise, you should update your installation and " -"restart your server to get such new add-ons available in your Apps " -"repository. For any issue you can still download the modules from `Odoo's " -"Apps store `__." +"To install the module in any system created before December 18th 2017, you " +"should update the modules list. To do so, activate the developer mode from " +"the *Settings* menu. Then go to the *Apps* menu and press *Update Modules " +"List* in the top-menu." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:56 -msgid "Anti-fraud features of Odoo" +#: ../../accounting/localizations/france.rst:78 +msgid "" +"In case you run Odoo on-premise, you need to update your installation and " +"restart your server beforehand." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:57 -msgid "The anti-fraud add-on introduces the following features:" +#: ../../accounting/localizations/france.rst:80 +msgid "" +"If you have installed the initial version of the anti-fraud module (prior to" +" December 18th 2017), you need to update it. The module's name was *France -" +" Accounting - Certified CGI 286 I-3 bis*. After an update of the modules " +"list, search for the updated module in *Apps*, select it and click " +"*Upgrade*. Finally, make sure the following module *l10n_fr_sale_closing* is" +" installed." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:59 +#: ../../accounting/localizations/france.rst:89 +msgid "Anti-fraud features" +msgstr "" + +#: ../../accounting/localizations/france.rst:91 +msgid "The anti-fraud module introduces the following features:" +msgstr "" + +#: ../../accounting/localizations/france.rst:93 msgid "" "**Inalterability**: deactivation of all the ways to cancel or modify key " "data of POS orders, invoices and journal entries;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:61 +#: ../../accounting/localizations/france.rst:95 msgid "**Security**: chaining algorithm to verify the inalterability;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:62 +#: ../../accounting/localizations/france.rst:96 msgid "" "**Storage**: automatic sales closings with computation of both period and " "cumulative totals (daily, monthly, annually)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:66 +#: ../../accounting/localizations/france.rst:100 msgid "Inalterability" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:67 +#: ../../accounting/localizations/france.rst:102 msgid "" "All the possible ways to cancel and modify key data of paid POS orders, " "confirmed invoices and journal entries are deactivated, if the company is " "located in France or in any DOM-TOM." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:71 +#: ../../accounting/localizations/france.rst:106 msgid "" "If you run a multi-companies environment, only the documents of such " "companies are impacted." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:75 +#: ../../accounting/localizations/france.rst:110 msgid "Security" msgstr "Beveiliging" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:76 +#: ../../accounting/localizations/france.rst:112 msgid "" "To ensure the inalterability, every order or journal entry is encrypted upon" " validation. This number (or hash) is calculated from the key data of the " "document as well as from the hash of the precedent documents." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:81 +#: ../../accounting/localizations/france.rst:117 msgid "" -"The add-on introduces an interface to test the data inalterability. If any " +"The module introduces an interface to test the data inalterability. If any " "information is modified on a document after its validation, the test will " "fail. The algorithm recomputes all the hashes and compares them against the " "initial ones. In case of failure, the system points out the first corrupted " "document recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:87 +#: ../../accounting/localizations/france.rst:123 msgid "" "Users with *Manager* access rights can launch the inalterability check. For " "POS orders, go to :menuselection:`Point of Sales --> Reporting --> French " @@ -2168,11 +2305,11 @@ msgid "" ":menuselection:`Invoicing/Accounting --> Reporting --> French Statements`." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:94 +#: ../../accounting/localizations/france.rst:130 msgid "Storage" msgstr "Opslag" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:95 +#: ../../accounting/localizations/france.rst:132 msgid "" "The system also processes automatic sales closings on a daily, monthly and " "annual basis. Such closings distinctly compute the sales total of the period" @@ -2180,32 +2317,32 @@ msgid "" "recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:101 +#: ../../accounting/localizations/france.rst:138 msgid "" "Closings can be found in the *French Statements* menu of Point of Sale, " "Invoicing and Accounting apps." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:105 +#: ../../accounting/localizations/france.rst:142 msgid "" "Closings compute the totals for journal entries of sales journals (Journal " "Type = Sales)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:107 +#: ../../accounting/localizations/france.rst:144 msgid "" "For multi-companies environments, such closings are performed by company." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:109 +#: ../../accounting/localizations/france.rst:146 msgid "" "POS orders are posted as journal entries at the closing of the POS session. " "Closing a POS session can be done anytime. To prompt users to do it on a " -"daily basis, the add-on prevents from resuming a session opened more than 24" +"daily basis, the module prevents from resuming a session opened more than 24" " hours ago. Such a session must be closed before selling again." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:115 +#: ../../accounting/localizations/france.rst:152 msgid "" "A period’s total is computed from all the journal entries posted after the " "previous closing of the same type, regardless of their posting date. If you " @@ -2213,65 +2350,133 @@ msgid "" "counted in the very next closing." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:120 +#: ../../accounting/localizations/france.rst:157 msgid "" "For test & audit purposes such closings can be manually generated in the " "developer mode. Go to :menuselection:`Settings --> Technical --> Automation " "--> Scheduled Actions` to do so." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:127 +#: ../../accounting/localizations/france.rst:164 msgid "Responsibilities" msgstr "Verantwoordelijkheden" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:128 +#: ../../accounting/localizations/france.rst:166 msgid "" "Do not uninstall the module! If you do so, the hashes will be reset and none" " of your past data will be longer guaranteed as being inalterable." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:131 +#: ../../accounting/localizations/france.rst:169 msgid "" "Users remain responsible for their Odoo instance and must use it with due " "diligence. It is not permitted to modify the source code which guarantees " "the inalterability of data." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:135 +#: ../../accounting/localizations/france.rst:173 msgid "" "Odoo absolves itself of all and any responsibility in case of changes in the" -" add-on’s functions caused by 3rd party applications not certified by Odoo." +" module’s functions caused by 3rd party applications not certified by Odoo." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:140 +#: ../../accounting/localizations/france.rst:178 msgid "More Information" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:141 +#: ../../accounting/localizations/france.rst:180 msgid "" "You will find more information about this legislation in the official " "documents:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:143 +#: ../../accounting/localizations/france.rst:182 msgid "" "`Frequently Asked Questions " "`__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:144 +#: ../../accounting/localizations/france.rst:183 msgid "" "`Official Statement " "`__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:145 +#: ../../accounting/localizations/france.rst:184 msgid "" "`Item 88 of Finance Law 2016 " "`__" msgstr "" +#: ../../accounting/localizations/germany.rst:3 +msgid "Germany" +msgstr "Duitsland" + +#: ../../accounting/localizations/germany.rst:6 +msgid "German Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/germany.rst:8 +msgid "" +"The chart of accounts SKR03 and SKR04 are both supported in Odoo. You can " +"choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the Fiscal Localization " +"section." +msgstr "" + +#: ../../accounting/localizations/germany.rst:12 +#: ../../accounting/localizations/spain.rst:17 +msgid "" +"Be careful, you can only change the accounting package as long as you have " +"not created any accounting entry." +msgstr "" + +#: ../../accounting/localizations/germany.rst:16 +msgid "" +"When you create a new SaaS database, the SKR03 is installed by default." +msgstr "" + +#: ../../accounting/localizations/germany.rst:19 +msgid "German Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/germany.rst:21 +msgid "" +"Here is the list of German-specific reports available on Odoo Enterprise:" +msgstr "" + +#: ../../accounting/localizations/germany.rst:23 +#: ../../accounting/localizations/spain.rst:27 +#: ../../accounting/others/reporting/main_reports.rst:30 +msgid "Balance Sheet" +msgstr "Balans" + +#: ../../accounting/localizations/germany.rst:24 +msgid "Profit & Loss" +msgstr "" + +#: ../../accounting/localizations/germany.rst:25 +msgid "Tax Report (Umsatzsteuervoranmeldung)" +msgstr "" + +#: ../../accounting/localizations/germany.rst:26 +msgid "Partner VAT Intra" +msgstr "BTW intra" + +#: ../../accounting/localizations/germany.rst:29 +msgid "Export from Odoo to Datev" +msgstr "" + +#: ../../accounting/localizations/germany.rst:31 +msgid "" +"It is possible to export your accounting entries from Odoo to Datev. To be " +"able to use this feature, the german accounting localization needs to be " +"installed on your Odoo Enterprise database. Then you can go in " +":menuselection:`Accounting --> Reporting --> General Ledger` then click on " +"the **Export Datev (csv)** button." +msgstr "" + #: ../../accounting/localizations/mexico.rst:3 msgid "Mexico" msgstr "Mexico" @@ -2997,10 +3202,6 @@ msgid "" "generic one with no explanation." msgstr "" -#: ../../accounting/localizations/mexico.rst:501 -msgid "FAQ" -msgstr "" - #: ../../accounting/localizations/mexico.rst:503 msgid "**Error message** (Only applicable on CFDI 3.3):" msgstr "" @@ -3137,6 +3338,67 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/spain.rst:3 +msgid "Spain" +msgstr "Spanje" + +#: ../../accounting/localizations/spain.rst:6 +msgid "Spanish Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/spain.rst:8 +msgid "" +"In Odoo, there are several Spanish Chart of Accounts that are available by " +"default:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:10 +msgid "PGCE PYMEs 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:11 +msgid "PGCE Completo 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:12 +msgid "PGCE Entitades" +msgstr "" + +#: ../../accounting/localizations/spain.rst:14 +msgid "" +"You can choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the **Fiscal " +"Localization** section." +msgstr "" + +#: ../../accounting/localizations/spain.rst:20 +msgid "" +"When you create a new SaaS database, the PGCE PYMEs 2008 is installed by " +"default." +msgstr "" + +#: ../../accounting/localizations/spain.rst:23 +msgid "Spanish Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/spain.rst:25 +msgid "" +"If the Spanish Accounting Localization is installed, you will have access to" +" accounting reports specific to Spain:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:28 +msgid "Tax Report (Modelo 111)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:29 +msgid "Tax Report (Modelo 115)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:30 +msgid "Tax Report (Modelo 303)" +msgstr "" + #: ../../accounting/localizations/switzerland.rst:3 msgid "Switzerland" msgstr "Zwitserland" @@ -3465,6 +3727,13 @@ msgid "" "odoo.com/help." msgstr "" +#: ../../accounting/localizations/switzerland.rst:128 +msgid "" +"Don't forget to update your fiscal positions. If you have a version 11.1 (or" +" higher), there is nothing to do. Otherwise, you will also have to update " +"your fiscal positions accordingly." +msgstr "" + #: ../../accounting/others.rst:3 #: ../../accounting/receivables/customer_invoices/overview.rst:108 msgid "Others" @@ -3833,18 +4102,11 @@ msgid "" " feature" msgstr "" -#: ../../accounting/others/adviser/budget.rst:34 -msgid "" -"If we want to be precise and point specific invoices and vendors bills to " -"our budget, you should enable the Analytic accounting as well. If we don't " -"we will only be able to budget the total amount of general accounts." -msgstr "" - -#: ../../accounting/others/adviser/budget.rst:40 +#: ../../accounting/others/adviser/budget.rst:35 msgid "Budgetary Positions" msgstr "Budgetposten" -#: ../../accounting/others/adviser/budget.rst:42 +#: ../../accounting/others/adviser/budget.rst:37 msgid "" "Budgetary positions are the general accounts for which you want to keep " "budgets (typically expense or income accounts). They need to be defined so " @@ -3852,77 +4114,76 @@ msgid "" "Some might be already installed with your chart of accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:48 +#: ../../accounting/others/adviser/budget.rst:43 msgid "" "To define the positions enter the :menuselection:`Accounting module --> " "Configuration --> Budgetary Positions`." msgstr "" -#: ../../accounting/others/adviser/budget.rst:51 +#: ../../accounting/others/adviser/budget.rst:46 msgid "" "For our example we need to define what accounts relates to our project's " "expenses. Create a position and add items to select the accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:57 +#: ../../accounting/others/adviser/budget.rst:52 msgid "" "In this case we select the three relevant accounts used wherein we will book" " our expenses." msgstr "" -#: ../../accounting/others/adviser/budget.rst:63 +#: ../../accounting/others/adviser/budget.rst:58 msgid "Click on *Select*." msgstr "Klik op *Selecteer*." -#: ../../accounting/others/adviser/budget.rst:68 +#: ../../accounting/others/adviser/budget.rst:63 msgid "Save the changes to confirm your Budgetary position." msgstr "Bewaar de wijzigingen om uw budgetaire positie te bevestigen." -#: ../../accounting/others/adviser/budget.rst:70 +#: ../../accounting/others/adviser/budget.rst:65 msgid "" "Repeat this steps to create a revenue budgetary position. Only in this case " "select the relevant income accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:74 +#: ../../accounting/others/adviser/budget.rst:69 msgid "Analytical account" msgstr "Analytische rekening" -#: ../../accounting/others/adviser/budget.rst:76 +#: ../../accounting/others/adviser/budget.rst:71 msgid "" -"If you wish to point specific invoices or vendor bills to your budget you " -"need to use analytical accounting. Odoo needs to know which costs or " -"expenses are relevant to a specified budget. To do so we need to link our " -"invoices and expenses to a defined analytical account. Create an analytical " -"account by entering the Accounting module and clicking " -":menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a " -"new Account called Smith&Co project and select the related partner." +"Odoo needs to know which costs or expenses are relevant to a specified " +"budget. To do so we need to link our invoices and expenses to a defined " +"analytical account. Create an analytical account by entering the Accounting " +"module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open " +"Charts`. Create a new Account called Smith&Co project and select the related" +" partner." msgstr "" -#: ../../accounting/others/adviser/budget.rst:88 +#: ../../accounting/others/adviser/budget.rst:82 msgid "Set a budget" msgstr "Stel een budget in" -#: ../../accounting/others/adviser/budget.rst:90 +#: ../../accounting/others/adviser/budget.rst:84 msgid "" "Let's now set our targets for our budget. We specified that we expect to " "gain 1000 with this project and we would like not to spend more than 700." msgstr "" -#: ../../accounting/others/adviser/budget.rst:94 +#: ../../accounting/others/adviser/budget.rst:88 msgid "" "To set those targets, enter the accounting app, select " ":menuselection:`Advisers --> Budgets` and create a new Budget." msgstr "" -#: ../../accounting/others/adviser/budget.rst:97 +#: ../../accounting/others/adviser/budget.rst:91 msgid "" "We have to give a name to the budget. In this case we'll call it \"Smith " "Project\". Select the period wherein the budget will be applicable. Next add" " an item to specify your targets in the Budget Line." msgstr "" -#: ../../accounting/others/adviser/budget.rst:104 +#: ../../accounting/others/adviser/budget.rst:98 msgid "" "Select the Budgetary Position related to the Budget Line. In other words, " "select the position that points to the accounts you want to budget. In this " @@ -3932,57 +4193,57 @@ msgid "" "corresponding analytic account." msgstr "" -#: ../../accounting/others/adviser/budget.rst:114 +#: ../../accounting/others/adviser/budget.rst:108 msgid "" "Click on **Save & new** to input the revenue budget. The Budgetary Position " "is Revenue and the Planned Amount is 1000. Save and close" msgstr "" -#: ../../accounting/others/adviser/budget.rst:117 +#: ../../accounting/others/adviser/budget.rst:111 msgid "You'll need to **Confirm** and **Approve** the budget." msgstr "U moet het budget **Bevestigen** en **Goedkeuren**." -#: ../../accounting/others/adviser/budget.rst:120 +#: ../../accounting/others/adviser/budget.rst:114 msgid "Check your budget" msgstr "Controleer uw budget" -#: ../../accounting/others/adviser/budget.rst:122 +#: ../../accounting/others/adviser/budget.rst:116 msgid "" "You can check your budget at any time. To see the evolution, let's book some" " Invoices and Vendors Bills." msgstr "" -#: ../../accounting/others/adviser/budget.rst:127 +#: ../../accounting/others/adviser/budget.rst:121 msgid "" "if you use analytical accounts remember that you need to specify the account" " in the invoice and / or purchase line." msgstr "" -#: ../../accounting/others/adviser/budget.rst:131 +#: ../../accounting/others/adviser/budget.rst:125 msgid "for more information about booking invoices and purchase orders see:" msgstr "" "voor meer informatie over het inboeken van facturen en inkooporders zie: " -#: ../../accounting/others/adviser/budget.rst:133 +#: ../../accounting/others/adviser/budget.rst:127 msgid ":doc:`../../receivables/customer_invoices/overview`" msgstr ":doc:`../../receivables/customer_invoices/overview`" -#: ../../accounting/others/adviser/budget.rst:134 +#: ../../accounting/others/adviser/budget.rst:128 msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`" msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice`" -#: ../../accounting/others/adviser/budget.rst:136 +#: ../../accounting/others/adviser/budget.rst:130 msgid "Go back in the budget list and find the Smith Project." msgstr "Ga terug in de budgetlijst en zoek het Smith project." -#: ../../accounting/others/adviser/budget.rst:138 +#: ../../accounting/others/adviser/budget.rst:132 msgid "" "Via the analytical account, Odoo can account the invoice lines and purchase " "lines booked in the accounts and will display them in the **Practical " "Amount** column." msgstr "" -#: ../../accounting/others/adviser/budget.rst:147 +#: ../../accounting/others/adviser/budget.rst:141 msgid "" "The theoretical amount represents the amount of money you theoretically " "could have spend / should have received in function of the date. When your " @@ -6325,10 +6586,6 @@ msgid "" "default **Previous 1 Period** option." msgstr "" -#: ../../accounting/others/reporting/main_reports.rst:30 -msgid "Balance Sheet" -msgstr "Balans" - #: ../../accounting/others/reporting/main_reports.rst:32 msgid "" "The **Balance Sheet** shows a snapshot of the assets, liabilities and equity" @@ -10680,6 +10937,78 @@ msgstr "" msgid ":doc:`overview`" msgstr ":doc:`overview`" +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2 +msgid "Set up cash roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:4 +msgid "" +"In some currencies, the smallest coins do not exist. For example, in " +"Switzerland, there is no coin for 0.01 CHF. For this reason, if invoices are" +" paid in cash, you have to round their total amount to the smallest coin " +"that exist in the currency. For the CHF, the smallest coin is 0.05 CHF." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:10 +msgid "There are two strategies for the rounding:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:12 +msgid "Add a line on the invoice for the rounding" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:14 +msgid "Add the rounding in the tax amount" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:16 +msgid "Both strategies are applicable in Odoo." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:21 +msgid "" +"First, you have to activate the feature. For this, go in " +":menuselection:`Accounting --> Configuration --> Settings` and activate the " +"Cash Rounding." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:28 +msgid "" +"There is a new menu to manage cash roundings in :menuselection:`Accounting " +"--> Configuration --> Management --> Cash roundings`." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:31 +msgid "" +"Now, you can create cash roundings. You can choose between two rounding " +"strategies:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:34 +msgid "" +"**Add a rounding line**: if a rounding is necessary, Odoo will add a line on" +" your customer invoice to take this rounding into account. You also have to " +"define the account in which the rounding will go." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:39 +msgid "" +"**Modify tax amount:** Odoo will add the rounding to the amount of the " +"highest tax." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:46 +msgid "Apply roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:48 +msgid "" +"Once your roundings are created, you can apply them on customer invoices. On" +" the customer invoices, there is a new field called **Cash Rounding Method**" +" where you can simply choose one of the rounding methods created previously." +" If needed, a rounding will be applied to the invoice." +msgstr "" + #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:3 msgid "Deferred revenues: how to automate them?" msgstr "" @@ -10992,97 +11321,6 @@ msgstr "" msgid ":doc:`payment_terms`" msgstr ":doc:`payment_terms`" -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:3 -msgid "How to modify a validated invoice?" -msgstr "Hoe een gevalideerde factuur te wijzigen?" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:5 -msgid "" -"In most accounting legislation over the word, it's not allowed to modify an " -"invoice that is validated and sent to the customer. However, you sometimes " -"need to change an invoice for different reasons: the sale has changed, the " -"made a mistake while recording the invoice, etc." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:10 -msgid "Thus, the right way to modify an invoice is to:" -msgstr "Dus, de correcte manier om een factuur te wijzigen is om:" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:12 -msgid "Refund the original invoice" -msgstr "De originele factuur terugbetalen" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:13 -msgid "Create a new invoice" -msgstr "Maak een nieuwe factuur" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:15 -msgid "" -"Odoo's refund mechanism helps you handle the whole process in just a few " -"clicks." -msgstr "" -"Odoo's terugbetaling mechanisme helpt u met het afhandelen van het hele " -"proces in een paar klikken." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:19 -msgid "Modify an invoice" -msgstr "Wijzig een factuur" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:21 -msgid "" -"If your invoice is still in draft, you can modify it the way you want. " -"However, if your invoice is validated, you can not change it anymore. If you" -" need to modify it, the right operations to do are:" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:25 -msgid "Refund the original invoice;" -msgstr "Betaal de originele factuur terug;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:26 -msgid "Reconcile the original invoice with the refund to void them;" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:27 -msgid "Create a new draft invoice, a copy of the original;" -msgstr "Maak een nieuwe conceptfactuur, een kopie van het originele factuur;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:28 -msgid "Validate the new invoice." -msgstr "Valideer de nieuwe factuur." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:30 -msgid "" -"All those steps are automated by Odoo. All you have to do is to click on the" -" Refund button on an invoice." -msgstr "" -"Al deze stappen zijn geautomatiseerd door Odoo. Het enige dat u hoeft te " -"doen is te klikken op de knop Terugbetaling op een factuur." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:36 -msgid "" -"In the refund dialog, select the option \"Modify: create a refund, reconcile" -" and create a draft invoice\". Once you click on the \"Create Refund\" " -"button, Odoo will void your existing invoice and create a new draft invoice " -"that is a duplicate of the original one." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:41 -msgid "Edit this new draft invoice and validate it when it's correct." -msgstr "" -"Wijzig deze nieuwe concept factuur en valideer het wanneer deze correct is." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:45 -msgid "" -"if you already sent the original invoice to your customer, you should send " -"the new invoice and the refund to the customer so that he gets all the " -"documents." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:50 -msgid ":doc:`refund`" -msgstr ":doc:`refund`" - #: ../../accounting/receivables/customer_invoices/overview.rst:3 msgid "Overview of the invoicing process" msgstr "Overzicht van de factureringsprocessen" diff --git a/locale/nl/LC_MESSAGES/crm.po b/locale/nl/LC_MESSAGES/crm.po index 71c33b8fe..973cfbab8 100644 --- a/locale/nl/LC_MESSAGES/crm.po +++ b/locale/nl/LC_MESSAGES/crm.po @@ -54,11 +54,11 @@ msgstr "" #: ../../crm/calendar/google_calendar_credentials.rst:14 msgid "Go to the API & Services page." -msgstr "" +msgstr "Ga naar de API & Diensten pagina." #: ../../crm/calendar/google_calendar_credentials.rst:19 msgid "Search for *Google Calendar API* and select it." -msgstr "" +msgstr "Zoek voor *Google Kalender API* en selecteer deze." #: ../../crm/calendar/google_calendar_credentials.rst:27 msgid "Enable the API." @@ -69,10 +69,13 @@ msgid "" "Select or create an API project to store the credentials if not yet done " "before. Give it an explicit name (e.g. Odoo Sync)." msgstr "" +"Selecteer of maak een API project om de logingegevens te bewaren indien u " +"dit nog niet heeft gedaan. Geef het een expliciete naam (bijvoorbeeld Odoo " +"sync)." #: ../../crm/calendar/google_calendar_credentials.rst:35 msgid "Create credentials." -msgstr "" +msgstr "Logingegevens aanmaken." #: ../../crm/calendar/google_calendar_credentials.rst:40 msgid "" diff --git a/locale/nl/LC_MESSAGES/db_management.po b/locale/nl/LC_MESSAGES/db_management.po index ba2e0124a..0b2349430 100644 --- a/locale/nl/LC_MESSAGES/db_management.po +++ b/locale/nl/LC_MESSAGES/db_management.po @@ -160,6 +160,9 @@ msgid "" "`__ with the button \"Unlink " "database\"" msgstr "" +"U kan de oude database ontkoppelen via uw `Odoo Contract " +"`__ met de knop \"Database " +"ontkoppelen\"" #: ../../db_management/db_premise.rst:52 msgid "" diff --git a/locale/nl/LC_MESSAGES/discuss.po b/locale/nl/LC_MESSAGES/discuss.po index 65363b4b0..0f52c7040 100644 --- a/locale/nl/LC_MESSAGES/discuss.po +++ b/locale/nl/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: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Yenthe Van Ginneken , 2017\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" @@ -23,238 +23,107 @@ msgid "Discuss" msgstr "Discussieer" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive email in Odoo" +msgid "How to use my mail server to send and receive emails in Odoo" msgstr "" -"Hoe mijn eigen mailservers gebruiken om e-mail te ontvangen en verzenden in " -"Odoo" -#: ../../discuss/email_servers.rst:6 -msgid "When is it needed" -msgstr "Wanneer het nodig is" - -#: ../../discuss/email_servers.rst:7 +#: ../../discuss/email_servers.rst:5 msgid "" -"Using your own email servers is required to send and receive messages in " -"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " -"solution that works straight away. However you can still use your own email " -"servers with the online edition. Some insights are provided here below." +"This document is mainly dedicated to Odoo on-premise users who don't benefit" +" from an out-of-the-box solution to send and receive emails in Odoo, unlike " +"in `Odoo Online `__ & `Odoo.sh " +"`__." msgstr "" -"Uw eigen e-mail servers gebruiken is vereist om berichten te verzenden en " -"ontvangen in Odoo community of enterprise. Odoo online biedt out of the box " -"e-mail oplossingen aan. U kan nog altijd uw eigen e-mailservers gebruiken " -"met de online versie, indien nodig. Sommige inzichten vind u hieronder." -#: ../../discuss/email_servers.rst:14 -msgid "How to set it up" -msgstr "Hoe op te zetten" +#: ../../discuss/email_servers.rst:9 +msgid "" +"If no one in your company is used to manage email servers, we strongly " +"recommend that you opt for such convenient Odoo hosting solutions. Indeed " +"their email system works instantly and is monitored by professionals. " +"Nevertheless you can still use your own email servers if you want to manage " +"your email server's reputation yourself." +msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"As a system admin, go to :menuselection:`Settings --> General Settings` and " -"check *External Email Servers* (watch out: this checkbox only shows up after" -" Odoo 10). Then, go through the following steps." +"You will find here below some useful information to do so by integrating " +"your own email solution with Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:19 +msgid "How to manage outbound messages" msgstr "" -"Als systeembeheerder gaat u naar :menuselection:`Instellingen --> Algemene " -"instellingen` en vinkt u de optie *Externe e-mail server* aan (opgepast: " -"deze optie verschijnt enkel sinds Odoo 10). Ga vervolgens door de volgende " -"stappen." #: ../../discuss/email_servers.rst:21 msgid "" -"Office 365 email servers don't allow to send external emails from hosts like" -" Odoo. Consequently you can only use such email servers for incoming " -"messages." +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers*. Then, click *Outgoing Mail Servers* to " +"create one and reference the SMTP data of your email server. Once all the " +"information has been filled out, click on *Test Connection*." msgstr "" -"Office 365 email servers laten niet toe externe emails te verzenden van " -"hosts als Odoo. Hierdoor kunt u enkel zulke email servers gebruiken voor " -"inkomende berichten." #: ../../discuss/email_servers.rst:26 -msgid "Set an outgoing email server for outbound messages" -msgstr "Stel een uitgaande e-mailserver in voor uitgaande berichten" - -#: ../../discuss/email_servers.rst:27 -msgid "" -"You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " -"etc.) as well as your admin credentials. Once all the information has been " -"filled out, click on *Test Connection*." +msgid "Here is a typical configuration for a G Suite server." +msgstr "" + +#: ../../discuss/email_servers.rst:31 +msgid "Then set your email domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:34 +msgid "Can I use an Office 365 server" msgstr "" -"U heeft de SMTP data van uw e-mail provider nodig (Gmail, Outlook, Yahoo, " -"AOL, enz.) en uw administrator logingegevens. Wanneer alle informatie is " -"ingegeven klikt u op *Test connectie*." #: ../../discuss/email_servers.rst:35 -msgid "Set an incoming email server for inbound messages" -msgstr "Stel een inkomende e-mailserver in voor inkomende berichten" - -#: ../../discuss/email_servers.rst:36 msgid "" -"Fill out the form according to your email provider’s settings. Leave the " -"*Actions to Perform on Incoming Mails* blank. Once all the information has " -"been filled out, click on *TEST & CONFIRM*." +"You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP" +" relays are not compatible with Odoo Online." +msgstr "" + +#: ../../discuss/email_servers.rst:38 +msgid "" +"Please refer to `Microsoft's documentation `__ to configure" +" a SMTP relay for your Odoo's IP address." +msgstr "" + +#: ../../discuss/email_servers.rst:42 +msgid "How to use a G Suite server" msgstr "" -"Vul het formulier in naargelang uw email provider zijn instellingen. Laat " -"het *Acties te ondernemen bij inkomende mail* blanco. Eenmaal alle " -"informatie is ingevuld, klik op *TEST & BEVESTIG*." #: ../../discuss/email_servers.rst:43 msgid "" -"By default inbound messages are fetched every 5 minutes. You can change this" -" value in developer mode. Go to :menuselection:`Settings --> Technical --> " -"Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." +"You can use an G Suite server for any Odoo hosting type. To do so you need " +"to enable a SMTP relay and to allow *Any addresses* in the *Allowed senders*" +" section. The configuration steps are explained in `Google documentation " +"`__." msgstr "" -"Standaard worden inkomende berichten elke 5 minuten opgehaald. Je kan deze " -"waarde veranderen in de ontwikkelaars modus. Ga naar " -":menuselection:'Instellingen --> Technisch --> Automatisering --> Geplande " -"acties' en zoek voor *Mail: Fetchmail dienst*." #: ../../discuss/email_servers.rst:49 -msgid "Set the domain name" -msgstr "Stel de domeinnaam in" +msgid "Be SPF-compliant" +msgstr "" #: ../../discuss/email_servers.rst:50 msgid "" -"Enter the domain name of your email servers (e.g. mycompany.com) in General " -"Settings." +"In case you use SPF (Sender Policy Framework) to increase the deliverability" +" of your outgoing emails, don't forget to authorize Odoo as a sending host " +"in your domain name settings. Here is the configuration for Odoo Online:" msgstr "" -"Geef de domeinnaam van uw email server in (bijvoorbeeld mijnbedrijf.com) in " -"de algemene instellingen." -#: ../../discuss/email_servers.rst:57 -msgid "Create a catchall address" -msgstr "Maak een catchall adres" - -#: ../../discuss/email_servers.rst:58 +#: ../../discuss/email_servers.rst:54 msgid "" -"When a contact replies to an email sent from Odoo, the *reply-to* address is" -" a generic address used to route the reply to the right discussion thread in" -" Odoo (opportunity, order, task, etc.) and to the inbox of all its " -"followers. By default this address is \"catchall@\" but it can be changed." +"If no TXT record is set for SPF, create one with following definition: " +"v=spf1 include:_spf.odoo.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:63 +#: ../../discuss/email_servers.rst:56 msgid "" -"Create a catchall address in your email server settings. We advise you to " -"use \"catchall@\" so that everything works out straight away. If you want to" -" use another alias, you have extra steps in Odoo:" +"In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g." +" for a domain name that sends emails via Odoo Online and via G Suite it " +"could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:67 -msgid "Activate the developer mode from your Settings Dashboard." -msgstr "Activeer de ontwikkellaarsmodus vanuit uw instellingen dashboard." - -#: ../../discuss/email_servers.rst:72 -msgid "" -"Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " -"Parameters --> System Parameters` and enter your custom catchall alias in " -"*mail.catchall.alias*." -msgstr "" - -#: ../../discuss/email_servers.rst:79 -msgid "You can edit the email alias used for bounced messages the same way." -msgstr "" -"U kan de e-mail alias wijzigen op dezelde manier als voor bounced berichten." - -#: ../../discuss/email_servers.rst:82 -msgid "How to use my own email servers with Odoo Online" -msgstr "Hoe mijn eigen e-mail servers te gebruiken met Odoo Online" - -#: ../../discuss/email_servers.rst:83 -msgid "" -"Odoo Online comes up with an embedded and ready-to-use email solution with " -"*@yourcompany.odoo.com* as domain. We recommend to keep this default setup " -"as it is really convenient." -msgstr "" - -#: ../../discuss/email_servers.rst:87 -msgid "" -"Nevertheless you can still use your own email servers if you want to manage " -"your email server's reputation (blacklisting, etc). The configuration for " -"both incoming and outgoing mail servers is given here above." -msgstr "" - -#: ../../discuss/email_servers.rst:92 -msgid "" -"However when it comes to incoming messages, we don't recommend to " -"exclusively use your own email server. Indeed, Odoo Online is fetching " -"incoming messages from the email server once every hour only. To receive " -"emails in real time, you should rather use a **catchall redirection** (your " -"server -> Odoo server). To do so:" -msgstr "" - -#: ../../discuss/email_servers.rst:98 -msgid "" -"Create a catchall address in your email server settings (e.g. catchall)." -msgstr "" - -#: ../../discuss/email_servers.rst:99 -msgid "" -"Still from such settings, set a redirection from this catchall address to " -"Odoo's one: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com." -msgstr "" - -#: ../../discuss/email_servers.rst:102 -msgid "" -"In Odoo check *External Email Servers* in :menuselection:`Settings --> " -"General Settings` and enter your email domain name (i.e. yourdomain.ext)." -msgstr "" - -#: ../../discuss/email_servers.rst:104 -msgid "No need to set up an incoming email server in such a case." -msgstr "" - -#: ../../discuss/email_servers.rst:108 -msgid "How to be SPF-compliant when using external email servers in Odoo" -msgstr "" - -#: ../../discuss/email_servers.rst:109 -msgid "" -"Sender Policy Framework (SPF) is an email-validation system that checks that" -" incoming mail from a domain comes from a host authorized by that domain's " -"administrator. Such a security system is used in most email servers. If you " -"don't comply with it, your emails sent from Odoo will be likely flagged as " -"spam." -msgstr "" - -#: ../../discuss/email_servers.rst:115 -msgid "" -"To be SPF-compliant, you need to authorize Odoo as a sending host in your " -"domain name settings:" -msgstr "" -"Om SPF-conform te zijn moet u Odoo authoriseren als een verzend host in uw " -"domeinnaam instellingen:" - -#: ../../discuss/email_servers.rst:118 -msgid "Sign in to your domain’s account at your domain host." -msgstr "Meld u aan met uw domeinaccount op uw domein provider." - -#: ../../discuss/email_servers.rst:119 -msgid "Locate the page for updating your domain’s DNS records." -msgstr "Localiseer de pagina voor het updaten van uw domein zijn DNS records." - -#: ../../discuss/email_servers.rst:120 -msgid "" -"If no TXT record is set, create one with following definition: v=spf1 " -"include:_spf.odoo.com ~all" -msgstr "" -"Indien er geen TXT record is ingesteld maakt u er één aan met de volgende " -"definitie: v=spf1 include:_spf.odoo.com ~all" - -#: ../../discuss/email_servers.rst:122 -msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." -msgstr "" -"Indien er al een TXT record is ingesteld voegt u \"include:_spf.odoo.com\" " -"toe." - -#: ../../discuss/email_servers.rst:124 -msgid "e.g. for a Gmail server it should be:" -msgstr "b.v voor een Gmail server moet dit zijn:" - -#: ../../discuss/email_servers.rst:126 -msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" -msgstr "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" - -#: ../../discuss/email_servers.rst:128 +#: ../../discuss/email_servers.rst:60 msgid "" "Find `here `__ the exact procedure to " "create or modify TXT records in your own domain registrar." @@ -262,7 +131,7 @@ msgstr "" "Vind `hier `__ de exacte procedure om een " "TXT record aan te maken of te wijzigen bij uw eigen domein provider." -#: ../../discuss/email_servers.rst:131 +#: ../../discuss/email_servers.rst:63 msgid "" "Your new SPF record can take up to 48 hours to go into effect, but this " "usually happens more quickly." @@ -270,33 +139,141 @@ msgstr "" "Uw nieuwe SPF record kan tot 48 uur nodig hebben om actief te zijn, maar " "normaal gezien gebeurd dit al veel sneller." -#: ../../discuss/email_servers.rst:134 +#: ../../discuss/email_servers.rst:66 msgid "" "Adding more than one SPF record for a domain can cause problems with mail " "delivery and spam classification. Instead, we recommend using only one SPF " "record by modifying it to authorize Odoo." msgstr "" -#: ../../discuss/email_servers.rst:139 -msgid "How to choose between Odoo and my traditional email box" -msgstr "Hoe te kiezen tussen Odoo en mijn traditionele e-mail box" +#: ../../discuss/email_servers.rst:71 +msgid "Allow DKIM" +msgstr "" + +#: ../../discuss/email_servers.rst:72 +msgid "" +"You should do the same thing if DKIM (Domain Keys Identified Mail) is " +"enabled on your email server. In the case of Odoo Online & Odoo.sh, you " +"should add a DNS \"odoo._domainkey\" CNAME record to " +"\"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have " +"a record \"odoo._domainkey.foo.com\" that is a CNAME with the value " +"\"odoo._domainkey.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:80 +msgid "How to manage inbound messages" +msgstr "" + +#: ../../discuss/email_servers.rst:82 +msgid "Odoo relies on generic email aliases to fetch incoming messages." +msgstr "" + +#: ../../discuss/email_servers.rst:84 +msgid "" +"**Reply messages** of messages sent from Odoo are routed to their original " +"discussion thread (and to the inbox of all its followers) by the catchall " +"alias (**catchall@**)." +msgstr "" + +#: ../../discuss/email_servers.rst:88 +msgid "" +"**Bounced messages** are routed to **bounce@** in order to track them in " +"Odoo. This is especially used in `Odoo Email Marketing " +"`__ to opt-out invalid " +"recipients." +msgstr "" + +#: ../../discuss/email_servers.rst:92 +msgid "" +"**Original messages**: Several business objects have their own alias to " +"create new records in Odoo from incoming emails:" +msgstr "" + +#: ../../discuss/email_servers.rst:95 +msgid "" +"Sales Channel (to create Leads or Opportunities in `Odoo CRM " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:97 +msgid "" +"Support Channel (to create Tickets in `Odoo Helpdesk " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:99 +msgid "" +"Projects (to create new Tasks in `Odoo Project `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:101 +msgid "" +"Job Positions (to create Applicants in `Odoo Recruitment " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:103 +msgid "etc." +msgstr "etc." + +#: ../../discuss/email_servers.rst:105 +msgid "" +"Depending on your mail server, there might be several methods to fetch " +"emails. The easiest and most recommended method is to manage one email " +"address per Odoo alias in your mail server." +msgstr "" + +#: ../../discuss/email_servers.rst:109 +msgid "" +"Create the corresponding email addresses in your mail server (catcall@, " +"bounce@, sales@, etc.)." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "Set your domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:116 +msgid "" +"If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for " +"each alias. You can do it from the General Settings as well. Fill out the " +"form according to your email provider’s settings. Leave the *Actions to " +"Perform on Incoming Mails* blank. Once all the information has been filled " +"out, click on *TEST & CONFIRM*." +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "" +"If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming " +"messages to Odoo's domain name rather than exclusively use your own email " +"server. That way you will receive incoming messages without delay. Indeed, " +"Odoo Online is fetching incoming messages of external servers once per hour " +"only. You should set redirections for all the email addresses to Odoo's " +"domain name in your email server (e.g. *catchall@mydomain.ext* to " +"*catchall@mycompany.odoo.com*)." +msgstr "" + +#: ../../discuss/email_servers.rst:132 +msgid "" +"All the aliases are customizable in Odoo. Object aliases can be edited from " +"their respective configuration view. To edit catchall and bounce aliases, " +"you first need to activate the developer mode from the Settings Dashboard." +msgstr "" #: ../../discuss/email_servers.rst:140 msgid "" -"Odoo Discuss is a perfect tool to send and read messages related to business" -" documents. However it doesn't aim to replace a full-featured email solution" -" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " -"both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not can be managed into your " -"external email box." +"Then refresh your screen and go to :menuselection:`Settings --> Technical " +"--> Parameters --> System Parameters` to customize the aliases " +"(*mail.catchall.alias* & * mail.bounce.alias*)." msgstr "" #: ../../discuss/email_servers.rst:147 msgid "" -"To do so, create specific email aliases to use in Odoo (to generate leads or" -" opportunities, helpdesk tickets, etc.). If you take an email alias already " -"used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity." +"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*." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/nl/LC_MESSAGES/ecommerce.po b/locale/nl/LC_MESSAGES/ecommerce.po index c9cb0d523..17ff0ac16 100644 --- a/locale/nl/LC_MESSAGES/ecommerce.po +++ b/locale/nl/LC_MESSAGES/ecommerce.po @@ -420,6 +420,8 @@ msgstr "" msgid "" "The quantity of optional items added to cart is the same than the main item." msgstr "" +"De hoeveelheid van optioneel toegevoegd producten aan een winkelmandje is " +"hetzelfde als het hoofd product." #: ../../ecommerce/maximizing_revenue/pricing.rst:3 msgid "How to adapt the prices to my website visitors" @@ -563,6 +565,8 @@ msgid "" "Visitors must log in to share their comments. Make sure they are able to do " "so (see Portal documentation)." msgstr "" +"Bezoekers moeten aanmelden om hun reacties te delen. Verzeker u ervan dat uw" +" bezoekers dit zeker kunnen (bekijken de portaal documentatie)." #: ../../ecommerce/maximizing_revenue/reviews.rst:25 msgid "Review the posts in real time" @@ -1377,7 +1381,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/wire_transfer.rst:13 msgid "How to provide customers with payment instructions" -msgstr "" +msgstr "Hoe klanten betaling instructies aanbieden" #: ../../ecommerce/shopper_experience/wire_transfer.rst:14 msgid "" diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index 866a3947b..9ab51aadb 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -146,6 +146,8 @@ msgid "" "Then, use the label you found in your import template in order to make it " "work straight away the very next time you try to import." msgstr "" +"Gebruik vervolgens het label dat u gevonden heeft in uw importeer sjabloon " +"zodat het direct werkt bij uw volgende importeer poging." #: ../../general/base_import/adapt_template.rst:31 msgid "Why an “ID” column" @@ -170,6 +172,8 @@ msgid "" "Update imports: you can import the same file several times without creating " "duplicates;" msgstr "" +"Update imports: U kan hetzelfde bestand meerdere keren importeren zonder " +"duplicaten aan te maken;" #: ../../general/base_import/adapt_template.rst:39 msgid "Import relation fields (see here below)." diff --git a/locale/nl/LC_MESSAGES/getting_started.po b/locale/nl/LC_MESSAGES/getting_started.po index f9407a43c..37fa44c74 100644 --- a/locale/nl/LC_MESSAGES/getting_started.po +++ b/locale/nl/LC_MESSAGES/getting_started.po @@ -161,6 +161,9 @@ msgid "" "Pack): `https://odoo.thinkific.com/courses/odoo-functional " "`__" msgstr "" +"Bekijk de video's op ons e-Learning platform (gratis bij uw eerste succes " +"pakket): `https://odoo.thinkific.com/courses/odoo-functional " +"`__" #: ../../getting_started/documentation.rst:82 msgid "" @@ -175,6 +178,8 @@ msgid "" "Or send your questions to our online support team through our `online " "support form `__." msgstr "" +"Of verzend uw vragen naar ons online ondersteuningsteam via ons `online " +"ondersteuningsformulier `__." #: ../../getting_started/documentation.rst:89 msgid "What do we expect from you?" diff --git a/locale/nl/LC_MESSAGES/helpdesk.po b/locale/nl/LC_MESSAGES/helpdesk.po index 191fd7b2a..ce462abb0 100644 --- a/locale/nl/LC_MESSAGES/helpdesk.po +++ b/locale/nl/LC_MESSAGES/helpdesk.po @@ -28,29 +28,31 @@ msgstr "Overzicht" #: ../../helpdesk/helpdesk.rst:11 msgid "Getting started with Odoo Helpdesk" -msgstr "" +msgstr "Starten met Odoo Helpdesk" #: ../../helpdesk/helpdesk.rst:13 msgid "Installing Odoo Helpdesk:" -msgstr "" +msgstr "Odoo Helpdesk installeren:" #: ../../helpdesk/helpdesk.rst:15 msgid "Open the Apps module, search for \"Helpdesk\", and click install" -msgstr "" +msgstr "Open de Apps module, zoek voor \"Helpdesk\" en klik op installeren" #: ../../helpdesk/helpdesk.rst:21 msgid "Set up Helpdesk teams" -msgstr "" +msgstr "Helpdesk teams opzetten" #: ../../helpdesk/helpdesk.rst:23 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\"" -msgstr "" +msgstr "Standaard komt Odoo Helpdesk met een team \"Support\" genaamd." #: ../../helpdesk/helpdesk.rst:28 msgid "" "To modify this team, or create additional teams, select \"Configuration\" in" " the purple bar and select \"Settings\"" 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 msgid "" @@ -62,7 +64,7 @@ msgstr "" #: ../../helpdesk/helpdesk.rst:40 msgid "How to set up different stages for each team" -msgstr "" +msgstr "Hoe verschillende fases opzetten voor elk team" #: ../../helpdesk/helpdesk.rst:42 msgid "" @@ -81,11 +83,11 @@ msgstr "" #: ../../helpdesk/helpdesk.rst:55 msgid "Start receiving tickets" -msgstr "" +msgstr "Start met het ontvangen van tickets" #: ../../helpdesk/helpdesk.rst:58 msgid "How can my customers submit tickets?" -msgstr "" +msgstr "Hoe kunnen mijn klanten tickets doorsturen?" #: ../../helpdesk/helpdesk.rst:60 msgid "" @@ -119,10 +121,13 @@ msgid "" "documentation `*here* " "`__." msgstr "" +"De laatste optie om een ticket door te sturen is via een API connectie. " +"Bekijk de documentatie `*hier* " +"`__." #: ../../helpdesk/helpdesk.rst:93 msgid "Tickets have been created, now what?" -msgstr "" +msgstr "Er zijn tickets aangemaakt, wat nu?" #: ../../helpdesk/helpdesk.rst:95 msgid "" @@ -143,10 +148,12 @@ 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 "" +"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 msgid "How do I mark this ticket as urgent?" -msgstr "" +msgstr "Hoe markeer ik dit ticket als urgent?" #: ../../helpdesk/helpdesk.rst:112 msgid "" diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po index d291c92c7..55a0fe692 100644 --- a/locale/nl/LC_MESSAGES/inventory.po +++ b/locale/nl/LC_MESSAGES/inventory.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-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gunther Clauwaert , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -464,6 +464,8 @@ msgid "" "Print this document to be able to use your barcode scanner to perform more " "actions." msgstr "" +"Print het document om uw barcode scanner te kunnen gebruiken voor meerdere " +"acties." #: ../../inventory/barcode/setup/software.rst:19 msgid "Document: |download_barcode|" @@ -595,6 +597,8 @@ msgid "" "if you are using multiple locations for your warehouse, you will be able to " "set the location of your product from this screen." msgstr "" +"Indien u meerdere locaties gebruikt voor uw magazijn kan u de locatie van uw" +" product instellen vanuit dit scherm." #: ../../inventory/management/adjustment/initial_inventory.rst:42 msgid "" @@ -751,8 +755,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:18 #: ../../inventory/routes/strategies/putaway.rst:23 #: ../../inventory/routes/strategies/removal.rst:18 -#: ../../inventory/settings/products/packages.rst:17 -#: ../../inventory/settings/products/packages.rst:66 #: ../../inventory/settings/products/strategies.rst:30 #: ../../inventory/settings/products/uom.rst:17 #: ../../inventory/settings/products/variants.rst:114 @@ -931,7 +933,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:6 #: ../../inventory/routes/strategies/putaway.rst:6 #: ../../inventory/routes/strategies/removal.rst:6 -#: ../../inventory/settings/products/packages.rst:6 #: ../../inventory/settings/products/uom.rst:6 #: ../../inventory/shipping/operation/cancel.rst:6 #: ../../inventory/shipping/operation/invoicing.rst:6 @@ -2777,6 +2778,65 @@ msgstr "" msgid "Miscellaneous Operations" msgstr "Memoriaal" +#: ../../inventory/management/misc/immediate_planned_transfers.rst:2 +msgid "Immediate & Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:4 +msgid "" +"In Odoo, you can create two types of transfers: immediate or planned " +"transfers." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:8 +msgid "Immediate Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:10 +msgid "" +"When you create a transfer manually, it is by default an immediate transfer." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:13 +msgid "" +"In the case of an immediate transfer, you directly encode the products and " +"quantities you are processing, there is no reservation that applies. This is" +" why the column \"Initial Demand\" is not editable. You only fill in the " +"column \"Done\" for the quantities." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:18 +msgid "" +"This is for example used when you are transferring goods from a location A " +"to a location B and that this is not planned (you are processing the " +"transfer right now)." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:23 +msgid "Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:25 +msgid "" +"When a transfer is generated automatically (from a sales order or purchase " +"order for example), it is a planned transfer. This means that there is an " +"initial demand and that reservation applies on this initial demand." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:30 +msgid "" +"If you want to create a planned transfer manually, you can do it from the " +"inventory dashboard." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:36 +msgid "" +"In that case, you will have to enter the initial demand first (how many " +"units are you supposed to proceed), then to mark your transfer as to do. " +"Once this is done, you will be able to reserve the products and to process " +"the transfer." +msgstr "" + #: ../../inventory/management/misc/owned_stock.rst:3 msgid "How to manage stock that you don't own?" msgstr "Hoe stock te beheren die u niet bezit?" @@ -5751,6 +5811,8 @@ msgstr "Een strategie opzetten" msgid "" "Let's take as an example a retail shop where we store vegetables and fruits." msgstr "" +"Laten we een voorbeeld nemen van een winkel waar we groenten en fruit " +"bewaren." #: ../../inventory/routes/strategies/putaway.rst:38 msgid "" @@ -6115,155 +6177,6 @@ msgstr "Instellingen" msgid "Products" msgstr "Producten" -#: ../../inventory/settings/products/packages.rst:3 -msgid "How to use packages?" -msgstr "Hoe verpakkingen te gebruiken?" - -#: ../../inventory/settings/products/packages.rst:8 -#: ../../inventory/settings/products/usage.rst:31 -msgid "" -"The package is the physical container in which you put one or several " -"product." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:11 -msgid "By default, Odoo does not take into account the use of it." -msgstr "Standaard houdt Odoo geen rekening met het gebruiken hiervan." - -#: ../../inventory/settings/products/packages.rst:13 -msgid "" -"Once you activate the option, you will be able to manage one or several " -"packages when doing your transfers." -msgstr "" -"Eenmaal u de optie activeert kan u één of meerdere pakketten beheren wanneer" -" u mutaties doet." - -#: ../../inventory/settings/products/packages.rst:19 -msgid "" -"To configure the use of packages, go to the menu :menuselection:`Inventory " -"--> Configuration --> Settings`. µ Locate the **Packages** section and tick " -"**Record packages used on packing: pallets, boxes,...**" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:27 -#: ../../inventory/shipping/operation/multipack.rst:23 -msgid "Click on **Apply** when you are done." -msgstr "Klik op **Toepassen** wanneer u klaar bent." - -#: ../../inventory/settings/products/packages.rst:30 -msgid "Pack products" -msgstr "Verpak producten" - -#: ../../inventory/settings/products/packages.rst:32 -msgid "" -"Putting products in packs is usually done when processing warehouses " -"transfers (receipt, internals or deliveries)." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:35 -msgid "" -"To be able to put products in pack, the status of your transfer has to be " -"**Available**." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:41 -msgid "" -"In the operation tab, you can put your products into one or multiple " -"packages." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:44 -#: ../../inventory/shipping/operation/multipack.rst:50 -msgid "" -"Choose the quantity you want to put in the first pack in the **Done** " -"column, then click on the link **Put in Pack**." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:50 -#: ../../inventory/shipping/operation/multipack.rst:56 -msgid "It will automatically create a pack with the requested quantity." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:52 -#: ../../inventory/shipping/operation/multipack.rst:58 -msgid "Do the same steps for the other pieces you want to pack in." -msgstr "Doe dezelfde stap met de andere onderdelen die u wilt inpakken." - -#: ../../inventory/settings/products/packages.rst:57 -#: ../../inventory/shipping/operation/multipack.rst:63 -msgid "Click on **Validate** when you are done." -msgstr "Klik op **Valideren** wanneer u klaar bent." - -#: ../../inventory/settings/products/packages.rst:60 -msgid "Whole packages transfers" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:62 -msgid "" -"If you are using several locations and/or warehouses, it is possible to " -"transfer packages with its contents." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:68 -msgid "" -"You need to configure the **Operation Type** to allow moving packages. Go to" -" :menuselection:`Configuration --> Operations Types`. Tick **Allow moving " -"packs**:" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:75 -msgid "Transfer packages" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:77 -msgid "" -"Create a transfer order. Choose the source and the destination locations, " -"then click on **Mark as todo**. Do not put anything under the **Initial " -"Demand** tab." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:84 -msgid "" -"In the Operation tab, click on **Add an item** under the **Package To Move**" -" section." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:87 -msgid "Tick the **Done** checkbox to confirm the move of the package :" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:92 -msgid "When it is finished, click on **Validate**." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:95 -msgid "Packages traceability" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:97 -msgid "" -"To trace a package or check its content, go to :menuselection:`Inventory " -"Control --> Packages`." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:103 -msgid "Click on **Package Transfers** to see all its moves." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:106 -#: ../../inventory/settings/products/usage.rst:70 -msgid ":doc:`../../overview/start/setup`" -msgstr ":doc:`../../overview/start/setup`" - -#: ../../inventory/settings/products/packages.rst:107 -msgid ":doc:`usage`" -msgstr ":doc:`usage`" - -#: ../../inventory/settings/products/packages.rst:108 -#: ../../inventory/settings/products/usage.rst:71 -msgid ":doc:`uom`" -msgstr ":doc:`uom`" - #: ../../inventory/settings/products/strategies.rst:3 msgid "How to select the right replenishment strategy" msgstr "Hoe de correcte bevoorrading strategie te kiezen" @@ -6302,7 +6215,7 @@ msgid "" msgstr "" "Met de functie Maak op Order wordt een aankooporder geactiveerd dat gelijk " "is aan het aantal bestelde producten. Het systeem zal de huidige voorraad **" -" niet ** controleren. Dit betekent dat een draft aankooporder wordt " +" niet ** controleren. Dit betekent dat een concept aankooporder wordt " "gegenereerd, ongeacht de beschikbare hoeveelheid." #: ../../inventory/settings/products/strategies.rst:35 @@ -6314,7 +6227,7 @@ msgid "" msgstr "" "De Minimum voorraad regels configuratie is beschikbaar door de Voorraad " "module. In het Voorraadbeheer menu selecteer \"Aanvulopdracht regels\" in " -"het drop down menu. Daar, druk op \"Aanmaken\" om minimum en maximum stock " +"het drop down menu. Druk daar op \"Aanmaken\" om minimum en maximum stock " "waarden in te geven voor een bepaald product." #: ../../inventory/settings/products/strategies.rst:44 @@ -6547,6 +6460,12 @@ msgstr "" msgid "Packages" msgstr "Verpakkingen" +#: ../../inventory/settings/products/usage.rst:31 +msgid "" +"The package is the physical container in which you put one or several " +"product." +msgstr "" + #: ../../inventory/settings/products/usage.rst:38 msgid "Packaging" msgstr "Verpakking" @@ -6600,6 +6519,14 @@ msgid "" "``box`` or in a ``plastic`` wrapping. It is the **package**." msgstr "" +#: ../../inventory/settings/products/usage.rst:70 +msgid ":doc:`../../overview/start/setup`" +msgstr ":doc:`../../overview/start/setup`" + +#: ../../inventory/settings/products/usage.rst:71 +msgid ":doc:`uom`" +msgstr ":doc:`uom`" + #: ../../inventory/settings/products/usage.rst:72 msgid ":doc:`packages`" msgstr ":doc:`packages`" @@ -7484,6 +7411,10 @@ msgid "" "**Record packages used on packing: pallets, boxes,...**" msgstr "" +#: ../../inventory/shipping/operation/multipack.rst:23 +msgid "Click on **Apply** when you are done." +msgstr "Klik op **Toepassen** wanneer u klaar bent." + #: ../../inventory/shipping/operation/multipack.rst:29 #: ../../inventory/shipping/setup/delivery_method.rst:77 #: ../../inventory/shipping/setup/third_party_shipper.rst:110 @@ -7508,6 +7439,24 @@ msgstr "" msgid "From here, you can split your delivery into multiple packages." msgstr "" +#: ../../inventory/shipping/operation/multipack.rst:50 +msgid "" +"Choose the quantity you want to put in the first pack in the **Done** " +"column, then click on the link **Put in Pack**." +msgstr "" + +#: ../../inventory/shipping/operation/multipack.rst:56 +msgid "It will automatically create a pack with the requested quantity." +msgstr "" + +#: ../../inventory/shipping/operation/multipack.rst:58 +msgid "Do the same steps for the other pieces you want to pack in." +msgstr "Doe dezelfde stap met de andere onderdelen die u wilt inpakken." + +#: ../../inventory/shipping/operation/multipack.rst:63 +msgid "Click on **Validate** when you are done." +msgstr "Klik op **Valideren** wanneer u klaar bent." + #: ../../inventory/shipping/operation/multipack.rst:66 msgid "Multi-packages with a 3rd party-shipper" msgstr "" diff --git a/locale/nl/LC_MESSAGES/manufacturing.po b/locale/nl/LC_MESSAGES/manufacturing.po index 5a4e188a6..c05f1720a 100644 --- a/locale/nl/LC_MESSAGES/manufacturing.po +++ b/locale/nl/LC_MESSAGES/manufacturing.po @@ -24,7 +24,7 @@ msgstr "Productie" #: ../../manufacturing/management.rst:5 msgid "Manufacturing Management" -msgstr "" +msgstr "Productie beheer" #: ../../manufacturing/management/bill_configuration.rst:3 msgid "How to create a Bill of Materials" @@ -109,13 +109,15 @@ msgstr "" #: ../../manufacturing/management/bill_configuration.rst:61 msgid "Adding Byproducts to a BoM" -msgstr "" +msgstr "Bijproducten toevoegen aan een BoM" #: ../../manufacturing/management/bill_configuration.rst:63 msgid "" "In Odoo, a byproduct is any product produced by a BoM in addition to the " "primary product." msgstr "" +"In Odoo is een bijproduct een product dat geproduceerd is via een BoM " +"bovenop een primair product." #: ../../manufacturing/management/bill_configuration.rst:66 msgid "" diff --git a/locale/nl/LC_MESSAGES/point_of_sale.po b/locale/nl/LC_MESSAGES/point_of_sale.po index 46fbc9a22..0066d1f79 100644 --- a/locale/nl/LC_MESSAGES/point_of_sale.po +++ b/locale/nl/LC_MESSAGES/point_of_sale.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: Erwin van der Ploeg , 2017\n" +"Last-Translator: Melroy van den Berg , 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" @@ -2439,7 +2439,7 @@ msgstr "Klant display" #: ../../point_of_sale/overview/start.rst:0 msgid "Show checkout to customers with a remotely-connected screen." -msgstr "" +msgstr "Toon checkout aan klanten met een extern verbonden scherm." #: ../../point_of_sale/overview/start.rst:0 msgid "" @@ -2458,6 +2458,8 @@ msgid "" "This is useful for restaurants with onsite and take-away services that imply" " specific tax rates." msgstr "" +"Dit is handig voor restaurants met op locatie- en afhaaldiensten die " +"specifieke belastingtarieven impliceren." #: ../../point_of_sale/overview/start.rst:0 msgid "Available Pricelists" @@ -2470,6 +2472,11 @@ msgid "" "be valid, this pricelist must be listed here as an available pricelist. " "Otherwise the default pricelist will apply." msgstr "" +"Maak meerdere prijslijsten beschikbaar in de kassa. U kan een prijslijst ook" +" toewijzen aan specifieke klanten vanuit het contact formulier (onder het " +"tabblad verkopen). Om geldig te zijn moet de prijslijst hier opgelijst zijn " +"als beschikbare prijslijst. Anders is de standaard prijslijst van " +"toepassing." #: ../../point_of_sale/overview/start.rst:0 msgid "Default Pricelist" diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index 026fa3fe3..c4cb965db 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -1717,6 +1717,8 @@ msgid "" "Update imports: you can import the same file several times without creating " "duplicates;" msgstr "" +"Update imports: U kan hetzelfde bestand meerdere keren importeren zonder " +"duplicaten aan te maken;" #: ../../sales/products_prices/products/import.rst:32 msgid "Import relation fields (see here below)." diff --git a/locale/nl/LC_MESSAGES/website.po b/locale/nl/LC_MESSAGES/website.po index fca8268d2..db34ec991 100644 --- a/locale/nl/LC_MESSAGES/website.po +++ b/locale/nl/LC_MESSAGES/website.po @@ -165,6 +165,8 @@ msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" +"Open uw website dashboard in Odoo en link uw Analytics account door uw " +"cliënt ID in te geven." #: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." diff --git a/locale/sources/accounting.pot b/locale/sources/accounting.pot index 41dc700c8..84987f7af 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: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,6 +74,7 @@ msgstr "" #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30 #: ../../accounting/payables/supplier_bills/manage.rst:31 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15 +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19 @@ -465,6 +466,63 @@ msgstr "" msgid "Once you filled in your credentials, your bank feeds will be synchronized every 4 hours." msgstr "" +#: ../../accounting/bank/feeds/synchronize.rst:73 +#: ../../accounting/localizations/mexico.rst:501 +msgid "FAQ" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:76 +msgid "The synchronization is not working in real time, is it normal?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:78 +msgid "Yodlee tries to get the data from a bank account once a day. However, this doesn't always happen at the same time. And sometimes the process can fail. In that case, Yodlee retries one hour or two later. This is why in Odoo there is a cron that is running every 4 hours to fetch the information from Yodlee." +msgstr "" + +#: ../../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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:86 +msgid "Moreover, a transaction can be visible in your bank account but not being fetched by Yodlee. Indeed, the transaction in your bank account can have the 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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:91 +msgid "What is important to remember is that Yodlee is not a service fetching transactions in real time. This is a service to facilitate the import of the bank statement in the database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:95 +msgid "Is the Yodlee feature included in my contract?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:97 +msgid "Enterprise Version: Yes, if you have a valid enterprise contract linked to your database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:98 +msgid "Community Version: No, this feature is not included in the Community Version." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:99 +msgid "Online Version: Yes, even if you benefit from the One App Free contract." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:102 +msgid "Some banks have a status \"Beta\", what does it mean?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:104 +msgid "This means that Yodlee is only currently working on developing the synchronization with this bank. The synchronization could already work or it may need a bit more time to have a 100% working synchronization. Unfortunately, there is not much to do about except being patient." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:110 +msgid "All my past transactions are not in Odoo, why?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:112 +msgid "Yodlee only allows to fetch up transactions to 3 months in the past." +msgstr "" + #: ../../accounting/bank/misc.rst:3 #: ../../accounting/payables/misc.rst:3 #: ../../accounting/payables/misc/employee_expense.rst:187 @@ -1370,194 +1428,289 @@ msgstr "" msgid "France" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:3 +#: ../../accounting/localizations/france.rst:6 +msgid "FEC" +msgstr "" + +#: ../../accounting/localizations/france.rst:8 +msgid "If you have installed the French Accounting, you will be able to download the FEC. For this, go in :menuselection:`Accounting --> Reporting --> France --> FEC`." +msgstr "" + +#: ../../accounting/localizations/france.rst:12 +msgid "If you do not see the submenu **FEC**, go in **Apps** and search for the module called **France-FEC** and verify if it is well installed." +msgstr "" + +#: ../../accounting/localizations/france.rst:16 +msgid "French Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/france.rst:18 +msgid "If you have installed the French Accounting, you will have access to some accounting reports specific to France:" +msgstr "" + +#: ../../accounting/localizations/france.rst:20 +msgid "Bilan comptable" +msgstr "" + +#: ../../accounting/localizations/france.rst:21 +msgid "Compte de résultats" +msgstr "" + +#: ../../accounting/localizations/france.rst:22 +msgid "Plan de Taxes France" +msgstr "" + +#: ../../accounting/localizations/france.rst:25 msgid "Get the VAT anti-fraud certification with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:5 -msgid "As of January 1st 2018, a new anti-fraud legislation will come into effect in France and DOM-TOM. This new legislation stipulates certain criteria concerning the inalterability, security, storage and archiving of sales data. These legal requirements are implemented in Odoo, version 9 onward, through an add-on." +#: ../../accounting/localizations/france.rst:27 +msgid "As of January 1st 2018, a new anti-fraud legislation comes into effect in France and DOM-TOM. This new legislation stipulates certain criteria concerning the inalterability, security, storage and archiving of sales data. These legal requirements are implemented in Odoo, version 9 onward, through a module and a certificate of conformity to download." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:12 +#: ../../accounting/localizations/france.rst:34 msgid "Is my company required to use an anti-fraud software?" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:13 +#: ../../accounting/localizations/france.rst:36 msgid "Your company is required to use an anti-fraud cash register software like Odoo (CGI art. 286, I. 3° bis) if:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:16 +#: ../../accounting/localizations/france.rst:39 msgid "You are taxable (not VAT exempt) in France or any DOM-TOM," msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:17 +#: ../../accounting/localizations/france.rst:40 msgid "Some of your customers are private individuals (B2C)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:19 +#: ../../accounting/localizations/france.rst:42 msgid "This rule applies to any company size. Auto-entrepreneurs are exempted from VAT and therefore are not affected." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:23 +#: ../../accounting/localizations/france.rst:46 msgid "Get certified with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:24 -msgid "Getting compliant with Odoo is vey easy." +#: ../../accounting/localizations/france.rst:48 +msgid "Getting compliant with Odoo is very easy." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:26 -msgid "Your company is requested by the tax administration to deliver a Certificate of Conformity testifying that your software complies with the anti-fraud legislation. This certificate is granted by Odoo SA to Odoo Enterprise users. If you use Odoo Community, you should `upgrade to Odoo Enterprise `__ or contact your Odoo service provider. `Get the certificate here `__." +#: ../../accounting/localizations/france.rst:50 +msgid "Your company is requested by the tax administration to deliver a certificate of conformity testifying that your software complies with the anti-fraud legislation. This certificate is granted by Odoo SA to Odoo Enterprise users `here `__. If you use Odoo Community, you should `upgrade to Odoo Enterprise `__ or contact your Odoo service provider." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:34 +#: ../../accounting/localizations/france.rst:58 msgid "In case of non-conformity, your company risks a fine of €7,500." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:36 +#: ../../accounting/localizations/france.rst:60 msgid "To get the certification just follow the following steps:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:38 -msgid "Install the anti-fraud add-on fitting your Odoo environment from the *Apps* menu:" +#: ../../accounting/localizations/france.rst:62 +msgid "Install the anti-fraud module fitting your Odoo environment from the *Apps* menu:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:41 -msgid "France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) (if you use Odoo Point of Sale)" +#: ../../accounting/localizations/france.rst:65 +msgid "if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:43 -msgid "France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) (in any other case)" +#: ../../accounting/localizations/france.rst:67 +msgid "in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud Certification (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:44 +#: ../../accounting/localizations/france.rst:68 msgid "Make sure a country is set on your company, otherwise your entries won’t be encrypted for the inalterability check. To edit your company’s data, go to :menuselection:`Settings --> Users & Companies --> Companies`. Select a country from the list; Do not create a new country." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:48 -msgid "Download the mandatory Certificate of Conformity delivered by Odoo SA from `here `__." +#: ../../accounting/localizations/france.rst:72 +msgid "Download the mandatory certificate of conformity delivered by Odoo SA `here `__." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:50 -msgid "If case you run Odoo on-premise, you should update your installation and restart your server to get such new add-ons available in your Apps repository. For any issue you can still download the modules from `Odoo's Apps store `__." +#: ../../accounting/localizations/france.rst:74 +msgid "To install the module in any system created before December 18th 2017, you should update the modules list. To do so, activate the developer mode from the *Settings* menu. Then go to the *Apps* menu and press *Update Modules List* in the top-menu." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:56 -msgid "Anti-fraud features of Odoo" +#: ../../accounting/localizations/france.rst:78 +msgid "In case you run Odoo on-premise, you need to update your installation and restart your server beforehand." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:57 -msgid "The anti-fraud add-on introduces the following features:" +#: ../../accounting/localizations/france.rst:80 +msgid "If you have installed the initial version of the anti-fraud module (prior to December 18th 2017), you need to update it. The module's name was *France - Accounting - Certified CGI 286 I-3 bis*. After an update of the modules list, search for the updated module in *Apps*, select it and click *Upgrade*. Finally, make sure the following module *l10n_fr_sale_closing* is installed." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:59 +#: ../../accounting/localizations/france.rst:89 +msgid "Anti-fraud features" +msgstr "" + +#: ../../accounting/localizations/france.rst:91 +msgid "The anti-fraud module introduces the following features:" +msgstr "" + +#: ../../accounting/localizations/france.rst:93 msgid "**Inalterability**: deactivation of all the ways to cancel or modify key data of POS orders, invoices and journal entries;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:61 +#: ../../accounting/localizations/france.rst:95 msgid "**Security**: chaining algorithm to verify the inalterability;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:62 +#: ../../accounting/localizations/france.rst:96 msgid "**Storage**: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:66 +#: ../../accounting/localizations/france.rst:100 msgid "Inalterability" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:67 +#: ../../accounting/localizations/france.rst:102 msgid "All the possible ways to cancel and modify key data of paid POS orders, confirmed invoices and journal entries are deactivated, if the company is located in France or in any DOM-TOM." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:71 +#: ../../accounting/localizations/france.rst:106 msgid "If you run a multi-companies environment, only the documents of such companies are impacted." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:75 +#: ../../accounting/localizations/france.rst:110 msgid "Security" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:76 +#: ../../accounting/localizations/france.rst:112 msgid "To ensure the inalterability, every order or journal entry is encrypted upon validation. This number (or hash) is calculated from the key data of the document as well as from the hash of the precedent documents." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:81 -msgid "The add-on introduces an interface to test the data inalterability. If any information is modified on a document after its validation, the test will fail. The algorithm recomputes all the hashes and compares them against the initial ones. In case of failure, the system points out the first corrupted document recorded in the system." +#: ../../accounting/localizations/france.rst:117 +msgid "The module introduces an interface to test the data inalterability. If any information is modified on a document after its validation, the test will fail. The algorithm recomputes all the hashes and compares them against the initial ones. In case of failure, the system points out the first corrupted document recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:87 +#: ../../accounting/localizations/france.rst:123 msgid "Users with *Manager* access rights can launch the inalterability check. For POS orders, go to :menuselection:`Point of Sales --> Reporting --> French Statements`. For invoices or journal entries, go to :menuselection:`Invoicing/Accounting --> Reporting --> French Statements`." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:94 +#: ../../accounting/localizations/france.rst:130 msgid "Storage" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:95 +#: ../../accounting/localizations/france.rst:132 msgid "The system also processes automatic sales closings on a daily, monthly and annual basis. Such closings distinctly compute the sales total of the period as well as the cumulative grand totals from the very first sales entry recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:101 +#: ../../accounting/localizations/france.rst:138 msgid "Closings can be found in the *French Statements* menu of Point of Sale, Invoicing and Accounting apps." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:105 +#: ../../accounting/localizations/france.rst:142 msgid "Closings compute the totals for journal entries of sales journals (Journal Type = Sales)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:107 +#: ../../accounting/localizations/france.rst:144 msgid "For multi-companies environments, such closings are performed by company." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:109 -msgid "POS orders are posted as journal entries at the closing of the POS session. Closing a POS session can be done anytime. To prompt users to do it on a daily basis, the add-on prevents from resuming a session opened more than 24 hours ago. Such a session must be closed before selling again." +#: ../../accounting/localizations/france.rst:146 +msgid "POS orders are posted as journal entries at the closing of the POS session. Closing a POS session can be done anytime. To prompt users to do it on a daily basis, the module prevents from resuming a session opened more than 24 hours ago. Such a session must be closed before selling again." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:115 +#: ../../accounting/localizations/france.rst:152 msgid "A period’s total is computed from all the journal entries posted after the previous closing of the same type, regardless of their posting date. If you record a new sales transaction for a period already closed, it will be counted in the very next closing." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:120 +#: ../../accounting/localizations/france.rst:157 msgid "For test & audit purposes such closings can be manually generated in the developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` to do so." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:127 +#: ../../accounting/localizations/france.rst:164 msgid "Responsibilities" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:128 +#: ../../accounting/localizations/france.rst:166 msgid "Do not uninstall the module! If you do so, the hashes will be reset and none of your past data will be longer guaranteed as being inalterable." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:131 +#: ../../accounting/localizations/france.rst:169 msgid "Users remain responsible for their Odoo instance and must use it with due diligence. It is not permitted to modify the source code which guarantees the inalterability of data." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:135 -msgid "Odoo absolves itself of all and any responsibility in case of changes in the add-on’s functions caused by 3rd party applications not certified by Odoo." +#: ../../accounting/localizations/france.rst:173 +msgid "Odoo absolves itself of all and any responsibility in case of changes in the module’s functions caused by 3rd party applications not certified by Odoo." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:140 +#: ../../accounting/localizations/france.rst:178 msgid "More Information" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:141 +#: ../../accounting/localizations/france.rst:180 msgid "You will find more information about this legislation in the official documents:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:143 +#: ../../accounting/localizations/france.rst:182 msgid "`Frequently Asked Questions `__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:144 +#: ../../accounting/localizations/france.rst:183 msgid "`Official Statement `__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:145 +#: ../../accounting/localizations/france.rst:184 msgid "`Item 88 of Finance Law 2016 `__" msgstr "" +#: ../../accounting/localizations/germany.rst:3 +msgid "Germany" +msgstr "" + +#: ../../accounting/localizations/germany.rst:6 +msgid "German Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/germany.rst:8 +msgid "The chart of accounts SKR03 and SKR04 are both supported in Odoo. You can choose the one you want by going in :menuselection:`Accounting --> Configuration` then choose the package you want in the Fiscal Localization section." +msgstr "" + +#: ../../accounting/localizations/germany.rst:12 +#: ../../accounting/localizations/spain.rst:17 +msgid "Be careful, you can only change the accounting package as long as you have not created any accounting entry." +msgstr "" + +#: ../../accounting/localizations/germany.rst:16 +msgid "When you create a new SaaS database, the SKR03 is installed by default." +msgstr "" + +#: ../../accounting/localizations/germany.rst:19 +msgid "German Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/germany.rst:21 +msgid "Here is the list of German-specific reports available on Odoo Enterprise:" +msgstr "" + +#: ../../accounting/localizations/germany.rst:23 +#: ../../accounting/localizations/spain.rst:27 +#: ../../accounting/others/reporting/main_reports.rst:30 +msgid "Balance Sheet" +msgstr "" + +#: ../../accounting/localizations/germany.rst:24 +msgid "Profit & Loss" +msgstr "" + +#: ../../accounting/localizations/germany.rst:25 +msgid "Tax Report (Umsatzsteuervoranmeldung)" +msgstr "" + +#: ../../accounting/localizations/germany.rst:26 +msgid "Partner VAT Intra" +msgstr "" + +#: ../../accounting/localizations/germany.rst:29 +msgid "Export from Odoo to Datev" +msgstr "" + +#: ../../accounting/localizations/germany.rst:31 +msgid "It is possible to export your accounting entries from Odoo to Datev. To be able to use this feature, the german accounting localization needs to be installed on your Odoo Enterprise database. Then you can go in :menuselection:`Accounting --> Reporting --> General Ledger` then click on the **Export Datev (csv)** button." +msgstr "" + #: ../../accounting/localizations/mexico.rst:3 msgid "Mexico" msgstr "" @@ -2052,10 +2205,6 @@ msgstr "" msgid "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." msgstr "" -#: ../../accounting/localizations/mexico.rst:501 -msgid "FAQ" -msgstr "" - #: ../../accounting/localizations/mexico.rst:503 msgid "**Error message** (Only applicable on CFDI 3.3):" msgstr "" @@ -2132,6 +2281,58 @@ msgstr "" msgid "**Solution:** Set the mexican name for the tax 0% and 16% in your system and used on the invoice." msgstr "" +#: ../../accounting/localizations/spain.rst:3 +msgid "Spain" +msgstr "" + +#: ../../accounting/localizations/spain.rst:6 +msgid "Spanish Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/spain.rst:8 +msgid "In Odoo, there are several Spanish Chart of Accounts that are available by default:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:10 +msgid "PGCE PYMEs 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:11 +msgid "PGCE Completo 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:12 +msgid "PGCE Entitades" +msgstr "" + +#: ../../accounting/localizations/spain.rst:14 +msgid "You can choose the one you want by going in :menuselection:`Accounting --> Configuration` then choose the package you want in the **Fiscal Localization** section." +msgstr "" + +#: ../../accounting/localizations/spain.rst:20 +msgid "When you create a new SaaS database, the PGCE PYMEs 2008 is installed by default." +msgstr "" + +#: ../../accounting/localizations/spain.rst:23 +msgid "Spanish Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/spain.rst:25 +msgid "If the Spanish Accounting Localization is installed, you will have access to accounting reports specific to Spain:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:28 +msgid "Tax Report (Modelo 111)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:29 +msgid "Tax Report (Modelo 115)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:30 +msgid "Tax Report (Modelo 303)" +msgstr "" + #: ../../accounting/localizations/switzerland.rst:3 msgid "Switzerland" msgstr "" @@ -2414,6 +2615,10 @@ msgstr "" msgid "If you have questions or remarks, please contact our support using odoo.com/help." msgstr "" +#: ../../accounting/localizations/switzerland.rst:128 +msgid "Don't forget to update your fiscal positions. If you have a version 11.1 (or higher), there is nothing to do. Otherwise, you will also have to update your fiscal positions accordingly." +msgstr "" + #: ../../accounting/others.rst:3 #: ../../accounting/receivables/customer_invoices/overview.rst:108 msgid "Others" @@ -2691,111 +2896,107 @@ msgstr "" msgid "Further configuration is as well necessary. Go to :menuselection:`Accounting module --> Configuration --> Settings` and enable the **Budget management** feature" msgstr "" -#: ../../accounting/others/adviser/budget.rst:34 -msgid "If we want to be precise and point specific invoices and vendors bills to our budget, you should enable the Analytic accounting as well. If we don't we will only be able to budget the total amount of general accounts." -msgstr "" - -#: ../../accounting/others/adviser/budget.rst:40 +#: ../../accounting/others/adviser/budget.rst:35 msgid "Budgetary Positions" msgstr "" -#: ../../accounting/others/adviser/budget.rst:42 +#: ../../accounting/others/adviser/budget.rst:37 msgid "Budgetary positions are the general accounts for which you want to keep budgets (typically expense or income accounts). They need to be defined so Odoo can know it which accounts he needs to go get the budget information. Some might be already installed with your chart of accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:48 +#: ../../accounting/others/adviser/budget.rst:43 msgid "To define the positions enter the :menuselection:`Accounting module --> Configuration --> Budgetary Positions`." msgstr "" -#: ../../accounting/others/adviser/budget.rst:51 +#: ../../accounting/others/adviser/budget.rst:46 msgid "For our example we need to define what accounts relates to our project's expenses. Create a position and add items to select the accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:57 +#: ../../accounting/others/adviser/budget.rst:52 msgid "In this case we select the three relevant accounts used wherein we will book our expenses." msgstr "" -#: ../../accounting/others/adviser/budget.rst:63 +#: ../../accounting/others/adviser/budget.rst:58 msgid "Click on *Select*." msgstr "" -#: ../../accounting/others/adviser/budget.rst:68 +#: ../../accounting/others/adviser/budget.rst:63 msgid "Save the changes to confirm your Budgetary position." msgstr "" -#: ../../accounting/others/adviser/budget.rst:70 +#: ../../accounting/others/adviser/budget.rst:65 msgid "Repeat this steps to create a revenue budgetary position. Only in this case select the relevant income accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:74 +#: ../../accounting/others/adviser/budget.rst:69 msgid "Analytical account" msgstr "" -#: ../../accounting/others/adviser/budget.rst:76 -msgid "If you wish to point specific invoices or vendor bills to your budget you need to use analytical accounting. Odoo needs to know which costs or expenses are relevant to a specified budget. To do so we need to link our invoices and expenses to a defined analytical account. Create an analytical account by entering the Accounting module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a new Account called Smith&Co project and select the related partner." +#: ../../accounting/others/adviser/budget.rst:71 +msgid "Odoo needs to know which costs or expenses are relevant to a specified budget. To do so we need to link our invoices and expenses to a defined analytical account. Create an analytical account by entering the Accounting module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a new Account called Smith&Co project and select the related partner." msgstr "" -#: ../../accounting/others/adviser/budget.rst:88 +#: ../../accounting/others/adviser/budget.rst:82 msgid "Set a budget" msgstr "" -#: ../../accounting/others/adviser/budget.rst:90 +#: ../../accounting/others/adviser/budget.rst:84 msgid "Let's now set our targets for our budget. We specified that we expect to gain 1000 with this project and we would like not to spend more than 700." msgstr "" -#: ../../accounting/others/adviser/budget.rst:94 +#: ../../accounting/others/adviser/budget.rst:88 msgid "To set those targets, enter the accounting app, select :menuselection:`Advisers --> Budgets` and create a new Budget." msgstr "" -#: ../../accounting/others/adviser/budget.rst:97 +#: ../../accounting/others/adviser/budget.rst:91 msgid "We have to give a name to the budget. In this case we'll call it \"Smith Project\". Select the period wherein the budget will be applicable. Next add an item to specify your targets in the Budget Line." msgstr "" -#: ../../accounting/others/adviser/budget.rst:104 +#: ../../accounting/others/adviser/budget.rst:98 msgid "Select the Budgetary Position related to the Budget Line. In other words, select the position that points to the accounts you want to budget. In this case we will start with our 700 maximum charge target. Select the \"Cost\" Budgetary Position and specify the Planned Amount. As we are recording a cost, we need to specify a **negative amount**. Finally, select the corresponding analytic account." msgstr "" -#: ../../accounting/others/adviser/budget.rst:114 +#: ../../accounting/others/adviser/budget.rst:108 msgid "Click on **Save & new** to input the revenue budget. The Budgetary Position is Revenue and the Planned Amount is 1000. Save and close" msgstr "" -#: ../../accounting/others/adviser/budget.rst:117 +#: ../../accounting/others/adviser/budget.rst:111 msgid "You'll need to **Confirm** and **Approve** the budget." msgstr "" -#: ../../accounting/others/adviser/budget.rst:120 +#: ../../accounting/others/adviser/budget.rst:114 msgid "Check your budget" msgstr "" -#: ../../accounting/others/adviser/budget.rst:122 +#: ../../accounting/others/adviser/budget.rst:116 msgid "You can check your budget at any time. To see the evolution, let's book some Invoices and Vendors Bills." msgstr "" -#: ../../accounting/others/adviser/budget.rst:127 +#: ../../accounting/others/adviser/budget.rst:121 msgid "if you use analytical accounts remember that you need to specify the account in the invoice and / or purchase line." msgstr "" -#: ../../accounting/others/adviser/budget.rst:131 +#: ../../accounting/others/adviser/budget.rst:125 msgid "for more information about booking invoices and purchase orders see:" msgstr "" -#: ../../accounting/others/adviser/budget.rst:133 +#: ../../accounting/others/adviser/budget.rst:127 msgid ":doc:`../../receivables/customer_invoices/overview`" msgstr "" -#: ../../accounting/others/adviser/budget.rst:134 +#: ../../accounting/others/adviser/budget.rst:128 msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`" msgstr "" -#: ../../accounting/others/adviser/budget.rst:136 +#: ../../accounting/others/adviser/budget.rst:130 msgid "Go back in the budget list and find the Smith Project." msgstr "" -#: ../../accounting/others/adviser/budget.rst:138 +#: ../../accounting/others/adviser/budget.rst:132 msgid "Via the analytical account, Odoo can account the invoice lines and purchase lines booked in the accounts and will display them in the **Practical Amount** column." msgstr "" -#: ../../accounting/others/adviser/budget.rst:147 +#: ../../accounting/others/adviser/budget.rst:141 msgid "The theoretical amount represents the amount of money you theoretically could have spend / should have received in function of the date. When your budget is 1200 for 12 months (january to december), and today is 31 of january, the theoretical amount will be 1000, since this is the actual amount that could have been realised." msgstr "" @@ -4601,10 +4802,6 @@ msgstr "" msgid "You can also compare values with another period. Choose how many periods you want to compare the chosen time period with. You can choose up to 12 periods back from the date of the report if you don't want to use the default **Previous 1 Period** option." msgstr "" -#: ../../accounting/others/reporting/main_reports.rst:30 -msgid "Balance Sheet" -msgstr "" - #: ../../accounting/others/reporting/main_reports.rst:32 msgid "The **Balance Sheet** shows a snapshot of the assets, liabilities and equity of your organisation as at a particular date." msgstr "" @@ -7666,6 +7863,58 @@ msgstr "" msgid ":doc:`overview`" msgstr "" +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2 +msgid "Set up cash roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:4 +msgid "In some currencies, the smallest coins do not exist. For example, in Switzerland, there is no coin for 0.01 CHF. For this reason, if invoices are paid in cash, you have to round their total amount to the smallest coin that exist in the currency. For the CHF, the smallest coin is 0.05 CHF." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:10 +msgid "There are two strategies for the rounding:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:12 +msgid "Add a line on the invoice for the rounding" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:14 +msgid "Add the rounding in the tax amount" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:16 +msgid "Both strategies are applicable in Odoo." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:21 +msgid "First, you have to activate the feature. For this, go in :menuselection:`Accounting --> Configuration --> Settings` and activate the Cash Rounding." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:28 +msgid "There is a new menu to manage cash roundings in :menuselection:`Accounting --> Configuration --> Management --> Cash roundings`." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:31 +msgid "Now, you can create cash roundings. You can choose between two rounding strategies:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:34 +msgid "**Add a rounding line**: if a rounding is necessary, Odoo will add a line on your customer invoice to take this rounding into account. You also have to define the account in which the rounding will go." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:39 +msgid "**Modify tax amount:** Odoo will add the rounding to the amount of the highest tax." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:46 +msgid "Apply roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:48 +msgid "Once your roundings are created, you can apply them on customer invoices. On the customer invoices, there is a new field called **Cash Rounding Method** where you can simply choose one of the rounding methods created previously. If needed, a rounding will be applied to the invoice." +msgstr "" + #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:3 msgid "Deferred revenues: how to automate them?" msgstr "" @@ -7909,74 +8158,6 @@ msgstr "" msgid ":doc:`payment_terms`" msgstr "" -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:3 -msgid "How to modify a validated invoice?" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:5 -msgid "In most accounting legislation over the word, it's not allowed to modify an invoice that is validated and sent to the customer. However, you sometimes need to change an invoice for different reasons: the sale has changed, the made a mistake while recording the invoice, etc." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:10 -msgid "Thus, the right way to modify an invoice is to:" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:12 -msgid "Refund the original invoice" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:13 -msgid "Create a new invoice" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:15 -msgid "Odoo's refund mechanism helps you handle the whole process in just a few clicks." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:19 -msgid "Modify an invoice" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:21 -msgid "If your invoice is still in draft, you can modify it the way you want. However, if your invoice is validated, you can not change it anymore. If you need to modify it, the right operations to do are:" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:25 -msgid "Refund the original invoice;" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:26 -msgid "Reconcile the original invoice with the refund to void them;" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:27 -msgid "Create a new draft invoice, a copy of the original;" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:28 -msgid "Validate the new invoice." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:30 -msgid "All those steps are automated by Odoo. All you have to do is to click on the Refund button on an invoice." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:36 -msgid "In the refund dialog, select the option \"Modify: create a refund, reconcile and create a draft invoice\". Once you click on the \"Create Refund\" button, Odoo will void your existing invoice and create a new draft invoice that is a duplicate of the original one." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:41 -msgid "Edit this new draft invoice and validate it when it's correct." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:45 -msgid "if you already sent the original invoice to your customer, you should send the new invoice and the refund to the customer so that he gets all the documents." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:50 -msgid ":doc:`refund`" -msgstr "" - #: ../../accounting/receivables/customer_invoices/overview.rst:3 msgid "Overview of the invoicing process" msgstr "" diff --git a/locale/sources/discuss.pot b/locale/sources/discuss.pot index e520adc92..aab6185ca 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: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,171 +21,163 @@ msgid "Discuss" msgstr "" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive email in Odoo" +msgid "How to use my mail server to send and receive emails in Odoo" msgstr "" -#: ../../discuss/email_servers.rst:6 -msgid "When is it needed" +#: ../../discuss/email_servers.rst:5 +msgid "This document is mainly dedicated to Odoo on-premise users who don't benefit from an out-of-the-box solution to send and receive emails in Odoo, unlike in `Odoo Online `__ & `Odoo.sh `__." msgstr "" -#: ../../discuss/email_servers.rst:7 -msgid "Using your own email servers is required to send and receive messages in Odoo Community or Enterprise. Odoo Online embeds an out-of-box email solution that works straight away. However you can still use your own email servers with the online edition. Some insights are provided here below." -msgstr "" - -#: ../../discuss/email_servers.rst:14 -msgid "How to set it up" +#: ../../discuss/email_servers.rst:9 +msgid "If no one in your company is used to manage email servers, we strongly recommend that you opt for such convenient Odoo hosting solutions. Indeed their email system works instantly and is monitored by professionals. Nevertheless you can still use your own email servers if you want to manage your email server's reputation yourself." msgstr "" #: ../../discuss/email_servers.rst:15 -msgid "As a system admin, go to :menuselection:`Settings --> General Settings` and check *External Email Servers* (watch out: this checkbox only shows up after Odoo 10). Then, go through the following steps." +msgid "You will find here below some useful information to do so by integrating your own email solution with Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:19 +msgid "How to manage outbound messages" msgstr "" #: ../../discuss/email_servers.rst:21 -msgid "Office 365 email servers don't allow to send external emails from hosts like Odoo. Consequently you can only use such email servers for incoming messages." +msgid "As a system admin, go to :menuselection:`Settings --> General Settings` and check *External Email Servers*. Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. Once all the information has been filled out, click on *Test Connection*." msgstr "" #: ../../discuss/email_servers.rst:26 -msgid "Set an outgoing email server for outbound messages" +msgid "Here is a typical configuration for a G Suite server." msgstr "" -#: ../../discuss/email_servers.rst:27 -msgid "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, etc.) as well as your admin credentials. Once all the information has been filled out, click on *Test Connection*." +#: ../../discuss/email_servers.rst:31 +msgid "Then set your email domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:34 +msgid "Can I use an Office 365 server" msgstr "" #: ../../discuss/email_servers.rst:35 -msgid "Set an incoming email server for inbound messages" +msgid "You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP relays are not compatible with Odoo Online." msgstr "" -#: ../../discuss/email_servers.rst:36 -msgid "Fill out the form according to your email provider’s settings. Leave the *Actions to Perform on Incoming Mails* blank. Once all the information has been filled out, click on *TEST & CONFIRM*." +#: ../../discuss/email_servers.rst:38 +msgid "Please refer to `Microsoft's documentation `__ to configure a SMTP relay for your Odoo's IP address." +msgstr "" + +#: ../../discuss/email_servers.rst:42 +msgid "How to use a G Suite server" msgstr "" #: ../../discuss/email_servers.rst:43 -msgid "By default inbound messages are fetched every 5 minutes. You can change this value in developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." +msgid "You can use an G Suite server for any Odoo hosting type. To do so you need to enable a SMTP relay and to allow *Any addresses* in the *Allowed senders* section. The configuration steps are explained in `Google documentation `__." msgstr "" #: ../../discuss/email_servers.rst:49 -msgid "Set the domain name" +msgid "Be SPF-compliant" msgstr "" #: ../../discuss/email_servers.rst:50 -msgid "Enter the domain name of your email servers (e.g. mycompany.com) in General Settings." +msgid "In case you use SPF (Sender Policy Framework) to increase the deliverability of your outgoing emails, don't forget to authorize Odoo as a sending host in your domain name settings. Here is the configuration for Odoo Online:" msgstr "" -#: ../../discuss/email_servers.rst:57 -msgid "Create a catchall address" +#: ../../discuss/email_servers.rst:54 +msgid "If no TXT record is set for SPF, create one with following definition: v=spf1 include:_spf.odoo.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:58 -msgid "When a contact replies to an email sent from Odoo, the *reply-to* address is a generic address used to route the reply to the right discussion thread in Odoo (opportunity, order, task, etc.) and to the inbox of all its followers. By default this address is \"catchall@\" but it can be changed." +#: ../../discuss/email_servers.rst:56 +msgid "In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g. for a domain name that sends emails via Odoo Online and via G Suite it could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:63 -msgid "Create a catchall address in your email server settings. We advise you to use \"catchall@\" so that everything works out straight away. If you want to use another alias, you have extra steps in Odoo:" -msgstr "" - -#: ../../discuss/email_servers.rst:67 -msgid "Activate the developer mode from your Settings Dashboard." -msgstr "" - -#: ../../discuss/email_servers.rst:72 -msgid "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` and enter your custom catchall alias in *mail.catchall.alias*." -msgstr "" - -#: ../../discuss/email_servers.rst:79 -msgid "You can edit the email alias used for bounced messages the same way." -msgstr "" - -#: ../../discuss/email_servers.rst:82 -msgid "How to use my own email servers with Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:83 -msgid "Odoo Online comes up with an embedded and ready-to-use email solution with *@yourcompany.odoo.com* as domain. We recommend to keep this default setup as it is really convenient." -msgstr "" - -#: ../../discuss/email_servers.rst:87 -msgid "Nevertheless you can still use your own email servers if you want to manage your email server's reputation (blacklisting, etc). The configuration for both incoming and outgoing mail servers is given here above." -msgstr "" - -#: ../../discuss/email_servers.rst:92 -msgid "However when it comes to incoming messages, we don't recommend to exclusively use your own email server. Indeed, Odoo Online is fetching incoming messages from the email server once every hour only. To receive emails in real time, you should rather use a **catchall redirection** (your server -> Odoo server). To do so:" -msgstr "" - -#: ../../discuss/email_servers.rst:98 -msgid "Create a catchall address in your email server settings (e.g. catchall)." -msgstr "" - -#: ../../discuss/email_servers.rst:99 -msgid "Still from such settings, set a redirection from this catchall address to Odoo's one: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com." -msgstr "" - -#: ../../discuss/email_servers.rst:102 -msgid "In Odoo check *External Email Servers* in :menuselection:`Settings --> General Settings` and enter your email domain name (i.e. yourdomain.ext)." -msgstr "" - -#: ../../discuss/email_servers.rst:104 -msgid "No need to set up an incoming email server in such a case." -msgstr "" - -#: ../../discuss/email_servers.rst:108 -msgid "How to be SPF-compliant when using external email servers in Odoo" -msgstr "" - -#: ../../discuss/email_servers.rst:109 -msgid "Sender Policy Framework (SPF) is an email-validation system that checks that incoming mail from a domain comes from a host authorized by that domain's administrator. Such a security system is used in most email servers. If you don't comply with it, your emails sent from Odoo will be likely flagged as spam." -msgstr "" - -#: ../../discuss/email_servers.rst:115 -msgid "To be SPF-compliant, you need to authorize Odoo as a sending host in your domain name settings:" -msgstr "" - -#: ../../discuss/email_servers.rst:118 -msgid "Sign in to your domain’s account at your domain host." -msgstr "" - -#: ../../discuss/email_servers.rst:119 -msgid "Locate the page for updating your domain’s DNS records." -msgstr "" - -#: ../../discuss/email_servers.rst:120 -msgid "If no TXT record is set, create one with following definition: v=spf1 include:_spf.odoo.com ~all" -msgstr "" - -#: ../../discuss/email_servers.rst:122 -msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." -msgstr "" - -#: ../../discuss/email_servers.rst:124 -msgid "e.g. for a Gmail server it should be:" -msgstr "" - -#: ../../discuss/email_servers.rst:126 -msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" -msgstr "" - -#: ../../discuss/email_servers.rst:128 +#: ../../discuss/email_servers.rst:60 msgid "Find `here `__ the exact procedure to create or modify TXT records in your own domain registrar." msgstr "" -#: ../../discuss/email_servers.rst:131 +#: ../../discuss/email_servers.rst:63 msgid "Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly." msgstr "" -#: ../../discuss/email_servers.rst:134 +#: ../../discuss/email_servers.rst:66 msgid "Adding more than one SPF record for a domain can cause problems with mail delivery and spam classification. Instead, we recommend using only one SPF record by modifying it to authorize Odoo." msgstr "" -#: ../../discuss/email_servers.rst:139 -msgid "How to choose between Odoo and my traditional email box" +#: ../../discuss/email_servers.rst:71 +msgid "Allow DKIM" +msgstr "" + +#: ../../discuss/email_servers.rst:72 +msgid "You should do the same thing if DKIM (Domain Keys Identified Mail) is enabled on your email server. In the case of Odoo Online & Odoo.sh, you should add a DNS \"odoo._domainkey\" CNAME record to \"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have a record \"odoo._domainkey.foo.com\" that is a CNAME with the value \"odoo._domainkey.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:80 +msgid "How to manage inbound messages" +msgstr "" + +#: ../../discuss/email_servers.rst:82 +msgid "Odoo relies on generic email aliases to fetch incoming messages." +msgstr "" + +#: ../../discuss/email_servers.rst:84 +msgid "**Reply messages** of messages sent from Odoo are routed to their original discussion thread (and to the inbox of all its followers) by the catchall alias (**catchall@**)." +msgstr "" + +#: ../../discuss/email_servers.rst:88 +msgid "**Bounced messages** are routed to **bounce@** in order to track them in Odoo. This is especially used in `Odoo Email Marketing `__ to opt-out invalid recipients." +msgstr "" + +#: ../../discuss/email_servers.rst:92 +msgid "**Original messages**: Several business objects have their own alias to create new records in Odoo from incoming emails:" +msgstr "" + +#: ../../discuss/email_servers.rst:95 +msgid "Sales Channel (to create Leads or Opportunities in `Odoo CRM `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:97 +msgid "Support Channel (to create Tickets in `Odoo Helpdesk `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:99 +msgid "Projects (to create new Tasks in `Odoo Project `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:101 +msgid "Job Positions (to create Applicants in `Odoo Recruitment `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:103 +msgid "etc." +msgstr "" + +#: ../../discuss/email_servers.rst:105 +msgid "Depending on your mail server, there might be several methods to fetch emails. The easiest and most recommended method is to manage one email address per Odoo alias in your mail server." +msgstr "" + +#: ../../discuss/email_servers.rst:109 +msgid "Create the corresponding email addresses in your mail server (catcall@, bounce@, sales@, etc.)." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "Set your domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:116 +msgid "If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for each alias. You can do it from the General Settings as well. Fill out the form according to your email provider’s settings. Leave the *Actions to Perform on Incoming Mails* blank. Once all the information has been filled out, click on *TEST & CONFIRM*." +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming messages to Odoo's domain name rather than exclusively use your own email server. That way you will receive incoming messages without delay. Indeed, Odoo Online is fetching incoming messages of external servers once per hour only. You should set redirections for all the email addresses to Odoo's domain name in your email server (e.g. *catchall@mydomain.ext* to *catchall@mycompany.odoo.com*)." +msgstr "" + +#: ../../discuss/email_servers.rst:132 +msgid "All the aliases are customizable in Odoo. Object aliases can be edited from their respective configuration view. To edit catchall and bounce aliases, you first need to activate the developer mode from the Settings Dashboard." msgstr "" #: ../../discuss/email_servers.rst:140 -msgid "Odoo Discuss is a perfect tool to send and read messages related to business documents. However it doesn't aim to replace a full-featured email solution (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of both systems without mingling them: What is related to Odoo business objects or applications goes into Odoo; What is not can be managed into your external email box." +msgid "Then refresh your screen and go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` to customize the aliases (*mail.catchall.alias* & * mail.bounce.alias*)." msgstr "" #: ../../discuss/email_servers.rst:147 -msgid "To do so, create specific email aliases to use in Odoo (to generate leads or opportunities, helpdesk tickets, etc.). If you take an email alias already used for messaging outside of Odoo, incoming messages will land into both systems. This will negatively impact your productivity." +msgid "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*." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/sources/inventory.pot b/locale/sources/inventory.pot index 5e58f0461..cdfddc6f1 100644 --- a/locale/sources/inventory.pot +++ b/locale/sources/inventory.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-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -506,8 +506,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:18 #: ../../inventory/routes/strategies/putaway.rst:23 #: ../../inventory/routes/strategies/removal.rst:18 -#: ../../inventory/settings/products/packages.rst:17 -#: ../../inventory/settings/products/packages.rst:66 #: ../../inventory/settings/products/strategies.rst:30 #: ../../inventory/settings/products/uom.rst:17 #: ../../inventory/settings/products/variants.rst:114 @@ -640,7 +638,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:6 #: ../../inventory/routes/strategies/putaway.rst:6 #: ../../inventory/routes/strategies/removal.rst:6 -#: ../../inventory/settings/products/packages.rst:6 #: ../../inventory/settings/products/uom.rst:6 #: ../../inventory/shipping/operation/cancel.rst:6 #: ../../inventory/shipping/operation/invoicing.rst:6 @@ -1913,6 +1910,46 @@ msgstr "" msgid "Miscellaneous Operations" msgstr "" +#: ../../inventory/management/misc/immediate_planned_transfers.rst:2 +msgid "Immediate & Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:4 +msgid "In Odoo, you can create two types of transfers: immediate or planned transfers." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:8 +msgid "Immediate Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:10 +msgid "When you create a transfer manually, it is by default an immediate transfer." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:13 +msgid "In the case of an immediate transfer, you directly encode the products and quantities you are processing, there is no reservation that applies. This is why the column \"Initial Demand\" is not editable. You only fill in the column \"Done\" for the quantities." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:18 +msgid "This is for example used when you are transferring goods from a location A to a location B and that this is not planned (you are processing the transfer right now)." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:23 +msgid "Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:25 +msgid "When a transfer is generated automatically (from a sales order or purchase order for example), it is a planned transfer. This means that there is an initial demand and that reservation applies on this initial demand." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:30 +msgid "If you want to create a planned transfer manually, you can do it from the inventory dashboard." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:36 +msgid "In that case, you will have to enter the initial demand first (how many units are you supposed to proceed), then to mark your transfer as to do. Once this is done, you will be able to reserve the products and to process the transfer." +msgstr "" + #: ../../inventory/management/misc/owned_stock.rst:3 msgid "How to manage stock that you don't own?" msgstr "" @@ -4565,126 +4602,6 @@ msgstr "" msgid "Products" msgstr "" -#: ../../inventory/settings/products/packages.rst:3 -msgid "How to use packages?" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:8 -#: ../../inventory/settings/products/usage.rst:31 -msgid "The package is the physical container in which you put one or several product." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:11 -msgid "By default, Odoo does not take into account the use of it." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:13 -msgid "Once you activate the option, you will be able to manage one or several packages when doing your transfers." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:19 -msgid "To configure the use of packages, go to the menu :menuselection:`Inventory --> Configuration --> Settings`. µ Locate the **Packages** section and tick **Record packages used on packing: pallets, boxes,...**" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:27 -#: ../../inventory/shipping/operation/multipack.rst:23 -msgid "Click on **Apply** when you are done." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:30 -msgid "Pack products" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:32 -msgid "Putting products in packs is usually done when processing warehouses transfers (receipt, internals or deliveries)." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:35 -msgid "To be able to put products in pack, the status of your transfer has to be **Available**." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:41 -msgid "In the operation tab, you can put your products into one or multiple packages." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:44 -#: ../../inventory/shipping/operation/multipack.rst:50 -msgid "Choose the quantity you want to put in the first pack in the **Done** column, then click on the link **Put in Pack**." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:50 -#: ../../inventory/shipping/operation/multipack.rst:56 -msgid "It will automatically create a pack with the requested quantity." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:52 -#: ../../inventory/shipping/operation/multipack.rst:58 -msgid "Do the same steps for the other pieces you want to pack in." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:57 -#: ../../inventory/shipping/operation/multipack.rst:63 -msgid "Click on **Validate** when you are done." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:60 -msgid "Whole packages transfers" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:62 -msgid "If you are using several locations and/or warehouses, it is possible to transfer packages with its contents." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:68 -msgid "You need to configure the **Operation Type** to allow moving packages. Go to :menuselection:`Configuration --> Operations Types`. Tick **Allow moving packs**:" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:75 -msgid "Transfer packages" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:77 -msgid "Create a transfer order. Choose the source and the destination locations, then click on **Mark as todo**. Do not put anything under the **Initial Demand** tab." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:84 -msgid "In the Operation tab, click on **Add an item** under the **Package To Move** section." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:87 -msgid "Tick the **Done** checkbox to confirm the move of the package :" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:92 -msgid "When it is finished, click on **Validate**." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:95 -msgid "Packages traceability" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:97 -msgid "To trace a package or check its content, go to :menuselection:`Inventory Control --> Packages`." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:103 -msgid "Click on **Package Transfers** to see all its moves." -msgstr "" - -#: ../../inventory/settings/products/packages.rst:106 -#: ../../inventory/settings/products/usage.rst:70 -msgid ":doc:`../../overview/start/setup`" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:107 -msgid ":doc:`usage`" -msgstr "" - -#: ../../inventory/settings/products/packages.rst:108 -#: ../../inventory/settings/products/usage.rst:71 -msgid ":doc:`uom`" -msgstr "" - #: ../../inventory/settings/products/strategies.rst:3 msgid "How to select the right replenishment strategy" msgstr "" @@ -4870,6 +4787,10 @@ msgstr "" msgid "Packages" msgstr "" +#: ../../inventory/settings/products/usage.rst:31 +msgid "The package is the physical container in which you put one or several product." +msgstr "" + #: ../../inventory/settings/products/usage.rst:38 msgid "Packaging" msgstr "" @@ -4910,6 +4831,14 @@ msgstr "" msgid "When you are selling several trays, you might wrap all the trays into a ``box`` or in a ``plastic`` wrapping. It is the **package**." msgstr "" +#: ../../inventory/settings/products/usage.rst:70 +msgid ":doc:`../../overview/start/setup`" +msgstr "" + +#: ../../inventory/settings/products/usage.rst:71 +msgid ":doc:`uom`" +msgstr "" + #: ../../inventory/settings/products/usage.rst:72 msgid ":doc:`packages`" msgstr "" @@ -5529,6 +5458,10 @@ msgstr "" msgid "To configure the use of packages, go to the menu :menuselection:`Inventory --> Configuration --> Settings`. Locate the **Packages** section and tick **Record packages used on packing: pallets, boxes,...**" msgstr "" +#: ../../inventory/shipping/operation/multipack.rst:23 +msgid "Click on **Apply** when you are done." +msgstr "" + #: ../../inventory/shipping/operation/multipack.rst:29 #: ../../inventory/shipping/setup/delivery_method.rst:77 #: ../../inventory/shipping/setup/third_party_shipper.rst:110 @@ -5551,6 +5484,22 @@ msgstr "" msgid "From here, you can split your delivery into multiple packages." msgstr "" +#: ../../inventory/shipping/operation/multipack.rst:50 +msgid "Choose the quantity you want to put in the first pack in the **Done** column, then click on the link **Put in Pack**." +msgstr "" + +#: ../../inventory/shipping/operation/multipack.rst:56 +msgid "It will automatically create a pack with the requested quantity." +msgstr "" + +#: ../../inventory/shipping/operation/multipack.rst:58 +msgid "Do the same steps for the other pieces you want to pack in." +msgstr "" + +#: ../../inventory/shipping/operation/multipack.rst:63 +msgid "Click on **Validate** when you are done." +msgstr "" + #: ../../inventory/shipping/operation/multipack.rst:66 msgid "Multi-packages with a 3rd party-shipper" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po index 9d8dd3871..ed4bcc854 100644 --- a/locale/zh_CN/LC_MESSAGES/accounting.po +++ b/locale/zh_CN/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: 2017-12-22 15:27+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+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" @@ -86,6 +86,7 @@ msgstr "" #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30 #: ../../accounting/payables/supplier_bills/manage.rst:31 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15 +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19 @@ -688,6 +689,86 @@ msgid "" "every 4 hours." msgstr "一旦你填写了你的凭证,你的银行订阅将会每4小时进行一次同步。" +#: ../../accounting/bank/feeds/synchronize.rst:73 +#: ../../accounting/localizations/mexico.rst:501 +msgid "FAQ" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:76 +msgid "The synchronization is not working in real time, is it normal?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:78 +msgid "" +"Yodlee tries to get the data from a bank account once a day. However, this " +"doesn't always happen at the same time. And sometimes the process can fail. " +"In that case, Yodlee retries one hour or two later. This is why in Odoo " +"there is a cron that is running every 4 hours to fetch the information from " +"Yodlee." +msgstr "" + +#: ../../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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:86 +msgid "" +"Moreover, a transaction can be visible in your bank account but not being " +"fetched by Yodlee. Indeed, the transaction in your bank account can have the" +" 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 "" + +#: ../../accounting/bank/feeds/synchronize.rst:91 +msgid "" +"What is important to remember is that Yodlee is not a service fetching " +"transactions in real time. This is a service to facilitate the import of the" +" bank statement in the database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:95 +msgid "Is the Yodlee feature included in my contract?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:97 +msgid "" +"Enterprise Version: Yes, if you have a valid enterprise contract linked to " +"your database." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:98 +msgid "" +"Community Version: No, this feature is not included in the Community " +"Version." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:99 +msgid "" +"Online Version: Yes, even if you benefit from the One App Free contract." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:102 +msgid "Some banks have a status \"Beta\", what does it mean?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:104 +msgid "" +"This means that Yodlee is only currently working on developing the " +"synchronization with this bank. The synchronization could already work or it" +" may need a bit more time to have a 100% working synchronization. " +"Unfortunately, there is not much to do about except being patient." +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:110 +msgid "All my past transactions are not in Odoo, why?" +msgstr "" + +#: ../../accounting/bank/feeds/synchronize.rst:112 +msgid "Yodlee only allows to fetch up transactions to 3 months in the past." +msgstr "" + #: ../../accounting/bank/misc.rst:3 ../../accounting/payables/misc.rst:3 #: ../../accounting/payables/misc/employee_expense.rst:187 msgid "Miscellaneous" @@ -1949,88 +2030,128 @@ msgstr "" msgid "France" msgstr "法国" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:3 +#: ../../accounting/localizations/france.rst:6 +msgid "FEC" +msgstr "" + +#: ../../accounting/localizations/france.rst:8 +msgid "" +"If you have installed the French Accounting, you will be able to download " +"the FEC. For this, go in :menuselection:`Accounting --> Reporting --> France" +" --> FEC`." +msgstr "" + +#: ../../accounting/localizations/france.rst:12 +msgid "" +"If you do not see the submenu **FEC**, go in **Apps** and search for the " +"module called **France-FEC** and verify if it is well installed." +msgstr "" + +#: ../../accounting/localizations/france.rst:16 +msgid "French Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/france.rst:18 +msgid "" +"If you have installed the French Accounting, you will have access to some " +"accounting reports specific to France:" +msgstr "" + +#: ../../accounting/localizations/france.rst:20 +msgid "Bilan comptable" +msgstr "" + +#: ../../accounting/localizations/france.rst:21 +msgid "Compte de résultats" +msgstr "" + +#: ../../accounting/localizations/france.rst:22 +msgid "Plan de Taxes France" +msgstr "" + +#: ../../accounting/localizations/france.rst:25 msgid "Get the VAT anti-fraud certification with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:5 +#: ../../accounting/localizations/france.rst:27 msgid "" -"As of January 1st 2018, a new anti-fraud legislation will come into effect " -"in France and DOM-TOM. This new legislation stipulates certain criteria " +"As of January 1st 2018, a new anti-fraud legislation comes into effect in " +"France and DOM-TOM. This new legislation stipulates certain criteria " "concerning the inalterability, security, storage and archiving of sales " "data. These legal requirements are implemented in Odoo, version 9 onward, " -"through an add-on." +"through a module and a certificate of conformity to download." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:12 +#: ../../accounting/localizations/france.rst:34 msgid "Is my company required to use an anti-fraud software?" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:13 +#: ../../accounting/localizations/france.rst:36 msgid "" "Your company is required to use an anti-fraud cash register software like " "Odoo (CGI art. 286, I. 3° bis) if:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:16 +#: ../../accounting/localizations/france.rst:39 msgid "You are taxable (not VAT exempt) in France or any DOM-TOM," msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:17 +#: ../../accounting/localizations/france.rst:40 msgid "Some of your customers are private individuals (B2C)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:19 +#: ../../accounting/localizations/france.rst:42 msgid "" "This rule applies to any company size. Auto-entrepreneurs are exempted from " "VAT and therefore are not affected." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:23 +#: ../../accounting/localizations/france.rst:46 msgid "Get certified with Odoo" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:24 -msgid "Getting compliant with Odoo is vey easy." +#: ../../accounting/localizations/france.rst:48 +msgid "Getting compliant with Odoo is very easy." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:26 +#: ../../accounting/localizations/france.rst:50 msgid "" -"Your company is requested by the tax administration to deliver a Certificate" -" of Conformity testifying that your software complies with the anti-fraud " -"legislation. This certificate is granted by Odoo SA to Odoo Enterprise " -"users. If you use Odoo Community, you should `upgrade to Odoo Enterprise " +"Your company is requested by the tax administration to deliver a certificate" +" of conformity testifying that your software complies with the anti-fraud " +"legislation. This certificate is granted by Odoo SA to Odoo Enterprise users" +" `here `__. If you " +"use Odoo Community, you should `upgrade to Odoo Enterprise " "`__ or " -"contact your Odoo service provider. `Get the certificate here " -"`__." +"contact your Odoo service provider." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:34 +#: ../../accounting/localizations/france.rst:58 msgid "In case of non-conformity, your company risks a fine of €7,500." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:36 +#: ../../accounting/localizations/france.rst:60 msgid "To get the certification just follow the following steps:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:38 +#: ../../accounting/localizations/france.rst:62 msgid "" -"Install the anti-fraud add-on fitting your Odoo environment from the *Apps* " +"Install the anti-fraud module fitting your Odoo environment from the *Apps* " "menu:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:41 +#: ../../accounting/localizations/france.rst:65 msgid "" -"France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis) " -"(if you use Odoo Point of Sale)" +"if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud " +"Certification for Point of Sale (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:43 +#: ../../accounting/localizations/france.rst:67 msgid "" -"France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) (in any other case)" +"in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud " +"Certification (CGI 286 I-3 bis)" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:44 +#: ../../accounting/localizations/france.rst:68 msgid "" "Make sure a country is set on your company, otherwise your entries won’t be " "encrypted for the inalterability check. To edit your company’s data, go to " @@ -2038,82 +2159,98 @@ msgid "" "country from the list; Do not create a new country." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:48 +#: ../../accounting/localizations/france.rst:72 msgid "" -"Download the mandatory Certificate of Conformity delivered by Odoo SA from " -"`here `__." +"Download the mandatory certificate of conformity delivered by Odoo SA `here " +"`__." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:50 +#: ../../accounting/localizations/france.rst:74 msgid "" -"If case you run Odoo on-premise, you should update your installation and " -"restart your server to get such new add-ons available in your Apps " -"repository. For any issue you can still download the modules from `Odoo's " -"Apps store `__." +"To install the module in any system created before December 18th 2017, you " +"should update the modules list. To do so, activate the developer mode from " +"the *Settings* menu. Then go to the *Apps* menu and press *Update Modules " +"List* in the top-menu." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:56 -msgid "Anti-fraud features of Odoo" +#: ../../accounting/localizations/france.rst:78 +msgid "" +"In case you run Odoo on-premise, you need to update your installation and " +"restart your server beforehand." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:57 -msgid "The anti-fraud add-on introduces the following features:" +#: ../../accounting/localizations/france.rst:80 +msgid "" +"If you have installed the initial version of the anti-fraud module (prior to" +" December 18th 2017), you need to update it. The module's name was *France -" +" Accounting - Certified CGI 286 I-3 bis*. After an update of the modules " +"list, search for the updated module in *Apps*, select it and click " +"*Upgrade*. Finally, make sure the following module *l10n_fr_sale_closing* is" +" installed." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:59 +#: ../../accounting/localizations/france.rst:89 +msgid "Anti-fraud features" +msgstr "" + +#: ../../accounting/localizations/france.rst:91 +msgid "The anti-fraud module introduces the following features:" +msgstr "" + +#: ../../accounting/localizations/france.rst:93 msgid "" "**Inalterability**: deactivation of all the ways to cancel or modify key " "data of POS orders, invoices and journal entries;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:61 +#: ../../accounting/localizations/france.rst:95 msgid "**Security**: chaining algorithm to verify the inalterability;" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:62 +#: ../../accounting/localizations/france.rst:96 msgid "" "**Storage**: automatic sales closings with computation of both period and " "cumulative totals (daily, monthly, annually)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:66 +#: ../../accounting/localizations/france.rst:100 msgid "Inalterability" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:67 +#: ../../accounting/localizations/france.rst:102 msgid "" "All the possible ways to cancel and modify key data of paid POS orders, " "confirmed invoices and journal entries are deactivated, if the company is " "located in France or in any DOM-TOM." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:71 +#: ../../accounting/localizations/france.rst:106 msgid "" "If you run a multi-companies environment, only the documents of such " "companies are impacted." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:75 +#: ../../accounting/localizations/france.rst:110 msgid "Security" msgstr "安全" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:76 +#: ../../accounting/localizations/france.rst:112 msgid "" "To ensure the inalterability, every order or journal entry is encrypted upon" " validation. This number (or hash) is calculated from the key data of the " "document as well as from the hash of the precedent documents." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:81 +#: ../../accounting/localizations/france.rst:117 msgid "" -"The add-on introduces an interface to test the data inalterability. If any " +"The module introduces an interface to test the data inalterability. If any " "information is modified on a document after its validation, the test will " "fail. The algorithm recomputes all the hashes and compares them against the " "initial ones. In case of failure, the system points out the first corrupted " "document recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:87 +#: ../../accounting/localizations/france.rst:123 msgid "" "Users with *Manager* access rights can launch the inalterability check. For " "POS orders, go to :menuselection:`Point of Sales --> Reporting --> French " @@ -2121,11 +2258,11 @@ msgid "" ":menuselection:`Invoicing/Accounting --> Reporting --> French Statements`." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:94 +#: ../../accounting/localizations/france.rst:130 msgid "Storage" msgstr "存储" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:95 +#: ../../accounting/localizations/france.rst:132 msgid "" "The system also processes automatic sales closings on a daily, monthly and " "annual basis. Such closings distinctly compute the sales total of the period" @@ -2133,32 +2270,32 @@ msgid "" "recorded in the system." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:101 +#: ../../accounting/localizations/france.rst:138 msgid "" "Closings can be found in the *French Statements* menu of Point of Sale, " "Invoicing and Accounting apps." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:105 +#: ../../accounting/localizations/france.rst:142 msgid "" "Closings compute the totals for journal entries of sales journals (Journal " "Type = Sales)." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:107 +#: ../../accounting/localizations/france.rst:144 msgid "" "For multi-companies environments, such closings are performed by company." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:109 +#: ../../accounting/localizations/france.rst:146 msgid "" "POS orders are posted as journal entries at the closing of the POS session. " "Closing a POS session can be done anytime. To prompt users to do it on a " -"daily basis, the add-on prevents from resuming a session opened more than 24" +"daily basis, the module prevents from resuming a session opened more than 24" " hours ago. Such a session must be closed before selling again." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:115 +#: ../../accounting/localizations/france.rst:152 msgid "" "A period’s total is computed from all the journal entries posted after the " "previous closing of the same type, regardless of their posting date. If you " @@ -2166,65 +2303,133 @@ msgid "" "counted in the very next closing." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:120 +#: ../../accounting/localizations/france.rst:157 msgid "" "For test & audit purposes such closings can be manually generated in the " "developer mode. Go to :menuselection:`Settings --> Technical --> Automation " "--> Scheduled Actions` to do so." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:127 +#: ../../accounting/localizations/france.rst:164 msgid "Responsibilities" msgstr "责任" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:128 +#: ../../accounting/localizations/france.rst:166 msgid "" "Do not uninstall the module! If you do so, the hashes will be reset and none" " of your past data will be longer guaranteed as being inalterable." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:131 +#: ../../accounting/localizations/france.rst:169 msgid "" "Users remain responsible for their Odoo instance and must use it with due " "diligence. It is not permitted to modify the source code which guarantees " "the inalterability of data." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:135 +#: ../../accounting/localizations/france.rst:173 msgid "" "Odoo absolves itself of all and any responsibility in case of changes in the" -" add-on’s functions caused by 3rd party applications not certified by Odoo." +" module’s functions caused by 3rd party applications not certified by Odoo." msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:140 +#: ../../accounting/localizations/france.rst:178 msgid "More Information" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:141 +#: ../../accounting/localizations/france.rst:180 msgid "" "You will find more information about this legislation in the official " "documents:" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:143 +#: ../../accounting/localizations/france.rst:182 msgid "" "`Frequently Asked Questions " "`__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:144 +#: ../../accounting/localizations/france.rst:183 msgid "" "`Official Statement " "`__" msgstr "" -#: ../../accounting/localizations/france/vat-anti-fraud.rst:145 +#: ../../accounting/localizations/france.rst:184 msgid "" "`Item 88 of Finance Law 2016 " "`__" msgstr "" +#: ../../accounting/localizations/germany.rst:3 +msgid "Germany" +msgstr "德国" + +#: ../../accounting/localizations/germany.rst:6 +msgid "German Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/germany.rst:8 +msgid "" +"The chart of accounts SKR03 and SKR04 are both supported in Odoo. You can " +"choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the Fiscal Localization " +"section." +msgstr "" + +#: ../../accounting/localizations/germany.rst:12 +#: ../../accounting/localizations/spain.rst:17 +msgid "" +"Be careful, you can only change the accounting package as long as you have " +"not created any accounting entry." +msgstr "" + +#: ../../accounting/localizations/germany.rst:16 +msgid "" +"When you create a new SaaS database, the SKR03 is installed by default." +msgstr "" + +#: ../../accounting/localizations/germany.rst:19 +msgid "German Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/germany.rst:21 +msgid "" +"Here is the list of German-specific reports available on Odoo Enterprise:" +msgstr "" + +#: ../../accounting/localizations/germany.rst:23 +#: ../../accounting/localizations/spain.rst:27 +#: ../../accounting/others/reporting/main_reports.rst:30 +msgid "Balance Sheet" +msgstr "资产负债表" + +#: ../../accounting/localizations/germany.rst:24 +msgid "Profit & Loss" +msgstr "" + +#: ../../accounting/localizations/germany.rst:25 +msgid "Tax Report (Umsatzsteuervoranmeldung)" +msgstr "" + +#: ../../accounting/localizations/germany.rst:26 +msgid "Partner VAT Intra" +msgstr "合作伙伴增值税内" + +#: ../../accounting/localizations/germany.rst:29 +msgid "Export from Odoo to Datev" +msgstr "" + +#: ../../accounting/localizations/germany.rst:31 +msgid "" +"It is possible to export your accounting entries from Odoo to Datev. To be " +"able to use this feature, the german accounting localization needs to be " +"installed on your Odoo Enterprise database. Then you can go in " +":menuselection:`Accounting --> Reporting --> General Ledger` then click on " +"the **Export Datev (csv)** button." +msgstr "" + #: ../../accounting/localizations/mexico.rst:3 msgid "Mexico" msgstr "墨西哥" @@ -2950,10 +3155,6 @@ msgid "" "generic one with no explanation." msgstr "" -#: ../../accounting/localizations/mexico.rst:501 -msgid "FAQ" -msgstr "" - #: ../../accounting/localizations/mexico.rst:503 msgid "**Error message** (Only applicable on CFDI 3.3):" msgstr "" @@ -3090,6 +3291,67 @@ msgid "" " used on the invoice." msgstr "" +#: ../../accounting/localizations/spain.rst:3 +msgid "Spain" +msgstr "西班牙" + +#: ../../accounting/localizations/spain.rst:6 +msgid "Spanish Chart of Accounts" +msgstr "" + +#: ../../accounting/localizations/spain.rst:8 +msgid "" +"In Odoo, there are several Spanish Chart of Accounts that are available by " +"default:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:10 +msgid "PGCE PYMEs 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:11 +msgid "PGCE Completo 2008" +msgstr "" + +#: ../../accounting/localizations/spain.rst:12 +msgid "PGCE Entitades" +msgstr "" + +#: ../../accounting/localizations/spain.rst:14 +msgid "" +"You can choose the one you want by going in :menuselection:`Accounting --> " +"Configuration` then choose the package you want in the **Fiscal " +"Localization** section." +msgstr "" + +#: ../../accounting/localizations/spain.rst:20 +msgid "" +"When you create a new SaaS database, the PGCE PYMEs 2008 is installed by " +"default." +msgstr "" + +#: ../../accounting/localizations/spain.rst:23 +msgid "Spanish Accounting Reports" +msgstr "" + +#: ../../accounting/localizations/spain.rst:25 +msgid "" +"If the Spanish Accounting Localization is installed, you will have access to" +" accounting reports specific to Spain:" +msgstr "" + +#: ../../accounting/localizations/spain.rst:28 +msgid "Tax Report (Modelo 111)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:29 +msgid "Tax Report (Modelo 115)" +msgstr "" + +#: ../../accounting/localizations/spain.rst:30 +msgid "Tax Report (Modelo 303)" +msgstr "" + #: ../../accounting/localizations/switzerland.rst:3 msgid "Switzerland" msgstr "瑞士" @@ -3418,6 +3680,13 @@ msgid "" "odoo.com/help." msgstr "" +#: ../../accounting/localizations/switzerland.rst:128 +msgid "" +"Don't forget to update your fiscal positions. If you have a version 11.1 (or" +" higher), there is nothing to do. Otherwise, you will also have to update " +"your fiscal positions accordingly." +msgstr "" + #: ../../accounting/others.rst:3 #: ../../accounting/receivables/customer_invoices/overview.rst:108 msgid "Others" @@ -3796,18 +4065,11 @@ msgstr "" "也进一步配置是必要的。去 :menuselection:`Accounting module --> Configuration --> " "Settings` , 使用 **预算管理** 功能" -#: ../../accounting/others/adviser/budget.rst:34 -msgid "" -"If we want to be precise and point specific invoices and vendors bills to " -"our budget, you should enable the Analytic accounting as well. If we don't " -"we will only be able to budget the total amount of general accounts." -msgstr "如果我们想要精确和指定供应商发票, 您应该启用分析会计。如果不用分析账户, 我们只能一般账户统计总额。" - -#: ../../accounting/others/adviser/budget.rst:40 +#: ../../accounting/others/adviser/budget.rst:35 msgid "Budgetary Positions" msgstr "预算状况" -#: ../../accounting/others/adviser/budget.rst:42 +#: ../../accounting/others/adviser/budget.rst:37 msgid "" "Budgetary positions are the general accounts for which you want to keep " "budgets (typically expense or income accounts). They need to be defined so " @@ -3816,7 +4078,7 @@ msgid "" msgstr "" "预算的位置一般是科目, 用于保存预算(通常是费用或收入科目)。事先需要定义, Odoo才知道怎样去抓取预算信息。有一些可能已在科目表中安装." -#: ../../accounting/others/adviser/budget.rst:48 +#: ../../accounting/others/adviser/budget.rst:43 msgid "" "To define the positions enter the :menuselection:`Accounting module --> " "Configuration --> Budgetary Positions`." @@ -3824,74 +4086,70 @@ msgstr "" "定义位置, 进入 :menuselection:`Accounting module --> Configuration --> Budgetary " "Positions` ." -#: ../../accounting/others/adviser/budget.rst:51 +#: ../../accounting/others/adviser/budget.rst:46 msgid "" "For our example we need to define what accounts relates to our project's " "expenses. Create a position and add items to select the accounts." msgstr "在我们的示例中, 我们需要定义关联到项目费用的科目。创建一个位置并将条目添加到选择账户。" -#: ../../accounting/others/adviser/budget.rst:57 +#: ../../accounting/others/adviser/budget.rst:52 msgid "" "In this case we select the three relevant accounts used wherein we will book" " our expenses." msgstr "在这种情况下, 我们选择使用的三个相关科目, 用来登记费用。" -#: ../../accounting/others/adviser/budget.rst:63 +#: ../../accounting/others/adviser/budget.rst:58 msgid "Click on *Select*." msgstr "点击 *选择* 。" -#: ../../accounting/others/adviser/budget.rst:68 +#: ../../accounting/others/adviser/budget.rst:63 msgid "Save the changes to confirm your Budgetary position." msgstr "保存变更确认你的预算状况。" -#: ../../accounting/others/adviser/budget.rst:70 +#: ../../accounting/others/adviser/budget.rst:65 msgid "" "Repeat this steps to create a revenue budgetary position. Only in this case " "select the relevant income accounts." msgstr "重复这个步骤创建一个收入预算的位置。只有在这种情况下选择相关收入科目。" -#: ../../accounting/others/adviser/budget.rst:74 +#: ../../accounting/others/adviser/budget.rst:69 msgid "Analytical account" msgstr "分析会计" -#: ../../accounting/others/adviser/budget.rst:76 +#: ../../accounting/others/adviser/budget.rst:71 msgid "" -"If you wish to point specific invoices or vendor bills to your budget you " -"need to use analytical accounting. Odoo needs to know which costs or " -"expenses are relevant to a specified budget. To do so we need to link our " -"invoices and expenses to a defined analytical account. Create an analytical " -"account by entering the Accounting module and clicking " -":menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a " -"new Account called Smith&Co project and select the related partner." +"Odoo needs to know which costs or expenses are relevant to a specified " +"budget. To do so we need to link our invoices and expenses to a defined " +"analytical account. Create an analytical account by entering the Accounting " +"module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open " +"Charts`. Create a new Account called Smith&Co project and select the related" +" partner." msgstr "" -"如果你想具体分析发票或供应商账单, 你需要利用分析科目。Odoo需要知道指定预算的成本或费用。所以, 我们需要将发票和费用链接到分析科目。创建分析科目," -" 需进入会计模块和点击 :menuselection:`Advisers --> Analytic Accounts --> Open Charts` " -". 创建一个名为Smith&Co项目并选择相关的合作伙伴。" -#: ../../accounting/others/adviser/budget.rst:88 +#: ../../accounting/others/adviser/budget.rst:82 msgid "Set a budget" msgstr "设置预算" -#: ../../accounting/others/adviser/budget.rst:90 +#: ../../accounting/others/adviser/budget.rst:84 msgid "" "Let's now set our targets for our budget. We specified that we expect to " "gain 1000 with this project and we would like not to spend more than 700." msgstr "现在, 让我们为我们的预算设定我们的目标。我们规定, 我们期望这个项目获得1000, 话费不超过700。" -#: ../../accounting/others/adviser/budget.rst:94 +#: ../../accounting/others/adviser/budget.rst:88 msgid "" "To set those targets, enter the accounting app, select " ":menuselection:`Advisers --> Budgets` and create a new Budget." msgstr "设定这些目标, 进入会计程序, 选择 :menuselection:`Advisers --> Budgets` , 创建一个新的预算。" -#: ../../accounting/others/adviser/budget.rst:97 +#: ../../accounting/others/adviser/budget.rst:91 msgid "" "We have to give a name to the budget. In this case we'll call it \"Smith " "Project\". Select the period wherein the budget will be applicable. Next add" " an item to specify your targets in the Budget Line." msgstr "我们需要为这个预算命名。在这种情况下, 我们把它叫做 \"史密斯项目\" 。选择预算适用的期间。下一步, 在预算行定义目标。 " -#: ../../accounting/others/adviser/budget.rst:104 +#: ../../accounting/others/adviser/budget.rst:98 msgid "" "Select the Budgetary Position related to the Budget Line. In other words, " "select the position that points to the accounts you want to budget. In this " @@ -3903,56 +4161,56 @@ msgstr "" "选择相关预算行的预算位置。换句话说, 选择你想要的位置科目。在这种情况下, 我们将开始费用目标, 不超700。选择“成本\" 预算位置, " "指定计划预算金额。我们记录成本, 我们需要指定一个 **负数金额** 。最后, 选择相应的分析科目。 " -#: ../../accounting/others/adviser/budget.rst:114 +#: ../../accounting/others/adviser/budget.rst:108 msgid "" "Click on **Save & new** to input the revenue budget. The Budgetary Position " "is Revenue and the Planned Amount is 1000. Save and close" msgstr "点击 **Save & new** 输入收入预算。预算的位置是收入, 计划是1000。保存并关闭" -#: ../../accounting/others/adviser/budget.rst:117 +#: ../../accounting/others/adviser/budget.rst:111 msgid "You'll need to **Confirm** and **Approve** the budget." msgstr "你需要确认并且同意这个预算" -#: ../../accounting/others/adviser/budget.rst:120 +#: ../../accounting/others/adviser/budget.rst:114 msgid "Check your budget" msgstr "检查预算" -#: ../../accounting/others/adviser/budget.rst:122 +#: ../../accounting/others/adviser/budget.rst:116 msgid "" "You can check your budget at any time. To see the evolution, let's book some" " Invoices and Vendors Bills." msgstr "你可以在任何时间检查你的预算。查看进化, 让我们录入一些发票和供应商账单。" -#: ../../accounting/others/adviser/budget.rst:127 +#: ../../accounting/others/adviser/budget.rst:121 msgid "" "if you use analytical accounts remember that you need to specify the account" " in the invoice and / or purchase line." msgstr "如果你使用分析账户, 请记住, 您需要在发票上和/或购买行指定科目。" -#: ../../accounting/others/adviser/budget.rst:131 +#: ../../accounting/others/adviser/budget.rst:125 msgid "for more information about booking invoices and purchase orders see:" msgstr "关于发票和采购订单的信息请看 :" -#: ../../accounting/others/adviser/budget.rst:133 +#: ../../accounting/others/adviser/budget.rst:127 msgid ":doc:`../../receivables/customer_invoices/overview`" msgstr ":doc:`../../receivables/customer_invoices/overview` " -#: ../../accounting/others/adviser/budget.rst:134 +#: ../../accounting/others/adviser/budget.rst:128 msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`" msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice` " -#: ../../accounting/others/adviser/budget.rst:136 +#: ../../accounting/others/adviser/budget.rst:130 msgid "Go back in the budget list and find the Smith Project." msgstr "返回预算明细并且找到具体项目" -#: ../../accounting/others/adviser/budget.rst:138 +#: ../../accounting/others/adviser/budget.rst:132 msgid "" "Via the analytical account, Odoo can account the invoice lines and purchase " "lines booked in the accounts and will display them in the **Practical " "Amount** column." msgstr "通过分析账户, Odoo可以计算发票行和采购发票行, 金额将显示在 **实际金额** 列。" -#: ../../accounting/others/adviser/budget.rst:147 +#: ../../accounting/others/adviser/budget.rst:141 msgid "" "The theoretical amount represents the amount of money you theoretically " "could have spend / should have received in function of the date. When your " @@ -6383,10 +6641,6 @@ msgid "" "default **Previous 1 Period** option." msgstr "你可以将当期的值与另一期间的值比较。也可选择多个期间进行比较。如果不想使用系统默认的* *前一期间 * *, 你可以选择之前的12期。" -#: ../../accounting/others/reporting/main_reports.rst:30 -msgid "Balance Sheet" -msgstr "资产负债表" - #: ../../accounting/others/reporting/main_reports.rst:32 msgid "" "The **Balance Sheet** shows a snapshot of the assets, liabilities and equity" @@ -10713,6 +10967,78 @@ msgstr "如果客户全额支付，没有使用现金折扣，将付款(完全) msgid ":doc:`overview`" msgstr ":doc:`overview` " +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2 +msgid "Set up cash roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:4 +msgid "" +"In some currencies, the smallest coins do not exist. For example, in " +"Switzerland, there is no coin for 0.01 CHF. For this reason, if invoices are" +" paid in cash, you have to round their total amount to the smallest coin " +"that exist in the currency. For the CHF, the smallest coin is 0.05 CHF." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:10 +msgid "There are two strategies for the rounding:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:12 +msgid "Add a line on the invoice for the rounding" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:14 +msgid "Add the rounding in the tax amount" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:16 +msgid "Both strategies are applicable in Odoo." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:21 +msgid "" +"First, you have to activate the feature. For this, go in " +":menuselection:`Accounting --> Configuration --> Settings` and activate the " +"Cash Rounding." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:28 +msgid "" +"There is a new menu to manage cash roundings in :menuselection:`Accounting " +"--> Configuration --> Management --> Cash roundings`." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:31 +msgid "" +"Now, you can create cash roundings. You can choose between two rounding " +"strategies:" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:34 +msgid "" +"**Add a rounding line**: if a rounding is necessary, Odoo will add a line on" +" your customer invoice to take this rounding into account. You also have to " +"define the account in which the rounding will go." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:39 +msgid "" +"**Modify tax amount:** Odoo will add the rounding to the amount of the " +"highest tax." +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:46 +msgid "Apply roundings" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/cash_rounding.rst:48 +msgid "" +"Once your roundings are created, you can apply them on customer invoices. On" +" the customer invoices, there is a new field called **Cash Rounding Method**" +" where you can simply choose one of the rounding methods created previously." +" If needed, a rounding will be applied to the invoice." +msgstr "" + #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:3 msgid "Deferred revenues: how to automate them?" msgstr "递延收入 : 如何自动处理？" @@ -11031,93 +11357,6 @@ msgstr "在客户对账单中，您将看到不同到期日的两行。如需查 msgid ":doc:`payment_terms`" msgstr ":doc:`payment_terms` " -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:3 -msgid "How to modify a validated invoice?" -msgstr "如何修改验证过的发票？" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:5 -msgid "" -"In most accounting legislation over the word, it's not allowed to modify an " -"invoice that is validated and sent to the customer. However, you sometimes " -"need to change an invoice for different reasons: the sale has changed, the " -"made a mistake while recording the invoice, etc." -msgstr "在大多数地方的会计法规定，确认并发送给客户的发票不允许更改。然而，你有时需要改变发票：销售发生了变化，在登记发票时的错误，等等。" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:10 -msgid "Thus, the right way to modify an invoice is to:" -msgstr "因此，修改发票的正确方法是：" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:12 -msgid "Refund the original invoice" -msgstr "退款原始发票" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:13 -msgid "Create a new invoice" -msgstr "创建一个新发票" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:15 -msgid "" -"Odoo's refund mechanism helps you handle the whole process in just a few " -"clicks." -msgstr "只需点击几下,就可处理完退款." - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:19 -msgid "Modify an invoice" -msgstr "修改一个发票" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:21 -msgid "" -"If your invoice is still in draft, you can modify it the way you want. " -"However, if your invoice is validated, you can not change it anymore. If you" -" need to modify it, the right operations to do are:" -msgstr "如果发票仍在草稿状态，可以修改。但是，如果发票已验证，就不能再更改了。如果你需要修改，正确的操作是：" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:25 -msgid "Refund the original invoice;" -msgstr "退款原始发票；" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:26 -msgid "Reconcile the original invoice with the refund to void them;" -msgstr "将原来的发票和红冲发票核销；" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:27 -msgid "Create a new draft invoice, a copy of the original;" -msgstr "创建一个新的草稿发票, 通过复制原始发票;" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:28 -msgid "Validate the new invoice." -msgstr "确认新发票" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:30 -msgid "" -"All those steps are automated by Odoo. All you have to do is to click on the" -" Refund button on an invoice." -msgstr "所有这些步骤都是Odoo自动完成的。你所要做的就是点击发票上的退款按钮。" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:36 -msgid "" -"In the refund dialog, select the option \"Modify: create a refund, reconcile" -" and create a draft invoice\". Once you click on the \"Create Refund\" " -"button, Odoo will void your existing invoice and create a new draft invoice " -"that is a duplicate of the original one." -msgstr "" -"在“退款”对话框中，选择“修改：创建一个退款，核销并创建一张草稿发票”。点击“创建退款”按钮后，Odoo将作废现有的发票并通过复制原有发票创建一张新的发票。" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:41 -msgid "Edit this new draft invoice and validate it when it's correct." -msgstr "编辑这个新发票，验证无误后确认" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:45 -msgid "" -"if you already sent the original invoice to your customer, you should send " -"the new invoice and the refund to the customer so that he gets all the " -"documents." -msgstr "如果你已经把初始发票寄给了你的客户，你应该把新开的发票和退还款项也寄送给客户以使其得到全部记录" - -#: ../../accounting/receivables/customer_invoices/modify_validated.rst:50 -msgid ":doc:`refund`" -msgstr ":doc:`refund` " - #: ../../accounting/receivables/customer_invoices/overview.rst:3 msgid "Overview of the invoicing process" msgstr "开票流程概述" diff --git a/locale/zh_CN/LC_MESSAGES/discuss.po b/locale/zh_CN/LC_MESSAGES/discuss.po index b46211d49..e0a1273c5 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: 2017-12-13 13:31+0100\n" +"POT-Creation-Date: 2018-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Connie Xiao , 2017\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" @@ -23,263 +23,254 @@ msgid "Discuss" msgstr "讨论" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive email in Odoo" -msgstr "Odoo邮件收发服务器配置详解" - -#: ../../discuss/email_servers.rst:6 -msgid "When is it needed" -msgstr "什么情况下需要在Odoo中收发邮件？" - -#: ../../discuss/email_servers.rst:7 -msgid "" -"Using your own email servers is required to send and receive messages in " -"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " -"solution that works straight away. However you can still use your own email " -"servers with the online edition. Some insights are provided here below." +msgid "How to use my mail server to send and receive emails in Odoo" msgstr "" -"当您在Odoo社区版或企业版中使用邮件服务器进行邮件收发来传递消息时您需要使用Odoo的这个功能。Odoo自带一个在线电子邮件管理系统。您可通过配置相关参数来在线收发电子邮件。以下操作仅供参考。" -#: ../../discuss/email_servers.rst:14 -msgid "How to set it up" -msgstr "如何设置" +#: ../../discuss/email_servers.rst:5 +msgid "" +"This document is mainly dedicated to Odoo on-premise users who don't benefit" +" from an out-of-the-box solution to send and receive emails in Odoo, unlike " +"in `Odoo Online `__ & `Odoo.sh " +"`__." +msgstr "" + +#: ../../discuss/email_servers.rst:9 +msgid "" +"If no one in your company is used to manage email servers, we strongly " +"recommend that you opt for such convenient Odoo hosting solutions. Indeed " +"their email system works instantly and is monitored by professionals. " +"Nevertheless you can still use your own email servers if you want to manage " +"your email server's reputation yourself." +msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"As a system admin, go to :menuselection:`Settings --> General Settings` and " -"check *External Email Servers* (watch out: this checkbox only shows up after" -" Odoo 10). Then, go through the following steps." +"You will find here below some useful information to do so by integrating " +"your own email solution with Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:19 +msgid "How to manage outbound messages" msgstr "" -"以系统管理员的身份登陆后点击菜单 :menuselection:`设置 --> " -"通用设置，勾选*外部邮件服务器*（注意：只有Odoo10以上的版本才有这个复选框)。若是8.0版本请您以系统管理员的身份登陆后点击菜单 " -":menuselection:`设置 --> 常规设置，看到电子邮件四个中国汉字，的边上对应两个配置项，点击进行相关参数配置。然后进入以下步骤。" #: ../../discuss/email_servers.rst:21 msgid "" -"Office 365 email servers don't allow to send external emails from hosts like" -" Odoo. Consequently you can only use such email servers for incoming " -"messages." +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers*. Then, click *Outgoing Mail Servers* to " +"create one and reference the SMTP data of your email server. Once all the " +"information has been filled out, click on *Test Connection*." msgstr "" #: ../../discuss/email_servers.rst:26 -msgid "Set an outgoing email server for outbound messages" -msgstr "设置发件服务器相关参数" - -#: ../../discuss/email_servers.rst:27 -msgid "" -"You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " -"etc.) as well as your admin credentials. Once all the information has been " -"filled out, click on *Test Connection*." +msgid "Here is a typical configuration for a G Suite server." +msgstr "" + +#: ../../discuss/email_servers.rst:31 +msgid "Then set your email domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:34 +msgid "Can I use an Office 365 server" msgstr "" -"你需要找到电子邮件服务商（例如Gmail, Outlook, Yahoo, " -"AOL）的SMTP参数和管理证书。比如在中国大陆用QQ邮箱的话，SMTP你可以这样设置：smtp.qq.com——前提是你需要开启QQ邮箱的SMTP，实在没办法的也可加应用群212904求助。填写完邮箱配置信息后，点击*测试连接*。" #: ../../discuss/email_servers.rst:35 -msgid "Set an incoming email server for inbound messages" -msgstr "设置收件服务器相关参数" - -#: ../../discuss/email_servers.rst:36 msgid "" -"Fill out the form according to your email provider’s settings. Leave the " -"*Actions to Perform on Incoming Mails* blank. Once all the information has " -"been filled out, click on *TEST & CONFIRM*." +"You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP" +" relays are not compatible with Odoo Online." +msgstr "" + +#: ../../discuss/email_servers.rst:38 +msgid "" +"Please refer to `Microsoft's documentation `__ to configure" +" a SMTP relay for your Odoo's IP address." +msgstr "" + +#: ../../discuss/email_servers.rst:42 +msgid "How to use a G Suite server" msgstr "" -"根据电子邮件服务商的具体参数进行填写配置。例如中国大陆QQ邮箱您可以填写imap.qq.com。不要填写*对接收到的邮件采取的行动*栏。如实在没办法可加群374626483求助。填写完毕后，点击*测试并确认*。" #: ../../discuss/email_servers.rst:43 msgid "" -"By default inbound messages are fetched every 5 minutes. You can change this" -" value in developer mode. Go to :menuselection:`Settings --> Technical --> " -"Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." +"You can use an G Suite server for any Odoo hosting type. To do so you need " +"to enable a SMTP relay and to allow *Any addresses* in the *Allowed senders*" +" section. The configuration steps are explained in `Google documentation " +"`__." msgstr "" -"默认的设置是每隔5分钟接收一次邮件。可以在开发模式中更改这个间隔值。方法是进入 :menuselection:`设置 --> 技术 --> 自动 -->" -" 设定动作，然后找到*邮件: 邮件收发服务*。" #: ../../discuss/email_servers.rst:49 -msgid "Set the domain name" -msgstr "设定邮箱域名" +msgid "Be SPF-compliant" +msgstr "" #: ../../discuss/email_servers.rst:50 msgid "" -"Enter the domain name of your email servers (e.g. mycompany.com) in General " -"Settings." -msgstr "在通用设置里面输入邮件服务器域名（如duuge.com）注：在8.0叫别名域。" - -#: ../../discuss/email_servers.rst:57 -msgid "Create a catchall address" -msgstr "创建一个分组收件地址（类似QQ域名邮箱中的分组管理功能）" - -#: ../../discuss/email_servers.rst:58 -msgid "" -"When a contact replies to an email sent from Odoo, the *reply-to* address is" -" a generic address used to route the reply to the right discussion thread in" -" Odoo (opportunity, order, task, etc.) and to the inbox of all its " -"followers. By default this address is \"catchall@\" but it can be changed." -msgstr "" -"当一个联系人回复Odoo发送的邮件时，*reply-to* " -"地址是一个catchall地址，可将回复中继到Odoo（商机、订单、任务等）中正确的讨论话题，以及所有关注者的邮箱中。地址默认为\"catchall@\"，也可以更改。" - -#: ../../discuss/email_servers.rst:63 -msgid "" -"Create a catchall address in your email server settings. We advise you to " -"use \"catchall@\" so that everything works out straight away. If you want to" -" use another alias, you have extra steps in Odoo:" -msgstr "" -"在你的邮件服务器设置中创建一个catchall地址。我们建议您使用\"catchall@\"地址，可直接运行。如想使用其他别名，需要在Odoo中多设置一些步骤。" - -#: ../../discuss/email_servers.rst:67 -msgid "Activate the developer mode from your Settings Dashboard." -msgstr "从设置仪表板激活开发者模式。" - -#: ../../discuss/email_servers.rst:72 -msgid "" -"Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " -"Parameters --> System Parameters` and enter your custom catchall alias in " -"*mail.catchall.alias*." -msgstr "" -"刷新屏幕。然后进入 :menuselection:`设置 --> 技术 --> 参数 --> " -"系统参数，在*mail.catchall.alias*中输入你自定的catchall别名。" - -#: ../../discuss/email_servers.rst:79 -msgid "You can edit the email alias used for bounced messages the same way." -msgstr "可以用同样的方法编辑外发邮件的地址别名。" - -#: ../../discuss/email_servers.rst:82 -msgid "How to use my own email servers with Odoo Online" -msgstr "如何通过Odoo在线使用我自己的邮件服务器" - -#: ../../discuss/email_servers.rst:83 -msgid "" -"Odoo Online comes up with an embedded and ready-to-use email solution with " -"*@yourcompany.odoo.com* as domain. We recommend to keep this default setup " -"as it is really convenient." +"In case you use SPF (Sender Policy Framework) to increase the deliverability" +" of your outgoing emails, don't forget to authorize Odoo as a sending host " +"in your domain name settings. Here is the configuration for Odoo Online:" msgstr "" -#: ../../discuss/email_servers.rst:87 +#: ../../discuss/email_servers.rst:54 msgid "" -"Nevertheless you can still use your own email servers if you want to manage " -"your email server's reputation (blacklisting, etc). The configuration for " -"both incoming and outgoing mail servers is given here above." +"If no TXT record is set for SPF, create one with following definition: " +"v=spf1 include:_spf.odoo.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:92 +#: ../../discuss/email_servers.rst:56 msgid "" -"However when it comes to incoming messages, we don't recommend to " -"exclusively use your own email server. Indeed, Odoo Online is fetching " -"incoming messages from the email server once every hour only. To receive " -"emails in real time, you should rather use a **catchall redirection** (your " -"server -> Odoo server). To do so:" +"In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g." +" for a domain name that sends emails via Odoo Online and via G Suite it " +"could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:98 -msgid "" -"Create a catchall address in your email server settings (e.g. catchall)." -msgstr "" - -#: ../../discuss/email_servers.rst:99 -msgid "" -"Still from such settings, set a redirection from this catchall address to " -"Odoo's one: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com." -msgstr "" - -#: ../../discuss/email_servers.rst:102 -msgid "" -"In Odoo check *External Email Servers* in :menuselection:`Settings --> " -"General Settings` and enter your email domain name (i.e. yourdomain.ext)." -msgstr "" - -#: ../../discuss/email_servers.rst:104 -msgid "No need to set up an incoming email server in such a case." -msgstr "" - -#: ../../discuss/email_servers.rst:108 -msgid "How to be SPF-compliant when using external email servers in Odoo" -msgstr "在Odoo上使用外部邮件服务器时如何与SPF兼容" - -#: ../../discuss/email_servers.rst:109 -msgid "" -"Sender Policy Framework (SPF) is an email-validation system that checks that" -" incoming mail from a domain comes from a host authorized by that domain's " -"administrator. Such a security system is used in most email servers. If you " -"don't comply with it, your emails sent from Odoo will be likely flagged as " -"spam." -msgstr "" -"发送者策略框架（SPF）是一种邮件确认系统，它可以检查某个域名发出的邮件是否经过域名管理者的授权。这种安全机制被用于多数邮件服务器。如果不兼容，则你从Odoo发出的邮件很可能被标记为垃圾邮件。" - -#: ../../discuss/email_servers.rst:115 -msgid "" -"To be SPF-compliant, you need to authorize Odoo as a sending host in your " -"domain name settings:" -msgstr "为了与SPF兼容，你需要在域名设置中对Odoo授权。" - -#: ../../discuss/email_servers.rst:118 -msgid "Sign in to your domain’s account at your domain host." -msgstr "在你的域名主机中登入你域名的帐户。" - -#: ../../discuss/email_servers.rst:119 -msgid "Locate the page for updating your domain’s DNS records." -msgstr "找到域名DNS记录的更新页面。" - -#: ../../discuss/email_servers.rst:120 -msgid "" -"If no TXT record is set, create one with following definition: v=spf1 " -"include:_spf.odoo.com ~all" -msgstr "如果未设置TXT格式的记录，用以下定义创建一个记录：v=spf1 include:_spf.odoo.com ~all " - -#: ../../discuss/email_servers.rst:122 -msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." -msgstr "如已经设置了TXT记录，添加\"include:_spf.odoo.com\"" - -#: ../../discuss/email_servers.rst:124 -msgid "e.g. for a Gmail server it should be:" -msgstr "例如，Gmail服务器可以这样设置：" - -#: ../../discuss/email_servers.rst:126 -msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" -msgstr " v=spf1 include:_spf.odoo.com include:_spf.google.com ~all " - -#: ../../discuss/email_servers.rst:128 +#: ../../discuss/email_servers.rst:60 msgid "" "Find `here `__ the exact procedure to " "create or modify TXT records in your own domain registrar." msgstr "找到，在你自己的域寄存器中以准确步骤创建或修改TXT记录。" -#: ../../discuss/email_servers.rst:131 +#: ../../discuss/email_servers.rst:63 msgid "" "Your new SPF record can take up to 48 hours to go into effect, but this " "usually happens more quickly." msgstr "新的SPF记录48小时后生效，但通常用不了那么长时间。" -#: ../../discuss/email_servers.rst:134 +#: ../../discuss/email_servers.rst:66 msgid "" "Adding more than one SPF record for a domain can cause problems with mail " "delivery and spam classification. Instead, we recommend using only one SPF " "record by modifying it to authorize Odoo." msgstr "为一个域添加多个SPF记录可能导致邮件被分类为垃圾。我们建议仅修改一个SPF记录以授权给Odoo。" -#: ../../discuss/email_servers.rst:139 -msgid "How to choose between Odoo and my traditional email box" -msgstr "如何在Odoo和传统的电子邮箱之间做出选择" +#: ../../discuss/email_servers.rst:71 +msgid "Allow DKIM" +msgstr "" + +#: ../../discuss/email_servers.rst:72 +msgid "" +"You should do the same thing if DKIM (Domain Keys Identified Mail) is " +"enabled on your email server. In the case of Odoo Online & Odoo.sh, you " +"should add a DNS \"odoo._domainkey\" CNAME record to " +"\"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have " +"a record \"odoo._domainkey.foo.com\" that is a CNAME with the value " +"\"odoo._domainkey.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:80 +msgid "How to manage inbound messages" +msgstr "" + +#: ../../discuss/email_servers.rst:82 +msgid "Odoo relies on generic email aliases to fetch incoming messages." +msgstr "" + +#: ../../discuss/email_servers.rst:84 +msgid "" +"**Reply messages** of messages sent from Odoo are routed to their original " +"discussion thread (and to the inbox of all its followers) by the catchall " +"alias (**catchall@**)." +msgstr "" + +#: ../../discuss/email_servers.rst:88 +msgid "" +"**Bounced messages** are routed to **bounce@** in order to track them in " +"Odoo. This is especially used in `Odoo Email Marketing " +"`__ to opt-out invalid " +"recipients." +msgstr "" + +#: ../../discuss/email_servers.rst:92 +msgid "" +"**Original messages**: Several business objects have their own alias to " +"create new records in Odoo from incoming emails:" +msgstr "" + +#: ../../discuss/email_servers.rst:95 +msgid "" +"Sales Channel (to create Leads or Opportunities in `Odoo CRM " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:97 +msgid "" +"Support Channel (to create Tickets in `Odoo Helpdesk " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:99 +msgid "" +"Projects (to create new Tasks in `Odoo Project `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:101 +msgid "" +"Job Positions (to create Applicants in `Odoo Recruitment " +"`__)," +msgstr "" + +#: ../../discuss/email_servers.rst:103 +msgid "etc." +msgstr "等等" + +#: ../../discuss/email_servers.rst:105 +msgid "" +"Depending on your mail server, there might be several methods to fetch " +"emails. The easiest and most recommended method is to manage one email " +"address per Odoo alias in your mail server." +msgstr "" + +#: ../../discuss/email_servers.rst:109 +msgid "" +"Create the corresponding email addresses in your mail server (catcall@, " +"bounce@, sales@, etc.)." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "Set your domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:116 +msgid "" +"If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for " +"each alias. You can do it from the General Settings as well. Fill out the " +"form according to your email provider’s settings. Leave the *Actions to " +"Perform on Incoming Mails* blank. Once all the information has been filled " +"out, click on *TEST & CONFIRM*." +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "" +"If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming " +"messages to Odoo's domain name rather than exclusively use your own email " +"server. That way you will receive incoming messages without delay. Indeed, " +"Odoo Online is fetching incoming messages of external servers once per hour " +"only. You should set redirections for all the email addresses to Odoo's " +"domain name in your email server (e.g. *catchall@mydomain.ext* to " +"*catchall@mycompany.odoo.com*)." +msgstr "" + +#: ../../discuss/email_servers.rst:132 +msgid "" +"All the aliases are customizable in Odoo. Object aliases can be edited from " +"their respective configuration view. To edit catchall and bounce aliases, " +"you first need to activate the developer mode from the Settings Dashboard." +msgstr "" #: ../../discuss/email_servers.rst:140 msgid "" -"Odoo Discuss is a perfect tool to send and read messages related to business" -" documents. However it doesn't aim to replace a full-featured email solution" -" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " -"both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not can be managed into your " -"external email box." +"Then refresh your screen and go to :menuselection:`Settings --> Technical " +"--> Parameters --> System Parameters` to customize the aliases " +"(*mail.catchall.alias* & * mail.bounce.alias*)." msgstr "" -"Odoo讨论是一种发送与读取业务相关信息的完美工具，但它不会替代功能完善的电邮解决方案（如Gmail, Outlook, Yahoo, " -"AOL等）。我们建议采用两种方案的优势部分，而不是混用：与Odoo业务目标或应用相关的信息进入Odoo，无法管理的信息进入外部邮箱。" #: ../../discuss/email_servers.rst:147 msgid "" -"To do so, create specific email aliases to use in Odoo (to generate leads or" -" opportunities, helpdesk tickets, etc.). If you take an email alias already " -"used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity." +"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*." msgstr "" -"为此需要创建特定的电邮别名在Odoo中使用（以生成话题、机会或helpdesk工作票等）。如你已经采用了Odoo以外的邮箱别名，接收的邮件将同时进入两个系统。这会影响到工作效率。" #: ../../discuss/mail_twitter.rst:3 msgid "How to follow Twitter feed from Odoo" diff --git a/locale/zh_CN/LC_MESSAGES/inventory.po b/locale/zh_CN/LC_MESSAGES/inventory.po index c2d821295..9bb81e9f7 100644 --- a/locale/zh_CN/LC_MESSAGES/inventory.po +++ b/locale/zh_CN/LC_MESSAGES/inventory.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-01-08 17:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: 苏州远鼎 , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -722,8 +722,6 @@ msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:18 #: ../../inventory/routes/strategies/putaway.rst:23 #: ../../inventory/routes/strategies/removal.rst:18 -#: ../../inventory/settings/products/packages.rst:17 -#: ../../inventory/settings/products/packages.rst:66 #: ../../inventory/settings/products/strategies.rst:30 #: ../../inventory/settings/products/uom.rst:17 #: ../../inventory/settings/products/variants.rst:114 @@ -890,7 +888,6 @@ msgstr "如何取消交货单？" #: ../../inventory/routes/costing/landed_costs.rst:6 #: ../../inventory/routes/strategies/putaway.rst:6 #: ../../inventory/routes/strategies/removal.rst:6 -#: ../../inventory/settings/products/packages.rst:6 #: ../../inventory/settings/products/uom.rst:6 #: ../../inventory/shipping/operation/cancel.rst:6 #: ../../inventory/shipping/operation/invoicing.rst:6 @@ -2821,6 +2818,65 @@ msgstr "要追踪一个产品, 打开 **库存** 模块, 在 :menuselection:`库 msgid "Miscellaneous Operations" msgstr "杂项操作" +#: ../../inventory/management/misc/immediate_planned_transfers.rst:2 +msgid "Immediate & Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:4 +msgid "" +"In Odoo, you can create two types of transfers: immediate or planned " +"transfers." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:8 +msgid "Immediate Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:10 +msgid "" +"When you create a transfer manually, it is by default an immediate transfer." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:13 +msgid "" +"In the case of an immediate transfer, you directly encode the products and " +"quantities you are processing, there is no reservation that applies. This is" +" why the column \"Initial Demand\" is not editable. You only fill in the " +"column \"Done\" for the quantities." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:18 +msgid "" +"This is for example used when you are transferring goods from a location A " +"to a location B and that this is not planned (you are processing the " +"transfer right now)." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:23 +msgid "Planned Transfers" +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:25 +msgid "" +"When a transfer is generated automatically (from a sales order or purchase " +"order for example), it is a planned transfer. This means that there is an " +"initial demand and that reservation applies on this initial demand." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:30 +msgid "" +"If you want to create a planned transfer manually, you can do it from the " +"inventory dashboard." +msgstr "" + +#: ../../inventory/management/misc/immediate_planned_transfers.rst:36 +msgid "" +"In that case, you will have to enter the initial demand first (how many " +"units are you supposed to proceed), then to mark your transfer as to do. " +"Once this is done, you will be able to reserve the products and to process " +"the transfer." +msgstr "" + #: ../../inventory/management/misc/owned_stock.rst:3 msgid "How to manage stock that you don't own?" msgstr "如何处理不属于你的库存？" @@ -6261,156 +6317,6 @@ msgstr "设置" msgid "Products" msgstr "产品" -#: ../../inventory/settings/products/packages.rst:3 -msgid "How to use packages?" -msgstr "如何使用包裹？" - -#: ../../inventory/settings/products/packages.rst:8 -#: ../../inventory/settings/products/usage.rst:31 -msgid "" -"The package is the physical container in which you put one or several " -"product." -msgstr "包裹是一个你想在其中放置一个或者几个产品的实际的容器。" - -#: ../../inventory/settings/products/packages.rst:11 -msgid "By default, Odoo does not take into account the use of it." -msgstr "默认状态下, Odoo不用该功能" - -#: ../../inventory/settings/products/packages.rst:13 -msgid "" -"Once you activate the option, you will be able to manage one or several " -"packages when doing your transfers." -msgstr "一旦你激活了该选项, 你就可以在调拨的时候管理一个或者多个包裹。" - -#: ../../inventory/settings/products/packages.rst:19 -msgid "" -"To configure the use of packages, go to the menu :menuselection:`Inventory " -"--> Configuration --> Settings`. µ Locate the **Packages** section and tick " -"**Record packages used on packing: pallets, boxes,...**" -msgstr "" -"要陪只如何使用包裹, 进入菜单 :menuselection:`库存 -->配置 -->设置` 。找到 **包裹** 的位置并选择 " -"**记录产品包裹的包材 :栈板, 盒子, ……** " - -#: ../../inventory/settings/products/packages.rst:27 -#: ../../inventory/shipping/operation/multipack.rst:23 -msgid "Click on **Apply** when you are done." -msgstr "一旦完成, 点击 **应用** 。" - -#: ../../inventory/settings/products/packages.rst:30 -msgid "Pack products" -msgstr "打包产品" - -#: ../../inventory/settings/products/packages.rst:32 -msgid "" -"Putting products in packs is usually done when processing warehouses " -"transfers (receipt, internals or deliveries)." -msgstr "把产品分包通常在处理仓库调拨时完成(收货, 内部调拨或者发货)。" - -#: ../../inventory/settings/products/packages.rst:35 -msgid "" -"To be able to put products in pack, the status of your transfer has to be " -"**Available**." -msgstr "要把产品放进一个包裹, 调拨单的状态必须要是 **可用** 。" - -#: ../../inventory/settings/products/packages.rst:41 -msgid "" -"In the operation tab, you can put your products into one or multiple " -"packages." -msgstr "在操作页面, 你可以把产品放进一个或者多个包裹中。" - -#: ../../inventory/settings/products/packages.rst:44 -#: ../../inventory/shipping/operation/multipack.rst:50 -msgid "" -"Choose the quantity you want to put in the first pack in the **Done** " -"column, then click on the link **Put in Pack**." -msgstr "在 **完成** 栏位选择你想要放进该包裹的产品的数量, 然后点击 **放进一个包裹** 链接。" - -#: ../../inventory/settings/products/packages.rst:50 -#: ../../inventory/shipping/operation/multipack.rst:56 -msgid "It will automatically create a pack with the requested quantity." -msgstr "它会总动的创建所需数量的包裹。" - -#: ../../inventory/settings/products/packages.rst:52 -#: ../../inventory/shipping/operation/multipack.rst:58 -msgid "Do the same steps for the other pieces you want to pack in." -msgstr "其余的产品可以按照同样的步骤进行打包。" - -#: ../../inventory/settings/products/packages.rst:57 -#: ../../inventory/shipping/operation/multipack.rst:63 -msgid "Click on **Validate** when you are done." -msgstr "一旦完成, 点击 **确认** 。" - -#: ../../inventory/settings/products/packages.rst:60 -msgid "Whole packages transfers" -msgstr "整个包裹的转移" - -#: ../../inventory/settings/products/packages.rst:62 -msgid "" -"If you are using several locations and/or warehouses, it is possible to " -"transfer packages with its contents." -msgstr "如果有不同的库位和／或仓库, 也有可能通过转移包裹来转移产品。" - -#: ../../inventory/settings/products/packages.rst:68 -msgid "" -"You need to configure the **Operation Type** to allow moving packages. Go to" -" :menuselection:`Configuration --> Operations Types`. Tick **Allow moving " -"packs**:" -msgstr "" -"你需要设置 **作业类型** 为允许调拨包裹。进入 :menuselection:`配置 -->作业类型` 。勾选 **允许调拨包裹**: " - -#: ../../inventory/settings/products/packages.rst:75 -msgid "Transfer packages" -msgstr "调拨包裹" - -#: ../../inventory/settings/products/packages.rst:77 -msgid "" -"Create a transfer order. Choose the source and the destination locations, " -"then click on **Mark as todo**. Do not put anything under the **Initial " -"Demand** tab." -msgstr "创建一个调拨单。选择源库位和目标库位, 然后点击 ***标记为代办* 。在** 原始需求 **页面不要放置任何内容。" - -#: ../../inventory/settings/products/packages.rst:84 -msgid "" -"In the Operation tab, click on **Add an item** under the **Package To Move**" -" section." -msgstr "在操作页面, 在 **要移动的包裹** 下面点击 **添加新的条目** 。" - -#: ../../inventory/settings/products/packages.rst:87 -msgid "Tick the **Done** checkbox to confirm the move of the package :" -msgstr "点击 **完成** 勾选框确认包裹的移动 :" - -#: ../../inventory/settings/products/packages.rst:92 -msgid "When it is finished, click on **Validate**." -msgstr "一旦完成, 点击 **验证** 。" - -#: ../../inventory/settings/products/packages.rst:95 -msgid "Packages traceability" -msgstr "包裹追踪" - -#: ../../inventory/settings/products/packages.rst:97 -msgid "" -"To trace a package or check its content, go to :menuselection:`Inventory " -"Control --> Packages`." -msgstr "要追踪一个包裹或者包裹里面的明细, 进入 :menuselection:`库存控制 -->包裹` 。" - -#: ../../inventory/settings/products/packages.rst:103 -msgid "Click on **Package Transfers** to see all its moves." -msgstr "点击 **包裹转移** 查看所有的调拨。" - -#: ../../inventory/settings/products/packages.rst:106 -#: ../../inventory/settings/products/usage.rst:70 -msgid ":doc:`../../overview/start/setup`" -msgstr ":doc:`../../overview/start/setup` " - -#: ../../inventory/settings/products/packages.rst:107 -msgid ":doc:`usage`" -msgstr ":doc:`usage` " - -#: ../../inventory/settings/products/packages.rst:108 -#: ../../inventory/settings/products/usage.rst:71 -msgid ":doc:`uom`" -msgstr ":doc:`uom` " - #: ../../inventory/settings/products/strategies.rst:3 msgid "How to select the right replenishment strategy" msgstr "如何选择正确的补货策略" @@ -6668,6 +6574,12 @@ msgstr "不同计量单位之间的转换是自动完成的。唯一的条件是 msgid "Packages" msgstr "包裹" +#: ../../inventory/settings/products/usage.rst:31 +msgid "" +"The package is the physical container in which you put one or several " +"product." +msgstr "包裹是一个你想在其中放置一个或者几个产品的实际的容器。" + #: ../../inventory/settings/products/usage.rst:38 msgid "Packaging" msgstr "包装" @@ -6722,6 +6634,14 @@ msgid "" "``box`` or in a ``plastic`` wrapping. It is the **package**." msgstr "当你销售几个托盘的鸡蛋时, 你可能会把不同的托盘放进一个\" 箱子 \\ \"或者一个\" 塑料 \\ \"包装中, 这就是 **包裹** 。" +#: ../../inventory/settings/products/usage.rst:70 +msgid ":doc:`../../overview/start/setup`" +msgstr ":doc:`../../overview/start/setup` " + +#: ../../inventory/settings/products/usage.rst:71 +msgid ":doc:`uom`" +msgstr ":doc:`uom` " + #: ../../inventory/settings/products/usage.rst:72 msgid ":doc:`packages`" msgstr ":doc:`packages` " @@ -7614,6 +7534,10 @@ msgstr "" "要配置包裹的使用, 进入 :menuselection:`库存 -->配置 -->设置` 。找到 **包裹** 的位置并选择 **在包装上记录包材 " ":栈板, 箱子, ……** " +#: ../../inventory/shipping/operation/multipack.rst:23 +msgid "Click on **Apply** when you are done." +msgstr "一旦完成, 点击 **应用** 。" + #: ../../inventory/shipping/operation/multipack.rst:29 #: ../../inventory/shipping/setup/delivery_method.rst:77 #: ../../inventory/shipping/setup/third_party_shipper.rst:110 @@ -7638,6 +7562,24 @@ msgstr "从销售订单创建的发货单会带出发货信息。" msgid "From here, you can split your delivery into multiple packages." msgstr "在这里, 你可以把要发的货物分成不同的包" +#: ../../inventory/shipping/operation/multipack.rst:50 +msgid "" +"Choose the quantity you want to put in the first pack in the **Done** " +"column, then click on the link **Put in Pack**." +msgstr "在 **完成** 栏位选择你想要放进该包裹的产品的数量, 然后点击 **放进一个包裹** 链接。" + +#: ../../inventory/shipping/operation/multipack.rst:56 +msgid "It will automatically create a pack with the requested quantity." +msgstr "它会总动的创建所需数量的包裹。" + +#: ../../inventory/shipping/operation/multipack.rst:58 +msgid "Do the same steps for the other pieces you want to pack in." +msgstr "其余的产品可以按照同样的步骤进行打包。" + +#: ../../inventory/shipping/operation/multipack.rst:63 +msgid "Click on **Validate** when you are done." +msgstr "一旦完成, 点击 **确认** 。" + #: ../../inventory/shipping/operation/multipack.rst:66 msgid "Multi-packages with a 3rd party-shipper" msgstr "第3方货代的多包裹" diff --git a/locale/zh_CN/LC_MESSAGES/manufacturing.po b/locale/zh_CN/LC_MESSAGES/manufacturing.po index c12d91708..940e291f9 100644 --- a/locale/zh_CN/LC_MESSAGES/manufacturing.po +++ b/locale/zh_CN/LC_MESSAGES/manufacturing.po @@ -24,7 +24,7 @@ msgstr "制造" #: ../../manufacturing/management.rst:5 msgid "Manufacturing Management" -msgstr "" +msgstr "制造管理" #: ../../manufacturing/management/bill_configuration.rst:3 msgid "How to create a Bill of Materials" diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index 7dec7530f..bda2d2d27 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -831,7 +831,7 @@ msgstr "" #: ../../sales/invoicing/services/support.rst:104 msgid "Control delivered support on the sales order" -msgstr "" +msgstr "在销售订单控制交货支持" #: ../../sales/invoicing/services/support.rst:106 msgid "" @@ -1173,11 +1173,11 @@ msgstr "产品和价格" #: ../../sales/products_prices/prices.rst:3 msgid "Manage your pricing" -msgstr "" +msgstr "管理定价" #: ../../sales/products_prices/prices/currencies.rst:3 msgid "How to sell in foreign currencies" -msgstr "" +msgstr "如何用外币销售" #: ../../sales/products_prices/prices/currencies.rst:5 msgid "Pricelists can also be used to manage prices in foreign currencies." @@ -1209,7 +1209,7 @@ msgstr "" #: ../../sales/products_prices/prices/currencies.rst:20 msgid "Automatic conversion from public price" -msgstr "" +msgstr "从公开价格自动转换" #: ../../sales/products_prices/prices/currencies.rst:22 msgid "" @@ -1227,7 +1227,7 @@ msgstr "" #: ../../sales/products_prices/prices/currencies.rst:40 msgid "Set your own prices" -msgstr "" +msgstr "设置你自己的价格" #: ../../sales/products_prices/prices/currencies.rst:42 msgid "" diff --git a/point_of_sale/overview/setup.rst b/point_of_sale/overview/setup.rst index 93bc07659..01faf9dec 100644 --- a/point_of_sale/overview/setup.rst +++ b/point_of_sale/overview/setup.rst @@ -18,12 +18,12 @@ You will need : * A computer or tablet with an up-to-date web browser * A running SaaS or Odoo instance with the Point of Sale installed * A local network set up with DHCP (this is the default setting) -* An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter * An Epson USB TM-T20 Printer or another ESC/POS compatible printer (officially supported printers are listed at the `POS Hardware page `_) * A Honeywell Eclipse USB Barcode Scanner or another compatible scanner * An Epson compatible cash drawer +* An RJ45 Ethernet Cable (optional, Wi-Fi is built in) Step By Step Setup Guide ------------------------ @@ -57,12 +57,10 @@ hardware might work as well. cable. Make sure this will connect the POSBox to the same network as your POS device. -* **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. Power the POSBox ~~~~~~~~~~~~~~~~ @@ -110,10 +108,11 @@ should be ready to use. Wi-Fi configuration ------------------- -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. Make sure not to plug in an Ethernet cable, as all Wi-Fi related functionality will be disabled when a wired network connection is