diff --git a/.tx/config b/.tx/config index 418029e5d..9fbb5a7f8 100644 --- a/.tx/config +++ b/.tx/config @@ -37,6 +37,11 @@ file_filter = locale//LC_MESSAGES/expenses.po source_file = locale/sources/expenses.pot source_lang = en +[odoo-13-doc.fsm] +file_filter = locale//LC_MESSAGES/fsm.po +source_file = locale/sources/fsm.pot +source_lang = en + [odoo-13-doc.general] file_filter = locale//LC_MESSAGES/general.po source_file = locale/sources/general.pot @@ -82,6 +87,11 @@ file_filter = locale//LC_MESSAGES/manufacturing.po source_file = locale/sources/manufacturing.pot source_lang = en +[odoo-13-doc.planning] +file_filter = locale//LC_MESSAGES/planning.po +source_file = locale/sources/planning.pot +source_lang = en + [odoo-13-doc.point_of_sale] file_filter = locale//LC_MESSAGES/point_of_sale.po source_file = locale/sources/point_of_sale.pot diff --git a/locale/sources/accounting.pot b/locale/sources/accounting.pot index 9611081db..b0d239533 100644 --- a/locale/sources/accounting.pot +++ b/locale/sources/accounting.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-10 14:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../../accounting.rst:5 -#: ../../accounting/localizations/mexico.rst:312 +#: ../../accounting/localizations/mexico.rst:322 msgid "Accounting" msgstr "" @@ -43,10 +43,10 @@ msgid "With Odoo, you can download an CODA file from your bank or accounting sof msgstr "" #: ../../accounting/bank/feeds/coda.rst:14 -msgid "Test now the feature `with this sample CODA file `__" +msgid "Test now the feature :download:`with this sample CODA file <../../../_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt>`" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:17 +#: ../../accounting/bank/feeds/coda.rst:18 #: ../../accounting/bank/feeds/manual.rst:12 #: ../../accounting/bank/feeds/ofx.rst:18 #: ../../accounting/bank/feeds/paypal.rst:11 @@ -57,8 +57,9 @@ msgstr "" #: ../../accounting/bank/reconciliation/use_cases.rst:16 #: ../../accounting/bank/setup/foreign_currency.rst:22 #: ../../accounting/bank/setup/manage_cash_register.rst:9 -#: ../../accounting/localizations/colombia.rst:25 -#: ../../accounting/localizations/mexico.rst:33 +#: ../../accounting/localizations/argentina.rst:20 +#: ../../accounting/localizations/colombia.rst:27 +#: ../../accounting/localizations/mexico.rst:35 #: ../../accounting/others/adviser/assets.rst:24 #: ../../accounting/others/adviser/budget.rst:21 #: ../../accounting/others/analytic/purchases_expenses.rst:18 @@ -77,81 +78,81 @@ msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:31 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:13 #: ../../accounting/receivables/customer_invoices/epc_qr_code.rst:20 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:20 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:19 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19 #: ../../accounting/receivables/customer_payments/batch_sdd.rst:18 #: ../../accounting/receivables/customer_payments/check.rst:39 #: ../../accounting/receivables/customer_payments/check.rst:103 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:113 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:112 msgid "Configuration" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:20 +#: ../../accounting/bank/feeds/coda.rst:21 msgid "Install the CODA feature" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:22 -msgid "If you have installed the Belgian Chart of Account provided with Odoo, the CODA import feature is already installed by default. In such a case, you can move directly to the next section `Import your first coda file `_" +#: ../../accounting/bank/feeds/coda.rst:23 +msgid "If you have installed the Belgian Chart of Account provided with Odoo, the CODA import feature is already installed by default. In such a case, you can move directly to the next section :ref:`Import your first coda file `" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:27 +#: ../../accounting/bank/feeds/coda.rst:28 msgid "If CODA is not activated yet, you need to do it first. In the Accounting application, go to the menu :menuselection:`Configuration --> Settings`. From the accounting settings, check the option **Import of Bank Statements in .CODA Format** and apply." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:33 +#: ../../accounting/bank/feeds/coda.rst:34 msgid "Import your first CODA file" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:35 +#: ../../accounting/bank/feeds/coda.rst:36 msgid "Once you have installed this feature, you can setup your bank account to allow importing bank statement files. To do this, go to the accounting **Dashboard**, and click on the button **More** on the bank account card. Then, click on **Import Statement** to load your first CODA file." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:43 +#: ../../accounting/bank/feeds/coda.rst:44 msgid "Load your CODA file in the following screen and click **Import** to create all your bank statements." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:49 +#: ../../accounting/bank/feeds/coda.rst:50 #: ../../accounting/bank/feeds/ofx.rst:42 #: ../../accounting/bank/feeds/qif.rst:43 msgid "If the file is successfully loaded, you will get redirected to the bank reconciliation screen with all the transactions to reconcile." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:55 +#: ../../accounting/bank/feeds/coda.rst:56 msgid "Importing CODA files" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:57 +#: ../../accounting/bank/feeds/coda.rst:58 msgid "After having imported your first file, the Odoo accounting dashboard will automatically propose you to import more files for your bank. For the next import, you don't need to go to the **More** button anymore, you can directly click on the link **Import Statement**." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:65 +#: ../../accounting/bank/feeds/coda.rst:66 msgid "Every time you get a statement related to a new customer / supplier, Odoo will ask you to select the right contact to reconcile the transaction. Odoo learns from that operation and will automatically complete the next payments you get or make to these contacts. This will speed up a lot the reconciliation process." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:72 +#: ../../accounting/bank/feeds/coda.rst:73 msgid "Odoo is able to automatically detect if some files or transactions have already been imported. So, you should not worry about avoiding to import two times the same file: Odoo will check everything for you before creating new bank statements." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:78 -#: ../../accounting/bank/feeds/qif.rst:65 +#: ../../accounting/bank/feeds/coda.rst:79 +#: ../../accounting/bank/feeds/qif.rst:64 msgid ":doc:`ofx`" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:79 -#: ../../accounting/bank/feeds/ofx.rst:64 +#: ../../accounting/bank/feeds/coda.rst:80 +#: ../../accounting/bank/feeds/ofx.rst:63 msgid ":doc:`qif`" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:80 -#: ../../accounting/bank/feeds/ofx.rst:66 -#: ../../accounting/bank/feeds/qif.rst:67 +#: ../../accounting/bank/feeds/coda.rst:81 +#: ../../accounting/bank/feeds/ofx.rst:65 +#: ../../accounting/bank/feeds/qif.rst:66 msgid ":doc:`synchronize`" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:81 -#: ../../accounting/bank/feeds/ofx.rst:67 -#: ../../accounting/bank/feeds/qif.rst:68 +#: ../../accounting/bank/feeds/coda.rst:82 +#: ../../accounting/bank/feeds/ofx.rst:66 +#: ../../accounting/bank/feeds/qif.rst:67 msgid ":doc:`manual`" msgstr "" @@ -217,40 +218,40 @@ msgstr "" msgid "Click on **Validate** to reconcile your bank statement. If the partner is missing, Odoo will ask you to **select a partner**." msgstr "" -#: ../../accounting/bank/feeds/manual.rst:68 +#: ../../accounting/bank/feeds/manual.rst:67 msgid "Hit CTRL-Enter to reconcile all the balanced items on the sheets." msgstr "" -#: ../../accounting/bank/feeds/manual.rst:71 +#: ../../accounting/bank/feeds/manual.rst:70 msgid "Close Bank Statements from the reconciliation" msgstr "" -#: ../../accounting/bank/feeds/manual.rst:73 +#: ../../accounting/bank/feeds/manual.rst:72 msgid "If the balance is correct, you can directly close the statement from the reconciliation by clicking on |manual07|." msgstr "" -#: ../../accounting/bank/feeds/manual.rst:78 +#: ../../accounting/bank/feeds/manual.rst:77 msgid "Otherwise, click on |manual08| to open the statement and correct the issue." msgstr "" -#: ../../accounting/bank/feeds/manual.rst:84 +#: ../../accounting/bank/feeds/manual.rst:83 msgid "Close Bank Statements" msgstr "" -#: ../../accounting/bank/feeds/manual.rst:86 +#: ../../accounting/bank/feeds/manual.rst:85 msgid "On the accounting dashboard, click on the More button of your bank journal, then click on Bank Statements." msgstr "" -#: ../../accounting/bank/feeds/manual.rst:92 +#: ../../accounting/bank/feeds/manual.rst:91 msgid "To close the bank statement, just click on **Validate**." msgstr "" -#: ../../accounting/bank/feeds/manual.rst:99 +#: ../../accounting/bank/feeds/manual.rst:98 msgid ":doc:`../reconciliation/use_cases`" msgstr "" -#: ../../accounting/bank/feeds/manual.rst:100 -#: ../../accounting/bank/reconciliation/use_cases.rst:111 +#: ../../accounting/bank/feeds/manual.rst:99 +#: ../../accounting/bank/reconciliation/use_cases.rst:109 msgid ":doc:`../feeds/synchronize`" msgstr "" @@ -266,8 +267,8 @@ msgstr "" msgid "With Odoo, you can download an OFX file from your bank or accounting software and import it directly in your Odoo instance. This will create all bank statements." msgstr "" -#: ../../accounting/bank/feeds/ofx.rst:15 -msgid "Test now the feature `with this sample OFX file `__" +#: ../../accounting/bank/feeds/ofx.rst:14 +msgid "Test now the feature :download:`with this sample OFX file <../../../_static/example_files/test_ofx.ofx>`" msgstr "" #: ../../accounting/bank/feeds/ofx.rst:20 @@ -296,8 +297,8 @@ msgstr "" msgid "Every time you get a statement related to a new customer / supplier, Odoo will ask you to select the right contact to reconcile the transaction. Odoo learns from that operation and will automatically complete the next payments you get or do to these contacts. This will speed up a lot the reconciliation process." msgstr "" -#: ../../accounting/bank/feeds/ofx.rst:65 -#: ../../accounting/bank/feeds/qif.rst:66 +#: ../../accounting/bank/feeds/ofx.rst:64 +#: ../../accounting/bank/feeds/qif.rst:65 msgid ":doc:`coda`" msgstr "" @@ -337,27 +338,27 @@ msgstr "" msgid "Then, you will have to provide your credentials to connect to PayPal." msgstr "" -#: ../../accounting/bank/feeds/paypal.rst:49 +#: ../../accounting/bank/feeds/paypal.rst:48 msgid "Your Paypal **must be in English** (if it is not the case you must change the langage of your Paypal account) and if you use a Paypal business account you must switch back to the old interface in order for it to work with Online feeds (you can switch from new to old interface in your Paypal account)." msgstr "" -#: ../../accounting/bank/feeds/paypal.rst:54 +#: ../../accounting/bank/feeds/paypal.rst:53 msgid "If you don't do this you will get a message either saying to put Paypal in English or that the site is not supported." msgstr "" -#: ../../accounting/bank/feeds/paypal.rst:57 +#: ../../accounting/bank/feeds/paypal.rst:56 msgid "If you configured your Paypal account correctly you should get to the next step of the Online feeds configuration. There you will have a screen with a date to fetch transaction from and a list of account to choose. You must choose the **Paypal balance** account." msgstr "" -#: ../../accounting/bank/feeds/paypal.rst:62 +#: ../../accounting/bank/feeds/paypal.rst:61 msgid "Once everything is done, you should see your PayPal transactions right in Odoo and you can start reconciling your payments." msgstr "" -#: ../../accounting/bank/feeds/paypal.rst:65 +#: ../../accounting/bank/feeds/paypal.rst:64 msgid "Enjoy a full integration! You don't need to record transaction manually anymore." msgstr "" -#: ../../accounting/bank/feeds/paypal.rst:69 +#: ../../accounting/bank/feeds/paypal.rst:68 msgid "You only have to provide your credentials the first time. Once done, Odoo will synchronize with PayPal every 4 hours automatically." msgstr "" @@ -373,8 +374,8 @@ msgstr "" msgid "With Odoo, you can download a QIF file from your bank or accounting software and import it directly in your Odoo instance. This will create all bank statements." msgstr "" -#: ../../accounting/bank/feeds/qif.rst:16 -msgid "Test now the feature `with this sample QIF file `__" +#: ../../accounting/bank/feeds/qif.rst:15 +msgid "Test now the feature :download:`with this sample QIF file <../../../_static/example_files/test_qif.qif>`" msgstr "" #: ../../accounting/bank/feeds/qif.rst:21 @@ -466,7 +467,7 @@ msgid "Once you filled in your credentials, your bank feeds will be synchronized msgstr "" #: ../../accounting/bank/feeds/synchronize.rst:73 -#: ../../accounting/localizations/mexico.rst:562 +#: ../../accounting/localizations/mexico.rst:582 msgid "FAQ" msgstr "" @@ -524,7 +525,7 @@ msgstr "" #: ../../accounting/bank/misc.rst:3 #: ../../accounting/payables/misc.rst:3 -#: ../../accounting/payables/misc/employee_expense.rst:187 +#: ../../accounting/payables/misc/employee_expense.rst:184 msgid "Miscellaneous" msgstr "" @@ -633,7 +634,7 @@ msgid "If you select a batch deposit, Odoo will automatically fill all the check msgstr "" #: ../../accounting/bank/misc/batch.rst:124 -#: ../../accounting/payables/pay/sepa.rst:113 +#: ../../accounting/payables/pay/sepa.rst:111 msgid "Troubleshooting" msgstr "" @@ -726,42 +727,42 @@ msgid "Create a new payment. The payment type will automatically be set to inter msgstr "" #: ../../accounting/bank/misc/interbank.rst:76 -msgid "The memo is important if you wish to automatically reconcile (`see `_)." +msgid "The memo is important if you wish to automatically reconcile (see `Import bank statements and reconcile`_)." msgstr "" -#: ../../accounting/bank/misc/interbank.rst:81 +#: ../../accounting/bank/misc/interbank.rst:82 msgid "Save and confirm the changes to register the payment." msgstr "" -#: ../../accounting/bank/misc/interbank.rst:83 +#: ../../accounting/bank/misc/interbank.rst:84 msgid "In terms of accounting the money is now booked in the transfer account. We'll need to import bank statements to book the money in the final accounts." msgstr "" -#: ../../accounting/bank/misc/interbank.rst:90 +#: ../../accounting/bank/misc/interbank.rst:89 msgid "Import bank statements and reconcile" msgstr "" -#: ../../accounting/bank/misc/interbank.rst:92 +#: ../../accounting/bank/misc/interbank.rst:91 msgid "Note that the bank balance computed by Odoo is different that the last statement of your bank." msgstr "" -#: ../../accounting/bank/misc/interbank.rst:98 +#: ../../accounting/bank/misc/interbank.rst:97 msgid "That is because we did not import the bank statement confirming the receiving and sending of the money. It's thus necessary to import your bank statement and reconcile the payment with the correct bank statement line. Once you receive your bank statements click the **new statement** button of the corresponding bank to import them." msgstr "" -#: ../../accounting/bank/misc/interbank.rst:107 +#: ../../accounting/bank/misc/interbank.rst:106 msgid "Fill in your **Transactions line**. Once done, Odoo will display a **Computed Balance**. that computed balance is the theorical end balance of your bank account. If it's corresponding to the bank statement, it means that no errors were made. Fill in the **Ending balance** and click on the **Reconcile** button." msgstr "" -#: ../../accounting/bank/misc/interbank.rst:115 +#: ../../accounting/bank/misc/interbank.rst:114 msgid "The following window will open:" msgstr "" -#: ../../accounting/bank/misc/interbank.rst:120 +#: ../../accounting/bank/misc/interbank.rst:119 msgid "You need to choose counterparts for the payment. Select the correct bank statement line corresponding to the payment and click on the **reconcile** button. Close the statement to finish the transaction" msgstr "" -#: ../../accounting/bank/misc/interbank.rst:127 +#: ../../accounting/bank/misc/interbank.rst:126 msgid "The same steps will need to be repeated once you receive your second bank statement. Note that if you specify the same amount and the same memo in both bank statements and payment transactions then the reconciliation will happen automatically." msgstr "" @@ -803,41 +804,41 @@ msgstr "" msgid "Save your changes when you are done." msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:40 +#: ../../accounting/bank/reconciliation/configure.rst:39 msgid "If the amount of your bank fee is fixed, you can as well select **Fixed** under amount type and specify the amount in the amount tap." msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:45 +#: ../../accounting/bank/reconciliation/configure.rst:43 msgid "You can also use this functionality to handle discounts. Please refer to :doc:`../../receivables/customer_invoices/cash_discounts`" msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:49 +#: ../../accounting/bank/reconciliation/configure.rst:47 msgid "Register your payments based on a reconciliation model" msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:51 +#: ../../accounting/bank/reconciliation/configure.rst:49 msgid "Register your payment by importing your bank statements that will be impacted by the payment of the bank fee." msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:54 +#: ../../accounting/bank/reconciliation/configure.rst:52 msgid "When doing the reconciliation, you can select an open balance and click the **Reconciliation Model** button (in this case, **Bank Fees**) to get all the relevant data instantly." msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:61 +#: ../../accounting/bank/reconciliation/configure.rst:59 msgid "Finally, click on **Reconcile** to finish the process." msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:65 -#: ../../accounting/bank/reconciliation/use_cases.rst:112 +#: ../../accounting/bank/reconciliation/configure.rst:62 +#: ../../accounting/bank/reconciliation/use_cases.rst:110 msgid ":doc:`../feeds/manual`" msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:66 -#: ../../accounting/bank/reconciliation/use_cases.rst:110 +#: ../../accounting/bank/reconciliation/configure.rst:63 +#: ../../accounting/bank/reconciliation/use_cases.rst:108 msgid ":doc:`../feeds/ofx`" msgstr "" -#: ../../accounting/bank/reconciliation/configure.rst:67 +#: ../../accounting/bank/reconciliation/configure.rst:64 msgid ":doc:`use_cases`" msgstr "" @@ -933,7 +934,7 @@ msgstr "" msgid "If the payment is done with a down payment, just check if it is all right and validate all related payments :" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:106 +#: ../../accounting/bank/reconciliation/use_cases.rst:105 msgid "Hit CTRL-Enter to reconcile all the balanced items in the sheet." msgstr "" @@ -1441,223 +1442,578 @@ msgstr "" msgid "Localizations" msgstr "" -#: ../../accounting/localizations/colombia.rst:3 -msgid "Colombia" +#: ../../accounting/localizations/argentina.rst:3 +msgid "Argentina" msgstr "" +#: ../../accounting/localizations/argentina.rst:6 #: ../../accounting/localizations/colombia.rst:6 -#: ../../accounting/localizations/mexico.rst:14 +#: ../../accounting/localizations/mexico.rst:15 #: ../../accounting/others/taxes/B2B_B2C.rst:63 msgid "Introduction" msgstr "" +#: ../../accounting/localizations/argentina.rst:8 +msgid "The Argentinean localization has been improved and extended in Odoo v13, in this version the next modules are available:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:11 +msgid "**l10n_ar**: This module add accounting features for the Argentinian localization, which represent the minimal configuration needed for a company to operate in Argentina and under the AFIP (Administración Federal de Ingresos Públicos) regulations and guidelines." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:15 +msgid "**l10n_ar_reports**: Add VAT Book report which is a legal requirement in Argentine and that holds the VAT detail info of sales or purchases recorded on the journal entries. This module includes as well the VAT summary report that is used to analyze the invoice" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:23 +msgid "Install the Argentinean localization modules" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:25 +msgid "For this, go to *Apps* and search for Argentina. Then click *Install* for the first two modules." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:31 +msgid "Configure your company" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:33 +msgid "Once that the modules are installed, the first step is to set up your company data. Additional to the basic information, a key field to fill in the AFIP Responsibility Type, that represent the fiscal obligation and structure of the company:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:41 +msgid "Chart of Account" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:43 +msgid "In Accounting settings there are three available packages of Chart of accounts, which are related to the AFIP responsibility type of the Company, considering that if the base companies don't require as many accounts as the companies that gave more complex fiscal requirements:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:47 +msgid "Monotributista (149 accounts)." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:48 +msgid "IVA Exempto (159 accounts)." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:49 +msgid "Responsables Inscriptos (166 Accounts)." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:55 +msgid "Configure Master data" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:58 +#: ../../accounting/localizations/colombia.rst:79 +msgid "Partner" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:61 +msgid "Identification Type and VAT" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:63 +msgid "As part of the Argentinean localization, the document types defined by the AFIP are now available on the Partner form, this information is essential for most transactions. There are six identification types available by default:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:71 +msgid "The complete list of Identification types defined by the AFIP is included in Odoo but only the common ones are active." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:75 +msgid "AFIP Responsibility Type" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:77 +msgid "In Argentina the document type associated with customers and vendors transactions is defined based on the AFIP Responsibility type, this field should be defined in the partner form:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:84 +#: ../../accounting/localizations/colombia.rst:115 +#: ../../accounting/others/taxes.rst:3 +#: ../../accounting/overview/process_overview/customer_invoice.rst:111 +msgid "Taxes" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:86 +msgid "As part of the localization module, the taxes are created automatically with their related financial account and configuration." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:93 +msgid "Taxes Types" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:95 +msgid "Argentina has several tax types, the most common ones are:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:97 +msgid "VAT. Is the regular VAT and it can have several percentages." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:98 +msgid "Perception. Advance payment of a tax that is applied on Invoices." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:99 +msgid "Retention. Advance payment of a tax that is applied on payments" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:100 +msgid "Otros." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:103 +msgid "Special Taxes" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:105 +msgid "Some argentine taxes are not commonly used for all companies, these type of taxes are included as inactive by default, it's important that before creating a new tax you confirm if they are not already included in the Inactive taxes:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:113 +msgid "Document Types" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:115 +msgid "In some Latin America countries, including Argentina, some accounting transactions like invoices and vendor bills are classified by document types defined by the government fiscal authorities (In Argentina case: AFIP)." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:119 +msgid "The document type is an essential information that needs to be displayed in the printed reports and that needs to be easily identified, within the set of invoices as well of account moves." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:122 +msgid "Each document type can have a unique sequence per journal where it is assigned. As part of the localization, the Document Type include the country on which the document is applicable and the data is created automatically when the localization module is installed." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:126 +msgid "The information required for the document types is included by default so the user doesn't need to fill anything on this view:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:133 +msgid "There are several document types that are inactive by default but can be activated if needed." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:136 +msgid "Letters" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:138 +msgid "For Argentina, the document types include a letter that helps that indicates the transaction/operation, example:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:141 +msgid "When an invoice is related to a B2B transaction, a document type \"A\" must be used." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:142 +msgid "When an invoice is related to a B2C transaction, a document type \"B\" must be used." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:143 +msgid "When an invoice is related to exportation transaction, a document type \"E\" must be used." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:145 +msgid "The documents included in the localization have the proper letter associated, the user doesn't need to configure anything additional." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:152 +msgid "Use on Invoices" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:154 +msgid "The document type on each transaction will be determined by:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:156 +msgid "The Journal related to the Invoice, identifying if the journal use documents." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:157 +msgid "Condition applied based on the type of Issues and Receiver (ex. Type of fiscal regimen of the buyer and type of fiscal regimen of the vendor)" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:161 +#: ../../accounting/localizations/colombia.rst:133 +msgid "Journals" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:163 +msgid "In the Argentinean localization the Journal can have a different approach depending on its usage and internal type, to configure you journals go to :menuselection:`Accounting --> Configuration --> Journals`:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:167 +msgid "For Sales and Purchase Journals it’s possible to enable the option *Use Documents*, this indicates the Journal enables a list of document types that can be related to the Invoices and vendor Bills, for more detail of the invoices, please refer to the section 2.3 Document Types." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:171 +msgid "If the Sales/Purchase journal are used without the option *Use Documents* it because they won’t be used to generate fiscal invoices, but mostly for account moves related to internal control process." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:175 +msgid "AFIP Information (better known as AFIP Point of Sale)" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:180 +msgid "**AFIP POS System**: This field is only visible for the Sales journals and defined the type of AFIP POS that will be used to manage the transactions for which the journal is created. The AFIP POS defines as well:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:184 +msgid "The sequences of document types related to the WS." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:185 +msgid "The structure and data of the electronic invoice file." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:187 +msgid "**AFIP POS Number**: This is the number configured in the AFIP to identify the operations related to this AFIP POS." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:190 +msgid "**AFIP POS Address**: This field is related to commercial address registered for the POS, which is usually the same address than the Company. For example: has multiple stores (fiscal locations) then AFIP will require that you have one AFIP POS per location: this location will be printed in the invoice report." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:195 +msgid "**Unified Book**: When AFIP POS System is Preimpresa the document types (applicable to the journal) with the same letter will share the same sequence. For example:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:198 +msgid "Invoice: FA-A 0001-00000002." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:199 +msgid "Credit Note: NC-A 0001-00000003." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:200 +msgid "Debit Note: ND-A 0001-00000004." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:203 +#: ../../accounting/localizations/colombia.rst:163 +#: ../../accounting/localizations/mexico.rst:207 +msgid "Usage and testing" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:206 +#: ../../accounting/localizations/colombia.rst:166 +msgid "Invoice" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:208 +msgid "After the partners and journals are created and configured, when the invoices are created the will have the next behaviour:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:212 +msgid "Document type assignation" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:214 +msgid "Once the partner is selected the document type will filled automatically, based on the AFIP document type:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:217 +msgid "**Invoice for a customer IVA Responsable Inscripto, prefix A**." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:222 +msgid "**Invoice for an end customer, prefix B**." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:227 +msgid "**Exportation Invoice, prefix E**." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:232 +msgid "As it is shown in the invoices, all of them use the same journal but the prefix and sequence is given by the document type." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:235 +msgid "The most common document type will be defined automatically for the different combinations of AFIP responsibility type but it can be updated manually by the user." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:239 +msgid "Invoice Taxes" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:241 +msgid "Based on the AFIP Responsibility type, the VAT tax can have a different behavior on the pdf report:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:244 +msgid "**A. Tax excluded:** In this case the taxed amount needs to be clearly identified in the report. This condition applies when the customer has the following AFIP Responsibility type:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:247 +msgid "Responsable Inscripto" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:252 +msgid "**B. Tax amount included:** This means that the taxed amount is included as part of the product price, subtotal and totals. This condition applies when the customer has the following AFIP Responsibility types:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:256 +msgid "IVA Sujeto Exento." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:257 +msgid "Consumidor Final." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:258 +msgid "Responsable Monotributo." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:259 +msgid "IVA liberado." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:265 +#: ../../accounting/others/multicurrencies/invoices_payments.rst:64 +#: ../../accounting/payables/supplier_bills.rst:3 +msgid "Vendor Bills" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:267 +msgid "Based on the sales journal selected for the invoice, the document type is now a required field. This value is auto populated based on the AFIP Responsibility type of Issuer and Customer, but the value can be switched if necessary." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:274 +msgid "The document number needs to be registered manually and the format is validated automatically, in case that the format is invalid a user error will be displayed indicating the correct format that is expected." +msgstr "" + +#: ../../accounting/localizations/argentina.rst:282 +msgid "Reports" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:284 +msgid "As part of the localization the next Financial reports were added:" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:290 +msgid "VAT Reports" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:293 +msgid "Libro de IVA Ventas" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:299 +msgid "Libro de IVA Compras" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:305 +msgid "Resumen de IVA" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:311 +msgid "IIBB - Reports" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:314 +msgid "IIBB - Ventas por Jurisdicción" +msgstr "" + +#: ../../accounting/localizations/argentina.rst:320 +msgid "IIBB - Compras por Jurisdicción" +msgstr "" + +#: ../../accounting/localizations/colombia.rst:3 +msgid "Colombia" +msgstr "" + #: ../../accounting/localizations/colombia.rst:8 msgid "Electronic invoicing for Colombia is available from Odoo 12 and requires the next modules:" msgstr "" #: ../../accounting/localizations/colombia.rst:11 -msgid "**l11n_co**: All the basic data to manage the accounting module, contains the default setup for: chart of accounts, taxes, retentions, identification document types" +msgid "**l10n_co**: All the basic data to manage the accounting module, contains the default setup for: chart of accounts, taxes, retentions, identification document types" msgstr "" #: ../../accounting/localizations/colombia.rst:14 msgid "**l10n_co_edi**: This module includes all the extra fields that are required for the Integration with Carvajal T&S and generate the electronic invoice, based on the DIAN legal requirements." msgstr "" -#: ../../accounting/localizations/colombia.rst:19 +#: ../../accounting/localizations/colombia.rst:20 msgid "Workflow" msgstr "" -#: ../../accounting/localizations/colombia.rst:28 -msgid "1. Install the Colombian localization modules" +#: ../../accounting/localizations/colombia.rst:30 +msgid "Install the Colombian localization modules" msgstr "" -#: ../../accounting/localizations/colombia.rst:30 +#: ../../accounting/localizations/colombia.rst:32 msgid "For this, go in Apps and search for Colombia. Then click Install for the first two modules." msgstr "" -#: ../../accounting/localizations/colombia.rst:37 -msgid "2. Configure credentials for Carvajal T&S web service" +#: ../../accounting/localizations/colombia.rst:40 +msgid "Configure credentials for Carvajal T&S web service" msgstr "" -#: ../../accounting/localizations/colombia.rst:39 +#: ../../accounting/localizations/colombia.rst:42 msgid "Once that the modules are installed, in order to be able to connect with Carvajal T&S Web Service, it's necessary to configure the user and credentials, this information will be provided by Carvajal T&S." msgstr "" -#: ../../accounting/localizations/colombia.rst:43 -#: ../../accounting/localizations/colombia.rst:64 +#: ../../accounting/localizations/colombia.rst:46 +#: ../../accounting/localizations/colombia.rst:68 msgid "Go to :menuselection:`Accounting --> Configuration --> Settings` and look for the *Colombian Electronic Invoice* section." msgstr "" -#: ../../accounting/localizations/colombia.rst:49 +#: ../../accounting/localizations/colombia.rst:52 msgid "Using the Testing mode it is possible to connect with a Carvajal T&S testing environment. This allows users to test the complete workflow and integration with the CEN Financiero portal, which is accessible here: https://cenfinancierolab.cen.biz" msgstr "" -#: ../../accounting/localizations/colombia.rst:54 +#: ../../accounting/localizations/colombia.rst:57 msgid "Once that Odoo and Carvajal T&S is fully configured and ready for production the testing environment can be disabled." msgstr "" -#: ../../accounting/localizations/colombia.rst:58 -msgid "3. Configure your report data" +#: ../../accounting/localizations/colombia.rst:62 +msgid "Configure your report data" msgstr "" -#: ../../accounting/localizations/colombia.rst:60 +#: ../../accounting/localizations/colombia.rst:64 msgid "As part of the configurable information that is sent in the XML, you can define the data for the fiscal section and the bank information in the PDF." msgstr "" -#: ../../accounting/localizations/colombia.rst:71 -msgid "4. Configure data required in the XML" +#: ../../accounting/localizations/colombia.rst:76 +msgid "Configure data required in the XML" msgstr "" -#: ../../accounting/localizations/colombia.rst:74 -msgid "4.1 Partner" +#: ../../accounting/localizations/colombia.rst:82 +msgid "Identification" msgstr "" -#: ../../accounting/localizations/colombia.rst:77 -msgid "4.1.1 Identification" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:79 +#: ../../accounting/localizations/colombia.rst:84 msgid "As part of the Colombian Localization, the document types defined by the DIAN are now available on the Partner form. Colombian partners have to have their identification number and document type set:" msgstr "" -#: ../../accounting/localizations/colombia.rst:86 +#: ../../accounting/localizations/colombia.rst:91 msgid "When the document type is RUT the identification number needs to be configured in Odoo including the verification digit, Odoo will split this number when the data to the third party vendor is sent." msgstr "" -#: ../../accounting/localizations/colombia.rst:92 -msgid "4.1.2 Fiscal structure (RUT)" +#: ../../accounting/localizations/colombia.rst:98 +msgid "Fiscal structure (RUT)" msgstr "" -#: ../../accounting/localizations/colombia.rst:94 +#: ../../accounting/localizations/colombia.rst:100 msgid "The partner's responsibility codes (section 53 in the RUT document) are included as part of the electronic invoice module given that is part of the information required by the DIAN ." msgstr "" -#: ../../accounting/localizations/colombia.rst:98 +#: ../../accounting/localizations/colombia.rst:104 msgid "These fields can be found in :menuselection:`Partner --> Sales & Purchase Tab --> Fiscal Information`" msgstr "" -#: ../../accounting/localizations/colombia.rst:104 +#: ../../accounting/localizations/colombia.rst:110 msgid "Additionally two booleans fields were added in order to specify the fiscal regimen of the partner." msgstr "" -#: ../../accounting/localizations/colombia.rst:108 -msgid "4.2 Taxes" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:110 +#: ../../accounting/localizations/colombia.rst:117 msgid "If your sales transactions include products with taxes, it's important to consider that an extra field *Value Type* needs to be configured per tax. This option is located in the Advanced Options tab." msgstr "" -#: ../../accounting/localizations/colombia.rst:117 +#: ../../accounting/localizations/colombia.rst:124 msgid "Retention tax types (ICA, IVA, Fuente) are also included in the options to configure your taxes. This configuration is used in order to correctly display taxes in the invoice PDF." msgstr "" -#: ../../accounting/localizations/colombia.rst:125 -msgid "4.3 Journals" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:127 +#: ../../accounting/localizations/colombia.rst:135 msgid "Once the DIAN has assigned the official sequence and prefix for the electronic invoice resolution, the Sales journals related to your invoice documents need to be updated in Odoo. The sequence can be accessed using developer mode: :menuselection:`Accounting --> Settings --> Configuration Setting --> Journals`." msgstr "" -#: ../../accounting/localizations/colombia.rst:136 +#: ../../accounting/localizations/colombia.rst:144 msgid "Once that the sequence is opened, the Prefix and Next Number fields should be configured and synchronized with the CEN Financiero." msgstr "" -#: ../../accounting/localizations/colombia.rst:143 -msgid "4.4 Users" +#: ../../accounting/localizations/colombia.rst:152 +msgid "Users" msgstr "" -#: ../../accounting/localizations/colombia.rst:145 +#: ../../accounting/localizations/colombia.rst:154 msgid "The default template that is used by Odoo on the invoice PDF includes the job position of the salesperson, so these fields should be configured:" msgstr "" -#: ../../accounting/localizations/colombia.rst:153 -#: ../../accounting/localizations/mexico.rst:196 -msgid "Usage and testing" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:156 -msgid "1. Invoice" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:158 +#: ../../accounting/localizations/colombia.rst:168 msgid "When all your master data and credentials has been configured, it's possible to start testing the electronic invoice workflow." msgstr "" -#: ../../accounting/localizations/colombia.rst:162 -msgid "1.1 Invoice creation" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:164 -msgid "The functional workflow that takes place before an invoice validation doesn't change. The main changes that are introduced with the electronic invoice are the next fields:" -msgstr "" - -#: ../../accounting/localizations/colombia.rst:171 -msgid "There are three types of documents:" -msgstr "" - #: ../../accounting/localizations/colombia.rst:173 -msgid "**Factura Electronica**: This is the regular type of document and its applicable for Invoices, Credit Notes and Debit Notes." +#: ../../accounting/overview/process_overview/customer_invoice.rst:30 +msgid "Invoice creation" msgstr "" #: ../../accounting/localizations/colombia.rst:175 -msgid "**Factura de Importación**: This should be selected for importation transactions." +msgid "The functional workflow that takes place before an invoice validation doesn't change. The main changes that are introduced with the electronic invoice are the next fields:" msgstr "" -#: ../../accounting/localizations/colombia.rst:177 -msgid "**Factura de contingencia**: This is an exceptional type that is used as a manual backup in case that the company is not able to use the ERP and it's necessary to generate the invoice manually, when this invoice is added to the ERP, this invoice type should be selected." +#: ../../accounting/localizations/colombia.rst:182 +msgid "There are three types of documents:" msgstr "" #: ../../accounting/localizations/colombia.rst:184 -msgid "1.2 Invoice validation" +msgid "**Factura Electronica**: This is the regular type of document and its applicable for Invoices, Credit Notes and Debit Notes." msgstr "" #: ../../accounting/localizations/colombia.rst:186 +msgid "**Factura de Importación**: This should be selected for importation transactions." +msgstr "" + +#: ../../accounting/localizations/colombia.rst:188 +msgid "**Factura de contingencia**: This is an exceptional type that is used as a manual backup in case that the company is not able to use the ERP and it's necessary to generate the invoice manually, when this invoice is added to the ERP, this invoice type should be selected." +msgstr "" + +#: ../../accounting/localizations/colombia.rst:196 +msgid "Invoice validation" +msgstr "" + +#: ../../accounting/localizations/colombia.rst:198 msgid "After the invoice is validated an XML file is created and sent automatically to Carvajal, this file is displayed in the chatter." msgstr "" -#: ../../accounting/localizations/colombia.rst:192 +#: ../../accounting/localizations/colombia.rst:204 msgid "An extra field is now displayed in \"Other Info\" tab with the name of the XML file. Additionally there is a second extra field that is displayed with the Electronic Invoice status, with the initial value \"In progress\":" msgstr "" -#: ../../accounting/localizations/colombia.rst:201 -msgid "1.3 Reception of legal XML and PDF" +#: ../../accounting/localizations/colombia.rst:214 +msgid "Reception of legal XML and PDF" msgstr "" -#: ../../accounting/localizations/colombia.rst:203 +#: ../../accounting/localizations/colombia.rst:216 msgid "The electronic invoice vendor receives the XML file and proceeds to validate the structure and the information in it, if everything is correct the invoice status changes to \"Validated\" after using the \"Check Carvajal Status\" button in the Action dropdown. They then proceed to generate a Legal XML which includes a digital signature and a unique code (CUFE), a PDF invoice that includes a QR code and the CUFE is also generated." msgstr "" -#: ../../accounting/localizations/colombia.rst:211 +#: ../../accounting/localizations/colombia.rst:224 msgid "After this:" msgstr "" -#: ../../accounting/localizations/colombia.rst:213 +#: ../../accounting/localizations/colombia.rst:226 msgid "A ZIP containing the legal XML and the PDF is downloaded and displayed in the invoice chatter:" msgstr "" -#: ../../accounting/localizations/colombia.rst:222 +#: ../../accounting/localizations/colombia.rst:233 msgid "The Electronic Invoice status changes to \"Accepted\"" msgstr "" -#: ../../accounting/localizations/colombia.rst:225 -msgid "1.4 Common errors" +#: ../../accounting/localizations/colombia.rst:237 +msgid "Common errors" msgstr "" -#: ../../accounting/localizations/colombia.rst:227 +#: ../../accounting/localizations/colombia.rst:239 msgid "During the XML validation the most common errors are usually related to missing master data. In such cases, error messages are shown in the chatter after updating the electronic invoice status." msgstr "" -#: ../../accounting/localizations/colombia.rst:234 +#: ../../accounting/localizations/colombia.rst:246 msgid "After the master data is corrected, it's possible to reprocess the XML with the new data and send the updated version, using the following button:" msgstr "" -#: ../../accounting/localizations/colombia.rst:245 -msgid "2. Additional use cases" +#: ../../accounting/localizations/colombia.rst:258 +msgid "Additional use cases" msgstr "" -#: ../../accounting/localizations/colombia.rst:247 +#: ../../accounting/localizations/colombia.rst:260 msgid "The process for credit and debit notes is exactly the same as the invoice, the functional workflow remains the same as well." msgstr "" @@ -1665,291 +2021,248 @@ msgstr "" msgid "Colombia (ES)" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:5 -msgid "**Facturación Electrónica para Colombia**" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:8 +#: ../../accounting/localizations/colombia_ES.rst:6 msgid "Introducción" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:10 -msgid "La Facturación Electrónica para Colombia está disponible en Odoo V12 y requiere los siguientes Módulos:" +#: ../../accounting/localizations/colombia_ES.rst:8 +msgid "La Facturación Electrónica para Colombia está disponible en Odoo 12 y requiere los siguientes Módulos:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:11 +msgid "**l10n_co**: Contiene los datos básicos para manejar el módulo de contabilidad, incluyendo la configuración por defecto de los siguientes puntos:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:15 +msgid "Plan Contable" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:16 +#: ../../accounting/localizations/colombia_ES.rst:124 +msgid "Impuestos" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:17 +msgid "Retenciones" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:18 +msgid "Tipos de Documentos de Identificación" msgstr "" #: ../../accounting/localizations/colombia_ES.rst:20 -msgid "**l11n_co**:** Contiene los datos básicos para manejar el" +msgid "**l10n_co_edi**: Este módulo incluye todos los campos adicionales que son requeridos para la Integración entre Carvajal T&S y la generación de la Factura Electrónica, basado en los requisitos legales de la DIAN." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:14 -msgid "módulo de contabilidad, incluyendo la configuración por defecto de los siguientes puntos:" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:0 -msgid "a. Plan Contable" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:0 -msgid "b. Impuestos" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:0 -msgid "c. Retenciones" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:0 -msgid "d. Tipos de Documentos de Identificación" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:25 -msgid "**l10n_co_edi**: Este módulo incluye todos los campos" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:23 -msgid "adicionales que son requeridos para la Integración entre Carvajal T&S y la generación de la Factura Electrónica, basado en los requisitos legales de la DIAN." -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:28 +#: ../../accounting/localizations/colombia_ES.rst:26 msgid "Flujo General" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:31 +#: ../../accounting/localizations/colombia_ES.rst:33 msgid "Configuración" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:34 -msgid "1. Instalación de los módulos de Localización Colombiana" +#: ../../accounting/localizations/colombia_ES.rst:36 +msgid "Instalación de los módulos de Localización Colombiana" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:36 +#: ../../accounting/localizations/colombia_ES.rst:38 msgid "Para esto ve a las aplicaciones y busca “Colombia”, luego da click en Instalar a los primeros dos módulos:" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:39 -msgid "cz" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:42 -msgid "2. Configuración de las credenciales del Servicio Web de Carvajal T&S" -msgstr "" - #: ../../accounting/localizations/colombia_ES.rst:46 +msgid "Configuración de las credenciales del Servicio Web de Carvajal T&S" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:50 msgid "Una vez que los módulos están instalados, para poderte conectar con el Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las Credenciales. Esta información será provista por Carvajal T&S." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:48 -msgid "Ve a Facturación –> Configuración –> Configuración y busca la sección **Facturación Electrónica Colombiana**" +#: ../../accounting/localizations/colombia_ES.rst:52 +msgid "Ve a :menuselection:`Facturación --> Configuración --> Configuración` y busca la sección **Facturación Electrónica Colombiana**" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:56 -msgid "La funcionalidad de pruebas le permite conectarse e interactuar con el ambiente piloto de Carvajal T&S, esto permite a los usuarios probar el flujo completo y la integración con el Portal Financiero CEN, al cual se accede a través de la siguiente liga: `Cenfinanciero `__," +#: ../../accounting/localizations/colombia_ES.rst:57 +msgid "La funcionalidad de pruebas le permite conectarse e interactuar con el ambiente piloto de Carvajal T&S, esto permite a los usuarios probar el flujo completo y la integración con el Portal Financiero CEN, al cual se accede a través de la siguiente liga: `Cenfinanciero `_." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:58 -msgid "Una vez que el ambiente de producción está listo en Odoo y en Carvajal T&S el ambiente de pruebas debe ser deshabilitado para poder enviar la información al ambiente de producción de Carvajal, para el cual es utilizada la siguiente URL: `Cenfinanciero `__," +#: ../../accounting/localizations/colombia_ES.rst:62 +msgid "Una vez que el ambiente de producción está listo en Odoo y en Carvajal T&S el ambiente de pruebas debe ser deshabilitado para poder enviar la información al ambiente de producción de Carvajal, para el cual es utilizada la siguiente URL: `Cenfinanciero `_." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:64 -msgid "3. Configuración de Información para PDF" +#: ../../accounting/localizations/colombia_ES.rst:69 +msgid "Configuración de Información para PDF" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:68 +#: ../../accounting/localizations/colombia_ES.rst:73 msgid "Como parte de la información configurable que es enviada en el XML, puedes definir los datos de la sección fiscal del PDF, así como de la información Bancaria." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:70 -msgid "Ve a Contabilidad – Configuración – Ajustes y busca la sección **Facturación Electrónica Colombiana**." -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:76 -msgid "4. Configuración de los Datos Principales Requeridos en el XML" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:79 -msgid "4.1 Contacto (Tercero)" +#: ../../accounting/localizations/colombia_ES.rst:75 +msgid "Ve a :menuselection:`Contabilidad --> Configuración --> Ajustes` y busca la sección **Facturación Electrónica Colombiana**." msgstr "" #: ../../accounting/localizations/colombia_ES.rst:82 -msgid "4.1.1 Identificación" +msgid "Configuración de los Datos Principales Requeridos en el XML" msgstr "" #: ../../accounting/localizations/colombia_ES.rst:85 +msgid "Contacto (Tercero)" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:88 +msgid "Identificación" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:90 msgid "Como parte de la Localización Colombiana, los tipos de documentos definidos por la DIAN ahora están disponibles en el formulario de Contactos, por lo cual ya es posible asignarles su número de identificación asociado al tipo de documento correspondiente." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:93 +#: ../../accounting/localizations/colombia_ES.rst:98 msgid "Nota: Cuando el tipo de documento es RUT la identificación necesita ser ingresada en Odoo incluyendo el Dígito de Verificación. Odoo separará este número cuando la información sea enviada a los proveedores terceros." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:99 -msgid "4.1.2 Estructura Fiscal (RUT)" +#: ../../accounting/localizations/colombia_ES.rst:105 +msgid "Estructura Fiscal (RUT)" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:101 +#: ../../accounting/localizations/colombia_ES.rst:107 msgid "Los Códigos de tipo de Obligación aplicables a los terceros (sección 53 en el documento de RUT), son incluidos como parte del módulo de Facturación Electrónica, dado que es información requerida por la DIAN." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:105 -msgid "Estos campos se encuentran en Contactos –> Pestaña de Ventas y Compras –> Información Fiscal" +#: ../../accounting/localizations/colombia_ES.rst:111 +msgid "Estos campos se encuentran en :menuselection:`Contactos --> Pestaña de Ventas y Compras --> Información Fiscal`" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:111 +#: ../../accounting/localizations/colombia_ES.rst:117 msgid "Adicionalmente dos últimos campos fueron agregados para especificar el régimen fiscal del contacto. Cabe aclarar que para envío de Factura electrónica de Carvajal, únicamente se hace distinción de entre Grandes Contribuyentes y Régimen simplificado, por lo se muestran solo estas dos opciones." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:118 -msgid "4.2 Impuestos" +#: ../../accounting/localizations/colombia_ES.rst:126 +msgid "Si tus transacciones de ventas incluyen productos con impuestos, es importante considerar que un campo adicional llamado *Tipo de Valor* necesita ser configurado en la siguiente ruta: :menuselection:`Contabilidad --> Configuración --> Impuestos: --> Opciones Avanzadas --> Tipo de Valor`" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:122 -msgid "Si tus transacciones de ventas incluyen productos con impuestos, es importante considerar que un campo adicional llamado *Tipo de Valor* necesita ser configurado en la siguiente ruta:" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:124 -msgid "Contabilidad – > Configuración –> Impuestos: –> Opciones Avanzadas –>Tipo de Valor" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:129 +#: ../../accounting/localizations/colombia_ES.rst:134 msgid "Los impuestos para Retenciones (ICA, IVA y Fuente) también están incluidos en las opciones para configurar tus impuestos, esta configuración es considerada para desplegar correctamente los impuestos en la representación gráfica de la Factura. (PDF)" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:138 -msgid "4.3 Diarios" +#: ../../accounting/localizations/colombia_ES.rst:144 +msgid "Diarios" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:140 +#: ../../accounting/localizations/colombia_ES.rst:146 msgid "Una vez que la DIAN ha asignado la secuencia y prefijo oficiales para la resolución de la Facturación Electrónica, los Diarios de Ventas relacionados con tus documentos de facturación necesitan ser actualizados en Odoo." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:145 -msgid "La secuencia es configurada usando el modo de desarrollador en la siguiente ruta:" +#: ../../accounting/localizations/colombia_ES.rst:151 +msgid "La secuencia es configurada usando el modo de desarrollador en la siguiente ruta: :menuselection:`Contabilidad --> Configuración --> Diarios --> Liga de Secuencia`" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:148 -msgid "Contabilidad –> Configuración –> Diarios –> Liga de Secuencia" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:153 +#: ../../accounting/localizations/colombia_ES.rst:158 msgid "Una vez que la secuencia es abierta, los campos de Prefijo y Siguiente Número deben ser configurados y sincronizados con el CEN Financiero." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:160 -msgid "4.4 Usuarios" +#: ../../accounting/localizations/colombia_ES.rst:166 +msgid "Usuarios" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:162 +#: ../../accounting/localizations/colombia_ES.rst:168 msgid "La plantilla por defecto que es usada por Odoo en la representación gráfica incluye el nombre del Vendedor, así que estos campos deben ser considerados:" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:170 +#: ../../accounting/localizations/colombia_ES.rst:177 msgid "Uso y Pruebas" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:173 +#: ../../accounting/localizations/colombia_ES.rst:180 msgid "Facturas" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:175 +#: ../../accounting/localizations/colombia_ES.rst:182 msgid "Una vez que toda la información principal y las credenciales han sido configuradas, es posible empezar a probar el flujo de la Facturación Electrónica siguiendo las instrucciones que se detallan a continuación:" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:180 -msgid "1. Invoice Creation" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:182 -msgid "El flujo de trabajo funcional que lleva lugar antes de la validación de una factura continua siendo igual con Facturación Electrónica, independientemente de si es creada desde una Orden de Venta o si es creado manualmente." -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:187 -msgid "Los cambios principales que son introducidos con la Facturación Electrónica son los siguientes:" +#: ../../accounting/localizations/colombia_ES.rst:188 +msgid "Invoice Creation" msgstr "" #: ../../accounting/localizations/colombia_ES.rst:190 +msgid "El flujo de trabajo funcional que lleva lugar antes de la validación de una factura continua siendo igual con Facturación Electrónica, independientemente de si es creada desde una Orden de Venta o si es creado manualmente." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:195 +msgid "Los cambios principales que son introducidos con la Facturación Electrónica son los siguientes:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:198 msgid "Hay tres tipos de documentos" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:193 -msgid "**Factura electrónica**. Este es el documento normal y aplica" +#: ../../accounting/localizations/colombia_ES.rst:200 +msgid "**Factura electrónica**. Este es el documento normal y aplica para Facturas, Notas de Crédito y Notas de Débito." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:193 -msgid "para Facturas, Notas de Crédito y Notas de Débito." +#: ../../accounting/localizations/colombia_ES.rst:203 +msgid "**Factura de Importación**. Debe ser seleccionada para transacciones de importación." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:196 -msgid "**Factura de Importación**. Debe ser seleccionada para" +#: ../../accounting/localizations/colombia_ES.rst:206 +msgid "**Factura de Contingencia**. Esta es un caso excepcional y es utilizada como un respaldo manual en caso que la compañía no pueda usar el ERP y hay necesidad de crear la factura manualmente. Al ingresar esta factura en el ERP, se debe seleccionar este tipo." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:196 -msgid "transacciones de importación." +#: ../../accounting/localizations/colombia_ES.rst:216 +msgid "Invoice Validation" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:202 -msgid "**Factura de Contingencia**. Esta es un caso excepcional y es" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:199 -msgid "utilizada como un respaldo manual en caso que la compañía no pueda usar el ERP y hay necesidad de crear la factura manualmente. Al ingresar esta factura en el ERP, se debe seleccionar este tipo." -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:208 -msgid "1. Invoice Validation" -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:210 +#: ../../accounting/localizations/colombia_ES.rst:218 msgid "Después que la factura fue validada, un archivo XML es creado y enviado automáticamente al proveedor de la factura electrónica. Este archivo es desplegado en el historial." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:217 +#: ../../accounting/localizations/colombia_ES.rst:225 msgid "Un campo adicional es ahora desplegado en la pestaña de “Otra Información” con el nombre del archivo XML. Adicionalmente hay un segundo campo adicional que es desplegado con el estatus de la Factura Electrónica, con el valor inicial **En Proceso**." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:226 -msgid "1. Recepción del XML y PDF Legal" +#: ../../accounting/localizations/colombia_ES.rst:235 +msgid "Recepción del XML y PDF Legal" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:233 +#: ../../accounting/localizations/colombia_ES.rst:242 msgid "El proveedor de la Factura Electrónica recibe el archivo XML y procede a validar la información y la estructura contenida. Si todo es correcto, el estatus de la Factura cambia a “Validado”. Como parte de este proceso se generar el XML Legal, el cual incluye una firma digital y un código único (CUFE) y generan el PDF de la Factura (el cual incluye un código QR) y el CUFE." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:237 -msgid "Odoo envía una petición de actualización automáticamente para verificar que el XML fue creado. Si este es el caso, las siguientes acciones son hechas automáticamente." +#: ../../accounting/localizations/colombia_ES.rst:246 +msgid "Odoo envía una petición de actualización automáticamente para verificar que el XML fue creado. Si este es el caso, las siguientes acciones son hechas automáticamente:" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:240 -msgid "El XML Legal y el PDF son incluidos en un archivo ZIP y desplegados" +#: ../../accounting/localizations/colombia_ES.rst:248 +msgid "El XML Legal y el PDF son incluidos en un archivo ZIP y desplegados en el historial de la Factura." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:240 -msgid "en el historial de la Factura." -msgstr "" - -#: ../../accounting/localizations/colombia_ES.rst:245 +#: ../../accounting/localizations/colombia_ES.rst:253 msgid "El estatus de la Factura Electrónica es cambiado a “Aceptado”." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:250 -msgid "Nota: En caso que el PDF y el XML sean requeridos inmediatamente, es posible mandar manualmente la petición del estatus usando el siguiente botón:" -msgstr "" - #: ../../accounting/localizations/colombia_ES.rst:258 -msgid "1. Errores Frecuentes" +msgid "En caso que el PDF y el XML sean requeridos inmediatamente, es posible mandar manualmente la petición del estatus usando el siguiente botón:" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:260 +#: ../../accounting/localizations/colombia_ES.rst:267 +msgid "Errores Frecuentes" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:269 msgid "Durante la validación del XML los errores más comunes usualmente están relacionados con información principal faltante. En estos casos, los detalles del error son recuperados en la petición de actualización y desplegados en el historial." msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:268 +#: ../../accounting/localizations/colombia_ES.rst:277 msgid "Si la información principal es corregida, es posible re procesar el XML con la nueva información y mandar la versión actualizada usando el siguiente botón:" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:279 +#: ../../accounting/localizations/colombia_ES.rst:289 msgid "Casos de Uso adicionales" msgstr "" -#: ../../accounting/localizations/colombia_ES.rst:281 +#: ../../accounting/localizations/colombia_ES.rst:291 msgid "El proceso para las Notas de Crédito y Débito (Proveedores) es exactamente el mismo que en las Facturas. Su flujo de trabajo funcional se mantiene igual." msgstr "" @@ -2026,7 +2339,7 @@ msgid "Getting compliant with Odoo is very easy." msgstr "" #: ../../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." +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.rst:58 @@ -2045,7 +2358,7 @@ msgstr "" 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.rst:67 +#: ../../accounting/localizations/france.rst:66 msgid "in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud Certification (CGI 286 I-3 bis)" msgstr "" @@ -2057,132 +2370,132 @@ msgstr "" msgid "Download the mandatory certificate of conformity delivered by Odoo SA `here `__." msgstr "" -#: ../../accounting/localizations/france.rst:74 +#: ../../accounting/localizations/france.rst:75 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.rst:78 +#: ../../accounting/localizations/france.rst:79 msgid "In case you run Odoo on-premise, you need to update your installation and restart your server beforehand." msgstr "" -#: ../../accounting/localizations/france.rst:80 +#: ../../accounting/localizations/france.rst:81 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.rst:89 +#: ../../accounting/localizations/france.rst:90 msgid "Anti-fraud features" msgstr "" -#: ../../accounting/localizations/france.rst:91 +#: ../../accounting/localizations/france.rst:92 msgid "The anti-fraud module introduces the following features:" msgstr "" -#: ../../accounting/localizations/france.rst:93 +#: ../../accounting/localizations/france.rst:94 msgid "**Inalterability**: deactivation of all the ways to cancel or modify key data of POS orders, invoices and journal entries;" msgstr "" -#: ../../accounting/localizations/france.rst:95 +#: ../../accounting/localizations/france.rst:96 msgid "**Security**: chaining algorithm to verify the inalterability;" msgstr "" -#: ../../accounting/localizations/france.rst:96 +#: ../../accounting/localizations/france.rst:97 msgid "**Storage**: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)." msgstr "" -#: ../../accounting/localizations/france.rst:100 +#: ../../accounting/localizations/france.rst:101 msgid "Inalterability" msgstr "" -#: ../../accounting/localizations/france.rst:102 +#: ../../accounting/localizations/france.rst:103 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.rst:106 +#: ../../accounting/localizations/france.rst:107 msgid "If you run a multi-companies environment, only the documents of such companies are impacted." msgstr "" -#: ../../accounting/localizations/france.rst:110 +#: ../../accounting/localizations/france.rst:111 msgid "Security" msgstr "" -#: ../../accounting/localizations/france.rst:112 +#: ../../accounting/localizations/france.rst:113 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.rst:117 +#: ../../accounting/localizations/france.rst:118 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.rst:123 +#: ../../accounting/localizations/france.rst:124 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.rst:130 +#: ../../accounting/localizations/france.rst:131 msgid "Storage" msgstr "" -#: ../../accounting/localizations/france.rst:132 +#: ../../accounting/localizations/france.rst:133 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.rst:138 +#: ../../accounting/localizations/france.rst:139 msgid "Closings can be found in the *French Statements* menu of Point of Sale, Invoicing and Accounting apps." msgstr "" -#: ../../accounting/localizations/france.rst:142 +#: ../../accounting/localizations/france.rst:143 msgid "Closings compute the totals for journal entries of sales journals (Journal Type = Sales)." msgstr "" -#: ../../accounting/localizations/france.rst:144 +#: ../../accounting/localizations/france.rst:145 msgid "For multi-companies environments, such closings are performed by company." msgstr "" -#: ../../accounting/localizations/france.rst:146 +#: ../../accounting/localizations/france.rst:147 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.rst:152 +#: ../../accounting/localizations/france.rst:153 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.rst:157 +#: ../../accounting/localizations/france.rst:158 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.rst:164 +#: ../../accounting/localizations/france.rst:165 msgid "Responsibilities" msgstr "" -#: ../../accounting/localizations/france.rst:166 +#: ../../accounting/localizations/france.rst:167 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.rst:169 +#: ../../accounting/localizations/france.rst:170 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.rst:173 +#: ../../accounting/localizations/france.rst:174 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.rst:178 +#: ../../accounting/localizations/france.rst:179 msgid "More Information" msgstr "" -#: ../../accounting/localizations/france.rst:180 +#: ../../accounting/localizations/france.rst:181 msgid "You will find more information about this legislation in the official documents:" msgstr "" -#: ../../accounting/localizations/france.rst:182 -msgid "`Frequently Asked Questions `__" -msgstr "" - #: ../../accounting/localizations/france.rst:183 -msgid "`Official Statement `__" +msgid "`Frequently Asked Questions `_" msgstr "" #: ../../accounting/localizations/france.rst:184 -msgid "`Item 88 of Finance Law 2016 `__" +msgid "`Official Statement `_" +msgstr "" + +#: ../../accounting/localizations/france.rst:185 +msgid "`Item 88 of Finance Law 2016 `_" msgstr "" #: ../../accounting/localizations/germany.rst:3 @@ -2221,7 +2534,7 @@ msgid "Balance Sheet" msgstr "" #: ../../accounting/localizations/germany.rst:24 -#: ../../accounting/localizations/nederlands.rst:19 +#: ../../accounting/localizations/netherlands.rst:19 msgid "Profit & Loss" msgstr "" @@ -2249,20 +2562,20 @@ msgstr "" msgid "Questa guida spiegherà come utilizzare la fattura elettronica in Odoo e come configurare correttamente i dati aziendali, i contatti e la contabilità. Per testare la fattura elettronica i dati devono essere reali e non inventati, altrimenti il sistema dell’agenzia delle entrate non riconoscerà l’interscambio di informazioni." msgstr "" -#: ../../accounting/localizations/italy_IT.rst:12 +#: ../../accounting/localizations/italy_IT.rst:13 msgid "Configurare le informazioni sulla tua Azienda" msgstr "" -#: ../../accounting/localizations/italy_IT.rst:14 +#: ../../accounting/localizations/italy_IT.rst:15 msgid "Il passo successivo è la configurazione delle informazioni necessarie al funzionamento della fatturazione elettronica. Si può accedere alla schermata dall’applicazione Impostazioni: selezionare “Utenti e aziende” e scegliere Aziende. Accedere quindi alle informazioni sulla Azienda per cui si desidera configurare la fatturazione elettronica." msgstr "" -#: ../../accounting/localizations/italy_IT.rst:20 +#: ../../accounting/localizations/italy_IT.rst:21 msgid "I dati necessari al funzionamento dello strumento di fatturazione elettronica sono i seguenti:" msgstr "" -#: ../../accounting/localizations/italy_IT.rst:23 -msgid "Server PEC. Le informazioni sul server utilizzato dal tuo indirizzo di posta elettronica certificata sono fornite dal tuo fornitore o dal Ministero. Lo stesso server deve essere configurato come server che gestisce tutta la corrispondenza mail in Odoo, per saperne di più si puo’ consultare la relativa `guida `__." +#: ../../accounting/localizations/italy_IT.rst:24 +msgid "Server PEC. Le informazioni sul server utilizzato dal tuo indirizzo di posta elettronica certificata sono fornite dal tuo fornitore o dal Ministero. Lo stesso server deve essere configurato come server che gestisce tutta la corrispondenza mail in Odoo, per saperne di più si puo’ consultare la relativa :doc:`guida <../../discuss/email_servers>`." msgstr "" #: ../../accounting/localizations/italy_IT.rst:30 @@ -2286,7 +2599,7 @@ msgid "Numero di Iscrizione nel registro delle Imprese." msgstr "" #: ../../accounting/localizations/italy_IT.rst:54 -msgid "1. Configurare le impostazioni per la Fatturazione Elettronica" +msgid "Configurare le impostazioni per la Fatturazione Elettronica" msgstr "" #: ../../accounting/localizations/italy_IT.rst:56 @@ -2298,7 +2611,7 @@ msgid "Rappresentate Fiscale. Questa opzione è dedicata ad aziende con sede al msgstr "" #: ../../accounting/localizations/italy_IT.rst:70 -msgid "1. Configurare il profilo dei clienti" +msgid "Configurare il profilo dei clienti" msgstr "" #: ../../accounting/localizations/italy_IT.rst:72 @@ -2338,15 +2651,15 @@ msgid "I vari stadi di spedizione e recezione della fattura sono visibili anche msgstr "" #: ../../accounting/localizations/italy_IT.rst:115 -msgid "*Icona Rossa:* Invio fallito" +msgid "*Icona Rossa*: Invio fallito" msgstr "" #: ../../accounting/localizations/italy_IT.rst:117 -msgid "*Icona Gialla:* Fattura invitata. In attesa di accettazione" +msgid "*Icona Gialla*: Fattura invitata. In attesa di accettazione" msgstr "" #: ../../accounting/localizations/italy_IT.rst:119 -msgid "*Icona Verde:* Fattura inviata e accettata dal destinatario" +msgid "*Icona Verde*: Fattura inviata e accettata dal destinatario" msgstr "" #: ../../accounting/localizations/italy_IT.rst:121 @@ -2361,649 +2674,661 @@ msgstr "" msgid "This documentation is written assuming that you follow and know the official documentation regarding Invoicing, Sales and Accounting and that you have experience working with odoo on such areas, we are not intended to put here procedures that are already explained on those documents, just the information necessary to allow you use odoo in a Company with the country \"Mexico\" set." msgstr "" -#: ../../accounting/localizations/mexico.rst:16 +#: ../../accounting/localizations/mexico.rst:17 msgid "The mexican localization is a group of 3 modules:" msgstr "" -#: ../../accounting/localizations/mexico.rst:18 +#: ../../accounting/localizations/mexico.rst:19 msgid "**l10n_mx:** All basic data to manage the accounting, taxes and the chart of account, this proposed chart of account installed is a intended copy of the list of group codes offered by the `SAT`_." msgstr "" -#: ../../accounting/localizations/mexico.rst:21 +#: ../../accounting/localizations/mexico.rst:22 msgid "**l10n_mx_edi**: All regarding to electronic transactions, CFDI 3.2 and 3.3, payment complement, invoice addendum." msgstr "" -#: ../../accounting/localizations/mexico.rst:23 +#: ../../accounting/localizations/mexico.rst:24 msgid "**l10n_mx_reports**: All mandatory electronic reports for electronic accounting are here (Accounting app required)." msgstr "" -#: ../../accounting/localizations/mexico.rst:26 +#: ../../accounting/localizations/mexico.rst:27 msgid "With the Mexican localization in Odoo you will be able not just to comply with the required features by law in México but to use it as your accounting and invoicing system due to all the set of normal requirements for this market, becoming your Odoo in the perfect solution to administer your company in Mexico." msgstr "" -#: ../../accounting/localizations/mexico.rst:36 +#: ../../accounting/localizations/mexico.rst:38 msgid "After the configuration we will give you the process to test everything, try to follow step by step in order to allow you to avoid expend time on fix debugging problems. In any step you can recall the step and try again." msgstr "" -#: ../../accounting/localizations/mexico.rst:41 -msgid "1. Install the Mexican Accounting Localization" +#: ../../accounting/localizations/mexico.rst:44 +msgid "Install the Mexican Accounting Localization" msgstr "" -#: ../../accounting/localizations/mexico.rst:43 +#: ../../accounting/localizations/mexico.rst:46 msgid "For this, go in Apps and search for Mexico. Then click on *Install*." msgstr "" -#: ../../accounting/localizations/mexico.rst:49 +#: ../../accounting/localizations/mexico.rst:52 msgid "When creating a database from www.odoo.com, if you choose Mexico as country when creating your account, the mexican localization will be automatically installed." msgstr "" -#: ../../accounting/localizations/mexico.rst:54 -msgid "2. Electronic Invoices (CDFI 3.2 and 3.3 format)" +#: ../../accounting/localizations/mexico.rst:58 +msgid "Electronic Invoices (CDFI 3.2 and 3.3 format)" msgstr "" -#: ../../accounting/localizations/mexico.rst:56 +#: ../../accounting/localizations/mexico.rst:60 msgid "To enable this requirement in Mexico go to configuration in accounting Go in :menuselection:`Accounting --> Settings` and enable the option on the image with this you will be able to generate the signed invoice (CFDI 3.2 and 3.3) and generate the payment complement signed as well (3.3 only) all fully integrate with the normal invoicing flow in Odoo." msgstr "" -#: ../../accounting/localizations/mexico.rst:68 -msgid "3. Set you legal information in the company" +#: ../../accounting/localizations/mexico.rst:73 +msgid "Set you legal information in the company" msgstr "" -#: ../../accounting/localizations/mexico.rst:70 +#: ../../accounting/localizations/mexico.rst:75 msgid "First, make sure that your company is configured with the correct data. Go in :menuselection:`Settings --> Users --> Companies` and enter a valid address and VAT for your company. Don’t forget to define a mexican fiscal position on your company’s contact." msgstr "" -#: ../../accounting/localizations/mexico.rst:77 +#: ../../accounting/localizations/mexico.rst:82 msgid "If you want use the Mexican localization on test mode, you can put any known address inside Mexico with all fields for the company address and set the vat to **TCM970625MB1**." msgstr "" -#: ../../accounting/localizations/mexico.rst:85 -msgid "4. Set the proper \"Fiscal Position\" on the partner that represent the company" +#: ../../accounting/localizations/mexico.rst:91 +msgid "Set the proper \"Fiscal Position\" on the partner that represent the company" msgstr "" -#: ../../accounting/localizations/mexico.rst:87 +#: ../../accounting/localizations/mexico.rst:93 msgid "Go In the same form where you are editing the company save the record in order to set this form as a readonly and on readonly view click on the partner link, then edit it and set in the *Invoicing* tab the proper Fiscal Information (for the **Test Environment** this must be *601 - General de Ley Personas Morales*, just search it as a normal Odoo field if you can't see the option)." msgstr "" -#: ../../accounting/localizations/mexico.rst:94 -msgid "5. Enabling CFDI Version 3.3" +#: ../../accounting/localizations/mexico.rst:101 +msgid "Enabling CFDI Version 3.3" msgstr "" -#: ../../accounting/localizations/mexico.rst:97 -msgid "This steps are only necessary when you will enable the CFDI 3.3 (only available for V11.0 and above) if you do not have Version 11.0 or above on your SaaS instance please ask for an upgrade sending a ticket to support in https://www.odoo.com/help." +#: ../../accounting/localizations/mexico.rst:104 +msgid "This steps are only necessary when you will enable the CFDI 3.3 (only available for V11.0 and above) if you do not have Version 11.0 or above on your SaaS instance please ask for an upgrade by submitting a ticket to support in https://www.odoo.com/help." msgstr "" -#: ../../accounting/localizations/mexico.rst:102 +#: ../../accounting/localizations/mexico.rst:109 msgid "Enable debug mode:" msgstr "" -#: ../../accounting/localizations/mexico.rst:107 +#: ../../accounting/localizations/mexico.rst:114 msgid "Go and look the following technical parameter, on :menuselection:`Settings --> Technical --> Parameters --> System Parameters` and set the parameter called *l10n_mx_edi_cfdi_version* to 3.3 (Create it if the entry with this name does not exist)." msgstr "" -#: ../../accounting/localizations/mexico.rst:113 +#: ../../accounting/localizations/mexico.rst:120 msgid "The CFDI 3.2 will be legally possible until November 30th 2017 enable the 3.3 version will be a mandatory step to comply with the new `SAT resolution`_ in any new database created since v11.0 released CFDI 3.3 is the default behavior." msgstr "" -#: ../../accounting/localizations/mexico.rst:122 +#: ../../accounting/localizations/mexico.rst:130 msgid "Important considerations when yo enable the CFDI 3.3" msgstr "" -#: ../../accounting/localizations/mexico.rst:124 -#: ../../accounting/localizations/mexico.rst:642 +#: ../../accounting/localizations/mexico.rst:132 +#: ../../accounting/localizations/mexico.rst:683 msgid "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" field set to \"Tasa\"." msgstr "" -#: ../../accounting/localizations/mexico.rst:132 +#: ../../accounting/localizations/mexico.rst:140 msgid "You must go to the Fiscal Position configuration and set the proper code (it is the first 3 numbers in the name) for example for the test one you should set 601, it will look like the image." msgstr "" -#: ../../accounting/localizations/mexico.rst:139 +#: ../../accounting/localizations/mexico.rst:147 msgid "All products must have for CFDI 3.3 the \"SAT code\" and the field \"Reference\" properly set, you can export them and re import them to do it faster." msgstr "" -#: ../../accounting/localizations/mexico.rst:146 -msgid "6. Configure the PAC in order to sign properly the invoices" +#: ../../accounting/localizations/mexico.rst:155 +msgid "Configure the PAC in order to sign properly the invoices" msgstr "" -#: ../../accounting/localizations/mexico.rst:148 +#: ../../accounting/localizations/mexico.rst:157 msgid "To configure the EDI with the **PACs**, you can go in :menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`. You can choose a PAC within the **List of supported PACs** on the *PAC field* and then enter your PAC username and PAC password." msgstr "" -#: ../../accounting/localizations/mexico.rst:154 +#: ../../accounting/localizations/mexico.rst:163 msgid "Remember you must sign up in the refereed PAC before hand, that process can be done with the PAC itself on this case we will have two (2) availables `Finkok`_ and `Solución Factible`_." msgstr "" -#: ../../accounting/localizations/mexico.rst:158 +#: ../../accounting/localizations/mexico.rst:167 msgid "You must process your **Private Key (CSD)** with the SAT institution before follow this steps, if you do not have such information please try all the \"Steps for Test\" and come back to this process when you finish the process proposed for the SAT in order to set this information for your production environment with real transactions." msgstr "" -#: ../../accounting/localizations/mexico.rst:168 +#: ../../accounting/localizations/mexico.rst:177 msgid "If you ticked the box *MX PAC test environment* there is no need to enter a PAC username or password." msgstr "" -#: ../../accounting/localizations/mexico.rst:175 +#: ../../accounting/localizations/mexico.rst:184 msgid "Here is a SAT certificate you can use if you want to use the *Test Environment* for the Mexican Accounting Localization." msgstr "" -#: ../../accounting/localizations/mexico.rst:178 +#: ../../accounting/localizations/mexico.rst:187 msgid "`Certificate`_" msgstr "" -#: ../../accounting/localizations/mexico.rst:179 +#: ../../accounting/localizations/mexico.rst:188 msgid "`Certificate Key`_" msgstr "" -#: ../../accounting/localizations/mexico.rst:180 +#: ../../accounting/localizations/mexico.rst:189 msgid "**Password:** 12345678a" msgstr "" -#: ../../accounting/localizations/mexico.rst:183 -msgid "7. Configure the tag in sales taxes" +#: ../../accounting/localizations/mexico.rst:193 +msgid "Configure the tag in sales taxes" msgstr "" -#: ../../accounting/localizations/mexico.rst:185 +#: ../../accounting/localizations/mexico.rst:195 msgid "This tag is used to set the tax type code, transferred or withhold, applicable to the concept in the CFDI. So, if the tax is a sale tax the \"Tag\" field should be \"IVA\", \"ISR\" or \"IEPS\"." msgstr "" -#: ../../accounting/localizations/mexico.rst:192 +#: ../../accounting/localizations/mexico.rst:202 msgid "Note that the default taxes already has a tag assigned, but when you create a new tax you should choose a tag." msgstr "" -#: ../../accounting/localizations/mexico.rst:199 +#: ../../accounting/localizations/mexico.rst:210 msgid "Invoicing" msgstr "" -#: ../../accounting/localizations/mexico.rst:201 +#: ../../accounting/localizations/mexico.rst:212 msgid "To use the mexican invoicing you just need to do a normal invoice following the normal Odoo's behaviour." msgstr "" -#: ../../accounting/localizations/mexico.rst:204 +#: ../../accounting/localizations/mexico.rst:215 msgid "Once you validate your first invoice a correctly signed invoice should look like this:" msgstr "" -#: ../../accounting/localizations/mexico.rst:211 +#: ../../accounting/localizations/mexico.rst:222 msgid "You can generate the PDF just clicking on the Print button on the invoice or sending it by email following the normal process on odoo to send your invoice by email." msgstr "" -#: ../../accounting/localizations/mexico.rst:218 +#: ../../accounting/localizations/mexico.rst:229 msgid "Once you send the electronic invoice by email this is the way it should looks like." msgstr "" -#: ../../accounting/localizations/mexico.rst:225 +#: ../../accounting/localizations/mexico.rst:237 msgid "Cancelling invoices" msgstr "" -#: ../../accounting/localizations/mexico.rst:227 +#: ../../accounting/localizations/mexico.rst:239 msgid "The cancellation process is completely linked to the normal cancellation in Odoo." msgstr "" -#: ../../accounting/localizations/mexico.rst:229 +#: ../../accounting/localizations/mexico.rst:241 msgid "If the invoice is not paid." msgstr "" -#: ../../accounting/localizations/mexico.rst:231 -msgid "Go to to the customer invoice journal where the invoice belong to" -msgstr "" - -#: ../../accounting/localizations/mexico.rst:239 -msgid "Check the \"Allow cancelling entries\" field" -msgstr "" - -#: ../../accounting/localizations/mexico.rst:244 -msgid "Go back to your invoice and click on the button \"Cancel Invoice\"" +#: ../../accounting/localizations/mexico.rst:243 +msgid "Go to to the customer invoice journal where the invoice belong to." msgstr "" #: ../../accounting/localizations/mexico.rst:249 +msgid "Check the \"Allow cancelling entries\" field." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:253 +msgid "Go back to your invoice and click on the button \"Cancel Invoice\"." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:257 msgid "For security reasons it is recommendable return the check on the to allow cancelling to false again, then go to the journal and un check such field." msgstr "" -#: ../../accounting/localizations/mexico.rst:252 +#: ../../accounting/localizations/mexico.rst:260 msgid "**Legal considerations**" msgstr "" -#: ../../accounting/localizations/mexico.rst:254 +#: ../../accounting/localizations/mexico.rst:262 msgid "A cancelled invoice will automatically cancelled on the SAT." msgstr "" -#: ../../accounting/localizations/mexico.rst:255 +#: ../../accounting/localizations/mexico.rst:263 msgid "If you retry to use the same invoice after cancelled, you will have as much cancelled CFDI as you tried, then all those xml are important to maintain a good control of the cancellation reasons." msgstr "" -#: ../../accounting/localizations/mexico.rst:258 +#: ../../accounting/localizations/mexico.rst:266 msgid "You must unlink all related payment done to an invoice on odoo before cancel such document, this payments must be cancelled to following the same approach but setting the \"Allow Cancel Entries\" in the payment itself." msgstr "" -#: ../../accounting/localizations/mexico.rst:263 +#: ../../accounting/localizations/mexico.rst:272 msgid "Payments (Just available for CFDI 3.3)" msgstr "" -#: ../../accounting/localizations/mexico.rst:265 +#: ../../accounting/localizations/mexico.rst:274 msgid "To generate the payment complement you only need to follow the normal payment process in Odoo, this considerations to understand the behavior are important." msgstr "" -#: ../../accounting/localizations/mexico.rst:268 +#: ../../accounting/localizations/mexico.rst:277 msgid "To generate payment complement the payment term in the invoice must be PPD, because It is the expected behavior legally required for \"Cash payment\"." msgstr "" -#: ../../accounting/localizations/mexico.rst:272 +#: ../../accounting/localizations/mexico.rst:281 msgid "**1.1. How can I generate an invoice with payment term `PUE`?**" msgstr "" -#: ../../accounting/localizations/mexico.rst:274 +#: ../../accounting/localizations/mexico.rst:283 msgid "`According to the SAT documentation`_ a payment is classified as ``PUE`` if the invoice was agreed to be fully payed before the 17th of the next calendar month (the next month of the CFDI date), any other condition will generate a ``PPD`` invoice." msgstr "" -#: ../../accounting/localizations/mexico.rst:279 +#: ../../accounting/localizations/mexico.rst:288 msgid "**1.2. How can I get this with Odoo?**" msgstr "" -#: ../../accounting/localizations/mexico.rst:281 +#: ../../accounting/localizations/mexico.rst:290 msgid "In order to set the appropriate CFDI payment term (PPD or PUE), you can easily set it by using the ``Payment Terms`` defined in the invoice." msgstr "" -#: ../../accounting/localizations/mexico.rst:284 +#: ../../accounting/localizations/mexico.rst:293 msgid "If an invoice is generated without ``Payment Term`` the attribute ``MetodoPago`` will be ``PUE``." msgstr "" -#: ../../accounting/localizations/mexico.rst:287 +#: ../../accounting/localizations/mexico.rst:296 msgid "Today, if is the first day of the month and is generated an invoice with ``Payment Term`` ``30 Net Days`` the ``Due Date`` calculated is going to be the first day of the following month, this means its before the 17th of the next month, then the attribute ``MetodoPago`` will be ``PUE``." msgstr "" -#: ../../accounting/localizations/mexico.rst:292 +#: ../../accounting/localizations/mexico.rst:301 msgid "Today, if an invoice is generated with ``Payment Term`` ``30 Net Days`` and the ``Due Date`` is higher than the day 17 of the next month the ``MetodoPago`` will be ``PPD``." msgstr "" -#: ../../accounting/localizations/mexico.rst:296 +#: ../../accounting/localizations/mexico.rst:305 msgid "If having a ``Payment Term`` with 2 lines or more, for example ``30% Advance End of Following Month``, this is an installments term, then the attribute ``MetodoPago`` will be ``PPD``." msgstr "" -#: ../../accounting/localizations/mexico.rst:300 +#: ../../accounting/localizations/mexico.rst:309 msgid "To test a normal signed payment just create an invoice with payment term ``30% Advance End of Following Month`` and then register a payment to it." msgstr "" -#: ../../accounting/localizations/mexico.rst:302 +#: ../../accounting/localizations/mexico.rst:311 msgid "You must print the payment in order to retrieve the PDF properly." msgstr "" -#: ../../accounting/localizations/mexico.rst:303 +#: ../../accounting/localizations/mexico.rst:312 msgid "Regarding the \"Payments in Advance\" you must create a proper invoice with the payment in advance itself as a product line setting the proper SAT code following the procedure on the official documentation `given by the SAT`_ in the section **Apéndice 2 Procedimiento para la emisión de los CFDI en el caso de anticipos recibidos**." msgstr "" -#: ../../accounting/localizations/mexico.rst:308 +#: ../../accounting/localizations/mexico.rst:317 msgid "Related to topic 4 it is blocked the possibility to create a Customer Payment without a proper invoice." msgstr "" -#: ../../accounting/localizations/mexico.rst:313 +#: ../../accounting/localizations/mexico.rst:323 msgid "The accounting for Mexico in odoo is composed by 3 reports:" msgstr "" -#: ../../accounting/localizations/mexico.rst:315 +#: ../../accounting/localizations/mexico.rst:325 msgid "Chart of Account (Called and shown as COA)." msgstr "" -#: ../../accounting/localizations/mexico.rst:316 +#: ../../accounting/localizations/mexico.rst:326 msgid "Electronic Trial Balance." msgstr "" -#: ../../accounting/localizations/mexico.rst:317 +#: ../../accounting/localizations/mexico.rst:327 msgid "DIOT report." msgstr "" -#: ../../accounting/localizations/mexico.rst:319 -msgid "1 and 2 are considered as the electronic accounting, and the DIOT is a report only available on the context of the accounting." +#: ../../accounting/localizations/mexico.rst:329 +msgid "1. and 2. are considered as the electronic accounting, and the DIOT is a report only available on the context of the accounting." msgstr "" -#: ../../accounting/localizations/mexico.rst:322 +#: ../../accounting/localizations/mexico.rst:332 msgid "You can find all those reports in the original report menu on Accounting app." msgstr "" -#: ../../accounting/localizations/mexico.rst:328 +#: ../../accounting/localizations/mexico.rst:339 msgid "Electronic Accounting (Requires Accounting App)" msgstr "" -#: ../../accounting/localizations/mexico.rst:331 +#: ../../accounting/localizations/mexico.rst:342 msgid "Electronic Chart of account CoA" msgstr "" -#: ../../accounting/localizations/mexico.rst:333 +#: ../../accounting/localizations/mexico.rst:344 msgid "The electronic accounting never has been easier, just go to :menuselection:`Accounting --> Reporting --> Mexico --> COA` and click on the button **Export for SAT (XML)**" msgstr "" -#: ../../accounting/localizations/mexico.rst:340 -msgid "**How to add new accounts?**" +#: ../../accounting/localizations/mexico.rst:352 +msgid "How to add new accounts ?" msgstr "" -#: ../../accounting/localizations/mexico.rst:342 +#: ../../accounting/localizations/mexico.rst:354 msgid "If you add an account with the coding convention NNN.YY.ZZ where NNN.YY is a SAT coding group then your account will be automatically configured." msgstr "" -#: ../../accounting/localizations/mexico.rst:345 +#: ../../accounting/localizations/mexico.rst:357 msgid "Example to add an Account for a new Bank account go to :menuselection:`Accounting --> Settings --> Chart of Account` and then create a new account on the button \"Create\" and try to create an account with the number 102.01.99 once you change to set the name you will see a tag automatically set, the tags set are the one picked to be used in the COA on xml." msgstr "" -#: ../../accounting/localizations/mexico.rst:355 -msgid "**What is the meaning of the tag?**" +#: ../../accounting/localizations/mexico.rst:368 +msgid "What is the meaning of the tag ?" msgstr "" -#: ../../accounting/localizations/mexico.rst:357 +#: ../../accounting/localizations/mexico.rst:370 msgid "To know all possible tags you can read the `Anexo 24`_ in the SAT website on the section called **Código agrupador de cuentas del SAT**." msgstr "" -#: ../../accounting/localizations/mexico.rst:361 +#: ../../accounting/localizations/mexico.rst:374 msgid "When you install the module l10n_mx and yous Chart of Account rely on it (this happen automatically when you install setting Mexico as country on your database) then you will have the more common tags if the tag you need is not created you can create one on the fly." msgstr "" -#: ../../accounting/localizations/mexico.rst:367 +#: ../../accounting/localizations/mexico.rst:381 msgid "Electronic Trial Balance" msgstr "" -#: ../../accounting/localizations/mexico.rst:369 +#: ../../accounting/localizations/mexico.rst:383 msgid "Exactly as the COA but with Initial balance debit and credit, once you have your coa properly set you can go to :menuselection:`Accounting --> Reports --> Mexico --> Trial Balance` this is automatically generated, and can be exported to XML using the button in the top **Export for SAT (XML)** with the previous selection of the period you want to export." msgstr "" -#: ../../accounting/localizations/mexico.rst:378 +#: ../../accounting/localizations/mexico.rst:392 msgid "All the normal auditory and analysis features are available here also as any regular Odoo Report." msgstr "" -#: ../../accounting/localizations/mexico.rst:382 +#: ../../accounting/localizations/mexico.rst:397 msgid "DIOT Report (Requires Accounting App)" msgstr "" -#: ../../accounting/localizations/mexico.rst:384 -msgid "**What is the DIOT and the importance of presenting it SAT**" +#: ../../accounting/localizations/mexico.rst:400 +msgid "What is the DIOT and the importance of presenting it SAT" msgstr "" -#: ../../accounting/localizations/mexico.rst:386 +#: ../../accounting/localizations/mexico.rst:402 msgid "When it comes to procedures with the SAT Administration Service we know that we should not neglect what we present. So that things should not happen in Odoo." msgstr "" -#: ../../accounting/localizations/mexico.rst:389 +#: ../../accounting/localizations/mexico.rst:405 msgid "The DIOT is the Informational Statement of Operations with Third Parties (DIOT), which is an an additional obligation with the VAT, where we must give the status of our operations to third parties, or what is considered the same, with our providers." msgstr "" -#: ../../accounting/localizations/mexico.rst:394 +#: ../../accounting/localizations/mexico.rst:410 msgid "This applies both to individuals and to the moral as well, so if we have VAT for submitting to the SAT and also dealing with suppliers it is necessary to. submit the DIOT:" msgstr "" -#: ../../accounting/localizations/mexico.rst:398 -msgid "**When to file the DIOT and in what format?**" +#: ../../accounting/localizations/mexico.rst:415 +msgid "When to file the DIOT and in what format ?" msgstr "" -#: ../../accounting/localizations/mexico.rst:400 +#: ../../accounting/localizations/mexico.rst:417 msgid "It is simple to present the DIOT, since like all format this you can obtain it in the page of the SAT, it is the electronic format A-29 that you can find in the SAT website." msgstr "" -#: ../../accounting/localizations/mexico.rst:404 +#: ../../accounting/localizations/mexico.rst:421 msgid "Every month if you have operations with third parties it is necessary to present the DIOT, just as we do with VAT, so that if in January we have deals with suppliers, by February we must present the information pertinent to said data." msgstr "" -#: ../../accounting/localizations/mexico.rst:409 -msgid "**Where the DIOT is presented?**" +#: ../../accounting/localizations/mexico.rst:427 +msgid "Where the DIOT is presented ?" msgstr "" -#: ../../accounting/localizations/mexico.rst:411 +#: ../../accounting/localizations/mexico.rst:429 msgid "You can present DIOT in different ways, it is up to you which one you will choose and which will be more comfortable for you than you will present every month or every time you have dealings with suppliers." msgstr "" -#: ../../accounting/localizations/mexico.rst:415 +#: ../../accounting/localizations/mexico.rst:433 msgid "The A-29 format is electronic so you can present it on the SAT page, but this after having made up to 500 records." msgstr "" -#: ../../accounting/localizations/mexico.rst:418 +#: ../../accounting/localizations/mexico.rst:436 msgid "Once these 500 records are entered in the SAT, you must present them to the Local Taxpayer Services Administration (ALSC) with correspondence to your tax address, these records can be presented in a digital storage medium such as a CD or USB, which once validated you will be returned, so do not doubt that you will still have these records and of course, your CD or USB." msgstr "" -#: ../../accounting/localizations/mexico.rst:424 -msgid "**One more fact to know: the Batch load?**" +#: ../../accounting/localizations/mexico.rst:443 +msgid "One more fact to know: the Batch load ?" msgstr "" -#: ../../accounting/localizations/mexico.rst:426 +#: ../../accounting/localizations/mexico.rst:445 msgid "When reviewing the official SAT documents on DIOT, you will find the Batch load, and of course the first thing we think is what is that ?, and according to the SAT site is:" msgstr "" -#: ../../accounting/localizations/mexico.rst:430 +#: ../../accounting/localizations/mexico.rst:449 msgid "The \"batch upload\" is the conversion of records databases of transactions with suppliers made by taxpayers in text files (.txt). These files have the necessary structure for their application and importation into the system of the Informative Declaration of Operations with third parties, avoiding the direct capture and consequently, optimizing the time invested in its integration for the presentation in time and form to the SAT." msgstr "" -#: ../../accounting/localizations/mexico.rst:437 +#: ../../accounting/localizations/mexico.rst:456 msgid "You can use it to present the DIOT, since it is allowed, which will make this operation easier for you, so that it does not exist to avoid being in line with the SAT in regard to the Information Statement of Operations with Third Parties." msgstr "" -#: ../../accounting/localizations/mexico.rst:442 +#: ../../accounting/localizations/mexico.rst:461 msgid "You can find the `official information here`_." msgstr "" -#: ../../accounting/localizations/mexico.rst:444 -msgid "**How Generate this report in odoo?**" -msgstr "" - -#: ../../accounting/localizations/mexico.rst:446 -msgid "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:451 -msgid "A report view is shown, select last month to report the immediate before month you are or left the current month if it suits to you." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:457 -msgid "Click on \"Export (TXT)." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:462 -msgid "Save in a secure place the downloaded file and go to SAT website and follow the necessary steps to declare it." +#: ../../accounting/localizations/mexico.rst:464 +msgid "How Generate this report in Odoo ?" msgstr "" #: ../../accounting/localizations/mexico.rst:466 -msgid "Important considerations on your Supplier and Invice data for the DIOT" +msgid "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`." msgstr "" -#: ../../accounting/localizations/mexico.rst:468 -msgid "All suppliers must have set the fields on the accounting tab called \"DIOT Information\", the *L10N Mx Nationality* field is filled with just select the proper country in the address, you do not need to do anything else there, but the *L10N Mx Type Of Operation* must be filled by you in all your suppliers." +#: ../../accounting/localizations/mexico.rst:470 +msgid "A report view is shown, select last month to report the immediate before month you are or left the current month if it suits to you." msgstr "" -#: ../../accounting/localizations/mexico.rst:476 -msgid "There are 3 options of VAT for this report, 16%, 0% and exempt, an invoice line in odoo is considered exempt if no tax on it, the other 2 taxes are properly configured already." +#: ../../accounting/localizations/mexico.rst:475 +msgid "Click on \"Export (TXT)." msgstr "" #: ../../accounting/localizations/mexico.rst:479 +msgid "Save in a secure place the downloaded file and go to SAT website and follow the necessary steps to declare it." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:484 +msgid "Important considerations on your Supplier and Invoice data for the DIOT" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:486 +msgid "All suppliers must have set the fields on the accounting tab called \"DIOT Information\", the *L10N Mx Nationality* field is filled with just select the proper country in the address, you do not need to do anything else there, but the *L10N Mx Type Of Operation* must be filled by you in all your suppliers." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:493 +msgid "There are 3 options of VAT for this report, 16%, 0% and exempt, an invoice line in odoo is considered exempt if no tax on it, the other 2 taxes are properly configured already." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:496 msgid "Remember to pay an invoice which represent a payment in advance you must ask for the invoice first and then pay it and reconcile properly the payment following standard odoo procedure." msgstr "" -#: ../../accounting/localizations/mexico.rst:482 +#: ../../accounting/localizations/mexico.rst:499 msgid "You do not need all you data on partners filled to try to generate the supplier invoice, you can fix this information when you generate the report itself." msgstr "" -#: ../../accounting/localizations/mexico.rst:485 +#: ../../accounting/localizations/mexico.rst:502 msgid "Remember this report only shows the Supplier Invoices that were actually paid." msgstr "" -#: ../../accounting/localizations/mexico.rst:487 +#: ../../accounting/localizations/mexico.rst:504 msgid "If some of this considerations are not taken into account a message like this will appear when generate the DIOT on TXT with all the partners you need to check on this particular report, this is the reason we recommend use this report not just to export your legal obligation but to generate it before the end of the month and use it as your auditory process to see all your partners are correctly set." msgstr "" -#: ../../accounting/localizations/mexico.rst:498 +#: ../../accounting/localizations/mexico.rst:516 msgid "Extra Recommended features" msgstr "" -#: ../../accounting/localizations/mexico.rst:501 +#: ../../accounting/localizations/mexico.rst:519 msgid "Contact Module (Free)" msgstr "" -#: ../../accounting/localizations/mexico.rst:503 +#: ../../accounting/localizations/mexico.rst:521 msgid "If you want to administer properly your customers, suppliers and addresses this module even if it is not a technical need, it is highly recommended to install." msgstr "" -#: ../../accounting/localizations/mexico.rst:508 +#: ../../accounting/localizations/mexico.rst:527 msgid "Multi currency (Requires Accounting App)" msgstr "" -#: ../../accounting/localizations/mexico.rst:510 +#: ../../accounting/localizations/mexico.rst:529 msgid "In Mexico almost all companies send and receive payments in different currencies if you want to manage such capability you should enable the multi currency feature and you should enable the synchronization with **Banxico**, such feature allow you retrieve the proper exchange rate automatically retrieved from SAT and not being worried of put such information daily in the system manually." msgstr "" -#: ../../accounting/localizations/mexico.rst:517 +#: ../../accounting/localizations/mexico.rst:536 msgid "Go to settings and enable the multi currency feature." msgstr "" -#: ../../accounting/localizations/mexico.rst:523 +#: ../../accounting/localizations/mexico.rst:543 msgid "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI 3.3)" msgstr "" -#: ../../accounting/localizations/mexico.rst:525 +#: ../../accounting/localizations/mexico.rst:545 msgid "Frequently you want receive explicit errors from the fields incorrectly set on the xml, those errors are better informed to the user if the check is enable, to enable the Check with xsd feature follow the next steps (with debug mode enabled)." msgstr "" -#: ../../accounting/localizations/mexico.rst:530 +#: ../../accounting/localizations/mexico.rst:550 msgid "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`" msgstr "" -#: ../../accounting/localizations/mexico.rst:531 +#: ../../accounting/localizations/mexico.rst:551 msgid "Look for the Action called \"Download XSD files to CFDI\"" msgstr "" -#: ../../accounting/localizations/mexico.rst:532 +#: ../../accounting/localizations/mexico.rst:552 msgid "Click on button \"Create Contextual Action\"" msgstr "" -#: ../../accounting/localizations/mexico.rst:533 +#: ../../accounting/localizations/mexico.rst:553 msgid "Go to the company form :menuselection:`Settings --> Users&Companies --> Companies`" msgstr "" -#: ../../accounting/localizations/mexico.rst:534 +#: ../../accounting/localizations/mexico.rst:554 msgid "Open any company you have." msgstr "" -#: ../../accounting/localizations/mexico.rst:535 -#: ../../accounting/localizations/mexico.rst:558 +#: ../../accounting/localizations/mexico.rst:555 +#: ../../accounting/localizations/mexico.rst:578 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"." msgstr "" -#: ../../accounting/localizations/mexico.rst:540 +#: ../../accounting/localizations/mexico.rst:560 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:545 +#: ../../accounting/localizations/mexico.rst:565 msgid "If you see an error like this:" msgstr "" -#: ../../accounting/localizations/mexico.rst:547 +#: ../../accounting/localizations/mexico.rst:567 msgid "The cfdi generated is not valid" msgstr "" -#: ../../accounting/localizations/mexico.rst:549 +#: ../../accounting/localizations/mexico.rst:569 msgid "attribute decl. 'TipoRelacion', attribute 'type': The QName value '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does not resolve to a(n) simple type definition., line 36" msgstr "" -#: ../../accounting/localizations/mexico.rst:553 -msgid "This can be caused because of a database backup restored in anothe server, or when the XSD files are not correctly downloaded. Follow the same steps as above but:" +#: ../../accounting/localizations/mexico.rst:573 +msgid "This can be caused by a database backup restored in anothe server, or when the XSD files are not correctly downloaded. Follow the same steps as above but:" msgstr "" -#: ../../accounting/localizations/mexico.rst:557 +#: ../../accounting/localizations/mexico.rst:577 msgid "Go to the company in which the error occurs." msgstr "" -#: ../../accounting/localizations/mexico.rst:564 -msgid "**Error message** (Only applicable on CFDI 3.3):" +#: ../../accounting/localizations/mexico.rst:584 +msgid "**Error messages** (Only applicable on CFDI 3.3):" msgstr "" -#: ../../accounting/localizations/mexico.rst:566 -msgid ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'minLength'] The value '' has a length of '0'; this underruns the allowed minimum length of '1'." +#: ../../accounting/localizations/mexico.rst:586 +msgid "9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'minLength'] The value '' has a length of '0'; this underruns the allowed minimum length of '1'." msgstr "" -#: ../../accounting/localizations/mexico.rst:568 -msgid ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'." +#: ../../accounting/localizations/mexico.rst:591 +msgid "9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'." msgstr "" -#: ../../accounting/localizations/mexico.rst:571 -msgid "**Solution:** You forget to set the proper \"Reference\" field in the product, please go to the product form and set your internal reference properly." +#: ../../accounting/localizations/mexico.rst:595 +msgid "**Solution**: You forgot to set the proper \"Reference\" field in the product, please go to the product form and set your internal reference properly." msgstr "" -#: ../../accounting/localizations/mexico.rst:574 #: ../../accounting/localizations/mexico.rst:599 -#: ../../accounting/localizations/mexico.rst:609 -#: ../../accounting/localizations/mexico.rst:622 -#: ../../accounting/localizations/mexico.rst:633 -msgid "**Error message**:" -msgstr "" - -#: ../../accounting/localizations/mexico.rst:576 -msgid ":6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is required but missing." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:578 -msgid ":5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:581 -msgid "**Solution:** You forget to set the proper \"Fiscal Position\" on the partner of the company, go to customers, remove the customer filter and look for the partner called as your company and set the proper fiscal position which is the kind of business you company does related to SAT list of possible values, antoher option can be that you forgot follow the considerations about fiscal positions." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:588 -msgid "Yo must go to the Fiscal Position configuration and set the proper code (it is the first 3 numbers in the name) for example for the test one you should set 601, it will look like the image." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:596 -msgid "For testing purposes this value must be *601 - General de Ley Personas Morales* which is the one required for the demo VAT." +#: ../../accounting/localizations/mexico.rst:639 +#: ../../accounting/localizations/mexico.rst:670 +msgid "**Error messages**:" msgstr "" #: ../../accounting/localizations/mexico.rst:601 -msgid ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet 'enumeration'] The value '' is not an element of the set {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', '26', '27', '28', '29', '30', '99'}" +msgid "6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is required but missing." msgstr "" -#: ../../accounting/localizations/mexico.rst:604 -msgid "**Solution:** The payment method is required on your invoice." +#: ../../accounting/localizations/mexico.rst:605 +msgid "5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing." msgstr "" -#: ../../accounting/localizations/mexico.rst:611 -msgid ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': [facet 'enumeration'] The value '' is not an element of the set {'00 :2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'. :5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing." +#: ../../accounting/localizations/mexico.rst:608 +msgid "**Solution**: You forget to set the proper \"Fiscal Position\" on the partner of the company, go to customers, remove the customer filter and look for the partner called as your company and set the proper fiscal position which is the kind of business you company does related to SAT list of possible values, antoher option can be that you forgot follow the considerations about fiscal positions." msgstr "" #: ../../accounting/localizations/mexico.rst:616 -msgid "**Solution:** You must set the address on your company properly, this is a mandatory group of fields, you can go to your company configuration on :menuselection:`Settings --> Users & Companies --> Companies` and fill all the required fields for your address following the step :ref:`mx-legal-info`." +msgid "Yo must go to the Fiscal Position configuration and set the proper code (it is the first 3 numbers in the name) for example for the test one you should set 601, it will look like the image." msgstr "" -#: ../../accounting/localizations/mexico.rst:624 -msgid ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'." +#: ../../accounting/localizations/mexico.rst:623 +msgid "For testing purposes this value must be set to ``601 - General de Ley Personas Morales`` which is the one required for the demo VAT." msgstr "" -#: ../../accounting/localizations/mexico.rst:627 -msgid "**Solution:** The postal code on your company address is not a valid one for Mexico, fix it." +#: ../../accounting/localizations/mexico.rst:626 +#: ../../accounting/localizations/mexico.rst:657 +msgid "**Error message**:" msgstr "" -#: ../../accounting/localizations/mexico.rst:635 -msgid ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing. :34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.\", '')" +#: ../../accounting/localizations/mexico.rst:628 +msgid "2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet 'enumeration'] The value '' is not an element of the set {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', '26', '27', '28', '29', '30', '99'}" msgstr "" -#: ../../accounting/localizations/mexico.rst:639 -msgid "**Solution:** Set the mexican name for the tax 0% and 16% in your system and used on the invoice." +#: ../../accounting/localizations/mexico.rst:634 +msgid "**Solution**: The payment method is required on your invoice." msgstr "" -#: ../../accounting/localizations/nederlands.rst:2 +#: ../../accounting/localizations/mexico.rst:641 +msgid "2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': [facet 'enumeration'] The value '' is not an element of the set {'00" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:644 +#: ../../accounting/localizations/mexico.rst:659 +msgid "2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:647 +msgid "5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:650 +msgid "**Solution**: You must set the address on your company properly, this is a mandatory group of fields, you can go to your company configuration on :menuselection:`Settings --> Users & Companies --> Companies` and fill all the required fields for your address following the step :ref:`mx-legal-info`." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:664 +msgid "**Solution**: The postal code on your company address is not a valid one for Mexico, fix it." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:672 +msgid "18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:675 +msgid "34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.\", '')" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:679 +msgid "**Solution**: Set the mexican name for the tax 0% and 16% in your system and used on the invoice." +msgstr "" + +#: ../../accounting/localizations/netherlands.rst:2 msgid "Netherlands" msgstr "" -#: ../../accounting/localizations/nederlands.rst:5 +#: ../../accounting/localizations/netherlands.rst:5 msgid "XAF Export" msgstr "" -#: ../../accounting/localizations/nederlands.rst:7 +#: ../../accounting/localizations/netherlands.rst:7 msgid "With the Dutch accounting localization installed, you will be able to export all your accounting entries in XAF format. For this, you have to go in :menuselection:`Accounting --> Reporting --> General Ledger`, you define the entries you want to export using the filters (period, journals, ...) and then you click on the button **EXPORT (XAF)**." msgstr "" -#: ../../accounting/localizations/nederlands.rst:14 +#: ../../accounting/localizations/netherlands.rst:14 msgid "Dutch Accounting Reports" msgstr "" -#: ../../accounting/localizations/nederlands.rst:16 +#: ../../accounting/localizations/netherlands.rst:16 msgid "If you install the Dutch accounting localization, you will have access to some reports that are specific to the Netherlands such as :" msgstr "" -#: ../../accounting/localizations/nederlands.rst:21 +#: ../../accounting/localizations/netherlands.rst:21 msgid "Tax Report (Aangifte omzetbelasting)" msgstr "" -#: ../../accounting/localizations/nederlands.rst:23 +#: ../../accounting/localizations/netherlands.rst:23 msgid "Intrastat Report (ICP)" msgstr "" @@ -3346,7 +3671,7 @@ msgid "Don't forget to update your fiscal positions. If you have a version 11.1 msgstr "" #: ../../accounting/others.rst:3 -#: ../../accounting/receivables/customer_invoices/overview.rst:108 +#: ../../accounting/receivables/customer_invoices/overview.rst:109 msgid "Others" msgstr "" @@ -3434,67 +3759,59 @@ msgstr "" msgid "if you create asset manually, you still need to create the supplier bill for this asset. The asset document will only produce the depreciation journal entries, not those related to the supplier bill." msgstr "" -#: ../../accounting/others/adviser/assets.rst:82 -msgid "Explanation of the fields:" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:88 -msgid "Try creating an *Asset* in our online demonstration" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:91 +#: ../../accounting/others/adviser/assets.rst:84 msgid "Create assets automatically from a supplier bill" msgstr "" -#: ../../accounting/others/adviser/assets.rst:93 +#: ../../accounting/others/adviser/assets.rst:86 msgid "Assets can be automatically created from supplier bills. All you need to do is to set an asset category on your bill line. When the user will validate the bill, an asset will be automatically created, using the information of the supplier bill." msgstr "" -#: ../../accounting/others/adviser/assets.rst:100 +#: ../../accounting/others/adviser/assets.rst:93 msgid "Depending on the information on the asset category, the asset will be created in draft or directly validated\\ *.* It's easier to confirm assets directly so that you won't forget to confirm it afterwards. (check the field *Skip Draft State* on *Asset Category)* Generate assets in draft only when you want your adviser to control all the assets before posting them to your accounts." msgstr "" -#: ../../accounting/others/adviser/assets.rst:107 +#: ../../accounting/others/adviser/assets.rst:100 msgid "if you put the asset on the product, the asset category will automatically be filled in the supplier bill." msgstr "" -#: ../../accounting/others/adviser/assets.rst:111 +#: ../../accounting/others/adviser/assets.rst:104 msgid "How to depreciate an asset?" msgstr "" -#: ../../accounting/others/adviser/assets.rst:113 +#: ../../accounting/others/adviser/assets.rst:106 msgid "Odoo will create depreciation journal entries automatically at the right date for every confirmed asset. (not the draft ones). You can control in the depreciation board: a green bullet point means that the journal entry has been created for this line." msgstr "" -#: ../../accounting/others/adviser/assets.rst:118 +#: ../../accounting/others/adviser/assets.rst:111 msgid "But you can also post journal entries before the expected date by clicking on the green bullet and forcing the creation of related depreciation entry." msgstr "" -#: ../../accounting/others/adviser/assets.rst:125 +#: ../../accounting/others/adviser/assets.rst:118 msgid "In the Depreciation board, click on the red bullet to post the journal entry. Click on the :guilabel:`Items` button on the top to see the journal entries which are already posted." msgstr "" -#: ../../accounting/others/adviser/assets.rst:130 +#: ../../accounting/others/adviser/assets.rst:123 msgid "How to modify an existing asset?" msgstr "" -#: ../../accounting/others/adviser/assets.rst:132 +#: ../../accounting/others/adviser/assets.rst:125 msgid "Click on :guilabel:`Modify Depreciation`" msgstr "" -#: ../../accounting/others/adviser/assets.rst:133 +#: ../../accounting/others/adviser/assets.rst:126 msgid "Change the number of depreciation" msgstr "" -#: ../../accounting/others/adviser/assets.rst:135 +#: ../../accounting/others/adviser/assets.rst:128 msgid "Odoo will automatically recompute a new depreciation board." msgstr "" -#: ../../accounting/others/adviser/assets.rst:138 +#: ../../accounting/others/adviser/assets.rst:131 msgid "How to record the sale or disposal of an asset?" msgstr "" -#: ../../accounting/others/adviser/assets.rst:140 +#: ../../accounting/others/adviser/assets.rst:133 msgid "If you sell or dispose an asset, you need to deprecate completly this asset. Click on the button :guilabel:`Sell or Dispose`. This action will post the full costs of this assets but it will not record the sales transaction that should be registered through a customer invoice." msgstr "" @@ -3610,27 +3927,23 @@ msgstr "" 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:137 -msgid "if you use analytical accounts remember that you need to specify the account in the invoice and / or purchase line." +#: ../../accounting/others/adviser/budget.rst:136 +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:141 -msgid "for more information about booking invoices and purchase orders see:" +#: ../../accounting/others/adviser/budget.rst:140 +msgid "For more information about booking invoices and purchase orders see :doc:`../../receivables/customer_invoices/overview`" msgstr "" #: ../../accounting/others/adviser/budget.rst:143 -msgid ":doc:`../../receivables/customer_invoices/overview`" -msgstr "" - -#: ../../accounting/others/adviser/budget.rst:145 msgid "Go back in the budget list and find the Smith Project." msgstr "" -#: ../../accounting/others/adviser/budget.rst:147 +#: ../../accounting/others/adviser/budget.rst:145 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:156 +#: ../../accounting/others/adviser/budget.rst:153 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 "" @@ -3858,27 +4171,27 @@ msgstr "" msgid "The purchase module can be used in the same way as seen previously to handle subcontracting. if we purchase a service from another company we can re invoice this cost by linking the purchase order line to the correct analytical account. We simply need to create the correct vendors product." msgstr "" -#: ../../accounting/others/analytic/purchases_expenses.rst:127 +#: ../../accounting/others/analytic/purchases_expenses.rst:126 msgid "You can also track cost with timesheets, see: :doc:`timesheets`" msgstr "" -#: ../../accounting/others/analytic/purchases_expenses.rst:130 +#: ../../accounting/others/analytic/purchases_expenses.rst:129 msgid "Track costs in accounting" msgstr "" -#: ../../accounting/others/analytic/purchases_expenses.rst:132 +#: ../../accounting/others/analytic/purchases_expenses.rst:131 msgid "Now that everything is booked and points to the analytical account. Simply open it to check the costs related to that account." msgstr "" -#: ../../accounting/others/analytic/purchases_expenses.rst:135 +#: ../../accounting/others/analytic/purchases_expenses.rst:134 msgid "Enter the accounting module, click on :menuselection:`Advisers --> Analytic Accounts --> Open Charts`." msgstr "" -#: ../../accounting/others/analytic/purchases_expenses.rst:138 +#: ../../accounting/others/analytic/purchases_expenses.rst:137 msgid "Select \"consulting pack - Smith\" and click on the cost and revenue button to have an overview of all cost linked to the account." msgstr "" -#: ../../accounting/others/analytic/purchases_expenses.rst:146 +#: ../../accounting/others/analytic/purchases_expenses.rst:144 msgid "If you would like to have the revenue as well you should invoice the Consulting Pack in the Invoice menu and link the invoice line to this same analytical account." msgstr "" @@ -3939,86 +4252,86 @@ msgid "We thus need to create a **sales order** with a **service** product invoi msgstr "" #: ../../accounting/others/analytic/timesheets.rst:75 -msgid "For more information on how to create a sales order based on time and material please see: *How to invoice based on time and material* (Work in Progress)." +msgid "For more information on how to create a sales order based on time and material please see :doc:`../../../sales/invoicing/time_materials`." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:82 +#: ../../accounting/others/analytic/timesheets.rst:78 msgid "We save a Sales Order with the service product **External Consulting**. An analytical account will automatically be generated once the **Sales Order** is confirmed. Our employees will have to point to that account (in this case **SO002-Smith&Co**) in order to be able to invoice their hours (see picture below)." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:92 +#: ../../accounting/others/analytic/timesheets.rst:88 msgid "Fill in timesheet" msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:94 +#: ../../accounting/others/analytic/timesheets.rst:90 msgid "As an employee linked to a user, Harry can enter the **Timesheet** app and specify his timesheets for the contract. Logged on Harry's account we enter the **Timesheet** app and enter a detailed line pointing to the **Analytical Account** discussed above." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:99 +#: ../../accounting/others/analytic/timesheets.rst:95 msgid "Harry worked three hours on a SWOT analysis for Smith&Co." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:104 +#: ../../accounting/others/analytic/timesheets.rst:100 msgid "In the meantime, Cedric discussed businesses needs with the customer for 1 hour and specified it as well in his personal timesheet, pointing as well on the **Analytic Account**." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:108 +#: ../../accounting/others/analytic/timesheets.rst:104 msgid "In the **Sales Order** we notice that the delivered amounts of hours is automatically computed (see picture below)." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:115 +#: ../../accounting/others/analytic/timesheets.rst:111 msgid "Analytic accounting" msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:117 +#: ../../accounting/others/analytic/timesheets.rst:113 msgid "Thanks to analytic accounts we are able to have an overview of HR cost and revenues. All the revenues and cost of this transactions have been registered in the **SO002-Smith&Co** account." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:121 +#: ../../accounting/others/analytic/timesheets.rst:117 msgid "We can use two methods to analyze this situation." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:124 +#: ../../accounting/others/analytic/timesheets.rst:120 msgid "Without filters" msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:126 +#: ../../accounting/others/analytic/timesheets.rst:122 msgid "If we pointed all our costs and revenues of the project on the correct analytical account we can easily retrieve the cost and revenues related to this analytical account. Enter the *Accounting* app, select :menuselection:`Adviser --> Analytic Accounts --> Open Charts`." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:131 +#: ../../accounting/others/analytic/timesheets.rst:127 msgid "Note : you can specify a period for **Analysis**. If you want to open the current situation you should keep the fields empty. We can already note the credit and debit balance of the account." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:138 +#: ../../accounting/others/analytic/timesheets.rst:134 msgid "If we click on the account a special button is provided to have the details of cost and revenues (see picture below)." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:144 +#: ../../accounting/others/analytic/timesheets.rst:140 msgid "Click the button **Cost/Revenue** to have an overview of cost and revenues with the corresponding description." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:148 +#: ../../accounting/others/analytic/timesheets.rst:144 msgid "With filters" msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:150 +#: ../../accounting/others/analytic/timesheets.rst:146 msgid "We can thus filter this information from the **Analytic Entries**." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:152 +#: ../../accounting/others/analytic/timesheets.rst:148 msgid "Enter the **Accounting** app, and click on :menuselection:`Adviser --> Analytic Entries`. In this menu we have several options to analyse the human resource cost." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:155 +#: ../../accounting/others/analytic/timesheets.rst:151 msgid "We filter on the **Analytic account** so we can see the cost and revenues of the project. Add a custom **Filter** where the **Analytic Account** contains the **Sales Order** number." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:162 +#: ../../accounting/others/analytic/timesheets.rst:158 msgid "In the results we see timesheets activities and invoiced lines with the corresponding costs and revenues." msgstr "" -#: ../../accounting/others/analytic/timesheets.rst:168 +#: ../../accounting/others/analytic/timesheets.rst:164 msgid "We can group the different analytical accounts together and check their respective revenues. Simply group by **Analytic account** and select the **Graph view** to have a clear overview." msgstr "" @@ -4550,8 +4863,8 @@ msgid "Other Income" msgstr "" #: ../../accounting/others/configuration/account_type.rst:51 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:63 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:77 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:61 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:75 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:62 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:76 msgid "Income" @@ -4581,11 +4894,11 @@ msgstr "" msgid "It will install generic accounts. But if it does not cover all your cases, you can create your own accounts too." msgstr "" -#: ../../accounting/others/configuration/account_type.rst:72 +#: ../../accounting/others/configuration/account_type.rst:71 msgid "If you are a Saas User, your country chart of account is automatically installed." msgstr "" -#: ../../accounting/others/configuration/account_type.rst:75 +#: ../../accounting/others/configuration/account_type.rst:73 msgid "To create a new accounts, go to the Accounting application. Open the menu :menuselection:`Adviser --> Chart of Accounts`, the click on the **Create** button." msgstr "" @@ -4649,7 +4962,7 @@ msgstr "" msgid "Check this box if this account allows invoices & payments matching of journal items." msgstr "" -#: ../../accounting/others/configuration/account_type.rst:86 +#: ../../accounting/others/configuration/account_type.rst:84 msgid "View *Create Account* in our Online Demonstration" msgstr "" @@ -5120,18 +5433,19 @@ msgid "The Exchange difference journal can be changed in your accounting setting msgstr "" #: ../../accounting/others/multicurrencies/exchange.rst:109 -#: ../../accounting/payables/pay/multiple.rst:153 +#: ../../accounting/payables/pay/multiple.rst:147 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:68 msgid ":doc:`../../bank/reconciliation/configure`" msgstr "" #: ../../accounting/others/multicurrencies/exchange.rst:110 -#: ../../accounting/payables/pay/multiple.rst:103 +#: ../../accounting/payables/pay/multiple.rst:100 +#: ../../accounting/payables/pay/sepa.rst:131 msgid ":doc:`../../bank/reconciliation/use_cases`" msgstr "" #: ../../accounting/others/multicurrencies/how_it_works.rst:3 -#: ../../accounting/others/multicurrencies/how_it_works.rst:111 +#: ../../accounting/others/multicurrencies/how_it_works.rst:110 msgid "How is Odoo's multi-currency working?" msgstr "" @@ -5148,7 +5462,7 @@ msgid "In the accounting module, Go to :menuselection:`Configuration --> Setting msgstr "" #: ../../accounting/others/multicurrencies/how_it_works.rst:27 -#: ../../accounting/others/multicurrencies/how_it_works.rst:160 +#: ../../accounting/others/multicurrencies/how_it_works.rst:159 #: ../../accounting/others/multicurrencies/invoices_payments.rst:109 msgid "Exchange Rate Journal" msgstr "" @@ -5189,89 +5503,89 @@ msgstr "" msgid "Choose the interval : Manually, Daily, Weekly or Monthly. You can always force the update by clicking on **Update Now**. Select the provider, and you are set !" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:78 +#: ../../accounting/others/multicurrencies/how_it_works.rst:77 msgid "Only the **active** currencies are updated" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:81 +#: ../../accounting/others/multicurrencies/how_it_works.rst:80 msgid "Configure your charts of account" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:83 +#: ../../accounting/others/multicurrencies/how_it_works.rst:82 msgid "In the accounting application, go to :menuselection:`Adviser --> Charts of Accounts`. On each account, you can set a currency. It will force all moves for this account to have the account currency." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:87 +#: ../../accounting/others/multicurrencies/how_it_works.rst:86 msgid "If you leave it empty, it means that it can handle all currencies that are Active." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:94 +#: ../../accounting/others/multicurrencies/how_it_works.rst:93 msgid "Configure your journals" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:96 +#: ../../accounting/others/multicurrencies/how_it_works.rst:95 msgid "In order to register payments in other currencies, you have to remove the currency constraint on the journal. Go to the accounting application, Click on **More** on the journal and **Settings**." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:103 +#: ../../accounting/others/multicurrencies/how_it_works.rst:102 #: ../../accounting/others/multicurrencies/invoices_payments.rst:40 msgid "Check if the currency field is empty or in the foreign currency in which you will register the payments. If a currency is filled in, it means that you can register payments only in this currency." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:113 +#: ../../accounting/others/multicurrencies/how_it_works.rst:112 #: ../../accounting/others/multicurrencies/invoices_payments.rst:50 msgid "Now that you are working in a multi-currency environment, all accountable items will be linked to a currency, domestic or foreign." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:117 +#: ../../accounting/others/multicurrencies/how_it_works.rst:116 msgid "Sales Orders and Invoices" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:119 +#: ../../accounting/others/multicurrencies/how_it_works.rst:118 #: ../../accounting/others/multicurrencies/invoices_payments.rst:56 msgid "You are now able to set a different currency than the company one on your sale orders and on your invoices. The currency is set for the whole document." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:127 +#: ../../accounting/others/multicurrencies/how_it_works.rst:126 msgid "Purchases orders and Vendor Bills" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:129 +#: ../../accounting/others/multicurrencies/how_it_works.rst:128 #: ../../accounting/others/multicurrencies/invoices_payments.rst:66 msgid "You are now able to set a different currency than the company one on your purchase orders and on your vendor bills. The currency is set for the whole document." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:137 +#: ../../accounting/others/multicurrencies/how_it_works.rst:136 msgid "Payment Registrations" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:139 -msgid "In the accounting application, go to **Sales > Payments**. Register the payment and set the currency." +#: ../../accounting/others/multicurrencies/how_it_works.rst:138 +msgid "In the accounting application, go to :menuselection:`Sales --> Payments`. Register the payment and set the currency." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:146 +#: ../../accounting/others/multicurrencies/how_it_works.rst:145 msgid "Bank Statements" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:148 +#: ../../accounting/others/multicurrencies/how_it_works.rst:147 #: ../../accounting/others/multicurrencies/invoices_payments.rst:94 msgid "When creating or importing bank statements, the amount is in the company currency. But there are now two complementary fields, the amount that was actually paid and the currency in which it was paid." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:155 +#: ../../accounting/others/multicurrencies/how_it_works.rst:154 msgid "When reconciling it, Odoo will directly match the payment with the right Invoice. You will get the invoice price in the invoice currency and the amount in your company currency." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:162 +#: ../../accounting/others/multicurrencies/how_it_works.rst:161 msgid "Go to :menuselection:`Adviser --> Journal Entries` and look for the Exchange difference journal entries. All the exchange rates differences are recorded in it." msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:170 +#: ../../accounting/others/multicurrencies/how_it_works.rst:168 msgid ":doc:`invoices_payments`" msgstr "" -#: ../../accounting/others/multicurrencies/how_it_works.rst:171 -#: ../../accounting/others/multicurrencies/invoices_payments.rst:120 +#: ../../accounting/others/multicurrencies/how_it_works.rst:169 +#: ../../accounting/others/multicurrencies/invoices_payments.rst:119 msgid ":doc:`exchange`" msgstr "" @@ -5312,11 +5626,6 @@ msgstr "" msgid "Invoices" msgstr "" -#: ../../accounting/others/multicurrencies/invoices_payments.rst:64 -#: ../../accounting/payables/supplier_bills.rst:3 -msgid "Vendor Bills" -msgstr "" - #: ../../accounting/others/multicurrencies/invoices_payments.rst:74 msgid "Multi-currency Payments" msgstr "" @@ -5337,7 +5646,7 @@ msgstr "" msgid "Go to :menuselection:`Adviser --> Journal Entries` and look for the **Exchange Difference** journal entries. All the exchange rates differences are recorded in it." msgstr "" -#: ../../accounting/others/multicurrencies/invoices_payments.rst:119 +#: ../../accounting/others/multicurrencies/invoices_payments.rst:118 msgid ":doc:`how_it_works`" msgstr "" @@ -5646,11 +5955,6 @@ msgstr "" msgid "This report allows you to see the **net** and **tax amounts** for all the taxes grouped by type (sale/purchase)." msgstr "" -#: ../../accounting/others/taxes.rst:3 -#: ../../accounting/overview/process_overview/customer_invoice.rst:111 -msgid "Taxes" -msgstr "" - #: ../../accounting/others/taxes/B2B_B2C.rst:3 msgid "How to manage prices for B2B (tax excluded) and B2C (tax included)?" msgstr "" @@ -6371,8 +6675,8 @@ msgstr "" msgid "Odoo uses the rules of double-entry bookkeeping system: all journal entries are automatically balanced (sum of debits = sum of credits)." msgstr "" -#: ../../accounting/overview/main_concepts/in_odoo.rst:20 -msgid "`Understand Odoo's accounting transactions per document `__" +#: ../../accounting/overview/main_concepts/in_odoo.rst:19 +msgid "`Understand Odoo's accounting transactions per document `_" msgstr "" #: ../../accounting/overview/main_concepts/in_odoo.rst:23 @@ -6503,8 +6807,8 @@ msgstr "" msgid "Odoo support both periodic (manual) and perpetual (automated) inventory valuations. The available methods are standard price, average price, LIFO (for countries allowing it) and FIFO." msgstr "" -#: ../../accounting/overview/main_concepts/in_odoo.rst:132 -msgid "`View impact of the valuation method on your transactions `__" +#: ../../accounting/overview/main_concepts/in_odoo.rst:131 +msgid "`View impact of the valuation method on your transactions `_" msgstr "" #: ../../accounting/overview/main_concepts/in_odoo.rst:135 @@ -6696,8 +7000,8 @@ msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:59 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:57 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:69 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:58 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:70 #: ../../accounting/receivables/customer_payments/check.rst:68 @@ -6705,7 +7009,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:131 #: ../../accounting/receivables/customer_payments/credit_cards.rst:77 #: ../../accounting/receivables/customer_payments/credit_cards.rst:91 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:141 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:140 msgid "Debit" msgstr "" @@ -6713,8 +7017,8 @@ msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:59 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:57 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:69 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:58 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:70 #: ../../accounting/receivables/customer_payments/check.rst:68 @@ -6722,7 +7026,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:131 #: ../../accounting/receivables/customer_payments/credit_cards.rst:77 #: ../../accounting/receivables/customer_payments/credit_cards.rst:91 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:141 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:140 msgid "Credit" msgstr "" @@ -6738,9 +7042,9 @@ msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:244 #: ../../accounting/overview/main_concepts/memento.rst:246 #: ../../accounting/overview/process_overview/customer_invoice.rst:113 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:59 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:61 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:63 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:77 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:75 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:60 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:62 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:76 @@ -6844,8 +7148,8 @@ msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:216 #: ../../accounting/overview/main_concepts/memento.rst:226 #: ../../accounting/overview/main_concepts/memento.rst:242 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:59 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:57 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:69 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:58 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:70 #: ../../accounting/receivables/customer_payments/check.rst:68 @@ -6853,22 +7157,22 @@ msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:131 #: ../../accounting/receivables/customer_payments/credit_cards.rst:77 #: ../../accounting/receivables/customer_payments/credit_cards.rst:91 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:141 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:140 msgid "Account" msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:218 #: ../../accounting/overview/main_concepts/memento.rst:244 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:61 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:59 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:73 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:75 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:60 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:72 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:74 #: ../../accounting/receivables/customer_payments/check.rst:70 #: ../../accounting/receivables/customer_payments/check.rst:133 #: ../../accounting/receivables/customer_payments/credit_cards.rst:79 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:143 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:142 msgid "Account Receivable" msgstr "" @@ -6893,7 +7197,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:85 #: ../../accounting/receivables/customer_payments/check.rst:135 #: ../../accounting/receivables/customer_payments/credit_cards.rst:95 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:145 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:144 msgid "Bank" msgstr "" @@ -6933,10 +7237,6 @@ msgstr "" msgid "Invoicing in most countries occurs when a contractual obligation is met. If you ship a box to a customer, you have met the terms of the contract and can bill them. If your supplier sends you a shipment, they have met the terms of that contract and can bill you. Therefore, the terms of the contract is fulfilled when the box moves to or from the truck. At this point, Odoo supports the creation of what is called a Draft Invoice by Warehouse staff." msgstr "" -#: ../../accounting/overview/process_overview/customer_invoice.rst:30 -msgid "Invoice creation" -msgstr "" - #: ../../accounting/overview/process_overview/customer_invoice.rst:32 msgid "Draft invoices can be manually generated from other documents such as Sales Orders, Purchase Orders,etc. Although you can create a draft invoice directly if you would like." msgstr "" @@ -7485,43 +7785,48 @@ msgstr "" msgid "To invoice the customer, just click on the invoice button on his sale order. (or it will be done automatically at the end of the week/month if you invoice all your orders in batch)" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:176 +#: ../../accounting/payables/misc/employee_expense.rst:170 +#: ../../accounting/receivables/customer_invoices/overview.rst:95 +msgid ":doc:`../../../sales/invoicing/expense`" +msgstr "" + +#: ../../accounting/payables/misc/employee_expense.rst:173 msgid "Reimburse the employee" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:178 +#: ../../accounting/payables/misc/employee_expense.rst:175 msgid "If the expense was paid with the employee's own money, the company should reimburse the employee. In such a case, the employee will appear in the aged payable balance until the company reimburse him his expenses." msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:183 +#: ../../accounting/payables/misc/employee_expense.rst:180 msgid "All you have to do is to create a payment to this employee for the amount due." msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:190 +#: ../../accounting/payables/misc/employee_expense.rst:187 msgid "Expenses that are not reinvoiced to customers" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:192 +#: ../../accounting/payables/misc/employee_expense.rst:189 msgid "If some expenses should not be reinvoiced to customers, you have two options:" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:195 +#: ../../accounting/payables/misc/employee_expense.rst:192 msgid "if the decision to invoice or not is related to the product, change the invoicing policy on the product:" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:198 +#: ../../accounting/payables/misc/employee_expense.rst:195 msgid "**based on time and material**: reinvoice the customer" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:200 +#: ../../accounting/payables/misc/employee_expense.rst:197 msgid "**based on sale orders**: do not reinvoice the customer" msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:202 +#: ../../accounting/payables/misc/employee_expense.rst:199 msgid "if you have to make an exception for one invoice that should not be reinvoiced to the customer, do not set the related analytic account for this invoice." msgstr "" -#: ../../accounting/payables/misc/employee_expense.rst:208 +#: ../../accounting/payables/misc/employee_expense.rst:204 msgid ":doc:`forecast`" msgstr "" @@ -7610,75 +7915,75 @@ msgstr "" msgid "To record supplier payments by checks, you must install the **Check Writing** module. This module handle the process of recording checks in Odoo. Others modules are necessary to print checks, according to the country. As an example, the **U.S. Check Printing** module is required to print U.S. checks." msgstr "" -#: ../../accounting/payables/pay/check.rst:24 +#: ../../accounting/payables/pay/check.rst:23 msgid "According to your country and the chart of account you use, those modules may be installed by default. (example: United States users have nothing to install, it's configured by default)." msgstr "" -#: ../../accounting/payables/pay/check.rst:29 +#: ../../accounting/payables/pay/check.rst:28 msgid "Activate checks payment methods" msgstr "" -#: ../../accounting/payables/pay/check.rst:31 +#: ../../accounting/payables/pay/check.rst:30 msgid "In order to allow payments by checks, you must activate the payment method on related bank journals. From the accounting dashboard (the screen you get when you enter the accounting application), click on your bank account on :menuselection:`More --> Settings` option. On the **Payment Method** field, set **Check**." msgstr "" -#: ../../accounting/payables/pay/check.rst:41 +#: ../../accounting/payables/pay/check.rst:40 msgid "Compatible check stationery for printing checks" msgstr "" -#: ../../accounting/payables/pay/check.rst:44 +#: ../../accounting/payables/pay/check.rst:43 msgid "United States" msgstr "" -#: ../../accounting/payables/pay/check.rst:46 +#: ../../accounting/payables/pay/check.rst:45 msgid "For the United States, Odoo supports by default the check formats of:" msgstr "" -#: ../../accounting/payables/pay/check.rst:48 +#: ../../accounting/payables/pay/check.rst:47 msgid "**Quickbooks & Quicken**: check on top, stubs in the middle and bottom" msgstr "" -#: ../../accounting/payables/pay/check.rst:49 +#: ../../accounting/payables/pay/check.rst:48 msgid "**Peachtree**: check in the middle, stubs on top and bottom" msgstr "" -#: ../../accounting/payables/pay/check.rst:50 +#: ../../accounting/payables/pay/check.rst:49 msgid "**ADP**: check in the bottom, and stubs on the top." msgstr "" -#: ../../accounting/payables/pay/check.rst:52 +#: ../../accounting/payables/pay/check.rst:51 msgid "It is also possible to customize your own check format through customizations." msgstr "" -#: ../../accounting/payables/pay/check.rst:55 +#: ../../accounting/payables/pay/check.rst:54 msgid "Pay a supplier bill with a check" msgstr "" -#: ../../accounting/payables/pay/check.rst:57 +#: ../../accounting/payables/pay/check.rst:56 msgid "Paying a supplier with a check is done in three steps:" msgstr "" -#: ../../accounting/payables/pay/check.rst:59 +#: ../../accounting/payables/pay/check.rst:58 msgid "registering a payment you'd like to do on the bill" msgstr "" -#: ../../accounting/payables/pay/check.rst:60 +#: ../../accounting/payables/pay/check.rst:59 msgid "printing checks in batch for all registered payments" msgstr "" -#: ../../accounting/payables/pay/check.rst:61 +#: ../../accounting/payables/pay/check.rst:60 msgid "reconcile bank statements" msgstr "" -#: ../../accounting/payables/pay/check.rst:64 +#: ../../accounting/payables/pay/check.rst:63 msgid "Register a payment by check" msgstr "" -#: ../../accounting/payables/pay/check.rst:66 +#: ../../accounting/payables/pay/check.rst:65 msgid "To register a payment on a bill, open any supplier bill from the menu :menuselection:`Purchases --> Vendor Bills`. Once the supplier bill is validated, you can register a payment. Set the **Payment Method** to **Check** and validate the payment dialog." msgstr "" -#: ../../accounting/payables/pay/check.rst:74 +#: ../../accounting/payables/pay/check.rst:73 msgid "Explanation of the fields of the payment screen:" msgstr "" @@ -7774,60 +8079,60 @@ msgstr "" msgid "Change label of the counterpart that will hold the payment difference" msgstr "" -#: ../../accounting/payables/pay/check.rst:80 +#: ../../accounting/payables/pay/check.rst:79 msgid "Try paying a supplier bill with a check" msgstr "" -#: ../../accounting/payables/pay/check.rst:85 +#: ../../accounting/payables/pay/check.rst:82 msgid "Print checks" msgstr "" -#: ../../accounting/payables/pay/check.rst:87 +#: ../../accounting/payables/pay/check.rst:84 msgid "From the accounting dashboard, on your bank account, you should see a link \"X checks to print\". Click on this link and you will get the list of all checks that are not printed yet. From this screen, you can print all checks in batch or review them one by one." msgstr "" -#: ../../accounting/payables/pay/check.rst:92 +#: ../../accounting/payables/pay/check.rst:89 msgid "If you want to review every payment one by one before printing the check, open on the payment and click on **Print Check** if you accept it. A dialog will ask you the number of the check. It automatically proposes you the next number, but you can change it if it does not match your next check number." msgstr "" -#: ../../accounting/payables/pay/check.rst:98 +#: ../../accounting/payables/pay/check.rst:95 msgid "To print all checks in batch, select all payments from the list view and Print Check from the top \"print\" menu." msgstr "" -#: ../../accounting/payables/pay/check.rst:107 -msgid "Reconcile Bank Statements" +#: ../../accounting/payables/pay/check.rst:102 +msgid "Reconcile bank statements" msgstr "" -#: ../../accounting/payables/pay/check.rst:109 +#: ../../accounting/payables/pay/check.rst:104 msgid "Once you process your bank statement, when the check is credited from your bank account, Odoo will propose you automatically to match it with the payment. This will mark the payment as **Reconciled**." msgstr "" -#: ../../accounting/payables/pay/check.rst:115 -msgid "to review checks that have not been credited, open the list of payments and filter on the Sent state. Review those payments that have a date more than 2 weeks ago." +#: ../../accounting/payables/pay/check.rst:109 +msgid "To review checks that have not been credited, open the list of payments and filter on the Sent state. Review those payments that have a date more than 2 weeks ago." msgstr "" -#: ../../accounting/payables/pay/check.rst:120 +#: ../../accounting/payables/pay/check.rst:114 msgid "Pay anything with a check" msgstr "" -#: ../../accounting/payables/pay/check.rst:122 +#: ../../accounting/payables/pay/check.rst:116 msgid "You can register a payment that is not related to a supplier bill. To do so, use the top menu :menuselection:`Purchases --> Payments`. Register your payment and select a payment method by check." msgstr "" -#: ../../accounting/payables/pay/check.rst:126 +#: ../../accounting/payables/pay/check.rst:120 msgid "If you pay a specific supplier bill, put the reference of the bill in the **Memo** field." msgstr "" -#: ../../accounting/payables/pay/check.rst:132 +#: ../../accounting/payables/pay/check.rst:126 msgid "Once your payment by check is registered, don't forget to **Confirm** it. Once confirmed, you can use **Print Check** directly or follow the preceding flow to print checks in batch:" msgstr "" -#: ../../accounting/payables/pay/check.rst:136 -msgid "`Print checks `_" +#: ../../accounting/payables/pay/check.rst:130 +msgid "`Print checks`_" msgstr "" -#: ../../accounting/payables/pay/check.rst:138 -msgid "`Reconcile bank statements `_" +#: ../../accounting/payables/pay/check.rst:131 +msgid "`Reconcile bank statements`_" msgstr "" #: ../../accounting/payables/pay/multiple.rst:3 @@ -7914,56 +8219,48 @@ msgstr "" msgid "After receiving bank statement from the bank with payment detail, you can reconcile the transaction from the Dashboard. It will automatically map the transaction amount." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:101 -msgid "For more detail on the bank reconciliation process, please read:" -msgstr "" - -#: ../../accounting/payables/pay/multiple.rst:106 +#: ../../accounting/payables/pay/multiple.rst:103 msgid "Partial payments of several supplier bills" msgstr "" -#: ../../accounting/payables/pay/multiple.rst:109 +#: ../../accounting/payables/pay/multiple.rst:106 msgid "How to pay several supplier bills having cash discounts at once?" msgstr "" -#: ../../accounting/payables/pay/multiple.rst:111 +#: ../../accounting/payables/pay/multiple.rst:108 msgid "You already learned how to pay bills in various way but what about partial payment? We are taking another example where we will do partial payment for various bills." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:115 +#: ../../accounting/payables/pay/multiple.rst:112 msgid "We are creating multiple bills and partially pay them through bank statements." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:118 +#: ../../accounting/payables/pay/multiple.rst:115 msgid "We are adding payment terms which allow some cash discount where vendor offer us early payment discount." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:124 +#: ../../accounting/payables/pay/multiple.rst:121 msgid "We are creating the following bills with the assignment of the above payment term." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:130 +#: ../../accounting/payables/pay/multiple.rst:127 msgid "We have created the following bills:" msgstr "" -#: ../../accounting/payables/pay/multiple.rst:135 +#: ../../accounting/payables/pay/multiple.rst:132 msgid "We will pay the invoices by creating bank statement where we will adjust the cash discount our vendor provided under payment terms." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:141 +#: ../../accounting/payables/pay/multiple.rst:138 msgid "Before reconciling this bank statement, we need to create one statement model for cash discount." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:147 +#: ../../accounting/payables/pay/multiple.rst:144 msgid "Now we are going back to bank statement and opening reconcile view." msgstr "" -#: ../../accounting/payables/pay/multiple.rst:151 -msgid "For bank statement reconciliation with model option, see" -msgstr "" - #: ../../accounting/payables/pay/sepa.rst:3 -#: ../../accounting/payables/pay/sepa.rst:67 +#: ../../accounting/payables/pay/sepa.rst:65 msgid "Pay with SEPA" msgstr "" @@ -7987,88 +8284,94 @@ msgstr "" msgid "To pay suppliers with SEPA, you must install the **SEPA Credit Transfer** module. This module handle the process of generating SEPA files based on Odoo payments." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:37 +#: ../../accounting/payables/pay/sepa.rst:36 msgid "According to your country and the chart of account you use, this module may be installed by default." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:41 +#: ../../accounting/payables/pay/sepa.rst:40 msgid "Activate SEPA payment methods on banks" msgstr "" -#: ../../accounting/payables/pay/sepa.rst:43 +#: ../../accounting/payables/pay/sepa.rst:42 msgid "In order to allow payments by SEPA, you must activate the payment method on related bank journals. From the accounting dashboard (the screen you get when you enter the accounting application), click on \"More\" on your bank account and select the \"Settings\" option." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:48 +#: ../../accounting/payables/pay/sepa.rst:47 msgid "To activate SEPA, click the **Advanced Settings** tab and, in the **Payment Methods** part of the **Miscellaneous** section, check the box **Sepa Credit Transfer**." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:52 +#: ../../accounting/payables/pay/sepa.rst:51 msgid "Make sure to specify the IBAN account number (domestic account number won't work with SEPA) and the BIC (bank identifier code) on your bank journal." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:58 +#: ../../accounting/payables/pay/sepa.rst:56 msgid "By default, the payments you send using SEPA will use your company name as initiating party name. This is what appears on the recipient's bank statement in the **payment from** field. You can customize it in your company settings, in the tab **Configuration**, under the **SEPA** section." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:70 +#: ../../accounting/payables/pay/sepa.rst:68 msgid "Register your payments" msgstr "" -#: ../../accounting/payables/pay/sepa.rst:72 +#: ../../accounting/payables/pay/sepa.rst:70 msgid "You can register a payment that is not related to a supplier bill. To do so, use the top menu :menuselection:`Purchases --> Payments`. Register your payment and select a payment method by Sepa Credit Transfer." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:76 +#: ../../accounting/payables/pay/sepa.rst:74 msgid "If it's the first time you pay this vendor, you will have to fill in the Recipient Bank Account field with, at least, the bank name, IBAN and BIC (Bank Identifier Code). Odoo will automatically verify the IBAN format." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:80 +#: ../../accounting/payables/pay/sepa.rst:78 msgid "For future payments to this vendor, Odoo will propose you automatically the bank accounts but you will be able to select another one or create a new one." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:84 +#: ../../accounting/payables/pay/sepa.rst:82 msgid "If you pay a specific supplier bill, put the reference of the bill in the **memo** field." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:90 +#: ../../accounting/payables/pay/sepa.rst:88 msgid "Once your payment is registered, don't forget to Confirm it. You can also pay vendor bills from the bill directly using the Register Payment button on top of a vendor bill. The form is the same, but the payment is directly linked to the bill and will be automatically reconciled to it." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:96 +#: ../../accounting/payables/pay/sepa.rst:94 msgid "Generate SEPA files" msgstr "" -#: ../../accounting/payables/pay/sepa.rst:98 +#: ../../accounting/payables/pay/sepa.rst:96 msgid "From your accounting dashboard, you should see if there are SEPA files to generate for every bank account." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:104 +#: ../../accounting/payables/pay/sepa.rst:102 msgid "Click on the link to check all the payments that are ready to transfer via SEPA. Then, select all the payments you want to send (or check the top box to select all payment at once) and click on :menuselection:`More --> Download SEPA Payments`." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:116 +#: ../../accounting/payables/pay/sepa.rst:114 msgid "The bank refuses my SEPA file" msgstr "" -#: ../../accounting/payables/pay/sepa.rst:118 +#: ../../accounting/payables/pay/sepa.rst:116 msgid "Ask your bank if they support **PAIN.001.001.03 SEPA Credit Transfers**. If they don't, or cannot provide relevant informations, please forward the error message to your Odoo partner." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:123 +#: ../../accounting/payables/pay/sepa.rst:121 msgid "There is no Bank Identifier Code recorded for bank account ..." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:125 +#: ../../accounting/payables/pay/sepa.rst:123 msgid "In order to send a SEPA payment, the recipient must be identified by a valid IBAN and BIC. If this message appear, you probably encoded an IBAN account for the partner you are paying but forgot to fill in the BIC field." msgstr "" -#: ../../accounting/payables/pay/sepa.rst:132 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:168 -#: ../../accounting/receivables/customer_payments/recording.rst:129 +#: ../../accounting/payables/pay/sepa.rst:129 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:166 +#: ../../accounting/receivables/customer_payments/recording.rst:126 msgid ":doc:`check`" msgstr "" +#: ../../accounting/payables/pay/sepa.rst:130 +#: ../../accounting/receivables/customer_invoices/epc_qr_code.rst:64 +#: ../../accounting/receivables/customer_payments/batch_sdd.rst:121 +msgid ":doc:`../../bank/setup/create_bank_account`" +msgstr "" + #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:3 msgid "When should I use supplier bills or purchase receipts?" msgstr "" @@ -8125,6 +8428,212 @@ msgstr "" msgid "Validate the Purchase Receipt to post it. Don't forget you need to :doc:`reconcile payments <../../bank/reconciliation/use_cases>` in order to completely close the transaction in your accounting." msgstr "" +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:3 +msgid "Deferred Expenses and Prepayments" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:5 +msgid "**Deferred expenses** and **prepayments** (also known as **prepaid expense**), are both costs that have already occurred for unconsumed products or services yet to receive." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:8 +msgid "Such costs are **assets** for the company that pays them since it already paid for products and services still to receive or that are yet to be used. The company cannot report them on the current **Profit and Loss statement**, or *Income Statement*, since the payments will be effectively expensed in the future." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:13 +msgid "These future expenses must be deferred on the company's balance sheet until the moment in time they can be **recognized**, at once or over a defined period, on the Profit and Loss statement." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:16 +msgid "For example, let's say we pay $ 1200 at once for one year of insurance. We already pay the cost now but haven't used the service yet. Therefore, we post this new expense in a *prepayment account* and decide to recognize it on a monthly basis. Each month, for the next 12 months, $ 100 will be recognized as an expense." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:21 +msgid "Odoo Accounting handles deferred expenses and prepayments by spreading them in multiple entries that are automatically created in *draft mode* and then posted periodically." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:25 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 +msgid "The server checks once a day if an entry must be posted. It might then take up to 24 hours before you see a change from *draft* to *posted*." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:29 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:28 +msgid "Prerequisites" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:31 +msgid "Such transactions must be posted on a **Deferred Expense Account** rather than on the default expense account." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:35 +msgid "Configure a Deferred Expense Account" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:37 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:36 +msgid "To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting --> Configuration --> Chart of Accounts`, click on *Create*, and fill out the form." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:45 +msgid "This account's type must be either *Current Assets* or *Prepayments*" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:48 +msgid "Post an expense to the right account" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:51 +msgid "Select the account on a draft bill" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:53 +msgid "On a draft bill, select the right account for all the products of which the expenses must be deferred." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:61 +msgid "Choose a different Expense Account for specific products" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:63 +msgid "Start editing the product, go to the *Accounting* tab, select the right **Expense Account**, and save." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:71 +msgid "It is possible to automate the creation of expense entries for these products (see: `Automate the Deferred Expenses`_)." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:75 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:74 +msgid "Change the account of a posted journal item" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:77 +msgid "To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> Purchases`, select the journal item you want to modify, click on the account, and select the right one." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:86 +msgid "Deferred Expenses entries" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:89 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:88 +msgid "Create a new entry" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:91 +msgid "A **Deferred Expense entry** automatically generates all journal entries in *draft mode*. They are then posted one by one at the right time until the full amount of the expense is recognized." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:94 +msgid "To create a new entry, go to :menuselection:`Accounting --> Accounting --> Deferred Expense`, click on *Create*, and fill out the form." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:97 +msgid "Click on **select related purchases** to link an existing journal item to this new entry. Some fields are then automatically filled out, and the journal item is now listed under the **Related Expenses** tab." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:105 +msgid "Once done, you can click on *Compute Deferral* (next to the *Confirm* button) to generate all the values of the **Expense Board**. This board shows you all the entries that Odoo will post to recognize your expense, and at which date." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:114 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:113 +msgid "What does \"Prorata Temporis\" mean?" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:116 +msgid "The **Prorata Temporis** feature is useful to recognize your expense the most accurately possible." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:118 +msgid "With this feature, the first entry on the Expense Board is computed based on the time left between the *Prorata Date* and the *First Recognition Date* rather than the default amount of time between recognitions." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:122 +msgid "For example, the Expense Board above has its first expense with an amount of $ 70.97 rather than $ 100.00. Consequently, the last entry is also lower and has an amount of $ 29.03." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:126 +msgid "Deferred Entry from the Purchases Journal" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:128 +msgid "You can create a deferred entry from a specific journal item in your **Purchases Journal**." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:130 +msgid "To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> Purchases`, and select the journal item you want to defer. Make sure that it is posted in the right account (see: `Change the account of a posted journal item`_)." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:134 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:134 +msgid "Then, click on *Action*, select **Create Deferred Entry**, and fill out the form the same way you would do to `create a new entry`_." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:142 +msgid "Deferred Expense Models" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:144 +msgid "You can create **Deferred Expense Models** to create your Deferred Expense entries faster." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:146 +msgid "To create a model, go to :menuselection:`Accounting → Configuration --> Deferred Expense Models`, click on *Create*, and fill out the form the same way you would do to create a new entry." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:150 +msgid "You can also convert a *confirmed Deferred Expense entry* into a model by opening it from :menuselection:`Accounting --> Accounting --> Deferred Expenses` and then, by clicking on the button *Save Model*." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:155 +msgid "Apply a Deferred Expense Model to a new entry" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:157 +msgid "When you create a new Deferred Expense entry, fill out the **Deferred Expense Account** with the right recognition account." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:160 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:160 +msgid "New buttons with all the models linked to that account appear at the top of the form. Clicking on a model button fills out the form according to that model." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:168 +msgid "Automate the Deferred Expenses" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:170 +msgid "When you create or edit an account of which the type is either *Current Assets* or *Prepayments*, you can configure it to defer the expenses that are credited on it automatically." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:173 +msgid "You have three choices for the **Automate Deferred Expense** field:" +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:175 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:175 +msgid "**No:** this is the default value. Nothing happens." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:176 +msgid "**Create in draft:** whenever a transaction is posted on the account, a draft *Deferred Expenses entry* is created, but not validated. You must first fill out the form in :menuselection:`Accounting --> Accounting --> Deferred Expenses`." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:179 +msgid "**Create and validate:** you must also select a Deferred Expense Model (see: `Deferred Expense Models`_). Whenever a transaction is posted on the account, a *Deferred Expenses entry* is created and immediately validated." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:188 +msgid "You can, for example, select this account as the default **Expense Account** of a product to fully automate its sale completely. (see: `Choose a different Expense Account for specific products`_)." +msgstr "" + +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:193 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:192 +msgid ":doc:`../../others/configuration/account_type`" +msgstr "" + #: ../../accounting/payables/supplier_bills/manage.rst:3 msgid "How to manage vendor Bills?" msgstr "" @@ -8189,151 +8698,151 @@ msgstr "" msgid "Conversely, products that are set as a **Service or Digital Product** will not imply stock management, simply due to the fact that there is no inventory to manage. You will not be able to receive products under either of these designations." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:65 +#: ../../accounting/payables/supplier_bills/manage.rst:64 msgid "It is recommended that you create a **Miscellaneous** product for all purchases that occur infrequently and do not require inventory valuation or management. If you create such a product, it is recommended to set the product type to **Service**." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:70 +#: ../../accounting/payables/supplier_bills/manage.rst:69 msgid "Managing your Vendor Bills" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:73 +#: ../../accounting/payables/supplier_bills/manage.rst:72 msgid "Purchasing products or services" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:75 +#: ../../accounting/payables/supplier_bills/manage.rst:74 msgid "From the purchase application, you can create a purchase order with as many products as you need. If the vendor sends you a confirmation or quotation for an order, you may record the order reference number in the **Vendor Reference** field. This will enable you to easily match the PO with the the vendor bill later (as the vendor bill will probably include the Vendor Reference)" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:85 +#: ../../accounting/payables/supplier_bills/manage.rst:84 msgid "Validate the purchase order and receive the products from the Inventory application." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:89 +#: ../../accounting/payables/supplier_bills/manage.rst:88 msgid "Receiving Products" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:91 +#: ../../accounting/payables/supplier_bills/manage.rst:90 msgid "If you purchased any stockable products that you manage the inventory of, you will need to receive the products from the Inventory application after you confirm a purchase order. From the **Inventory dashboard**, you should see a button linking you directly to the transfer of products. This button is outlined in red below:" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:100 +#: ../../accounting/payables/supplier_bills/manage.rst:99 msgid "Navigating this route will take you to a list of all orders waiting to be received." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:106 +#: ../../accounting/payables/supplier_bills/manage.rst:105 msgid "If you have a lot of awaiting orders, apply a filter using the search bar in the upper right. With this search bar, you may filter based on the vendor (partner), the product, or the source document (also known as the reference of your purchase order). You can also group the orders by different criteria under **Group By**. Selecting an item from this list will open the following screen where you then will receive the products." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:117 +#: ../../accounting/payables/supplier_bills/manage.rst:116 msgid "Purchasing service products does not trigger a delivery order." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:120 +#: ../../accounting/payables/supplier_bills/manage.rst:119 msgid "Managing Vendor Bills" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:122 +#: ../../accounting/payables/supplier_bills/manage.rst:121 msgid "When you receive a vendor bill for a previous purchase, be sure to record it in the Purchases application under the **Control Menu**. You need to create a new vendor bill even if you already registered a purchase order." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:130 +#: ../../accounting/payables/supplier_bills/manage.rst:129 msgid "The first thing you will need to do upon creating a vendor bill is to select the appropriate vendor, since doing so will also pull up any associated accounting or pricelist information. From there, you can choose to specify one or multiple Purchase Orders to populate the Vendor Bill with. When you select a Purchase Order from the list, Odoo will pull any uninvoiced products associated to that Purchase Order and automatically populate that information below. If you are having a hard time finding the appropriate vendor bill, you may search through the list by inputting the vendor reference number or your internal purchase order number." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:144 +#: ../../accounting/payables/supplier_bills/manage.rst:143 msgid "While the invoice is in a draft state, you can make any modifications you need (i.e. remove or add product lines, modify quantities, and change prices)." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:150 +#: ../../accounting/payables/supplier_bills/manage.rst:148 msgid "Your vendor may send you several bills for the same Purchase Order if:" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:152 +#: ../../accounting/payables/supplier_bills/manage.rst:150 msgid "Your vendor is in back-order and is sending you invoices as they ship the products." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:153 +#: ../../accounting/payables/supplier_bills/manage.rst:151 msgid "Your vendor is sending you a partial bill or asking for a deposit." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:155 +#: ../../accounting/payables/supplier_bills/manage.rst:153 msgid "Every time you record a new vendor bill, Odoo will automatically populate the product quantities based on what has been received from the vendor. If this value is showing a zero, this means that you have not yet received this product and simply serves as a reminder that the product is not in hand and you may need to inquire further into this. At any point in time, before you validate the Vendor Bill, you may override this zero quantity." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:164 +#: ../../accounting/payables/supplier_bills/manage.rst:162 msgid "Vendor Bill Matching" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:167 +#: ../../accounting/payables/supplier_bills/manage.rst:165 msgid "What to do if your vendor bill does not match what you received" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:169 +#: ../../accounting/payables/supplier_bills/manage.rst:167 msgid "If the bill you receive from the vendor has quantities that do not match the quantities automatically populated by Odoo, this could be due to several reasons:" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:173 +#: ../../accounting/payables/supplier_bills/manage.rst:171 msgid "The vendor is incorrectly charging you for products and/or services that you have not ordered." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:176 +#: ../../accounting/payables/supplier_bills/manage.rst:174 msgid "The vendor is billing you for products that you might not have received yet, as the invoicing control may be based on ordered or received quantities." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:180 +#: ../../accounting/payables/supplier_bills/manage.rst:178 msgid "The vendor did not bill you for previously purchased products." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:182 +#: ../../accounting/payables/supplier_bills/manage.rst:180 msgid "In these instances it is recommended that you verify that the bill, and any associated purchase order to the vendor, are accurate and that you understand what you have ordered and what you have already received." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:186 +#: ../../accounting/payables/supplier_bills/manage.rst:184 msgid "If you are unable to find a purchase order related to a vendor bill, this could be due to one of a few reasons:" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:189 +#: ../../accounting/payables/supplier_bills/manage.rst:187 msgid "The vendor has already invoiced you for this purchase order; therefore it is not going to appear anywhere in the selection." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:192 +#: ../../accounting/payables/supplier_bills/manage.rst:190 msgid "Someone in the company forgot to record a purchase order for this vendor." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:195 +#: ../../accounting/payables/supplier_bills/manage.rst:193 msgid "The vendor is charging you for something you did not order." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:200 +#: ../../accounting/payables/supplier_bills/manage.rst:198 msgid "How product quantities are managed" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:202 +#: ../../accounting/payables/supplier_bills/manage.rst:200 msgid "By default, services are managed based on ordered quantities, while stockables and consumables are managed based on received quantities." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:205 +#: ../../accounting/payables/supplier_bills/manage.rst:203 msgid "If you need to manage products based on ordered quantities over received quantities, you will need to belong to the group **Purchase Manager**. Ask your system administrator to enable these access on :menuselection:`Settings --> Users --> Users --> Access Rights`. Once you belong to the correct group, select the product(s) you wish to modify, and you should see a new field appear, labeled **Control Purchase Bills**." msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:215 +#: ../../accounting/payables/supplier_bills/manage.rst:213 msgid "You can then change the default management method for the selected product to be based on either:" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:218 +#: ../../accounting/payables/supplier_bills/manage.rst:216 msgid "Ordered quantities" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:220 +#: ../../accounting/payables/supplier_bills/manage.rst:218 msgid "or Received quantities" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:223 +#: ../../accounting/payables/supplier_bills/manage.rst:221 msgid "Batch Billing" msgstr "" -#: ../../accounting/payables/supplier_bills/manage.rst:225 +#: ../../accounting/payables/supplier_bills/manage.rst:223 msgid "When creating a vendor bill and selecting the appropriate purchase order, you may continue to select additional purchase orders. Odoo will add the additional line items from the purchase orders you select. If you have not deleted the previous line items from the first purchase order, the bill will be linked to all the appropriate purchase orders." msgstr "" @@ -8561,46 +9070,34 @@ msgstr "" msgid "Deferred Revenues" msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:4 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "**Deferred revenues**, or **unearned revenue**, are payments made in advance by customers for products yet to deliver or services yet to render." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:7 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:8 msgid "Such payments are a **liability** for the company that receives them since it still owes its customers these products or services. The company cannot report them on the current **Profit and Loss statement**, or *Income Statement*, since the payments will be effectively earned in the future." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:11 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:12 msgid "These future revenues must be deferred on the company's balance sheet until the moment in time they can be **recognized**, at once or over a defined period, on the Profit and Loss statement." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:14 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:15 msgid "For example, let's say we sell a five-year extended warranty for $ 350. We already receive the money now but haven't earned it yet. Therefore, we post this new income in a deferred revenue account and decide to recognize it on a yearly basis. Each year, for the next 5 years, $ 70 will be recognized as revenue." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:19 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:20 msgid "Odoo Accounting handles deferred revenues by spreading them in multiple entries that are automatically created in *draft mode* and then posted periodically." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:23 -msgid "The server checks once a day if an entry must be posted. It might then take up to 24 hours before you see a change from *draft* to *posted*." -msgstr "" - -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:27 -msgid "Prerequisites" -msgstr "" - -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:29 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:30 msgid "Such transactions must be posted on a **Deferred Revenue Account** rather than on the default income account." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:33 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:34 msgid "Configure a Deferred Revenue Account" msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:35 -msgid "To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting --> Configuration --> Chart of Accounts`, click on *Create*, and fill out the form." -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:44 msgid "This account's type must be either *Current Liabilities* or *Non-current Liabilities*" msgstr "" @@ -8629,10 +9126,6 @@ msgstr "" msgid "It is possible to automate the creation of revenue entries for these products (see: `Automate the Deferred Revenues`_)." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:74 -msgid "Change the account of a posted journal item" -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:76 msgid "To do so, open your Sales Journal by going to :menuselection:`Accounting --> Accounting --> Sales`, select the journal item you want to modify, click on the account, and select the right one." msgstr "" @@ -8641,10 +9134,6 @@ msgstr "" msgid "Deferred Revenues entries" msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:88 -msgid "Create a new entry" -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:90 msgid "A **Deferred Revenues entry** automatically generates all journal entries in *draft mode*. They are then posted one by one at the right time until the full amount of the income is recognized." msgstr "" @@ -8661,10 +9150,6 @@ msgstr "" msgid "Once done, you can click on *Compute Revenue* (next to the *Confirm* button) to generate all the values of the **Revenue Board**. This board shows you all the entries that Odoo will post to recognize your revenue, and at which date." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:113 -msgid "What does \"Prorata Temporis\" mean?" -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:115 msgid "The **Prorata Temporis** feature is useful to recognize your revenue the most accurately possible." msgstr "" @@ -8689,10 +9174,6 @@ msgstr "" msgid "To do so, open your Sales Journal by going to :menuselection:`Accounting --> Accounting --> Sales`, and select the journal item you want to defer. Make sure that it is posted in the right account (see: `Change the account of a posted journal item`_)." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:134 -msgid "Then, click on *Action*, select **Create Deferred Entry**, and fill out the form the same way you would do to `create a new entry`_." -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:142 msgid "Deferred Revenue Models" msgstr "" @@ -8717,10 +9198,6 @@ msgstr "" msgid "When you create a new Deferred Revenue entry, fill out the **Deferred Revenue Account** with the right recognition account." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:160 -msgid "New buttons with all the models linked to that account appear at the top of the form. Clicking on a model button fills out the form according to that model." -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:168 msgid "Automate the Deferred Revenues" msgstr "" @@ -8733,10 +9210,6 @@ msgstr "" msgid "You have three choices for the **Automate Deferred Revenue** field:" msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:175 -msgid "**No:** this is the default value. Nothing happens." -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:176 msgid "**Create in draft:** whenever a transaction is posted on the account, a draft *Deferred Revenues entry* is created, but not validated. You must first fill out the form in :menuselection:`Accounting --> Accounting --> Deferred Revenues`." msgstr "" @@ -8749,10 +9222,6 @@ msgstr "" msgid "You can, for example, select this account as the default **Income Account** of a product to fully automate its sale completely. (see: `Choose a different Income Account for specific products`_)." msgstr "" -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:192 -msgid ":doc:`../../others/configuration/account_type`" -msgstr "" - #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:193 msgid "`Odoo Academy: Deferred Revenues (Recognition) `_" msgstr "" @@ -8813,11 +9282,6 @@ msgstr "" msgid "If you want to issue an invoice without an EPC QR Code, remove the IBAN indicated in the *Bank Account* field, under the *Other Info* tab of the invoice." msgstr "" -#: ../../accounting/receivables/customer_invoices/epc_qr_code.rst:64 -#: ../../accounting/receivables/customer_payments/batch_sdd.rst:121 -msgid ":doc:`../../bank/setup/create_bank_account`" -msgstr "" - #: ../../accounting/receivables/customer_invoices/epc_qr_code.rst:65 msgid "`Odoo Academy: QR Code on Invoices for European Customers `_" msgstr "" @@ -8845,88 +9309,88 @@ msgstr "" msgid "Pay the remaining balance within 30 days" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:15 -msgid "payment terms are not to be confused with a payment in several parts. If, for a specific order, you invoice the customer in two parts, that's not a payment term but an invoice policy." +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:14 +msgid "Payment terms are not to be confused with a payment in several parts. If, for a specific order, you invoice the customer in two parts, that's not a payment term but an invoice policy." msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:22 -msgid "Configure your usual installment plans from the application :menuselection:`Accounting --> Configuration > Payment Terms`." +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:21 +msgid "Configure your usual installment plans from the application :menuselection:`Accounting --> Configuration --> Payment Terms`." msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:25 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:24 msgid "A payment term may have one line (eg: 21 days) or several lines (10% within 3 days and the balance within 21 days). If you create a payment term with several lines, make sure the latest one is the balance. (avoid doing 50% in 10 days and 50% in 21 days because, with the rounding, it may not compute exactly 100%)" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:36 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:34 msgid "The description of the payment term will appear on the invoice or the sale order." msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:39 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:37 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:38 msgid "Payment terms for customers" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:41 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:39 msgid "You can set payment terms on:" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:43 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:41 msgid "**a customer**: the payment term automatically applies on new sales orders or invoices for this customer. Set payment terms on customers if you grant this payment term for all future orders for this customer." msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:48 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:46 msgid "**a quotation**: the payment term will apply on all invoices created from this quotation or sale order, but not on other quotations" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:51 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:49 msgid "**an invoice**: the payment term will apply on this invoice only" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:53 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:51 msgid "If an invoice contains a payment term, the journal entry related to the invoice is different. Without payment term, an invoice of $100 will produce the following journal entry (for the clarity of the example, we did not set any tax on the invoice):" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:59 -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:57 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:69 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:58 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:70 msgid "Due date" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:66 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:64 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:65 msgid "If you do an invoice the 1st of January with a payment term of 10% within 3 days and the balance within 30 days, you get the following journal entry:" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:73 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:72 msgid "Jan 03" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:73 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:71 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:72 msgid "10" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:75 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:73 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:74 msgid "Jan 30" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:75 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:73 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:74 msgid "90" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:80 -msgid "On the customer statement, you will see two lines with different due dates. To get the customer statement, use the menu Sales > Customers Statement." +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:78 +msgid "On the customer statement, you will see two lines with different du dates. To get the customer statement, use the menu :menuselection:`Sales --> Customers Statement`." msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:82 msgid ":doc:`overview`" msgstr "" -#: ../../accounting/receivables/customer_invoices/installment_plans.rst:87 +#: ../../accounting/receivables/customer_invoices/installment_plans.rst:83 msgid ":doc:`payment_terms`" msgstr "" @@ -8974,62 +9438,78 @@ msgstr "" msgid "This process is good for both services and physical products." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:47 +#: ../../accounting/receivables/customer_invoices/overview.rst:45 +msgid ":doc:`../../../sales/invoicing/proforma`" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/overview.rst:48 msgid "Sales Order ‣ Delivery Order ‣ Invoice" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:49 +#: ../../accounting/receivables/customer_invoices/overview.rst:50 msgid "Retailers and eCommerce usually invoice based on delivery orders, instead of sales order. This approach is suitable for businesses where the quantities you deliver may differs from the ordered quantities: foods (invoice based on actual Kg)." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:54 +#: ../../accounting/receivables/customer_invoices/overview.rst:55 msgid "This way, if you deliver a partial order, you only invoice for what you really delivered. If you do back orders (deliver partially and the rest later), the customer will receive two invoices, one for each delivery order." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:62 -msgid "eCommerce Order ‣ Invoice" +#: ../../accounting/receivables/customer_invoices/overview.rst:61 +msgid ":doc:`../../../sales/invoicing/invoicing_policy`" msgstr "" #: ../../accounting/receivables/customer_invoices/overview.rst:64 +msgid "eCommerce Order ‣ Invoice" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/overview.rst:66 msgid "An eCommerce order will also trigger the creation of the order when it is fully paid. If you allow paying orders by check or wire transfer, Odoo only creates an order and the invoice will be triggered once the payment is received." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:70 +#: ../../accounting/receivables/customer_invoices/overview.rst:72 msgid "Contracts" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:73 +#: ../../accounting/receivables/customer_invoices/overview.rst:75 msgid "Regular Contracts ‣ Invoices" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:75 +#: ../../accounting/receivables/customer_invoices/overview.rst:77 msgid "If you use contracts, you can trigger invoice based on time and material spent, expenses or fixed lines of services/products. Every month, the salesperson will trigger invoice based on activities on the contract." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:79 +#: ../../accounting/receivables/customer_invoices/overview.rst:81 msgid "Activities can be:" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:81 +#: ../../accounting/receivables/customer_invoices/overview.rst:83 msgid "fixed products/services, coming from a sale order linked to this contract" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:83 -msgid "materials purchased (that you will re-invoiced)" +#: ../../accounting/receivables/customer_invoices/overview.rst:84 +msgid "materials purchased (that you will re-invoice)" msgstr "" #: ../../accounting/receivables/customer_invoices/overview.rst:85 msgid "time and material based on timesheets or purchases (subcontracting)" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:87 +#: ../../accounting/receivables/customer_invoices/overview.rst:86 msgid "expenses like travel and accommodation that you re-invoice to the customer" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:89 +#: ../../accounting/receivables/customer_invoices/overview.rst:88 msgid "You can invoice at the end of the contract or trigger intermediate invoices. This approach is used by services companies that invoice mostly based on time and material. For services companies that invoice on fix price, they use a regular sales order." msgstr "" +#: ../../accounting/receivables/customer_invoices/overview.rst:94 +msgid ":doc:`../../../sales/invoicing/time_materials`" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/overview.rst:96 +msgid ":doc:`../../../sales/invoicing/milestone`" +msgstr "" + #: ../../accounting/receivables/customer_invoices/overview.rst:99 msgid "Recurring Contracts ‣ Invoices" msgstr "" @@ -9038,47 +9518,51 @@ msgstr "" msgid "For subscriptions, an invoice is triggered periodically, automatically. The frequency of the invoicing and the services/products invoiced are defined on the contract." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:111 +#: ../../accounting/receivables/customer_invoices/overview.rst:106 +msgid ":doc:`../../../sales/invoicing/subscriptions`" +msgstr "" + +#: ../../accounting/receivables/customer_invoices/overview.rst:112 msgid "Creating an invoice manually" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:113 +#: ../../accounting/receivables/customer_invoices/overview.rst:114 msgid "Users can also create invoices manually without using contracts or a sales order. It's a recommended approach if you do not need to manage the sales process (quotations), or the delivery of the products or services." msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:118 +#: ../../accounting/receivables/customer_invoices/overview.rst:119 msgid "Even if you generate the invoice from a sales order, you may need to create invoices manually in exceptional use cases:" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:121 +#: ../../accounting/receivables/customer_invoices/overview.rst:122 msgid "if you need to create a refund" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:123 +#: ../../accounting/receivables/customer_invoices/overview.rst:124 msgid "If you need to give a discount" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:125 +#: ../../accounting/receivables/customer_invoices/overview.rst:126 msgid "if you need to change an invoice created from a sales order" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:127 +#: ../../accounting/receivables/customer_invoices/overview.rst:128 msgid "if you need to invoice something not related to your core business" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:130 +#: ../../accounting/receivables/customer_invoices/overview.rst:131 msgid "Specific modules" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:132 +#: ../../accounting/receivables/customer_invoices/overview.rst:133 msgid "Some specific modules are also able to generate draft invoices:" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:134 +#: ../../accounting/receivables/customer_invoices/overview.rst:135 msgid "**membership**: invoice your members every year" msgstr "" -#: ../../accounting/receivables/customer_invoices/overview.rst:136 +#: ../../accounting/receivables/customer_invoices/overview.rst:137 msgid "**repairs**: invoice your after-sale services" msgstr "" @@ -9168,7 +9652,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/batch_sdd.rst:0 #: ../../accounting/receivables/customer_payments/batch_sdd.rst:123 -msgid "`List of all SEPA countries. `_" +msgid "`List of all SEPA countries `_." msgstr "" #: ../../accounting/receivables/customer_payments/batch_sdd.rst:19 @@ -9344,7 +9828,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:131 #: ../../accounting/receivables/customer_payments/credit_cards.rst:77 #: ../../accounting/receivables/customer_payments/credit_cards.rst:91 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:141 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:140 msgid "Statement Match" msgstr "" @@ -9358,8 +9842,8 @@ msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:81 #: ../../accounting/receivables/customer_payments/credit_cards.rst:93 #: ../../accounting/receivables/customer_payments/credit_cards.rst:95 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:143 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:145 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:142 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:144 msgid "100.00" msgstr "" @@ -9380,7 +9864,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:83 #: ../../accounting/receivables/customer_payments/check.rst:133 #: ../../accounting/receivables/customer_payments/credit_cards.rst:93 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:143 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:142 msgid "X" msgstr "" @@ -9393,7 +9877,7 @@ msgid "Both methods will produce the same data in your accounting at the end of msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:100 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:110 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:109 msgid "Option 2: One journal entry only" msgstr "" @@ -9414,7 +9898,7 @@ msgid "Once you will receive the bank statements, you will do the matching with msgstr "" #: ../../accounting/receivables/customer_payments/check.rst:127 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:137 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:136 msgid "With this approach, you will get the following journal entry in your books:" msgstr "" @@ -9479,7 +9963,7 @@ msgid "The account type should be \"Credit Card\". Once it's done, don't forget msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:57 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:119 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:118 msgid "From credit card payments to bank statements" msgstr "" @@ -9488,7 +9972,7 @@ msgid "The first way to handle credit cards is to create a credit card journal. msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:63 -#: ../../accounting/receivables/customer_payments/credit_cards.rst:121 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:120 msgid "Once you receive a customer credit card payment, go to the related invoice and click on Register Payment. Fill in the information about the payment:" msgstr "" @@ -9520,45 +10004,45 @@ msgstr "" msgid "If you use this approach to manage credit cards payments, you get the list of credit cards payments that have not been cashed in the \"Credit card\" account (accessible, for example, from the general ledger)." msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:104 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:103 msgid "Both methods will produce the same data in your accounting at the end of the process. But, if you have credit cards that have not been cashed, this one is cleaner because those credit cards have not been reported yet on your bank account." msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:115 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:114 msgid "There is nothing to configure if you plan to manage your credit cards using this method." msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:125 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:124 msgid "**Payment method**: the bank that will be used for the deposit" msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:127 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:126 msgid "**Memo**: write the credit card transaction number" msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:132 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:131 msgid "The invoice is marked as paid as soon as the credit card payment has been recorded. Once you receive the bank statements, you will do the matching with the statement and this actual payment (technically: point this payment and relate it to the statement line)." msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:150 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:148 msgid "You may also record the payment directly without going on the customer invoice, using the top menu :menuselection:`Sales --> Payments`. This method may be more convenient if you have a lot of credit cards to record in a batch but you will have to reconcile entries afterwards (matching payments with invoices)." msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:155 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:153 msgid "If you use this approach to manage received credit cards, you can use the report \"Bank Reconciliation Report\" to verify which credit cards have been received or paid by the bank (this report is available from the \"More\" option from the Accounting dashboard on the related bank account)." msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:166 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:164 msgid ":doc:`recording`" msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:167 -#: ../../accounting/receivables/customer_payments/recording.rst:128 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:165 +#: ../../accounting/receivables/customer_payments/recording.rst:125 msgid ":doc:`../../bank/feeds/paypal`" msgstr "" -#: ../../accounting/receivables/customer_payments/credit_cards.rst:169 -#: ../../accounting/receivables/customer_payments/recording.rst:130 +#: ../../accounting/receivables/customer_payments/credit_cards.rst:167 +#: ../../accounting/receivables/customer_payments/recording.rst:127 msgid ":doc:`followup`" msgstr "" @@ -9646,79 +10130,79 @@ msgstr "" msgid "The green icon near the payment line will display more information about the payment. From there you can choose to open the journal entry or reconcile the payment." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:33 +#: ../../accounting/receivables/customer_payments/recording.rst:32 msgid "If you unreconcile a payment, it is still registered in your books but not linked to the specific invoice any longer. If you unreconcile a payment in a different currency, Odoo will create a journal entry to reverse the Currency Exchange Loss/Gain posted at the time of reconciliation." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:39 +#: ../../accounting/receivables/customer_payments/recording.rst:38 msgid "Payments not tied to an invoice" msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:42 +#: ../../accounting/receivables/customer_payments/recording.rst:41 msgid "Registering a payment" msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:44 +#: ../../accounting/receivables/customer_payments/recording.rst:43 msgid "In the Accounting application, you can create a new payment from the Sales menu (register a customer payment) or the Purchases menu (pay a vendor). If you use these menus, the payment is not linked to an invoice, but can easily be reconciled on an invoice later on." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:52 +#: ../../accounting/receivables/customer_payments/recording.rst:51 msgid "When registering a new payment, you must select a customer or vendor, the payment method, and the amount of the payment. The currency of the transaction is defined by the payment method. If the payment refers to a document (sale order, purchase order or invoice), set the reference of this document in the memo field." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:58 +#: ../../accounting/receivables/customer_payments/recording.rst:57 msgid "Once confirmed, a journal entry will be posted reflecting the transaction just made in the accounting application." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:62 +#: ../../accounting/receivables/customer_payments/recording.rst:61 msgid "Reconciling invoice payments" msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:64 +#: ../../accounting/receivables/customer_payments/recording.rst:63 msgid "The easiest way of reconciling a payment with an invoice is to do so on the invoice directly." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:67 +#: ../../accounting/receivables/customer_payments/recording.rst:66 msgid "When validating a new invoice, Odoo will warn you that an outstanding payment for this customer or vendor is available. In this case, you can reconcile this payment to the invoice near the totals at the bottom, under \"Outstanding Payments\"." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:76 +#: ../../accounting/receivables/customer_payments/recording.rst:75 msgid "Reconciling all your outstanding payments and invoices" msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:78 +#: ../../accounting/receivables/customer_payments/recording.rst:77 msgid "If you want to reconcile all outstanding payments and invoices at once (instead of doing so one by one), you can use the batch reconciliation feature within Odoo." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:82 +#: ../../accounting/receivables/customer_payments/recording.rst:81 msgid "The batch reconciliation feature is available from the dashboard on the Customer Invoices card and the Vendor Bills card for reconciling Accounts Receivable and Payable, respectively." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:89 +#: ../../accounting/receivables/customer_payments/recording.rst:88 msgid "The payments matching tool will open all unreconciled customers or vendors and will give you the opportunity to process them all one by one, doing the matching of all their payments and invoices at once." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:96 +#: ../../accounting/receivables/customer_payments/recording.rst:95 msgid "During the reconciliation, if the sum of the debits and credits do not match, it means there is still a remaining balance that either needs to be reconciled at a later date, or needs to be written off directly." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:101 +#: ../../accounting/receivables/customer_payments/recording.rst:100 msgid "Transferring money from one bank account to another" msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:103 +#: ../../accounting/receivables/customer_payments/recording.rst:102 msgid "Just like making a customer or vendor payment, you transfer cash internally between your bank accounts from the dashboard or from the menus up top." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:110 +#: ../../accounting/receivables/customer_payments/recording.rst:109 msgid "This will take you to the same screen you have for receiving and making payments." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:118 +#: ../../accounting/receivables/customer_payments/recording.rst:116 msgid "When making an internal transfer from one bank account to another, select the bank you want to apply the transfer from in the dashboard, and in the register payments screen, you select the transfer to account. Do not go through this process again in the other bank account or else you will end up with two journal entries for the same transaction." msgstr "" -#: ../../accounting/receivables/customer_payments/recording.rst:127 +#: ../../accounting/receivables/customer_payments/recording.rst:124 msgid ":doc:`credit_cards`" msgstr "" diff --git a/locale/sources/crm.pot b/locale/sources/crm.pot index 54c065ef0..e8932edc4 100644 --- a/locale/sources/crm.pot +++ b/locale/sources/crm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-22 08:57+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,10 +85,6 @@ msgstr "" msgid "Here’s how, from the list view. Select the opportunities or leads you want to merge and the action button will appear. Then, you can select merge." msgstr "" -#: ../../crm/acquire_leads/convert.rst:66 -msgid "..note::" -msgstr "" - #: ../../crm/acquire_leads/convert.rst:67 msgid "It is also possible to merge more than 2 opportunities or leads." msgstr "" @@ -215,19 +211,19 @@ msgid "Pricing" msgstr "" #: ../../crm/acquire_leads/lead_mining.rst:51 -msgid "This is an In-App Purchase feature, each generated lead will cost you one credit. If you choose to get contact information each contact will also cost us one additional credit. Here is the pricing for this `feature `__, To buy credits you can either go to CRM > Configuration > Settings > Buy Credits; or go to Settings > In-App Purchases>View my Services" +msgid "This is an In-App Purchase feature, each generated lead will cost you one credit. If you choose to get contact information each contact will also cost us one additional credit. Here is the pricing for this `feature `__, To buy credits you can either go to :menuselection:`CRM --> Configuration --> Settings --> Buy Credits`; or go to `Settings --> In-App Purchases --> View my Services`." msgstr "" -#: ../../crm/acquire_leads/lead_mining.rst:64 +#: ../../crm/acquire_leads/lead_mining.rst:65 msgid "The blue box will automatically tell you how many credits are going to be consumed." msgstr "" -#: ../../crm/acquire_leads/lead_mining.rst:67 +#: ../../crm/acquire_leads/lead_mining.rst:68 msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature." msgstr "" -#: ../../crm/acquire_leads/lead_mining.rst:69 -msgid "More information about `In-App Purchases `__, (IAP)." +#: ../../crm/acquire_leads/lead_mining.rst:71 +msgid ":doc:`In-App Purchases (IAP) <../../general/in_app_purchase/in_app_purchase>`" msgstr "" #: ../../crm/acquire_leads/send_quotes.rst:3 @@ -622,12 +618,28 @@ msgstr "" msgid "In Odoo, the configuration should be done in the user's preferences." msgstr "" -#: ../../crm/optimize/setup.rst:206 -msgid "The SIP Login/Browser's Extension is the number you configured previously in the sip.conf file. In our example, 1060. The SIP Password is the secret you chose in the sip.conf file. The extension of your office's phone is not a required field but it is used if you want to transfer your call from Odoo to an external phone also configured in the sip.conf file." +#: ../../crm/optimize/setup.rst:210 +msgid "The SIP Login/Browser's Extension is the number you configured previously in the sip.conf file (in our example: 1060)." msgstr "" #: ../../crm/optimize/setup.rst:212 -msgid "The configuration should also be done in the sale settings under the title \"PBX Configuration\". You need to put the IP you define in the http.conf file and the WebSocket should be: ws://127.0.0.1:8088/ws. The part \"127.0.0.1\" needs to be the same as the IP defined previously and the \"8088\" is the port you defined in the http.conf file." +msgid "The SIP Password is the secret you chose in the sip.conf file." +msgstr "" + +#: ../../crm/optimize/setup.rst:214 +msgid "The extension of your office's phone is not a required field but it is used if you want to transfer your call from Odoo to an external phone also configured in the sip.conf file." +msgstr "" + +#: ../../crm/optimize/setup.rst:217 +msgid "The configuration should also be done in the General Settings under the \"Integrations\" section." +msgstr "" + +#: ../../crm/optimize/setup.rst:222 +msgid "The PBX Server IP should be the same as the IP you define in the http.conf file." +msgstr "" + +#: ../../crm/optimize/setup.rst:224 +msgid "The WebSocket should be: ws://localhost:XXXX/ws where \"localhost\" needs to be the same as the IP defined previously and \"XXXX\" needs to be the port defined in the http.conf file." msgstr "" #: ../../crm/performance.rst:3 diff --git a/locale/sources/db_management.pot b/locale/sources/db_management.pot index a51479d03..f1798ad51 100644 --- a/locale/sources/db_management.pot +++ b/locale/sources/db_management.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -160,7 +160,7 @@ msgstr "" msgid "Once you are ready and you have validated all your tests, you can click again on the Upgrade button and confirm by clicking on Upgrade (the button with the little rocket!) to switch your production database to the new version. Your database will then be taken offline within the next 10 minutes and will be upgraded automatically; you receive a confirmation e-mail once the process is completed." msgstr "" -#: ../../db_management/db_online.rst:139 +#: ../../db_management/db_online.rst:140 msgid "Your database will be taken offline during the upgrade (usually between 30min up to several hours for big databases), so make sure to plan your migration during non-business hours." msgstr "" @@ -204,51 +204,51 @@ msgstr "" msgid "After a few seconds, you will be logged in your duplicated database. Notice that the url uses the name you chose for your duplicated database." msgstr "" -#: ../../db_management/db_online.rst:179 +#: ../../db_management/db_online.rst:180 msgid "Duplicate databases expire automatically after 15 days." msgstr "" -#: ../../db_management/db_online.rst:187 +#: ../../db_management/db_online.rst:188 msgid "Rename a Database" msgstr "" -#: ../../db_management/db_online.rst:189 +#: ../../db_management/db_online.rst:190 msgid "To rename your database, make sure you are connected to the database you want to rename, access the `database management page `__ and click **Rename**. You will have to give a new name to your database, then click **Rename Database**." msgstr "" -#: ../../db_management/db_online.rst:200 +#: ../../db_management/db_online.rst:201 msgid "Deleting a Database" msgstr "" -#: ../../db_management/db_online.rst:202 +#: ../../db_management/db_online.rst:203 msgid "You can only delete databases of which you are the administrator." msgstr "" -#: ../../db_management/db_online.rst:204 +#: ../../db_management/db_online.rst:205 msgid "When you delete your database all the data will be permanently lost. The deletion is instant and for all the Users. We advise you to do an instant backup of your database before deleting it, since the last automated daily backup may be several hours old at that point." msgstr "" -#: ../../db_management/db_online.rst:210 +#: ../../db_management/db_online.rst:211 msgid "From the `database management page `__, on the line of the database you want to delete, click on the \"Delete\" button." msgstr "" -#: ../../db_management/db_online.rst:217 +#: ../../db_management/db_online.rst:218 msgid "Read carefully the warning message that will appear and proceed only if you fully understand the implications of deleting a database:" msgstr "" -#: ../../db_management/db_online.rst:223 +#: ../../db_management/db_online.rst:224 msgid "After a few seconds, the database will be deleted and the page will reload automatically." msgstr "" -#: ../../db_management/db_online.rst:227 +#: ../../db_management/db_online.rst:228 msgid "If you need to re-use this database name, it will be immediately available." msgstr "" -#: ../../db_management/db_online.rst:229 +#: ../../db_management/db_online.rst:230 msgid "It is not possible to delete a database if it is expired or linked to a Subscription. In these cases contact `Odoo Support `__" msgstr "" -#: ../../db_management/db_online.rst:233 +#: ../../db_management/db_online.rst:234 msgid "If you want to delete your Account, please contact `Odoo Support `__" msgstr "" @@ -274,7 +274,7 @@ msgstr "" #: ../../db_management/db_premise.rst:31 #: ../../db_management/db_premise.rst:110 -#: ../../db_management/db_premise.rst:143 +#: ../../db_management/db_premise.rst:138 msgid "Solutions" msgstr "" @@ -307,7 +307,7 @@ msgid "Do you have the updated version of Odoo 9?" msgstr "" #: ../../db_management/db_premise.rst:61 -#: ../../db_management/db_premise.rst:176 +#: ../../db_management/db_premise.rst:171 msgid "From July 2016 onward, Odoo 9 now automatically change the uuid of a duplicated database; a manual operation is no longer required." msgstr "" @@ -359,60 +359,56 @@ msgstr "" msgid "**Add more users** on your subscription: follow the link and Validate the upsell quotation and pay for the extra users." msgstr "" -#: ../../db_management/db_premise.rst:115 -msgid "or" +#: ../../db_management/db_premise.rst:114 +msgid "**Deactivate users** as explained in this `documentation `_ and **Reject** the upsell quotation." msgstr "" #: ../../db_management/db_premise.rst:117 -msgid "**Deactivate users** as explained in this `Documentation `__ and **Reject** the upsell quotation." -msgstr "" - -#: ../../db_management/db_premise.rst:122 msgid "Once your database has the correct number of users, the expiration message will disappear automatically after a few days, when the next verification occurs. We understand that it can be a bit frightening to see the countdown, so you can :ref:`force an Update Notification ` to make the message disappear right away." msgstr "" -#: ../../db_management/db_premise.rst:129 +#: ../../db_management/db_premise.rst:124 msgid "Database expired error message" msgstr "" -#: ../../db_management/db_premise.rst:131 +#: ../../db_management/db_premise.rst:126 msgid "If your database reaches its expiration date before your renew your subscription, you will encounter this message:" msgstr "" -#: ../../db_management/db_premise.rst:139 +#: ../../db_management/db_premise.rst:134 msgid "This **blocking** message appears after a non-blocking message that lasts 30 days. If you fail to take action before the end of the countdown, the database is expired." msgstr "" -#: ../../db_management/db_premise.rst:147 +#: ../../db_management/db_premise.rst:142 msgid "Renew your subscription: follow the link and renew your subscription - note that" msgstr "" -#: ../../db_management/db_premise.rst:146 +#: ../../db_management/db_premise.rst:141 msgid "if you wish to pay by Wire Transfer, your subscription will effectively be renewed only when the payment arrives, which can take a few days. Credit card payments are processed immediately." msgstr "" -#: ../../db_management/db_premise.rst:149 +#: ../../db_management/db_premise.rst:144 msgid "Contact our `Support `__" msgstr "" -#: ../../db_management/db_premise.rst:151 +#: ../../db_management/db_premise.rst:146 msgid "None of those solutions worked for you? Please contact our `Support `__" msgstr "" -#: ../../db_management/db_premise.rst:160 +#: ../../db_management/db_premise.rst:155 msgid "Duplicate a database" msgstr "" -#: ../../db_management/db_premise.rst:162 +#: ../../db_management/db_premise.rst:157 msgid "You can duplicate your database by accessing the database manager on your server (/web/database/manager). In this page, you can easily duplicate your database (among other things)." msgstr "" -#: ../../db_management/db_premise.rst:170 +#: ../../db_management/db_premise.rst:165 msgid "When you duplicate a local database, it is **strongly** advised to change the duplicated database's uuid (Unniversally Unique Identifier), since this uuid is how your database identifies itself with our servers. Having two databases with the same uuid could result in invoicing problems or registration problems down the line." msgstr "" -#: ../../db_management/db_premise.rst:179 -msgid "The database uuid is currently accessible from the menu **Settings > Technical > System Parameters**, we advise you to use a `uuid generator `__ or to use the unix command ``uuidgen`` to generate a new uuid. You can then simply replace it like any other record by clicking on it and using the edit button." +#: ../../db_management/db_premise.rst:174 +msgid "The database uuid is currently accessible from the menu :menuselection:`Settings --> Technical --> System Parameters`, we advise you to use a `uuid generator `_ or to use the unix command ``uuidgen`` to generate a new uuid. You can then simply replace it like any other record by clicking on it and using the edit button." msgstr "" #: ../../db_management/documentation.rst:7 diff --git a/locale/sources/ecommerce.pot b/locale/sources/ecommerce.pot index 10d308567..806b18ed9 100644 --- a/locale/sources/ecommerce.pot +++ b/locale/sources/ecommerce.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-07 17:13+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -618,11 +618,13 @@ msgid "To perform ficticious transactions you can use fake card numbers provided msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:76 +#: ../../ecommerce/shopper_experience/paypal.rst:206 msgid ":doc:`payment`" msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:77 #: ../../ecommerce/shopper_experience/payment.rst:111 +#: ../../ecommerce/shopper_experience/paypal.rst:207 msgid ":doc:`payment_acquirer`" msgstr "" @@ -756,7 +758,7 @@ msgid "Odoo can also be used for more advanced payment processes like installmen msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:102 -msgid "Such a customization service is made on-demand by our technical experts based on your own requirements. A business advisor can reach you out for such matter. `Contact us. `__" +msgid "Such a customization service is made on-demand by our technical experts based on your own requirements. A business advisor can reach you out for such matter. `Contact us `_." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:109 @@ -819,23 +821,23 @@ msgstr "" msgid "When the order is confirmed you can also have an invoice automatically issued and paid. This fully-automated made for businesses that invoice orders straight on." msgstr "" -#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53 -msgid "If you choose this mode you are requested to select a payment journal in order to record payments in your books. This payment is automatically reconcilied with the invoice, marking it as paid. Select your **bank account** if you get paid immediately on your bank account. If you don't you can create a specific journal for the payment acquirer (type = Bank). That way, you can track online payments in an intermediary account of your books until you get paid into your bank account (see `How to register credit card payments <../../accounting/receivables/customer_payments/credit_cards.html>`__)." +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:54 +msgid "If you choose this mode you are requested to select a payment journal in order to record payments in your books. This payment is automatically reconcilied with the invoice, marking it as paid. Select your **bank account** if you get paid immediately on your bank account. If you don't you can create a specific journal for the payment acquirer (type = Bank). That way, you can track online payments in an intermediary account of your books until you get paid into your bank account (see :doc:`../../accounting/receivables/customer_payments/credit_cards`)." msgstr "" -#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64 +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:63 msgid "Capture the payment after the delivery" msgstr "" -#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65 +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64 msgid "With this mode, the order is confirmed but the amount is kept on hold. Once the delivery processed, you can capture the payment from Odoo. This mode is only available with Authorize.net." msgstr "" -#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72 +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:71 msgid "To capture the payment, open the transaction from the order. Then click *Capture Transaction*." msgstr "" -#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78 +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:77 msgid "With other payment acquirers, you can manage the capture in their own interfaces, not from Odoo." msgstr "" @@ -852,213 +854,201 @@ msgid "Paypal account" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:14 -msgid "A business account is needed to get paid with Paypal. Create a `Paypayl Business Account `__ or upgrade your Personal account to a Business account. Go to the Paypal settings and click on *Upgrade to a Business account*. Then follow the few configuration steps." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:18 -msgid "Settings in Paypal" -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:21 -msgid "First, let’s see how to set up your Paypal account in order to build a seamless customer experience with Odoo." +msgid "A business account is needed to get paid with Paypal. Create a `Paypal Business Account `_ or upgrade your Personal account to a Business account. Go to the Paypal settings and click on *Upgrade to a Business account*. Then follow the few configuration steps." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:23 -msgid "Log in and open the settings. Go to *Products & Services > Website payments* and click *Update* on *Website preferences*." +msgid "Settings in Paypal" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:29 +#: ../../ecommerce/shopper_experience/paypal.rst:26 +msgid "First, let’s see how to set up your Paypal account in order to build a seamless customer experience with Odoo." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:28 +msgid "Log in and open the settings. Go to :menuselection:`Products & Services --> Website payments` and click **Update** on **Website preferences**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:34 msgid "Auto Return" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:31 -msgid "*Auto Return* automatically redirects your customers to Odoo once the payment is processed. Check *Auto Return* and enter your domain name \"/shop/confirmation\" as *Return URL* (e.g. https://yourcompany.odoo.com/shop/confirmation)." +#: ../../ecommerce/shopper_experience/paypal.rst:36 +msgid "*Auto Return* automatically redirects your customers to Odoo once the payment is processed. Check *Auto Return* and enter your domain name with the suffix ``/shop/confirmation`` as *Return URL* (e.g. ``https://yourcompany.odoo.com/shop/confirmation``)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:36 +#: ../../ecommerce/shopper_experience/paypal.rst:41 msgid "This URL is requested in Paypal but not used in practice as Odoo transmits it at each transaction. Don’t worry if you manage several sales channels or Odoo databases." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:44 +#: ../../ecommerce/shopper_experience/paypal.rst:49 msgid "Payment Data Transfer (PDT)" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:46 +#: ../../ecommerce/shopper_experience/paypal.rst:51 msgid "*Payment Data Transfer* delivers the payment confirmation to Odoo as soon as it is processed. Without it, Odoo cannot end the sales flow. This setting must be activated as well. When saving, an *Identity Token* is generated. You will be later requested to enter it in Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:54 +#: ../../ecommerce/shopper_experience/paypal.rst:59 msgid "Paypal Account Optional" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:56 +#: ../../ecommerce/shopper_experience/paypal.rst:61 msgid "We advise you to not prompt customers to log in with a Paypal account when they get to pay. Let them pay with debit/credit cards as well, or you might lose some deals. Make sure this setting is turned on." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:63 +#: ../../ecommerce/shopper_experience/paypal.rst:68 msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:65 +#: ../../ecommerce/shopper_experience/paypal.rst:70 msgid "PDT sends order confirmations once and only once. As a result, your site must be running when it happens; otherwise, it will never receive the message. That’s why we advise to activate the *Instant Payment Notification* (IPN) on top. With IPN, delivery of order confirmations is virtually guaranteed since IPN resends a confirmation until your site acknowledges receipt." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:72 +#: ../../ecommerce/shopper_experience/paypal.rst:77 msgid "To activate IPN, get back to *Website payments* menu and click *Update* in *Instant Payment Notification*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:75 -msgid "The *Notification URL* to set is your domain name + “payment/paypal/ipn” (e.g. https://yourcompany.odoo.com/payment/paypal/ipn)." +#: ../../ecommerce/shopper_experience/paypal.rst:79 +msgid "The *Notification URL* to set is your domain name + “payment/paypal/ipn” (e.g. ``https://yourcompany.odoo.com/payment/paypal/ipn``)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:81 +#: ../../ecommerce/shopper_experience/paypal.rst:85 msgid "Payment Messages Format" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:83 +#: ../../ecommerce/shopper_experience/paypal.rst:87 msgid "If you use accented characters (or anything else than basic Latin characters) for your customer names, addresses... you MUST configure the encoding format of the payment request sent by Odoo to Paypal." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:89 +#: ../../ecommerce/shopper_experience/paypal.rst:93 msgid "If you don't configure this setting, some transactions fail without notice." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:91 +#: ../../ecommerce/shopper_experience/paypal.rst:95 msgid "To do so, open:" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:93 +#: ../../ecommerce/shopper_experience/paypal.rst:97 msgid "`this page for a test account `__" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:95 +#: ../../ecommerce/shopper_experience/paypal.rst:99 msgid "`this page for a production account `__" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:97 +#: ../../ecommerce/shopper_experience/paypal.rst:101 msgid "Then, click *More Options* and set the two default encoding formats as **UTF-8**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:105 +#: ../../ecommerce/shopper_experience/paypal.rst:109 msgid "Your Paypal account is ready!" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:107 -msgid "If you want your customers to pay without creating a Paypal account, **Paypal Account Optional** needs to be turned on." +#: ../../ecommerce/shopper_experience/paypal.rst:112 +msgid "If you want your customers to pay without creating a Paypal account, *Paypal Account Optional* needs to be turned on." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:113 -msgid "For Encrypted Website Payments & EWP_SETTINGS error, please check the `paypal documentation. `__" +#: ../../ecommerce/shopper_experience/paypal.rst:118 +msgid "For Encrypted Website Payments & EWP_SETTINGS error, please check the `Paypal documentation `_." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:117 +#: ../../ecommerce/shopper_experience/paypal.rst:124 msgid "Settings in Odoo" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:120 +#: ../../ecommerce/shopper_experience/paypal.rst:127 msgid "Activation" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:122 +#: ../../ecommerce/shopper_experience/paypal.rst:129 msgid "Activate *Paypal* from the config bar of Sales, Invoicing and eCommerce apps, or from the configuration menu of *Payment Acquirers*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:126 +#: ../../ecommerce/shopper_experience/paypal.rst:133 msgid "Credentials" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:128 +#: ../../ecommerce/shopper_experience/paypal.rst:135 msgid "Odoo requires three Paypal credentials:" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:130 +#: ../../ecommerce/shopper_experience/paypal.rst:137 msgid "*Email ID* is your login email address in Paypal." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:132 -msgid "*Merchant ID* can be found in the settings of your Paypal account, in *Profile > About the business*." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:134 -msgid "*Paypal PDT Token* is given in *Website payments* configuration as explained here above." +#: ../../ecommerce/shopper_experience/paypal.rst:138 +msgid "*Merchant ID* can be found in the settings of your Paypal account, in :menuselection:`Profile --> About the business`." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:140 +msgid "*Paypal PDT Token* is given in *Website payments* configuration as explained here above." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:146 msgid "Transaction fees" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:142 +#: ../../ecommerce/shopper_experience/paypal.rst:148 msgid "You can charge extra fees to your customers for paying with Paypal; This to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees an extra applied to the order amount." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:145 +#: ../../ecommerce/shopper_experience/paypal.rst:151 msgid "To activate this, go to the Configuration tab of Paypal configuration in Odoo and check *Add Extra Fees*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:151 +#: ../../ecommerce/shopper_experience/paypal.rst:157 msgid "You can refer to `Paypal Fees `__ to set up fees." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:154 -msgid "..note:: `Traders in the EU `__ are not allowed to charge extra fees for paying with credit cards." +#: ../../ecommerce/shopper_experience/paypal.rst:161 +msgid "`Traders in the EU `_ are not allowed to charge extra fees for paying with credit cards." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:158 +#: ../../ecommerce/shopper_experience/paypal.rst:165 msgid "Go live!" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:160 +#: ../../ecommerce/shopper_experience/paypal.rst:167 msgid "Your configuration is ready to roll. Make sure *Production* mode is on. Then publish the payment method by clicking the *Published* button right next to it." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:169 +#: ../../ecommerce/shopper_experience/paypal.rst:176 msgid "Paypal is now available in your payment form available in eCommerce, Sales and Invoicing apps. Customers are redirected to Paypal website when hitting *Pay Now*. They get back to a confirmation page in Odoo once the payment is processed." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:178 +#: ../../ecommerce/shopper_experience/paypal.rst:185 msgid "Test environment" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:180 +#: ../../ecommerce/shopper_experience/paypal.rst:187 msgid "You can test the entire payment flow in Odoo thanks to Paypal Sandbox accounts." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:182 +#: ../../ecommerce/shopper_experience/paypal.rst:189 msgid "Log in to `Paypal Developer Site `__ with your Paypal credentials." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:184 +#: ../../ecommerce/shopper_experience/paypal.rst:191 msgid "This will create two sandbox accounts:" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:186 +#: ../../ecommerce/shopper_experience/paypal.rst:193 msgid "A business account (to use as merchant, e.g. `pp.merch01-facilitator@example.com `__)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:188 +#: ../../ecommerce/shopper_experience/paypal.rst:195 msgid "A default personal account (to use as shopper, e.g. `pp.merch01-buyer@example.com `__)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:190 +#: ../../ecommerce/shopper_experience/paypal.rst:197 msgid "Log in to Paypal Sandbox with the merchant account and follow the same configuration instructions. Enter your sandbox credentials in Odoo and make sure Paypal is still set on *Test Environment*. Also, make sure the automatic invoicing is not activated in your eCommerce settings, to not generate invoices when a fictitious transaction is completed." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:196 +#: ../../ecommerce/shopper_experience/paypal.rst:203 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:198 -msgid "See also" -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:200 -msgid "`How to manage orders paid with payment acquirers `__" -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:202 -msgid "`How to manage orders paid with payment acquirers `__" -msgstr "" - #: ../../ecommerce/shopper_experience/portal.rst:3 msgid "How customers can access their customer account" msgstr "" diff --git a/locale/sources/expense.pot b/locale/sources/expense.pot index e9a5d75d4..df376af2a 100644 --- a/locale/sources/expense.pot +++ b/locale/sources/expense.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-07 17:13+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -118,7 +118,7 @@ msgid "How to submit expenses to managers" msgstr "" #: ../../expense/expense.rst:90 -msgid "When you are ready to submit your expenses to your manager (e.g. at the end of a business trip, or once a month), go to the menu :menuselection:`My Expenses --> Expenses to Submit`. Select all expenses from the list view and click on :menuselection:`Action > Submit to Manager`. Save the newly created expense report (i.e. set of expenses), and wait for your manager to approve it." +msgid "When you are ready to submit your expenses to your manager (e.g. at the end of a business trip, or once a month), go to the menu :menuselection:`My Expenses --> Expenses to Submit`. Select all expenses from the list view and click on :menuselection:`Action --> Submit to Manager`. Save the newly created expense report (i.e. set of expenses), and wait for your manager to approve it." msgstr "" #: ../../expense/expense.rst:100 diff --git a/locale/sources/fsm.pot b/locale/sources/fsm.pot new file mode 100644 index 000000000..e165e3ea5 --- /dev/null +++ b/locale/sources/fsm.pot @@ -0,0 +1,269 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2015-TODAY, Odoo S.A. +# This file is distributed under the same license as the Odoo package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Odoo 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../fsm.rst:5 +msgid "Field Service" +msgstr "" + +#: ../../fsm/create_quotations.rst:3 +msgid "Create quotations from tasks" +msgstr "" + +#: ../../fsm/create_quotations.rst:4 +msgid "Allowing quotations to be created from tasks delivers a more efficient service as it allows space for preventive actions, while making the flow easy for employees." +msgstr "" + +#: ../../fsm/create_quotations.rst:8 +#: ../../fsm/customize_worksheets.rst:9 +#: ../../fsm/onsite_tasks_from_sales_orders.rst:9 +#: ../../fsm/plan_onsite.rst:8 +msgid "Enable the feature" +msgstr "" + +#: ../../fsm/create_quotations.rst:9 +msgid "First, go to :menuselection:`Field Service --> Configuration --> Settings` and enable the option *Extra Quotations*." +msgstr "" + +#: ../../fsm/create_quotations.rst:16 +msgid "Second, go to :menuselection:`Configuration --> Projects` and enable *Extra Quotations*." +msgstr "" + +#: ../../fsm/create_quotations.rst:21 +msgid "You can now create *New Quotations* directly from your tasks." +msgstr "" + +#: ../../fsm/customize_worksheets.rst:3 +msgid "Customize worksheet reports" +msgstr "" + +#: ../../fsm/customize_worksheets.rst:4 +msgid "Personalizing your customer reports, also called *worksheets*, allows you to have different descriptions of the work for each type of intervention. It speeds up the flow for your employees while giving customers a detailed summary, which can be reviewed and signed onsite." +msgstr "" + +#: ../../fsm/customize_worksheets.rst:10 +msgid "Go to :menuselection:`Field Service --> Configuration` and enable :menuselection:`Worksheet Templates --> Save`." +msgstr "" + +#: ../../fsm/customize_worksheets.rst:18 +msgid "Designing worksheets" +msgstr "" + +#: ../../fsm/customize_worksheets.rst:19 +msgid "Under :menuselection:`Configuration --> Worksheet Templates`, click on *Create* and start to *Design Worksheet Template*. You will be redirected to the *Studio* application." +msgstr "" + +#: ../../fsm/customize_worksheets.rst:27 +msgid "With the freedom of *Studio*, drag and drop fields to create a report tailored to your needs. Once you are done, click on *Close* and get an overview of the work done." +msgstr "" + +#: ../../fsm/customize_worksheets.rst:30 +msgid "*Worksheets* is where you can see how many times the worksheet has been used/completed under a task. *Analysis* examines all the worksheets under that given template and generates a graph." +msgstr "" + +#: ../../fsm/customize_worksheets.rst:38 +msgid "`Studio Basics `_" +msgstr "" + +#: ../../fsm/invoicing_time.rst:3 +msgid "Invoicing time and material to customers" +msgstr "" + +#: ../../fsm/invoicing_time.rst:4 +msgid "Track the exact time spent on a task and give customers the ability to sign their worksheet report onsite. Invoice customers as soon as the work is complete, leaving you, and the customer, with the confidence that they will be charged for the exact right hours and material used." +msgstr "" + +#: ../../fsm/invoicing_time.rst:9 +msgid "Get the exact time spent on a task" +msgstr "" + +#: ../../fsm/invoicing_time.rst:10 +msgid "Click on *Start* to launch the timer. You can *Pause* at any moment and *Resume* when you would like to continue." +msgstr "" + +#: ../../fsm/invoicing_time.rst:17 +msgid "Click on *Stop* once the work is done to confirm the total time spent and add a description." +msgstr "" + +#: ../../fsm/invoicing_time.rst:24 +msgid "Sign and send reports & validate stock-picking" +msgstr "" + +#: ../../fsm/invoicing_time.rst:25 +msgid "Now, fill your *Worksheet* and add the used products clicking on *Products*." +msgstr "" + +#: ../../fsm/invoicing_time.rst:31 +msgid "Click on *Start* if you need to record additional time for the same activity. The time recorded will be added to the already created and signed worksheet. Then, create a new invoice for the time added." +msgstr "" + +#: ../../fsm/invoicing_time.rst:34 +msgid "*Mark as done* to close the task and to invoice your intervention. It also validates the stock-picking keeping your inventory up-to-date." +msgstr "" + +#: ../../fsm/invoicing_time.rst:37 +msgid "*Sign Report* generates a detailed worksheet report for the customer to sign. Send it through email clicking on *Send Report*." +msgstr "" + +#: ../../fsm/invoicing_time.rst:41 +msgid "Invoice your time and material" +msgstr "" + +#: ../../fsm/invoicing_time.rst:42 +msgid "Under :menuselection:`All Tasks --> To Invoice`, find a list of all tasks marked as done but that have not been invoiced. Convenient feature as it allows accountants to easily access all finished tasks at once." +msgstr "" + +#: ../../fsm/invoicing_time.rst:52 +msgid "Invoice all tasks at once selecting them all and going to :menuselection:`Action --> Create Invoice`." +msgstr "" + +#: ../../fsm/invoicing_time.rst:60 +msgid ":doc:`../project/advanced/feedback`" +msgstr "" + +#: ../../fsm/keep_track.rst:3 +msgid "Keeping track of stock" +msgstr "" + +#: ../../fsm/keep_track.rst:4 +msgid "The integration with the Inventory application makes possible to track the material used and automatically keep your stock up to date." +msgstr "" + +#: ../../fsm/keep_track.rst:8 +msgid "Set up your Field Service project" +msgstr "" + +#: ../../fsm/keep_track.rst:9 +msgid "Go to :menuselection:`Field Service --> Configuration --> Projects` and make sure the option *Products on Tasks* is enabled." +msgstr "" + +#: ../../fsm/keep_track.rst:15 +msgid "Now, add the materials used in the intervention to the worksheet, and once the task is *Marked as done*, the stock-picking is automatically validated and the inventory evaluation is automatically updated." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:3 +msgid "Manage your employees’ schedules and time off" +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:4 +msgid "The integration with the *Time off* application allows you to quickly see your employees’ availabilities. It will avoid conflicts and errors between employees schedules and interventions." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:8 +msgid "Effortlessly see employees’ time off" +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:9 +msgid "No configuration needs to be done. Once the employees’ time has been validated in the *Time off* application, cells will be grayed for those days in your Gantt view." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:13 +msgid "It also adapts to the working calendar of the employee. Example: the employee works part-time (from Monday to Wednesday). So, Thursday and Friday will also be greyed, in addition to the weekends." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:20 +msgid "Easily manage employees’ schedules" +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:21 +msgid "From the Gantt view (under *Planning by User, Project or Worksheet*), click on the plus sign to add a new task or on the magnifying glass to plan an existing one." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:29 +msgid "Unassigned tasks" +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:30 +msgid "If you need to plan an intervention but you do not know yet who will take care of it, you can leave the task unassigned. It will still be shown in the Gantt view. Simply drag and drop the responsible person he can be assigned." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:39 +msgid "Create projects per team, or per working site, and have a more accurate and dynamic database." +msgstr "" + +#: ../../fsm/manage_employees_schedule.rst:42 +msgid ":doc:`../project/configuration/setup`" +msgstr "" + +#: ../../fsm/onsite_tasks_from_sales_orders.rst:3 +msgid "Create onsite interventions tasks from Sales Orders" +msgstr "" + +#: ../../fsm/onsite_tasks_from_sales_orders.rst:4 +msgid "By allowing your sales team to open onsite interventions tasks will create a seamless experience for your customers. It also allows them to first receive a quotation with the materials that will be used plus the service price to be approved before the work even starts." +msgstr "" + +#: ../../fsm/onsite_tasks_from_sales_orders.rst:10 +msgid "Go to :menuselection:`Sales --> Products --> Create` or edit an existing one. Select: under :menuselection:`General Information --> Product Type: Service`; under :menuselection:`Sales --> Service Invoicing Policy: Timesheet on task --> Service Tracking: Create a task in an existing project --> Project --> Worksheet Template --> Save`." +msgstr "" + +#: ../../fsm/onsite_tasks_from_sales_orders.rst:19 +msgid "Now, once you have *Confirmed* a *quotation*, a task will be created in the respective project you have chosen." +msgstr "" + +#: ../../fsm/onsite_tasks_from_sales_orders.rst:28 +msgid "One of the greatest benefits here is that you can have different *Worksheets Templates* under the same project and product, for example." +msgstr "" + +#: ../../fsm/plan_onsite.rst:3 +msgid "Plan onsite interventions from Helpdesk Tickets" +msgstr "" + +#: ../../fsm/plan_onsite.rst:4 +msgid "The integration with the Helpdesk application lets your helpdesk team manage interventions requests directly. It speeds up processes as you can plan field services tasks from tickets." +msgstr "" + +#: ../../fsm/plan_onsite.rst:9 +msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams --> Edit` and enable :menuselection:`Onsite Interventions --> Save`." +msgstr "" + +#: ../../fsm/plan_onsite.rst:15 +msgid "Now once your helpdesk team needs, they have the option to *Plan Intervention* from tickets." +msgstr "" + +#: ../../fsm/planning_itinerary.rst:3 +msgid "Planning an itinerary" +msgstr "" + +#: ../../fsm/planning_itinerary.rst:5 +msgid "Having an itinerary being shown based on the chronological order of the activities and on the best route to take, makes employees’ life easier and the workload more efficient." +msgstr "" + +#: ../../fsm/planning_itinerary.rst:9 +msgid "Have an itinerary displayed directly in Odoo" +msgstr "" + +#: ../../fsm/planning_itinerary.rst:10 +msgid "Go to *Settings* and under *Map view* click on *Get token*." +msgstr "" + +#: ../../fsm/planning_itinerary.rst:15 +msgid "Click on :menuselection:`Start mapping for free --> fill the Username, email and password fields --> agree with their Terms of Service and Privacy Policy --> Get started`. You will be redirected to your account. Scrolling the page down you will find *Access tokens*. Copy the *Default public token*." +msgstr "" + +#: ../../fsm/planning_itinerary.rst:24 +msgid "Back in Odoo, paste it on :menuselection:`Token --> Save`." +msgstr "" + +#: ../../fsm/planning_itinerary.rst:29 +msgid "Now, your maps will show the itinerary based on the scheduled time and best route." +msgstr "" + +#: ../../fsm/planning_itinerary.rst:36 +msgid "This is an optional feature, as you can still have access to a map view without a Mapbox account." +msgstr "" + diff --git a/locale/sources/general.pot b/locale/sources/general.pot index 150d85eb3..605f2e716 100644 --- a/locale/sources/general.pot +++ b/locale/sources/general.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,38 +37,38 @@ msgid "How to allow users to sign in with their Google account" msgstr "" #: ../../general/auth/google.rst:5 -msgid "Connect to your Google account and go to `https://console.developers.google.com/ `_." +msgid "Connect to your Google account and go to the `Google API Dashboard `_." msgstr "" -#: ../../general/auth/google.rst:7 +#: ../../general/auth/google.rst:8 msgid "Click on **Create Project** and enter the project name and other details." msgstr "" -#: ../../general/auth/google.rst:15 +#: ../../general/auth/google.rst:16 msgid "Click on **Use Google APIs**" msgstr "" -#: ../../general/auth/google.rst:20 +#: ../../general/auth/google.rst:21 msgid "On the left side menu, select the sub menu **Credentials** (from **API Manager**) then select **OAuth consent screen**." msgstr "" -#: ../../general/auth/google.rst:25 +#: ../../general/auth/google.rst:26 msgid "Fill in your address, email and the product name (for example odoo) and then save." msgstr "" -#: ../../general/auth/google.rst:30 +#: ../../general/auth/google.rst:31 msgid "Then click on **Add Credentials** and select the second option (OAuth 2.0 Client ID)." msgstr "" -#: ../../general/auth/google.rst:38 +#: ../../general/auth/google.rst:39 msgid "Check that the application type is set on **Web Application**. Now configure the allowed pages on which you will be redirected." msgstr "" -#: ../../general/auth/google.rst:40 +#: ../../general/auth/google.rst:41 msgid "To achieve this, complete the field **Authorized redirect URIs**. Copy paste the following link in the box: http://mydomain.odoo.com/auth_oauth/signin. Then click on **Create**" msgstr "" -#: ../../general/auth/google.rst:48 +#: ../../general/auth/google.rst:49 msgid "Once done, you receive two information (your Client ID and Client Secret). You have to insert your Client ID in the **General Settings**." msgstr "" @@ -137,7 +137,7 @@ msgid "Remove columns you don't need. We advise to not remove the *ID* one (see msgstr "" #: ../../general/base_import/adapt_template.rst:15 -#: ../../general/base_import/import_faq.rst:26 +#: ../../general/base_import/import_faq.rst:25 msgid "Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" @@ -201,319 +201,319 @@ msgstr "" msgid "There you are provided with templates you can easily populate with your own data. Such templates can be imported in one click; The data mapping is already done." msgstr "" -#: ../../general/base_import/import_faq.rst:22 +#: ../../general/base_import/import_faq.rst:21 msgid "How to adapt the template" msgstr "" -#: ../../general/base_import/import_faq.rst:24 +#: ../../general/base_import/import_faq.rst:23 msgid "Add, remove and sort columns to fit at best your data structure." msgstr "" -#: ../../general/base_import/import_faq.rst:25 +#: ../../general/base_import/import_faq.rst:24 msgid "We advise to not remove the **ID** one (see why in the next section)." msgstr "" -#: ../../general/base_import/import_faq.rst:31 +#: ../../general/base_import/import_faq.rst:30 msgid "When you add a new column, Odoo might not be able to map it automatically if its label doesn't fit any field in Odoo. Don't worry! You can map new columns manually when you test the import. Search the list for the corresponding field." msgstr "" -#: ../../general/base_import/import_faq.rst:39 +#: ../../general/base_import/import_faq.rst:38 msgid "Then, use this field's label in your file in order to make it work straight on the very next time." msgstr "" -#: ../../general/base_import/import_faq.rst:44 +#: ../../general/base_import/import_faq.rst:43 msgid "How to import from another application" msgstr "" -#: ../../general/base_import/import_faq.rst:46 +#: ../../general/base_import/import_faq.rst:45 msgid "In order to re-create relationships between different records, you should use the unique identifier from the original application and map it to the **ID** (External ID) column in Odoo. When you import another record that links to the first one, use **XXX/ID** (XXX/External ID) to the original unique identifier. You can also find this record using its name but you will be stuck if at least 2 records have the same name." msgstr "" -#: ../../general/base_import/import_faq.rst:54 +#: ../../general/base_import/import_faq.rst:53 msgid "The **ID** will also be used to update the original import if you need to re-import modified data later, it's thus good practice to specify it whenever possible." msgstr "" -#: ../../general/base_import/import_faq.rst:60 +#: ../../general/base_import/import_faq.rst:59 msgid "I cannot find the field I want to map my column to" msgstr "" -#: ../../general/base_import/import_faq.rst:62 +#: ../../general/base_import/import_faq.rst:61 msgid "Odoo tries to find with some heuristic, based on the first ten lines of the files, the type of field for each column inside your file. For example if you have a column only containing numbers, only the fields that are of type *Integer* will be displayed for you to choose from. While this behavior might be good and easy for most cases, it is also possible that it goes wrong or that you want to map your column to a field that is not proposed by default." msgstr "" -#: ../../general/base_import/import_faq.rst:71 +#: ../../general/base_import/import_faq.rst:70 msgid "If that happens, you just have to check the ** Show fields of relation fields (advanced)** option, you will then be able to choose from the complete list of fields for each column." msgstr "" -#: ../../general/base_import/import_faq.rst:79 +#: ../../general/base_import/import_faq.rst:78 msgid "Where can I change the date import format?" msgstr "" -#: ../../general/base_import/import_faq.rst:81 +#: ../../general/base_import/import_faq.rst:80 msgid "Odoo can automatically detect if a column is a date, and it will try to guess the date format from a set of most commonly used date formats. While this process can work for many date formats, some date formats will not be recognized. This can cause confusion due to day-month inversions; it is difficult to guess which part of a date format is the day and which part is the month in a date such as '01-03-2016'." msgstr "" -#: ../../general/base_import/import_faq.rst:83 +#: ../../general/base_import/import_faq.rst:86 msgid "To view which date format Odoo has found from your file you can check the **Date Format** that is shown when clicking on **Options** under the file selector. If this format is incorrect you can change it to your liking using the *ISO 8601* to define the format." msgstr "" -#: ../../general/base_import/import_faq.rst:86 +#: ../../general/base_import/import_faq.rst:91 msgid "If you are importing an excel (.xls, .xlsx) file, you can use date cells to store dates as the display of dates in excel is different from the way it is stored. That way you will be sure that the date format is correct in Odoo whatever your locale date format is." msgstr "" -#: ../../general/base_import/import_faq.rst:91 +#: ../../general/base_import/import_faq.rst:96 msgid "Can I import numbers with currency sign (e.g.: $32.00)?" msgstr "" -#: ../../general/base_import/import_faq.rst:93 +#: ../../general/base_import/import_faq.rst:98 msgid "Yes, we fully support numbers with parenthesis to represent negative sign as well as numbers with currency sign attached to them. Odoo also automatically detect which thousand/decimal separator you use (you can change those under **options**). If you use a currency symbol that is not known to Odoo, it might not be recognized as a number though and it will crash." msgstr "" -#: ../../general/base_import/import_faq.rst:95 +#: ../../general/base_import/import_faq.rst:103 msgid "Examples of supported numbers (using thirty-two thousands as an example):" msgstr "" -#: ../../general/base_import/import_faq.rst:97 +#: ../../general/base_import/import_faq.rst:105 msgid "32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:98 +#: ../../general/base_import/import_faq.rst:106 msgid "32000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:99 +#: ../../general/base_import/import_faq.rst:107 msgid "32,000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:100 +#: ../../general/base_import/import_faq.rst:108 msgid "-32000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:101 +#: ../../general/base_import/import_faq.rst:109 msgid "(32000.00)" msgstr "" -#: ../../general/base_import/import_faq.rst:102 +#: ../../general/base_import/import_faq.rst:110 msgid "$ 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:103 +#: ../../general/base_import/import_faq.rst:111 msgid "(32000.00 €)" msgstr "" -#: ../../general/base_import/import_faq.rst:105 +#: ../../general/base_import/import_faq.rst:113 msgid "Example that will not work:" msgstr "" -#: ../../general/base_import/import_faq.rst:107 +#: ../../general/base_import/import_faq.rst:115 msgid "ABC 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:108 +#: ../../general/base_import/import_faq.rst:116 msgid "$ (32.000,00)" msgstr "" -#: ../../general/base_import/import_faq.rst:113 +#: ../../general/base_import/import_faq.rst:119 msgid "What can I do when the Import preview table isn't displayed correctly?" msgstr "" -#: ../../general/base_import/import_faq.rst:115 +#: ../../general/base_import/import_faq.rst:121 msgid "By default the Import preview is set on commas as field separators and quotation marks as text delimiters. If your csv file does not have these settings, you can modify the File Format Options (displayed under the Browse CSV file bar after you select your file)." msgstr "" -#: ../../general/base_import/import_faq.rst:117 +#: ../../general/base_import/import_faq.rst:125 msgid "Note that if your CSV file has a tabulation as separator, Odoo will not detect the separations. You will need to change the file format options in your spreadsheet application. See the following question." msgstr "" -#: ../../general/base_import/import_faq.rst:122 +#: ../../general/base_import/import_faq.rst:130 msgid "How can I change the CSV file format options when saving in my spreadsheet application?" msgstr "" -#: ../../general/base_import/import_faq.rst:124 -msgid "If you edit and save CSV files in speadsheet applications, your computer's regional settings will be applied for the separator and delimiter. We suggest you use OpenOffice or LibreOffice Calc as they will allow you to modify all three options (in 'Save As' dialog box > Check the box 'Edit filter settings' > Save)." -msgstr "" - -#: ../../general/base_import/import_faq.rst:126 -msgid "Microsoft Excel will allow you to modify only the encoding when saving (in 'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)." -msgstr "" - -#: ../../general/base_import/import_faq.rst:131 -msgid "What's the difference between Database ID and External ID?" -msgstr "" - -#: ../../general/base_import/import_faq.rst:133 -msgid "Some fields define a relationship with another object. For example, the country of a contact is a link to a record of the 'Country' object. When you want to import such fields, Odoo will have to recreate links between the different records. To help you import such fields, Odoo provides 3 mechanisms. You must use one and only one mechanism per field you want to import." -msgstr "" - -#: ../../general/base_import/import_faq.rst:135 -msgid "For example, to reference the country of a contact, Odoo proposes you 3 different fields to import:" +#: ../../general/base_import/import_faq.rst:132 +msgid "If you edit and save CSV files in spreadsheet applications, your computer's regional settings will be applied for the separator and delimiter. We suggest you use OpenOffice or LibreOffice Calc as they will allow you to modify all three options (in :menuselection:`'Save As' dialog box --> Check the box 'Edit filter settings' --> Save`)." msgstr "" #: ../../general/base_import/import_faq.rst:137 -msgid "Country: the name or code of the country" -msgstr "" - -#: ../../general/base_import/import_faq.rst:138 -msgid "Country/Database ID: the unique Odoo ID for a record, defined by the ID postgresql column" -msgstr "" - -#: ../../general/base_import/import_faq.rst:139 -msgid "Country/External ID: the ID of this record referenced in another application (or the .XML file that imported it)" +msgid "Microsoft Excel will allow you to modify only the encoding when saving (in :menuselection:`'Save As' dialog box --> click 'Tools' dropdown list --> Encoding tab`)." msgstr "" #: ../../general/base_import/import_faq.rst:141 -msgid "For the country Belgium, you can use one of these 3 ways to import:" +msgid "What's the difference between Database ID and External ID?" msgstr "" #: ../../general/base_import/import_faq.rst:143 -msgid "Country: Belgium" +msgid "Some fields define a relationship with another object. For example, the country of a contact is a link to a record of the 'Country' object. When you want to import such fields, Odoo will have to recreate links between the different records. To help you import such fields, Odoo provides three mechanisms. You must use one and only one mechanism per field you want to import." msgstr "" -#: ../../general/base_import/import_faq.rst:144 -msgid "Country/Database ID: 21" -msgstr "" - -#: ../../general/base_import/import_faq.rst:145 -msgid "Country/External ID: base.be" -msgstr "" - -#: ../../general/base_import/import_faq.rst:147 -msgid "According to your need, you should use one of these 3 ways to reference records in relations. Here is when you should use one or the other, according to your need:" -msgstr "" - -#: ../../general/base_import/import_faq.rst:149 -msgid "Use Country: This is the easiest way when your data come from CSV files that have been created manually." +#: ../../general/base_import/import_faq.rst:148 +msgid "For example, to reference the country of a contact, Odoo proposes you 3 different fields to import:" msgstr "" #: ../../general/base_import/import_faq.rst:150 -msgid "Use Country/Database ID: You should rarely use this notation. It's mostly used by developers as it's main advantage is to never have conflicts (you may have several records with the same name, but they always have a unique Database ID)" +msgid "Country: the name or code of the country" msgstr "" #: ../../general/base_import/import_faq.rst:151 -msgid "Use Country/External ID: Use External ID when you import data from a third party application." +msgid "Country/Database ID: the unique Odoo ID for a record, defined by the ID postgresql column" msgstr "" -#: ../../general/base_import/import_faq.rst:153 -msgid "When you use External IDs, you can import CSV files with the \"External ID\" column to define the External ID of each record you import. Then, you will be able to make a reference to that record with columns like \"Field/External ID\". The following two CSV files give you an example for Products and their Categories." +#: ../../general/base_import/import_faq.rst:152 +msgid "Country/External ID: the ID of this record referenced in another application (or the .XML file that imported it)" msgstr "" #: ../../general/base_import/import_faq.rst:155 -msgid "`CSV file for categories <../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_." +msgid "For the country Belgium, you can use one of these 3 ways to import:" msgstr "" #: ../../general/base_import/import_faq.rst:157 -msgid "`CSV file for Products <../../_static/example_files/External_id_3rd_party_application_products.csv>`_." +msgid "Country: Belgium" +msgstr "" + +#: ../../general/base_import/import_faq.rst:158 +msgid "Country/Database ID: 21" +msgstr "" + +#: ../../general/base_import/import_faq.rst:159 +msgid "Country/External ID: base.be" msgstr "" #: ../../general/base_import/import_faq.rst:161 -msgid "What can I do if I have multiple matches for a field?" +msgid "According to your need, you should use one of these 3 ways to reference records in relations. Here is when you should use one or the other, according to your need:" msgstr "" -#: ../../general/base_import/import_faq.rst:163 -msgid "If for example you have two product categories with the child name \"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other Products/Sellable\"), your validation is halted but you may still import your data. However, we recommend you do not import the data because they will all be linked to the first 'Sellable' category found in the Product Category list (\"Misc. Products/Sellable\"). We recommend you modify one of the duplicates' values or your product category hierarchy." +#: ../../general/base_import/import_faq.rst:164 +msgid "Use Country: This is the easiest way when your data come from CSV files that have been created manually." msgstr "" -#: ../../general/base_import/import_faq.rst:165 -msgid "However if you do not wish to change your configuration of product categories, we recommend you use make use of the external ID for this field 'Category'." +#: ../../general/base_import/import_faq.rst:166 +msgid "Use Country/Database ID: You should rarely use this notation. It's mostly used by developers as it's main advantage is to never have conflicts (you may have several records with the same name, but they always have a unique Database ID)" msgstr "" -#: ../../general/base_import/import_faq.rst:170 -msgid "How can I import a many2many relationship field (e.g. a customer that has multiple tags)?" +#: ../../general/base_import/import_faq.rst:169 +msgid "Use Country/External ID: Use External ID when you import data from a third party application." msgstr "" -#: ../../general/base_import/import_faq.rst:172 -msgid "The tags should be separated by a comma without any spacing. For example, if you want your customer to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column of your CSV file." +#: ../../general/base_import/import_faq.rst:171 +msgid "When you use External IDs, you can import CSV files with the \"External ID\" column to define the External ID of each record you import. Then, you will be able to make a reference to that record with columns like \"Field/External ID\". The following two CSV files give you an example for Products and their Categories." msgstr "" -#: ../../general/base_import/import_faq.rst:174 -msgid "`CSV file for Manufacturer, Retailer <../../_static/example_files/m2m_customers_tags.csv>`_." +#: ../../general/base_import/import_faq.rst:176 +msgid ":download:`CSV file for categories <../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`." msgstr "" #: ../../general/base_import/import_faq.rst:179 -msgid "How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?" +msgid ":download:`CSV file for Products <../../_static/example_files/External_id_3rd_party_application_products.csv>`." msgstr "" -#: ../../general/base_import/import_faq.rst:181 -msgid "If you want to import sales order having several order lines; for each order line, you need to reserve a specific row in the CSV file. The first order line will be imported on the same row as the information relative to order. Any additional lines will need an addtional row that does not have any information in the fields relative to the order. As an example, here is purchase.order_functional_error_line_cant_adpat.CSV file of some quotations you can import, based on demo data." +#: ../../general/base_import/import_faq.rst:183 +msgid "What can I do if I have multiple matches for a field?" msgstr "" -#: ../../general/base_import/import_faq.rst:184 -msgid "`File for some Quotations <../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_." +#: ../../general/base_import/import_faq.rst:185 +msgid "If for example you have two product categories with the child name \"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other Products/Sellable\"), your validation is halted but you may still import your data. However, we recommend you do not import the data because they will all be linked to the first 'Sellable' category found in the Product Category list (\"Misc. Products/Sellable\"). We recommend you modify one of the duplicates' values or your product category hierarchy." msgstr "" -#: ../../general/base_import/import_faq.rst:186 -msgid "The following CSV file shows how to import purchase orders with their respective purchase order lines:" +#: ../../general/base_import/import_faq.rst:191 +msgid "However if you do not wish to change your configuration of product categories, we recommend you use make use of the external ID for this field 'Category'." msgstr "" -#: ../../general/base_import/import_faq.rst:188 -msgid "`Purchase orders with their respective purchase order lines <../../_static/example_files/o2m_purchase_order_lines.csv>`_." -msgstr "" - -#: ../../general/base_import/import_faq.rst:190 -msgid "The following CSV file shows how to import customers and their respective contacts:" -msgstr "" - -#: ../../general/base_import/import_faq.rst:192 -msgid "`Customers and their respective contacts <../../_static/example_files/o2m_customers_contacts.csv>`_." +#: ../../general/base_import/import_faq.rst:195 +msgid "How can I import a many2many relationship field (e.g. a customer that has multiple tags)?" msgstr "" #: ../../general/base_import/import_faq.rst:197 -msgid "Can I import several times the same record?" -msgstr "" - -#: ../../general/base_import/import_faq.rst:199 -msgid "If you import a file that contains one of the column \"External ID\" or \"Database ID\", records that have already been imported will be modified instead of being created. This is very usefull as it allows you to import several times the same CSV file while having made some changes in between two imports. Odoo will take care of creating or modifying each record depending if it's new or not." +msgid "The tags should be separated by a comma without any spacing. For example, if you want your customer to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column of your CSV file." msgstr "" #: ../../general/base_import/import_faq.rst:201 -msgid "This feature allows you to use the Import/Export tool of Odoo to modify a batch of records in your favorite spreadsheet application." +msgid ":download:`CSV file for Manufacturer, Retailer <../../_static/example_files/m2m_customers_tags.csv>`" msgstr "" -#: ../../general/base_import/import_faq.rst:206 -msgid "What happens if I do not provide a value for a specific field?" +#: ../../general/base_import/import_faq.rst:205 +msgid "How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?" msgstr "" -#: ../../general/base_import/import_faq.rst:208 -msgid "If you do not set all fields in your CSV file, Odoo will assign the default value for every non defined fields. But if you set fields with empty values in your CSV file, Odoo will set the EMPTY value in the field, instead of assigning the default value." +#: ../../general/base_import/import_faq.rst:207 +msgid "If you want to import sales order having several order lines; for each order line, you need to reserve a specific row in the CSV file. The first order line will be imported on the same row as the information relative to order. Any additional lines will need an additional row that does not have any information in the fields relative to the order. As an example, here is ``purchase.order_functional_error_line_cant_adpat.CSV`` file of some quotations you can import, based on demo data." msgstr "" -#: ../../general/base_import/import_faq.rst:213 -msgid "How to export/import different tables from an SQL application to Odoo?" -msgstr "" - -#: ../../general/base_import/import_faq.rst:215 -msgid "If you need to import data from different tables, you will have to recreate relations between records belonging to different tables. (e.g. if you import companies and persons, you will have to recreate the link between each person and the company they work for)." +#: ../../general/base_import/import_faq.rst:214 +msgid ":download:`File for some Quotations <../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`." msgstr "" #: ../../general/base_import/import_faq.rst:217 -msgid "To manage relations between tables, you can use the \"External ID\" facilities of Odoo. The \"External ID\" of a record is the unique identifier of this record in another application. This \"External ID\" must be unique accoss all the records of all objects, so it's a good practice to prefix this \"External ID\" with the name of the application or table. (like 'company_1', 'person_1' instead of '1')" +msgid "The following CSV file shows how to import purchase orders with their respective purchase order lines:" msgstr "" -#: ../../general/base_import/import_faq.rst:219 -msgid "As an example, suppose you have a SQL database with two tables you want to import: companies and persons. Each person belong to one company, so you will have to recreate the link between a person and the company he work for. (If you want to test this example, here is a dump of such a PostgreSQL database)" +#: ../../general/base_import/import_faq.rst:220 +msgid ":download:`Purchase orders with their respective purchase order lines <../../_static/example_files/o2m_purchase_order_lines.csv>`." msgstr "" -#: ../../general/base_import/import_faq.rst:221 -msgid "We will first export all companies and their \"External ID\". In PSQL, write the following command:" +#: ../../general/base_import/import_faq.rst:223 +msgid "The following CSV file shows how to import customers and their respective contacts:" msgstr "" -#: ../../general/base_import/import_faq.rst:227 -msgid "This SQL command will create the following CSV file::" +#: ../../general/base_import/import_faq.rst:225 +msgid ":download:`Customers and their respective contacts <../../_static/example_files/o2m_customers_contacts.csv>`." msgstr "" -#: ../../general/base_import/import_faq.rst:234 -msgid "To create the CSV file for persons, linked to companies, we will use the following SQL command in PSQL:" +#: ../../general/base_import/import_faq.rst:229 +msgid "Can I import several times the same record?" +msgstr "" + +#: ../../general/base_import/import_faq.rst:231 +msgid "If you import a file that contains one of the column \"External ID\" or \"Database ID\", records that have already been imported will be modified instead of being created. This is very usefull as it allows you to import several times the same CSV file while having made some changes in between two imports. Odoo will take care of creating or modifying each record depending if it's new or not." +msgstr "" + +#: ../../general/base_import/import_faq.rst:236 +msgid "This feature allows you to use the Import/Export tool of Odoo to modify a batch of records in your favorite spreadsheet application." msgstr "" #: ../../general/base_import/import_faq.rst:240 -msgid "It will produce the following CSV file::" +msgid "What happens if I do not provide a value for a specific field?" msgstr "" -#: ../../general/base_import/import_faq.rst:248 -msgid "As you can see in this file, Fabien and Laurence are working for the Bigees company (company_1) and Eric is working for the Organi company. The relation between persons and companies is done using the External ID of the companies. We had to prefix the \"External ID\" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the orignial database)." +#: ../../general/base_import/import_faq.rst:242 +msgid "If you do not set all fields in your CSV file, Odoo will assign the default value for every non defined fields. But if you set fields with empty values in your CSV file, Odoo will set the EMPTY value in the field, instead of assigning the default value." msgstr "" -#: ../../general/base_import/import_faq.rst:250 +#: ../../general/base_import/import_faq.rst:247 +msgid "How to export/import different tables from an SQL application to Odoo?" +msgstr "" + +#: ../../general/base_import/import_faq.rst:249 +msgid "If you need to import data from different tables, you will have to recreate relations between records belonging to different tables. (e.g. if you import companies and persons, you will have to recreate the link between each person and the company they work for)." +msgstr "" + +#: ../../general/base_import/import_faq.rst:253 +msgid "To manage relations between tables, you can use the \"External ID\" facilities of Odoo. The \"External ID\" of a record is the unique identifier of this record in another application. This \"External ID\" must be unique across all the records of all objects, so it's a good practice to prefix this \"External ID\" with the name of the application or table. (like 'company_1', 'person_1' instead of '1')" +msgstr "" + +#: ../../general/base_import/import_faq.rst:259 +msgid "As an example, suppose you have a SQL database with two tables you want to import: companies and persons. Each person belong to one company, so you will have to recreate the link between a person and the company he work for. (If you want to test this example, here is a :download:`dump of such a PostgreSQL database <../../_static/example_files/database_import_test.sql>`)" +msgstr "" + +#: ../../general/base_import/import_faq.rst:264 +msgid "We will first export all companies and their \"External ID\". In PSQL, write the following command:" +msgstr "" + +#: ../../general/base_import/import_faq.rst:270 +msgid "This SQL command will create the following CSV file:" +msgstr "" + +#: ../../general/base_import/import_faq.rst:279 +msgid "To create the CSV file for persons, linked to companies, we will use the following SQL command in PSQL:" +msgstr "" + +#: ../../general/base_import/import_faq.rst:285 +msgid "It will produce the following CSV file:" +msgstr "" + +#: ../../general/base_import/import_faq.rst:295 +msgid "As you can see in this file, Fabien and Laurence are working for the Bigees company (company_1) and Eric is working for the Organi company. The relation between persons and companies is done using the External ID of the companies. We had to prefix the \"External ID\" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the original database)." +msgstr "" + +#: ../../general/base_import/import_faq.rst:301 msgid "The two files produced are ready to be imported in Odoo without any modifications. After having imported these two CSV files, you will have 4 contacts and 3 companies. (the firsts two contacts are linked to the first company). You must first import the companies and then the persons." msgstr "" @@ -525,68 +525,68 @@ msgstr "" msgid "General guide about In-App Purchase (IAP) Services" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:4 +#: ../../general/in_app_purchase/in_app_purchase.rst:5 msgid "In-App Purchases (IAP) gives access to additional services through Odoo. For instance, it allows me to send SMS Text Messages or to send Invoices by post directly from my database." msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:7 +#: ../../general/in_app_purchase/in_app_purchase.rst:9 msgid "Buying Credits" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:8 -msgid "Each IAP Service relies on prepaid credits to work and has its own pricing. To consult my current balance or to recharge my account, go to *Settings> Odoo IAP > View my Services*." +#: ../../general/in_app_purchase/in_app_purchase.rst:11 +msgid "Each IAP Service relies on prepaid credits to work and has its own pricing. To consult my current balance or to recharge my account, go to :menuselection:`Settings --> Odoo IAP --> View my Services`." msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:13 +#: ../../general/in_app_purchase/in_app_purchase.rst:19 msgid "If I am on Odoo Online (SAAS) and have the Enterprise version, I benefit from free credits to test our IAP features." msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:16 +#: ../../general/in_app_purchase/in_app_purchase.rst:23 msgid "IAP accounts" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:17 -msgid "Credits to use IAP services are stored on IAP accounts, which are specific to each service and database. By default, IAP accounts are common to all companies, but can be restricted to specific ones by going to *Settings app > Activate the Developer Mode > Technical Settings > IAP Accoun*." +#: ../../general/in_app_purchase/in_app_purchase.rst:25 +msgid "Credits to use IAP services are stored on IAP accounts, which are specific to each service and database. By default, IAP accounts are common to all companies, but can be restricted to specific ones by going to :menuselection:`Settings app --> Activate the Developer Mode --> Technical Settings --> IAP Account`." msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:23 +#: ../../general/in_app_purchase/in_app_purchase.rst:34 msgid "IAP Portal" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:24 -msgid "The IAP Portal is a platform regrouping my IAP Services. It is accessible from *Settings app > Odoo IAP > View my Services*. From there, I can view my current balance, recharge my credits, review my consumption and set a reminder to when credits are low." +#: ../../general/in_app_purchase/in_app_purchase.rst:36 +msgid "The IAP Portal is a platform regrouping my IAP Services. It is accessible from :menuselection:`Settings app --> Odoo IAP --> View my Services`. From there, I can view my current balance, recharge my credits, review my consumption and set a reminder to when credits are low." msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:30 +#: ../../general/in_app_purchase/in_app_purchase.rst:44 msgid "Get notified when credits are low" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:31 -msgid "To be notified when it’s time to recharge my credits, I’ll go to my IAP Portal through *Settings app> Odoo IAP > View my Services*, unfold a service and mark the Receive threshold warning option. Then, I’ll provide a minimum amount of credits and email addresses. Now, every time that the limit is reached, an automatic reminder will be sent to by email!" +#: ../../general/in_app_purchase/in_app_purchase.rst:46 +msgid "To be notified when it’s time to recharge my credits, I’ll go to my IAP Portal through :menuselection:`Settings app --> Odoo IAP --> View my Services`, unfold a service and mark the Receive threshold warning option. Then, I’ll provide a minimum amount of credits and email addresses. Now, every time that the limit is reached, an automatic reminder will be sent to by email!" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:38 +#: ../../general/in_app_purchase/in_app_purchase.rst:56 msgid "IAP services available" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:39 +#: ../../general/in_app_purchase/in_app_purchase.rst:58 msgid "Different services are available depending on the hosting type of your Database:" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:41 +#: ../../general/in_app_purchase/in_app_purchase.rst:60 msgid "*Odoo Online (SAAS)*: only the IAP services provided by Odoo can be used (i.e. the SMS, Snailmail, Reveal and Partner Autocomplete features);" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:43 +#: ../../general/in_app_purchase/in_app_purchase.rst:62 msgid "*Odoo.sh and Odoo Enterprise (on-premise)*: both the services provided by Odoo and by third-party apps can be used." msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:46 +#: ../../general/in_app_purchase/in_app_purchase.rst:66 msgid "Offering my own services" msgstr "" -#: ../../general/in_app_purchase/in_app_purchase.rst:47 -msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: `In-App Purchase `_" +#: ../../general/in_app_purchase/in_app_purchase.rst:68 +msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: `In-App Purchase `_" msgstr "" #: ../../general/odoo_basics.rst:3 @@ -618,14 +618,14 @@ msgid "When you’re done editing the page and have clicked on **SAVE**, an invi msgstr "" #: ../../general/odoo_basics/add_user.rst:32 -msgid "Remember that each additional user will increase your subscription fees. Refer to our `*Pricing page* `__ for more information." +msgid "Remember that each additional user will increase your subscription fees. Refer to our `Pricing page `_ for more information." msgstr "" #: ../../general/odoo_basics/add_user.rst:39 msgid "You can also add a new user on the fly from your dashboard. From the above screenshot, enter the email address of the user you would like to add and click on **INVITE**. The user will receive an email invite containing a link to set his password. You will then be able to define his accesses rights under the :menuselection:`Settings --> Users menu`." msgstr "" -#: ../../general/odoo_basics/add_user.rst:45 +#: ../../general/odoo_basics/add_user.rst:46 msgid "`Deactivating Users <../../db_management/documentation.html#deactivating-users>`_" msgstr "" diff --git a/locale/sources/getting_started.pot b/locale/sources/getting_started.pot index a2b81968c..84f8d6d0b 100644 --- a/locale/sources/getting_started.pot +++ b/locale/sources/getting_started.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-03 11:39+0200\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgid "This document summarizes Odoo Online's services, our Success Pack impleme msgstr "" #: ../../getting_started/documentation.rst:12 -msgid "1. The SPoC (*Single Point of Contact*) and the Consultant" +msgid "The SPoC (*Single Point of Contact*) and the Consultant" msgstr "" #: ../../getting_started/documentation.rst:14 @@ -45,178 +45,178 @@ msgid "**Meetings optimization**: The Odoo consultant is not involved in the pro msgstr "" #: ../../getting_started/documentation.rst:39 -msgid "**Train the Trainer approach**: The Odoo consultant provides functional training to the SPoC so that he can pass on this knowledge to his collaborators. In order for this approach to be successful, it is necessary that the SPoC is also involved in its own rise in skills through self-learning via the `Odoo documentation `__, `The elearning platform `__ and the testing of functionalities." -msgstr "" - -#: ../../getting_started/documentation.rst:47 -msgid "2. Project Scope" +msgid "**Train the Trainer approach**: The Odoo consultant provides functional training to the SPoC so that he can pass on this knowledge to his collaborators. In order for this approach to be successful, it is necessary that the SPoC is also involved in its own rise in skills through self-learning via the :doc:`Odoo documentation <../index>`, `The elearning platform `_ and the testing of functionalities." msgstr "" #: ../../getting_started/documentation.rst:49 +msgid "Project Scope" +msgstr "" + +#: ../../getting_started/documentation.rst:51 msgid "To make sure all the stakeholders involved are always aligned, it is necessary to define and to make the project scope evolve as long as the project implementation is pursuing." msgstr "" -#: ../../getting_started/documentation.rst:53 +#: ../../getting_started/documentation.rst:55 msgid "**A clear definition of the initial project scope**: A clear definition of the initial needs is crucial to ensure the project is running smoothly. Indeed, when all the stakeholders share the same vision, the evolution of the needs and the resulting decision-making process are more simple and more clear." msgstr "" -#: ../../getting_started/documentation.rst:59 +#: ../../getting_started/documentation.rst:61 msgid "**Phasing the project**: Favoring an implementation in several coherent phases allowing regular production releases and an evolving takeover of Odoo by the end users have demonstrated its effectiveness over time. This approach also helps to identify gaps and apply corrective actions early in the implementation." msgstr "" -#: ../../getting_started/documentation.rst:66 +#: ../../getting_started/documentation.rst:68 msgid "**Adopting standard features as a priority**: Odoo offers a great environment to implement slight improvements (customizations) or more important ones (developments). Nevertheless, adoption of the standard solution will be preferred as often as possible in order to optimize project delivery times and provide the user with a long-term stability and fluid scalability of his new tool. Ideally, if an improvement of the software should still be realized, its implementation will be carried out after an experiment of the standard in production." msgstr "" -#: ../../getting_started/documentation.rst:80 -msgid "3. Managing expectations" +#: ../../getting_started/documentation.rst:82 +msgid "Managing expectations" msgstr "" -#: ../../getting_started/documentation.rst:82 +#: ../../getting_started/documentation.rst:84 msgid "The gap between the reality of an implementation and the expectations of future users is a crucial factor. Three important aspects must be taken into account from the beginning of the project:" msgstr "" -#: ../../getting_started/documentation.rst:86 +#: ../../getting_started/documentation.rst:88 msgid "**Align with the project approach**: Both a clear division of roles and responsibilities and a clear description of the operating modes (validation, problem-solving, etc.) are crucial to the success of an Odoo implementation. It is therefore strongly advised to take the necessary time at the beginning of the project to align with these topics and regularly check that this is still the case." msgstr "" -#: ../../getting_started/documentation.rst:94 +#: ../../getting_started/documentation.rst:96 msgid "**Focus on the project success, not on the ideal solution**: The main goal of the SPoC and the Consultant is to carry out the project entrusted to them in order to provide the most effective solution to meet the needs expressed. This goal can sometimes conflict with the end user's vision of an ideal solution. In that case, the SPoC and the consultant will apply the 80-20 rule: focus on 80% of the expressed needs and take out the remaining 20% of the most disadvantageous objectives in terms of cost/benefit ratio (those proportions can of course change over time). Therefore, it will be considered acceptable to integrate a more time-consuming manipulation if a global relief is noted. Changes in business processes may also be proposed to pursue this same objective." msgstr "" -#: ../../getting_started/documentation.rst:108 +#: ../../getting_started/documentation.rst:110 msgid "**Specifications are always EXPLICIT**: Gaps between what is expected and what is delivered are often a source of conflict in a project. In order to avoid being in this delicate situation, we recommend using several types of tools\\* :" msgstr "" -#: ../../getting_started/documentation.rst:113 +#: ../../getting_started/documentation.rst:115 msgid "**The GAP Analysis**: The comparison of the request with the standard features proposed by Odoo will make it possible to identify the gap to be filled by developments/customizations or changes in business processes." msgstr "" -#: ../../getting_started/documentation.rst:118 +#: ../../getting_started/documentation.rst:120 msgid "**The User Story**: This technique clearly separates the responsibilities between the SPoC, responsible for explaining the WHAT, the WHY and the WHO, and the Consultant who will provide a response to the HOW." msgstr "" -#: ../../getting_started/documentation.rst:126 +#: ../../getting_started/documentation.rst:128 msgid "`The Proof of Concept `__ A simplified version, a prototype of what is expected to agree on the main lines of expected changes." msgstr "" -#: ../../getting_started/documentation.rst:130 +#: ../../getting_started/documentation.rst:132 msgid "**The Mockup**: In the same idea as the Proof of Concept, it will align with the changes related to the interface." msgstr "" -#: ../../getting_started/documentation.rst:133 +#: ../../getting_started/documentation.rst:135 msgid "To these tools will be added complete transparency on the possibilities and limitations of the software and/or its environment so that all project stakeholders have a clear idea of what can be expected/achieved in the project. We will, therefore, avoid basing our work on hypotheses without verifying its veracity beforehand." msgstr "" -#: ../../getting_started/documentation.rst:139 +#: ../../getting_started/documentation.rst:141 msgid "*This list can, of course, be completed by other tools that would more adequately meet the realities and needs of your project*" msgstr "" -#: ../../getting_started/documentation.rst:143 -msgid "4. Communication Strategy" +#: ../../getting_started/documentation.rst:145 +msgid "Communication Strategy" msgstr "" -#: ../../getting_started/documentation.rst:145 +#: ../../getting_started/documentation.rst:147 msgid "The purpose of the QuickStart methodology is to ensure quick ownership of the tool for end users. Effective communication is therefore crucial to the success of this approach. Its optimization will, therefore, lead us to follow those principles:" msgstr "" -#: ../../getting_started/documentation.rst:150 +#: ../../getting_started/documentation.rst:152 msgid "**Sharing the project management documentation**: The best way to ensure that all stakeholders in a project have the same level of knowledge is to provide direct access to the project's tracking document (Project Organizer). This document will contain at least a list of tasks to be performed as part of the implementation for which the priority level and the manager are clearly defined." msgstr "" -#: ../../getting_started/documentation.rst:158 +#: ../../getting_started/documentation.rst:160 msgid "The Project Organizer is a shared project tracking tool that allows both detailed tracking of ongoing tasks and the overall progress of the project." msgstr "" -#: ../../getting_started/documentation.rst:162 +#: ../../getting_started/documentation.rst:164 msgid "**Report essential information**: In order to minimize the documentation time to the essentials, we will follow the following good practices:" msgstr "" -#: ../../getting_started/documentation.rst:166 +#: ../../getting_started/documentation.rst:168 msgid "Meeting minutes will be limited to decisions and validations;" msgstr "" -#: ../../getting_started/documentation.rst:168 +#: ../../getting_started/documentation.rst:170 msgid "Project statuses will only be established when an important milestone is reached;" msgstr "" -#: ../../getting_started/documentation.rst:171 +#: ../../getting_started/documentation.rst:173 msgid "Training sessions on the standard or customized solution will be organized." msgstr "" -#: ../../getting_started/documentation.rst:175 -msgid "5. Customizations and Development" +#: ../../getting_started/documentation.rst:177 +msgid "Customizations and Development" msgstr "" -#: ../../getting_started/documentation.rst:177 +#: ../../getting_started/documentation.rst:179 msgid "Odoo is a software known for its flexibility and its important evolution capacity. However, a significant amount of development contradicts a fast and sustainable implementation. This is the reason why it is recommended to:" msgstr "" -#: ../../getting_started/documentation.rst:182 +#: ../../getting_started/documentation.rst:184 msgid "**Develop only for a good reason**: The decision to develop must always be taken when the cost-benefit ratio is positive (saving time on a daily basis, etc.). For example, it will be preferable to realize a significant development in order to reduce the time of a daily operation, rather than an operation to be performed only once a quarter. It is generally accepted that the closer the solution is to the standard, the lighter and more fluid the migration process, and the lower the maintenance costs for both parties. In addition, experience has shown us that 60% of initial development requests are dropped after a few weeks of using standard Odoo (see \"Adopting the standard as a priority\")." msgstr "" -#: ../../getting_started/documentation.rst:194 +#: ../../getting_started/documentation.rst:196 msgid "**Replace, without replicate**: There is a good reason for the decision to change the management software has been made. In this context, the moment of implementation is THE right moment to accept and even be a change initiator both in terms of how the software will be used and at the level of the business processes of the company." msgstr "" -#: ../../getting_started/documentation.rst:202 -msgid "6. Testing and Validation principles" +#: ../../getting_started/documentation.rst:204 +msgid "Testing and Validation principles" msgstr "" -#: ../../getting_started/documentation.rst:204 +#: ../../getting_started/documentation.rst:206 msgid "Whether developments are made or not in the implementation, it is crucial to test and validate the correspondence of the solution with the operational needs of the company." msgstr "" -#: ../../getting_started/documentation.rst:208 +#: ../../getting_started/documentation.rst:210 msgid "**Role distribution**: In this context, the Consultant will be responsible for delivering a solution corresponding to the defined specifications; the SPoC will have to test and validate that the solution delivered meets the requirements of the operational reality." msgstr "" -#: ../../getting_started/documentation.rst:214 +#: ../../getting_started/documentation.rst:216 msgid "**Change management**: When a change needs to be made to the solution, the noted gap is caused by:" msgstr "" -#: ../../getting_started/documentation.rst:218 +#: ../../getting_started/documentation.rst:220 msgid "A difference between the specification and the delivered solution - This is a correction for which the Consultant is responsible" msgstr "" -#: ../../getting_started/documentation.rst:220 +#: ../../getting_started/documentation.rst:223 msgid "**or**" msgstr "" -#: ../../getting_started/documentation.rst:222 +#: ../../getting_started/documentation.rst:225 msgid "A difference between the specification and the imperatives of operational reality - This is a change that is the responsibility of SPoC." msgstr "" -#: ../../getting_started/documentation.rst:226 -msgid "7. Data Imports" +#: ../../getting_started/documentation.rst:229 +msgid "Data Imports" msgstr "" -#: ../../getting_started/documentation.rst:228 +#: ../../getting_started/documentation.rst:231 msgid "Importing the history of transactional data is an important issue and must be answered appropriately to allow the project running smoothly. Indeed, this task can be time-consuming and, if its priority is not well defined, prevent production from happening in time. To do this as soon as possible, it will be decided :" msgstr "" -#: ../../getting_started/documentation.rst:234 +#: ../../getting_started/documentation.rst:237 msgid "**Not to import anything**: It often happens that after reflection, importing data history is not considered necessary, these data being, moreover, kept outside Odoo and consolidated for later reporting." msgstr "" -#: ../../getting_started/documentation.rst:239 +#: ../../getting_started/documentation.rst:242 msgid "**To import a limited amount of data before going into production**: When the data history relates to information being processed (purchase orders, invoices, open projects, for example), the need to have this information available from the first day of use in production is real. In this case, the import will be made before the production launch." msgstr "" -#: ../../getting_started/documentation.rst:246 +#: ../../getting_started/documentation.rst:249 msgid "**To import after production launch**: When the data history needs to be integrated with Odoo mainly for reporting purposes, it is clear that these can be integrated into the software retrospectively. In this case, the production launch of the solution will precede the required imports." msgstr "" -#: ../../getting_started/documentation.rst:253 -msgid "8. Support" -msgstr "" - -#: ../../getting_started/documentation.rst:255 -msgid "When your project is put in production, our support teams take care of your questions or technical issues." +#: ../../getting_started/documentation.rst:256 +msgid "Support" msgstr "" #: ../../getting_started/documentation.rst:258 +msgid "When your project is put in production, our support teams take care of your questions or technical issues." +msgstr "" + +#: ../../getting_started/documentation.rst:261 msgid "See :ref:`support-expectations`." msgstr "" diff --git a/locale/sources/helpdesk.pot b/locale/sources/helpdesk.pot index a7bf3d781..cd6581552 100644 --- a/locale/sources/helpdesk.pot +++ b/locale/sources/helpdesk.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-10 14:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,63 +24,63 @@ msgstr "" msgid "After sales features: refund, coupon, return, repair, onsite interventions" msgstr "" -#: ../../helpdesk/after_sales.rst:4 +#: ../../helpdesk/after_sales.rst:5 msgid "As my business grows, having the tools to allow my helpdesk team to record, track and manage issues raised easy and efficiently, is key. Odoo’s Helpdesk app allows me to generate credit notes, return products, grant coupons, do repairs and plan onsite interventions from a ticket’s page." msgstr "" -#: ../../helpdesk/after_sales.rst:7 +#: ../../helpdesk/after_sales.rst:10 msgid "Set up the After Sales services" msgstr "" -#: ../../helpdesk/after_sales.rst:8 -msgid "Go to *Configuration > Helpdesk Teams* and enable the After Sales options: *Refunds, Returns, Coupons, Repairs and Onsite Interventions*." +#: ../../helpdesk/after_sales.rst:12 +msgid "Go to :menuselection:`Configuration --> Helpdesk Teams` and enable the After Sales options: *Refunds, Returns, Coupons, Repairs and Onsite Interventions*." msgstr "" -#: ../../helpdesk/after_sales.rst:14 +#: ../../helpdesk/after_sales.rst:19 msgid "Generate credit notes from tickets" msgstr "" -#: ../../helpdesk/after_sales.rst:15 +#: ../../helpdesk/after_sales.rst:21 msgid "I can use a credit note to refund a customer or adjust the amount due. For that, I’ll simply go to my ticket page, click on *Refund* and select the corresponding *Invoice*. Clicking on *Reverse* the credit note will be generated, and I can *Post* it while still being in the *Helpdesk* app." msgstr "" -#: ../../helpdesk/after_sales.rst:22 +#: ../../helpdesk/after_sales.rst:29 msgid "Allow product returns from tickets" msgstr "" -#: ../../helpdesk/after_sales.rst:23 +#: ../../helpdesk/after_sales.rst:31 msgid "The process of a product return from my customer back to my warehouse will be taken into action when, at the ticket page, I choose the option *Return*." msgstr "" -#: ../../helpdesk/after_sales.rst:29 +#: ../../helpdesk/after_sales.rst:38 msgid "Grant coupons from tickets" msgstr "" -#: ../../helpdesk/after_sales.rst:30 -msgid "First, be sure to have your *Coupon Program* planned at the *Sales or Website* app. At the *Helpdesk* app, I will open my ticket and click on *Coupon*, choose the *Coupon Program > Generate*." +#: ../../helpdesk/after_sales.rst:40 +msgid "First, be sure to have your *Coupon Program* planned at the *Sales or Website* app. At the *Helpdesk* app, I will open my ticket and click on *Coupon*, choose the :menuselection:`Coupon Program --> Generate`." msgstr "" -#: ../../helpdesk/after_sales.rst:37 +#: ../../helpdesk/after_sales.rst:48 msgid "Repairs from tickets" msgstr "" -#: ../../helpdesk/after_sales.rst:38 +#: ../../helpdesk/after_sales.rst:50 msgid "Clicking on *Repair* option, on my ticket page, a new repair order form will be shown. Fill up the rest of the fields as needed and choose the next step." msgstr "" -#: ../../helpdesk/after_sales.rst:44 +#: ../../helpdesk/after_sales.rst:57 msgid "Plan onsite interventions from tickets" msgstr "" -#: ../../helpdesk/after_sales.rst:45 +#: ../../helpdesk/after_sales.rst:59 msgid "At the ticket page, I can now configure my onsite interventions exactly the same way I would do being on the *Field Service* app, clicking on *Plan Intervention*." msgstr "" -#: ../../helpdesk/after_sales.rst:52 +#: ../../helpdesk/after_sales.rst:66 msgid "`Coupons `_" msgstr "" -#: ../../helpdesk/after_sales.rst:53 +#: ../../helpdesk/after_sales.rst:67 msgid ":doc:`../manufacturing/repair/repair`" msgstr "" @@ -88,44 +88,44 @@ msgstr "" msgid "Allow customers to close their tickets" msgstr "" -#: ../../helpdesk/close_tickets.rst:4 +#: ../../helpdesk/close_tickets.rst:5 msgid "Allowing customers to close their tickets gives them autonomy and minimize misunderstandings about when an issue is considered solved, or not. It makes communication and actions more efficient." msgstr "" -#: ../../helpdesk/close_tickets.rst:7 +#: ../../helpdesk/close_tickets.rst:9 msgid "Configure the feature" msgstr "" -#: ../../helpdesk/close_tickets.rst:8 -msgid "To configure the feauture go to *Helpdesk > Settings > Helpdesk Teams > Edit* and enable *Ticket closing*." +#: ../../helpdesk/close_tickets.rst:11 +msgid "To configure the feature go to :menuselection:`Helpdesk --> Settings --> Helpdesk Teams --> Edit` and enable *Ticket closing*." msgstr "" -#: ../../helpdesk/close_tickets.rst:14 -msgid "In order to designate to which stage the ticket will migrate to once it is closed, go to *Overview > Tickets*." +#: ../../helpdesk/close_tickets.rst:18 +msgid "In order to designate to which stage the ticket will migrate to once it is closed, go to :menuselection:`Overview --> Tickets`." msgstr "" -#: ../../helpdesk/close_tickets.rst:20 -msgid "You can either create a new kanban stage or work with an existing one. For both scenarios, go to *Settings > Edit Stage* and enable *Closing Stage*." +#: ../../helpdesk/close_tickets.rst:25 +msgid "You can either create a new kanban stage or work with an existing one. For both scenarios, go to :menuselection:`Settings --> Edit Stage` and enable *Closing Stage*." msgstr "" -#: ../../helpdesk/close_tickets.rst:26 +#: ../../helpdesk/close_tickets.rst:32 msgid "If a closing stage is not specified, by default, the ticket will be transferred to the last stage; contrarily, if you have more than one stage set as closing, the ticket will be put in the first one." msgstr "" -#: ../../helpdesk/close_tickets.rst:30 +#: ../../helpdesk/close_tickets.rst:35 msgid "The Costumer Portal" msgstr "" -#: ../../helpdesk/close_tickets.rst:31 +#: ../../helpdesk/close_tickets.rst:37 msgid "Now, once the user logs in to his Portal, the option *Close this ticket* is available." msgstr "" -#: ../../helpdesk/close_tickets.rst:39 +#: ../../helpdesk/close_tickets.rst:44 msgid "Get reports on tickets closed by costumers" msgstr "" -#: ../../helpdesk/close_tickets.rst:40 -msgid "To do an analysis of the tickets that have been closed by costumers go to *Reporting > Tickets > Filters > Add Custom filter > Closed by partner > Applied*." +#: ../../helpdesk/close_tickets.rst:46 +msgid "To do an analysis of the tickets that have been closed by costumers go to :menuselection:`Reporting --> Tickets --> Filters --> Add Custom filter --> Closed by partner --> Applied`." msgstr "" #: ../../helpdesk/getting_started.rst:3 @@ -201,94 +201,94 @@ msgid "Live Chat allows your customers to submit a ticket via Live Chat on your msgstr "" #: ../../helpdesk/getting_started.rst:86 -msgid "The final option to submit tickets is thru an API connection. View the documentation `*here* `__." +msgid "The final option to submit tickets is through an API connection. View the documentation `here `_." msgstr "" -#: ../../helpdesk/getting_started.rst:91 +#: ../../helpdesk/getting_started.rst:90 msgid "Tickets have been created, now what?" msgstr "" -#: ../../helpdesk/getting_started.rst:93 +#: ../../helpdesk/getting_started.rst:92 msgid "Now your employees can start working on them! If you have selecting a manual assignation method then your employees will need to assign themselves to tickets using the \"Assign To Me\" button on the top left of a ticket or by adding themselves to the \"Assigned to\" field." msgstr "" -#: ../../helpdesk/getting_started.rst:101 +#: ../../helpdesk/getting_started.rst:100 msgid "If you have selected \"Random\" or \"Balanced\" assignation method, your tickets will be assigned to a member of that Helpdesk team." msgstr "" -#: ../../helpdesk/getting_started.rst:104 +#: ../../helpdesk/getting_started.rst:103 msgid "From there they will begin working on resolving the tickets! When they are completed, they will move the ticket to the solved stage." msgstr "" -#: ../../helpdesk/getting_started.rst:108 +#: ../../helpdesk/getting_started.rst:107 msgid "How do I mark this ticket as urgent?" msgstr "" -#: ../../helpdesk/getting_started.rst:110 +#: ../../helpdesk/getting_started.rst:109 msgid "On your tickets you will see stars. You can determine how urgent a ticket is but selecting one or more stars on the ticket. You can do this in the Kanban view or on the ticket form." msgstr "" -#: ../../helpdesk/getting_started.rst:117 +#: ../../helpdesk/getting_started.rst:116 msgid "To set up a Service Level Agreement Policy for your employees, first activate the setting under \"Settings\"" msgstr "" -#: ../../helpdesk/getting_started.rst:123 +#: ../../helpdesk/getting_started.rst:122 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"." msgstr "" -#: ../../helpdesk/getting_started.rst:125 +#: ../../helpdesk/getting_started.rst:124 msgid "You will fill in information like the Helpdesk team, what the minimum priority is on the ticket (the stars) and the targets for the ticket." msgstr "" -#: ../../helpdesk/getting_started.rst:132 +#: ../../helpdesk/getting_started.rst:131 msgid "What if a ticket is blocked or is ready to be worked on?" msgstr "" -#: ../../helpdesk/getting_started.rst:134 +#: ../../helpdesk/getting_started.rst:133 msgid "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban State\" on the ticket. You have 3 options:" msgstr "" -#: ../../helpdesk/getting_started.rst:137 +#: ../../helpdesk/getting_started.rst:136 msgid "Grey - Normal State" msgstr "" -#: ../../helpdesk/getting_started.rst:139 +#: ../../helpdesk/getting_started.rst:138 msgid "Red - Blocked" msgstr "" -#: ../../helpdesk/getting_started.rst:141 +#: ../../helpdesk/getting_started.rst:140 msgid "Green - Ready for next stage" msgstr "" -#: ../../helpdesk/getting_started.rst:143 +#: ../../helpdesk/getting_started.rst:142 msgid "Like the urgency stars you can adjust the state in the Kanban or on the Ticket form." msgstr "" -#: ../../helpdesk/getting_started.rst:150 +#: ../../helpdesk/getting_started.rst:149 msgid "How can my employees log time against a ticket?" msgstr "" -#: ../../helpdesk/getting_started.rst:152 +#: ../../helpdesk/getting_started.rst:151 msgid "First, head over to \"Settings\" and select the option for \"Timesheet on Ticket\". You will see a field appear where you can select the project the timesheets will log against." msgstr "" -#: ../../helpdesk/getting_started.rst:159 +#: ../../helpdesk/getting_started.rst:158 msgid "Now that you have selected a project, you can save. If you move back to your tickets, you will see a new tab called \"Timesheets\"" msgstr "" -#: ../../helpdesk/getting_started.rst:165 +#: ../../helpdesk/getting_started.rst:164 msgid "Here you employees can add a line to add work they have done for this ticket." msgstr "" -#: ../../helpdesk/getting_started.rst:169 +#: ../../helpdesk/getting_started.rst:168 msgid "How to allow your customers to rate the service they received" msgstr "" -#: ../../helpdesk/getting_started.rst:171 +#: ../../helpdesk/getting_started.rst:170 msgid "First, you will need to activate the ratings setting under \"Settings\"" msgstr "" -#: ../../helpdesk/getting_started.rst:176 +#: ../../helpdesk/getting_started.rst:175 msgid "Now, when a ticket is moved to its solved or completed stage, it will send an email to the customer asking how their service went." msgstr "" @@ -404,27 +404,27 @@ msgstr "" msgid "Turn helpdesk hours into invoices directly from a project task" msgstr "" -#: ../../helpdesk/reinvoice_from_project.rst:4 +#: ../../helpdesk/reinvoice_from_project.rst:5 msgid "Directly pull the billable time you have tracked on your helpdesk tickets into sales orders and invoices through a project task. It gives you more control over what you charge your client, and it is more efficient." msgstr "" -#: ../../helpdesk/reinvoice_from_project.rst:7 +#: ../../helpdesk/reinvoice_from_project.rst:10 msgid "Configuration" msgstr "" -#: ../../helpdesk/reinvoice_from_project.rst:8 -msgid "Go to *Helpdesk > Configuration > Helpdesk team > Edit* and enable the options *Timesheet on Ticket* and *Time Reinvoicing*. Under *Timesheet on Ticket*, choose the *Project* to which the tickets (and timesheets) will be linked by default. Open its *External link* to enable the feature *Bill from tasks*." +#: ../../helpdesk/reinvoice_from_project.rst:12 +msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk team --> Edit` and enable the options *Timesheet on Ticket* and *Time Reinvoicing*. Under *Timesheet on Ticket*, choose the *Project* to which the tickets (and timesheets) will be linked by default. Open its *External link* to enable the feature *Bill from tasks*." msgstr "" -#: ../../helpdesk/reinvoice_from_project.rst:17 +#: ../../helpdesk/reinvoice_from_project.rst:22 msgid "Create a sales order and an invoice" msgstr "" -#: ../../helpdesk/reinvoice_from_project.rst:18 +#: ../../helpdesk/reinvoice_from_project.rst:24 msgid "Now, once you added the time you spent on the helpdesk ticket, under the *Timesheets* tab, access the task clicking on its name." msgstr "" -#: ../../helpdesk/reinvoice_from_project.rst:25 +#: ../../helpdesk/reinvoice_from_project.rst:31 msgid "*Create Sales Order* and proceed to create the invoice." msgstr "" diff --git a/locale/sources/inventory.pot b/locale/sources/inventory.pot index fa2022607..8095f7d73 100644 --- a/locale/sources/inventory.pot +++ b/locale/sources/inventory.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-10 14:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -88,7 +88,7 @@ msgid "Create a Barcode Nomenclature" msgstr "" #: ../../inventory/barcode/operations/barcode_nomenclature.rst:15 -msgid "Odoo supports Barcode Nomenclatures, which determine the mapping and interpretation of the encoded information. You can configure your barcode nomenclature being in **debug** mode. To do so, go to *Inventory > Configuration > Barcode Nomenclature*." +msgid "Odoo supports Barcode Nomenclatures, which determine the mapping and interpretation of the encoded information. You can configure your barcode nomenclature being in **debug** mode. To do so, go to :menuselection:`Inventory --> Configuration --> Barcode Nomenclature`." msgstr "" #: ../../inventory/barcode/operations/barcode_nomenclature.rst:20 @@ -373,7 +373,7 @@ msgid "Configuration" msgstr "" #: ../../inventory/barcode/setup/software.rst:14 -msgid "To use this feature, you first need to activate the *Barcode* functionality via *Inventory > Settings > Barcode Scanner*. Once you have ticked the feature, you can hit save." +msgid "To use this feature, you first need to activate the *Barcode* functionality via :menuselection:`Inventory --> Settings --> Barcode Scanner`. Once you have ticked the feature, you can hit save." msgstr "" #: ../../inventory/barcode/setup/software.rst:22 @@ -381,38 +381,38 @@ msgid "Set Product Barcodes" msgstr "" #: ../../inventory/barcode/setup/software.rst:24 -msgid "You can easily assign barcodes to your different products via the *Inventory* app. To do so, go to *Settings > Configure Products Barcodes*." +msgid "You can easily assign barcodes to your different products via the *Inventory* app. To do so, go to :menuselection:`Settings --> Configure Products Barcodes`." msgstr "" -#: ../../inventory/barcode/setup/software.rst:31 +#: ../../inventory/barcode/setup/software.rst:30 msgid "Then, you have the possibility to assign barcodes to your products directly at creation on the product form." msgstr "" -#: ../../inventory/barcode/setup/software.rst:41 +#: ../../inventory/barcode/setup/software.rst:40 msgid "Be careful to add barcodes directly on the product variants and not on the template product. Otherwise, you won’t be able to differentiate them." msgstr "" -#: ../../inventory/barcode/setup/software.rst:46 +#: ../../inventory/barcode/setup/software.rst:45 msgid "Set Locations Barcodes" msgstr "" -#: ../../inventory/barcode/setup/software.rst:48 -msgid "If you manage multiple locations, you will find useful to attribute a barcode to each location and stick it on the location. You can configure the locations barcodes in *Inventory > Configuration > Locations*." +#: ../../inventory/barcode/setup/software.rst:47 +msgid "If you manage multiple locations, you will find useful to attribute a barcode to each location and stick it on the location. You can configure the locations barcodes in :menuselection:`Inventory --> Configuration --> Locations`." msgstr "" -#: ../../inventory/barcode/setup/software.rst:59 +#: ../../inventory/barcode/setup/software.rst:58 msgid "You can easily print the barcode you allocate to the locations via the *Print* menu." msgstr "" -#: ../../inventory/barcode/setup/software.rst:63 +#: ../../inventory/barcode/setup/software.rst:62 msgid "Barcode Formats" msgstr "" -#: ../../inventory/barcode/setup/software.rst:65 +#: ../../inventory/barcode/setup/software.rst:64 msgid "Most retail products use EAN-13 barcodes. They cannot be made up without proper authorization. You must pay the International Article Numbering Association a fee in exchange for an EAN code sequence." msgstr "" -#: ../../inventory/barcode/setup/software.rst:69 +#: ../../inventory/barcode/setup/software.rst:68 msgid "Still, as Odoo supports any string as a barcode, you can always define your own barcode format for internal use." msgstr "" @@ -555,15 +555,15 @@ msgid "Configure Drop-Shipping" msgstr "" #: ../../inventory/management/delivery/dropshipping.rst:54 -msgid "Activate the functionality in the *Purchase* application by going to *Configuration > Settings*." +msgid "Activate the functionality in the *Purchase* application by going to :menuselection:`Configuration --> Settings`." msgstr "" #: ../../inventory/management/delivery/dropshipping.rst:60 -msgid "Then, go to the *Inventory* app, in *Configuration > Settings* to activate the *Multi-Step Routes* feature. It will allow you to make the *Route* field appear on the sale order lines to specify you send a product via drop-shipping." +msgid "Then, go to the *Inventory* app, in :menuselection:`Configuration --> Settings` to activate the *Multi-Step Routes* feature. It will allow you to make the *Route* field appear on the sale order lines to specify you send a product via drop-shipping." msgstr "" #: ../../inventory/management/delivery/dropshipping.rst:68 -msgid "Now, in the *Sales* app, go to *Products > Products*. Select the product you would like to drop-ship and add a vendor pricelist which contains the right supplier, via the purchase tab." +msgid "Now, in the *Sales* app, go to :menuselection:`Products --> Products`. Select the product you would like to drop-ship and add a vendor pricelist which contains the right supplier, via the purchase tab." msgstr "" #: ../../inventory/management/delivery/dropshipping.rst:76 @@ -695,7 +695,7 @@ msgstr "" #: ../../inventory/management/delivery/one_step.rst:9 #: ../../inventory/management/incoming/one_step.rst:9 -msgid "However, if advanced routes have been activated and you set another incoming configuration on your warehouse, you can set it back to the one-step receipt configuration. To do so, go to *Configuration > Warehouses* and edit the warehouse in question." +msgid "However, if advanced routes have been activated and you set another incoming configuration on your warehouse, you can set it back to the one-step receipt configuration. To do so, go to :menuselection:`Configuration --> Warehouses` and edit the warehouse in question." msgstr "" #: ../../inventory/management/delivery/one_step.rst:14 @@ -747,7 +747,7 @@ msgid "In Odoo, you have the possibility to deliver your products in different p msgstr "" #: ../../inventory/management/delivery/packaging_type.rst:11 -msgid "First, you need to activate the *Delivery Packages* feature in the *Inventory app > Configuration > Settings*." +msgid "First, you need to activate the *Delivery Packages* feature in the :menuselection:`Inventory app --> Configuration --> Settings`." msgstr "" #: ../../inventory/management/delivery/packaging_type.rst:18 @@ -967,7 +967,7 @@ msgstr "" #: ../../inventory/management/delivery/three_steps.rst:29 #: ../../inventory/management/incoming/three_steps.rst:29 -msgid "To activate *multi-step routes*, open the *inventory app*, and go to *Configuration > Settings* and activate the option. By default, activating *multi-step routes* will also activate *Storage Locations*." +msgid "To activate *multi-step routes*, open the *inventory app*, and go to :menuselection:`Configuration --> Settings` and activate the option. By default, activating *multi-step routes* will also activate *Storage Locations*." msgstr "" #: ../../inventory/management/delivery/three_steps.rst:38 @@ -977,7 +977,7 @@ msgstr "" #: ../../inventory/management/delivery/three_steps.rst:40 #: ../../inventory/management/incoming/three_steps.rst:40 -msgid "Now that *Multi-Step Routes* is activated, go to *Configuration > Warehouse* and open the one you will use to deliver in 3 steps. Then, you can select the option *Pack good, send goods in output and then deliver (3 steps)* as *Outgoing Shipments*." +msgid "Now that *Multi-Step Routes* is activated, go to :menuselection:`Configuration --> Warehouse` and open the one you will use to deliver in 3 steps. Then, you can select the option *Pack good, send goods in output and then deliver (3 steps)* as *Outgoing Shipments*." msgstr "" #: ../../inventory/management/delivery/three_steps.rst:48 @@ -987,7 +987,7 @@ msgstr "" #: ../../inventory/management/delivery/three_steps.rst:51 #: ../../inventory/management/incoming/three_steps.rst:51 -msgid "Of course, you can rename them if you want. To do so, go to *Configuration > Locations* and select the one you want to rename. Change its name and hit save." +msgid "Of course, you can rename them if you want. To do so, go to :menuselection:`Configuration --> Locations` and select the one you want to rename. Change its name and hit save." msgstr "" #: ../../inventory/management/delivery/three_steps.rst:56 @@ -1077,7 +1077,7 @@ msgstr "" #: ../../inventory/management/delivery/two_steps.rst:26 #: ../../inventory/management/incoming/two_steps.rst:26 -msgid "To allow *multi-step routes*, go to *Configuration > Settings* and activate the feature. By default, activating *multi-step routes* will also activate *Storage Locations*." +msgid "To allow *multi-step routes*, go to :menuselection:`Configuration --> Settings` and activate the feature. By default, activating *multi-step routes* will also activate *Storage Locations*." msgstr "" #: ../../inventory/management/delivery/two_steps.rst:34 @@ -1087,12 +1087,12 @@ msgstr "" #: ../../inventory/management/delivery/two_steps.rst:36 #: ../../inventory/management/incoming/two_steps.rst:36 -msgid "Once *multi-step routes* is activated, you can go to *Configuration > Warehouse* and enter the warehouse which will use receipt in 2 steps. Then, you can select the option *Receive goods in input and then stock (2 steps)* for *Incoming Shipments*." +msgid "Once *multi-step routes* is activated, you can go to :menuselection:`Configuration --> Warehouse` and enter the warehouse which will use receipt in 2 steps. Then, you can select the option *Receive goods in input and then stock (2 steps)* for *Incoming Shipments*." msgstr "" #: ../../inventory/management/delivery/two_steps.rst:45 #: ../../inventory/management/incoming/two_steps.rst:44 -msgid "Activating this option will lead to the creation of a new *Input* location. If you want to rename it, you can go to *Configuration > Locations > Select Input* and update its name." +msgid "Activating this option will lead to the creation of a new *Input* location. If you want to rename it, you can go to :menuselection:`Configuration --> Locations --> Select Input` and update its name." msgstr "" #: ../../inventory/management/delivery/two_steps.rst:54 @@ -1194,6 +1194,10 @@ msgstr "" msgid ":doc:`../delivery/inventory_flow`" msgstr "" +#: ../../inventory/management/incoming/handle_receipts.rst:69 +msgid ":doc:`../../../purchase/purchases/rfq/analyze`" +msgstr "" + #: ../../inventory/management/incoming/two_steps.rst:68 msgid "Process the receipt and the internal transfer" msgstr "" @@ -1277,7 +1281,7 @@ msgid "Application configuration" msgstr "" #: ../../inventory/management/lots_serial_numbers/expiration_dates.rst:19 -msgid "To use expiration dates tracking, open the *Inventory* application and go to *Configuration > Settings* and activate the *Lots & Serial Numbers* and *Expiration Dates* features." +msgid "To use expiration dates tracking, open the *Inventory* application and go to :menuselection:`Configuration --> Settings` and activate the *Lots & Serial Numbers* and *Expiration Dates* features." msgstr "" #: ../../inventory/management/lots_serial_numbers/expiration_dates.rst:27 @@ -1320,7 +1324,7 @@ msgid "Expiration Alerts" msgstr "" #: ../../inventory/management/lots_serial_numbers/expiration_dates.rst:60 -msgid "You can access all your expiration alerts from the *inventory* app. To do so, go to *Master Data > Lots/Serial Numbers*. There, you can use the pre-existing filter that shows all the lots/serial numbers that exceeded their alert date." +msgid "You can access all your expiration alerts from the *inventory* app. To do so, go to :menuselection:`Master Data --> Lots/Serial Numbers`. There, you can use the pre-existing filter that shows all the lots/serial numbers that exceeded their alert date." msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:3 @@ -1348,7 +1352,7 @@ msgid "Application Configuration" msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:23 -msgid "First, you need to activate the tracking of lot numbers. To do so, go to *Inventory > Configuration > Settings* and tick *Lots & Serial Numbers*. Then, click on save." +msgid "First, you need to activate the tracking of lot numbers. To do so, go to :menuselection:`Inventory --> Configuration --> Settings` and tick *Lots & Serial Numbers*. Then, click on save." msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:31 @@ -1360,7 +1364,7 @@ msgid "Now, you have to configure which products you want to track by serial num msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:36 -msgid "Go to *Master Data > Products* and open the product of your choice. There, click on *Edit* and select *Tracking by Lots* in the inventory tab." +msgid "Go to :menuselection:`Master Data --> Products` and open the product of your choice. There, click on *Edit* and select *Tracking by Lots* in the inventory tab." msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:47 @@ -1401,7 +1405,7 @@ msgid "Operation Types" msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:95 -msgid "Of course, you also have the possibility to define how you will manage lots for each operation type. To do so, open the *Inventory* app and go to *Configuration > Operation Types*." +msgid "Of course, you also have the possibility to define how you will manage lots for each operation type. To do so, open the *Inventory* app and go to :menuselection:`Configuration --> Operation Types`." msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:99 @@ -1417,7 +1421,7 @@ msgid "The lot number given to the products allows you to keep track of where th msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:117 -msgid "To track an item, open the *Inventory* module and, in *Master Data > Lots/Serial Numbers*, click on the lot number corresponding to your search." +msgid "To track an item, open the *Inventory* module and, in :menuselection:`Master Data --> Lots/Serial Numbers`, click on the lot number corresponding to your search." msgstr "" #: ../../inventory/management/lots_serial_numbers/lots.rst:124 @@ -1441,11 +1445,11 @@ msgid "If you want to do it or run very advanced traceability, the Odoo double-e msgstr "" #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:20 -msgid "First, you need to activate the serial numbers tracking. To do so, go to *Configuration > Settings* in the *Inventory* application. Then, enable the feature and hit save." +msgid "First, you need to activate the serial numbers tracking. To do so, go to :menuselection:`Configuration --> Settings` in the *Inventory* application. Then, enable the feature and hit save." msgstr "" #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:30 -msgid "Now, you have to configure the products you want to track by serial numbers. To do so, go to *Master Data > Products* and open the product of your choice. Edit it and select *Tracking By Unique Serial Number* in the *Inventory tab*. Then, click on save." +msgid "Now, you have to configure the products you want to track by serial numbers. To do so, go to :menuselection:`Master Data --> Products` and open the product of your choice. Edit it and select *Tracking By Unique Serial Number* in the *Inventory tab*. Then, click on save." msgstr "" #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:42 @@ -1499,7 +1503,7 @@ msgid "Operation types" msgstr "" #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:108 -msgid "You also have the possibility to define how you will manage lots for each operation type. To define it, go to *Configuration > Operation Types* in the *Inventory* app." +msgid "You also have the possibility to define how you will manage lots for each operation type. To define it, go to :menuselection:`Configuration --> Operation Types` in the *Inventory* app." msgstr "" #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:112 @@ -1519,10 +1523,10 @@ msgid "Using serial numbers allows you to keep track of where the products were msgstr "" #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:130 -msgid "Tracking an item is easy: open the *Inventory* app, and go to *Master Data > Lots/Serial Numbers* and click on the serial number corresponding to your search. Then, open the *Traceability* information. There, you will see in which documents the serial number has been used." +msgid "Tracking an item is easy: open the *Inventory* app, and go to :menuselection:`Master Data --> Lots/Serial Numbers` and click on the serial number corresponding to your search. Then, open the *Traceability* information. There, you will see in which documents the serial number has been used." msgstr "" -#: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:142 +#: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:140 msgid "And, if you want to locate a serial number, you can do so by clicking on the *Location* button available on the serial number form." msgstr "" @@ -1575,7 +1579,7 @@ msgid "Of course, Odoo has the ability to manage those consignee stocks through msgstr "" #: ../../inventory/management/misc/owned_stock.rst:20 -msgid "To use this feature, go to *Inventory > Configuration > Settings* in the inventory app. Then, enable the *Consignment* feature in the *Traceability* section. Now, hit save." +msgid "To use this feature, go to :menuselection:`Inventory --> Configuration --> Settings` in the inventory app. Then, enable the *Consignment* feature in the *Traceability* section. Now, hit save." msgstr "" #: ../../inventory/management/misc/owned_stock.rst:28 @@ -1615,11 +1619,11 @@ msgid "When you install the *Inventory* app, Odoo automatically creates a scrap msgstr "" #: ../../inventory/management/misc/scrap.rst:24 -msgid "Of course, you can create new scrap areas if needed. To do so, go to *Inventory > Configuration > Settings* and activate the *Storage Locations* feature." +msgid "Of course, you can create new scrap areas if needed. To do so, go to :menuselection:`Inventory --> Configuration --> Settings` and activate the *Storage Locations* feature." msgstr "" #: ../../inventory/management/misc/scrap.rst:31 -msgid "Now, go to *Configuration > Locations* and create your scrap location." +msgid "Now, go to :menuselection:`Configuration --> Locations` and create your scrap location." msgstr "" #: ../../inventory/management/misc/scrap.rst:34 @@ -1639,7 +1643,7 @@ msgid "Scrap from receipt" msgstr "" #: ../../inventory/management/misc/scrap.rst:47 -msgid "Scrapping products from receipts is easy. Go to *Inventory > Dashboard > Receipts* or click on *1 TO PROCESS* under the receipts location." +msgid "Scrapping products from receipts is easy. Go to :menuselection:`Inventory --> Dashboard --> Receipts` or click on *1 TO PROCESS* under the receipts location." msgstr "" #: ../../inventory/management/misc/scrap.rst:53 @@ -1655,7 +1659,7 @@ msgid "Scrap from delivery order" msgstr "" #: ../../inventory/management/misc/scrap.rst:70 -msgid "To scrap products from a delivery order, go to *Inventory > Dashboard > Delivery orders* or click on *1 TO PROCESS*." +msgid "To scrap products from a delivery order, go to :menuselection:`Inventory --> Dashboard --> Delivery orders` or click on *1 TO PROCESS*." msgstr "" #: ../../inventory/management/misc/scrap.rst:76 @@ -1671,7 +1675,7 @@ msgid "Scrap from an internal transfer" msgstr "" #: ../../inventory/management/misc/scrap.rst:95 -msgid "To do this, the flow is almost the same. In fact, you just have to go to *Inventory > Dashboard > Internal Transfers*." +msgid "To do this, the flow is almost the same. In fact, you just have to go to :menuselection:`Inventory --> Dashboard --> Internal Transfers`." msgstr "" #: ../../inventory/management/misc/scrap.rst:101 @@ -1803,7 +1807,7 @@ msgid "The idea is to subtract the numbers of security days from the calculation msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:97 -msgid "To set up your security dates, go to *Inventory > Configuration > Settings* and enable the feature." +msgid "To set up your security dates, go to :menuselection:`Inventory --> Configuration --> Settings` and enable the feature." msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:104 @@ -1819,7 +1823,7 @@ msgid "When the system generates purchase orders for procuring products, they wi msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:114 -msgid "To find purchase lead time, go to *Inventory > Configuration > Settings* and enable the feature." +msgid "To find purchase lead time, go to :menuselection:`Inventory --> Configuration --> Settings` and enable the feature." msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:121 @@ -1831,7 +1835,7 @@ msgid "The security lead time for manufacturing allows generating manufacturing msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:127 -msgid "To configure it, go to *Manufacturing > Configuration > Settings* and enable the *Security Lead Time* option. Then, hit save." +msgid "To configure it, go to :menuselection:`Manufacturing --> Configuration --> Settings` and enable the *Security Lead Time* option. Then, hit save." msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:136 @@ -1839,7 +1843,7 @@ msgid "Sometimes, the internal transfers that a product might do may also influe msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:141 -msgid "To specify them, go to *Inventory > Configuration > Routes* and add a push rule to set a delay. Of course, you need to activate *Multi-step Routes* to use this feature." +msgid "To specify them, go to :menuselection:`Inventory --> Configuration --> Routes` and add a push rule to set a delay. Of course, you need to activate *Multi-step Routes* to use this feature." msgstr "" #: ../../inventory/management/planning/scheduled_date.rst:149 @@ -1919,7 +1923,7 @@ msgid "Run the scheduler manually" msgstr "" #: ../../inventory/management/planning/schedulers.rst:36 -msgid "To start the scheduler manually, go to *Inventory > Operations > Run Schedulers*. The scheduler uses all the relevant parameters defined for products, suppliers and the company to prioritize the different production orders, deliveries and supplier purchases." +msgid "To start the scheduler manually, go to :menuselection:`Inventory --> Operations --> Run Schedulers`. The scheduler uses all the relevant parameters defined for products, suppliers and the company to prioritize the different production orders, deliveries and supplier purchases." msgstr "" #: ../../inventory/management/planning/schedulers.rst:45 @@ -1927,11 +1931,11 @@ msgid "Configure and run the scheduler (for advanced users)" msgstr "" #: ../../inventory/management/planning/schedulers.rst:47 -msgid "To use this feature, you have to enable the debug mode. To do so, go to *Settings > Activate the developer mode*." +msgid "To use this feature, you have to enable the debug mode. To do so, go to :menuselection:`Settings --> Activate the developer mode`." msgstr "" #: ../../inventory/management/planning/schedulers.rst:53 -msgid "Then, go to *Settings > Technical > Automation > Scheduled Actions* and modify the *Run MRP Scheduler Configuration*. There, you can set the starting time of the scheduler." +msgid "Then, go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` and modify the *Run MRP Scheduler Configuration*. There, you can set the starting time of the scheduler." msgstr "" #: ../../inventory/management/products.rst:3 @@ -2017,7 +2021,7 @@ msgid "You can set up Odoo to work with different units of measure for one produ msgstr "" #: ../../inventory/management/products/uom.rst:18 -msgid "In the *Inventory* application, go to *Configuration > Settings*. In the *Products* section, activate *Units of Measure*, then *Save*." +msgid "In the *Inventory* application, go to :menuselection:`Configuration --> Settings`. In the *Products* section, activate *Units of Measure*, then *Save*." msgstr "" #: ../../inventory/management/products/uom.rst:25 @@ -2025,7 +2029,7 @@ msgid "Create New Units of Measure" msgstr "" #: ../../inventory/management/products/uom.rst:27 -msgid "In the *Inventory* application go to *Configuration > UoM*. There, hit *Create*. As an example, we will create a Box of 6 units that we will use for the Egg product." +msgid "In the *Inventory* application go to :menuselection:`Configuration --> UoM`. There, hit *Create*. As an example, we will create a Box of 6 units that we will use for the Egg product." msgstr "" #: ../../inventory/management/products/uom.rst:34 @@ -2037,7 +2041,7 @@ msgid "Specify Units of Measure on your Products" msgstr "" #: ../../inventory/management/products/uom.rst:45 -msgid "In the *Inventory application > Master Data > Products*, open the product which you would like to change the purchase/sale unit of measure, and click on *Edit*." +msgid "In the :menuselection:`Inventory application --> Master Data --> Products`, open the product which you would like to change the purchase/sale unit of measure, and click on *Edit*." msgstr "" #: ../../inventory/management/products/uom.rst:49 @@ -2109,7 +2113,7 @@ msgid "The package is the physical container in which you put one or several pro msgstr "" #: ../../inventory/management/products/usage.rst:43 -msgid "To separate a delivery into different packages you will have to set the done qunatity to the desired package quantity then click on \"PUT IN PACK\", do this for each package." +msgid "To separate a delivery into different packages you will have to set the done quantity to the desired package quantity then click on \"PUT IN PACK\", do this for each package." msgstr "" #: ../../inventory/management/products/usage.rst:54 @@ -2153,7 +2157,7 @@ msgid "Reordering Rules" msgstr "" #: ../../inventory/management/replenishment_strategies/min_stock_rule_vs_mto.rst:26 -msgid "The *Reordering Rules* configuration is available through the menu *Inventory > Master Data > Reordering Rules*. There, click on *Create* to set minimum and maximum stock values for a given product." +msgid "The *Reordering Rules* configuration is available through the menu :menuselection:`Inventory --> Master Data --> Reordering Rules`. There, click on *Create* to set minimum and maximum stock values for a given product." msgstr "" #: ../../inventory/management/replenishment_strategies/min_stock_rule_vs_mto.rst:33 @@ -2177,7 +2181,7 @@ msgid "Don't forget to select the product type *storable* in the product form. A msgstr "" #: ../../inventory/management/replenishment_strategies/min_stock_rule_vs_mto.rst:69 -msgid "The *Make To Order* configuration is available on your product form through your *Inventory module > Master Data > Products* (or in any other module where products are available)." +msgid "The *Make To Order* configuration is available on your product form through your :menuselection:`Inventory module --> Master Data --> Products` (or in any other module where products are available)." msgstr "" #: ../../inventory/management/replenishment_strategies/min_stock_rule_vs_mto.rst:73 @@ -2197,7 +2201,7 @@ msgid "In order to be able to resupply from another warehouse, you need to activ msgstr "" #: ../../inventory/management/replenishment_strategies/virtual_warehouses.rst:16 -msgid "You can then access your warehouses via \\*Inventory > Configuration > Warehouses\\*. Create the necessary warehouses following this `*documentation* `__. Enter the warehouse which should be resupplied by another one. You will have the possibility to directly indicate through which warehouse it gets resupplied." +msgid "You can then access your warehouses via :menuselection:`Inventory --> Configuration --> Warehouses`. Create the necessary warehouses following this :doc:`documentation <../warehouses/warehouse_creation>`. Enter the warehouse which should be resupplied by another one. You will have the possibility to directly indicate through which warehouse it gets resupplied." msgstr "" #: ../../inventory/management/replenishment_strategies/virtual_warehouses.rst:26 @@ -2205,7 +2209,7 @@ msgid "By activating this option, a new route will now be available on your prod msgstr "" #: ../../inventory/management/replenishment_strategies/virtual_warehouses.rst:34 -msgid "For the demonstration, I set a reordering rule with a minimum of 5 units in stock and a maximum of 10 units in stock, having currently 0 units on hand. I will run the scheduler by going to \\*Inventory > Operations > Run scheduler\\*." +msgid "For the demonstration, I set a reordering rule with a minimum of 5 units in stock and a maximum of 10 units in stock, having currently 0 units on hand. I will run the scheduler by going to :menuselection:`Inventory --> Operations --> Run scheduler`." msgstr "" #: ../../inventory/management/replenishment_strategies/virtual_warehouses.rst:42 @@ -2229,7 +2233,7 @@ msgid "Landed costs can only be applied to products with a FIFO or AVCO costing msgstr "" #: ../../inventory/management/reporting/integrating_landed_costs.rst:17 -msgid "First, you need to go in *Inventory > Configuration > Settings* and activate the landed costs feature. You can also determine the default journal in which the landed cost accounting entries will be recorded." +msgid "First, you need to go in :menuselection:`Inventory --> Configuration --> Settings` and activate the landed costs feature. You can also determine the default journal in which the landed cost accounting entries will be recorded." msgstr "" #: ../../inventory/management/reporting/integrating_landed_costs.rst:25 @@ -2265,7 +2269,7 @@ msgid "I can access the journal entry that has been created by the landed cost b msgstr "" #: ../../inventory/management/reporting/integrating_landed_costs.rst:63 -msgid "You are not forced to start from the vendor bill, you can also go in *Inventory > Operations > Landed Costs* and directly create the landed cost from there." +msgid "You are not forced to start from the vendor bill, you can also go in :menuselection:`Inventory --> Operations --> Landed Costs` and directly create the landed cost from there." msgstr "" #: ../../inventory/management/reporting/inventory_valuation_config.rst:5 @@ -2560,7 +2564,7 @@ msgid "Manual Inventory Valuation" msgstr "" #: ../../inventory/management/reporting/inventory_valuation_config.rst:190 -msgid "In this case, goods receipts and deliveries won’t have any direct impact on your accounting books. Periodically, you create a manual journal entry representing the value of what you have in stock. To know that value, go in Inventory > Reporting > Inventory Valuation." +msgid "In this case, goods receipts and deliveries won’t have any direct impact on your accounting books. Periodically, you create a manual journal entry representing the value of what you have in stock. To know that value, go in :menuselection:`Inventory --> Reporting --> Inventory Valuation`." msgstr "" #: ../../inventory/management/reporting/inventory_valuation_config.rst:195 @@ -2916,7 +2920,7 @@ msgid "The inventory valuation report" msgstr "" #: ../../inventory/management/reporting/using_inventory_valuation.rst:70 -msgid "The summary of this is accessible via the inventory valuation report (accessible from *Inventory > Reporting > Inventory Valuation*). It gives you, product per product, the value of your stock. By clicking on the button *Inventory At Date*, you can have the same information for a past date." +msgid "The summary of this is accessible via the inventory valuation report (accessible from :menuselection:`Inventory --> Reporting --> Inventory Valuation`). It gives you, product per product, the value of your stock. By clicking on the button *Inventory At Date*, you can have the same information for a past date." msgstr "" #: ../../inventory/management/warehouses.rst:3 @@ -2968,11 +2972,11 @@ msgid "Create a New Location" msgstr "" #: ../../inventory/management/warehouses/location_creation.rst:8 -msgid "In order to be able to create different locations, you will need to activate *Multi-Locations* in the settings which can be done from the *Inventory application > Configuration > Settings*." +msgid "In order to be able to create different locations, you will need to activate *Multi-Locations* in the settings which can be done from the :menuselection:`Inventory application --> Configuration --> Settings`." msgstr "" #: ../../inventory/management/warehouses/location_creation.rst:15 -msgid "In the *Inventory application*, you can now go to *Configuration > Locations* and hit *Create* in order to create a new location." +msgid "In the *Inventory application*, you can now go to :menuselection:`Configuration --> Locations` and hit *Create* in order to create a new location." msgstr "" #: ../../inventory/management/warehouses/location_creation.rst:21 @@ -3000,11 +3004,11 @@ msgid "In order to create a new warehouse, you should activate the *Multi-Wareho msgstr "" #: ../../inventory/management/warehouses/warehouse_creation.rst:12 -msgid "In order to do so, go to the *Inventory app > Configuration > Settings*." +msgid "In order to do so, go to the :menuselection:`Inventory app --> Configuration --> Settings`." msgstr "" #: ../../inventory/management/warehouses/warehouse_creation.rst:18 -msgid "You can then go to *Inventory > Configuration > Warehouses* and hit *Create* to add a new warehouse." +msgid "You can then go to :menuselection:`Inventory --> Configuration --> Warehouses` and hit *Create* to add a new warehouse." msgstr "" #: ../../inventory/management/warehouses/warehouse_creation.rst:24 @@ -3035,7 +3039,7 @@ msgstr "" #: ../../inventory/overview/process/deliver_from_stock.rst:8 #: ../../inventory/overview/process/initial_stock.rst:5 #: ../../inventory/overview/process/receive_in_stock.rst:5 -msgid "The first step to use the inventory application is to create products in your database via the menu *Master Data > Products*. Click the Create button and enter the name of your product." +msgid "The first step to use the inventory application is to create products in your database via the menu :menuselection:`Master Data --> Products`. Click the Create button and enter the name of your product." msgstr "" #: ../../inventory/overview/process/deliver_from_stock.rst:15 @@ -3080,7 +3084,7 @@ msgid "Inventory Adjustment for Multiple Products" msgstr "" #: ../../inventory/overview/process/initial_stock.rst:21 -msgid "Once you have created all your *storable products*, you can create an *inventory adjustment* to determine their current stock level in Odoo. You therefore need to go to *Operations > Inventory Adjustments* and create a new one." +msgid "Once you have created all your *storable products*, you can create an *inventory adjustment* to determine their current stock level in Odoo. You therefore need to go to :menuselection:`Operations --> Inventory Adjustments` and create a new one." msgstr "" #: ../../inventory/overview/process/initial_stock.rst:29 @@ -3168,43 +3172,43 @@ msgstr "" msgid "For more information on how to organize your warehouse, read our blog: `What is cross-docking and is it for me? `__" msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:15 -msgid "In the *Inventory* app, open *Configuration > Settings* and activate the *Multi-Step Routes*." +#: ../../inventory/routes/concepts/cross_dock.rst:16 +msgid "In the *Inventory* app, open :menuselection:`Configuration --> Settings` and activate the *Multi-Step Routes*." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:21 +#: ../../inventory/routes/concepts/cross_dock.rst:22 msgid "Doing so will also enable the *Storage Locations* feature." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:23 -msgid "Now, both *Incoming* and *Outgoing* shipments should be configured to work with 2 steps. To adapt the configuration, go to *Inventory > Configuration > Warehouses* and edit your warehouse." +#: ../../inventory/routes/concepts/cross_dock.rst:24 +msgid "Now, both *Incoming* and *Outgoing* shipments should be configured to work with 2 steps. To adapt the configuration, go to :menuselection:`Inventory --> Configuration --> Warehouses` and edit your warehouse." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:28 -msgid "This modification will lead to the creation of a *Cross-Docking* route that can be found in *Inventory > Configuration > Routes*." +#: ../../inventory/routes/concepts/cross_dock.rst:31 +msgid "This modification will lead to the creation of a *Cross-Docking* route that can be found in :menuselection:`Inventory --> Configuration --> Routes`." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:34 +#: ../../inventory/routes/concepts/cross_dock.rst:38 msgid "Configure products with Cross-Dock Route" msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:36 +#: ../../inventory/routes/concepts/cross_dock.rst:40 msgid "Create the product that uses the *Cross-Dock Route* and then, in the inventory tab, select the routes *Buy* and *Cross-Dock*. Now, in the purchase tab, specify the vendor to who you buy the product and set a price for it." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:44 +#: ../../inventory/routes/concepts/cross_dock.rst:48 msgid "Once done, create a sale order for the product and confirm it. Odoo will automatically create two transfers which will be linked to the sale order. The first one is the transfer from the *Input Location* to the *Output Location*, corresponding to the move of the product in the *Cross-Dock* area. The second one is the delivery order from the *Output Location* to your *Customer Location. Both are in state *Waiting Another Operation* because we still need to order the product to our supplier." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:52 +#: ../../inventory/routes/concepts/cross_dock.rst:56 msgid "Now, go to the *Purchase* app. There, you will find the purchase order that has been automatically triggered by the system. Validate it and receive the products in the *Input Location*." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:60 +#: ../../inventory/routes/concepts/cross_dock.rst:64 msgid "When the products have been received from the supplier, you can go back to your initial sale order and validate the internal transfer from *Input* to *Output*." msgstr "" -#: ../../inventory/routes/concepts/cross_dock.rst:68 +#: ../../inventory/routes/concepts/cross_dock.rst:72 msgid "The delivery order is now ready to be processed and can be validated too." msgstr "" @@ -3220,95 +3224,95 @@ msgstr "" msgid "First of all you have to select the multi locations option. Go to :menuselection:`Configuration --> Settings` in the **Inventory application**. Then tick the **Manage several locations per warehouse** option. Please don't forget to **apply** your changes." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:22 +#: ../../inventory/routes/concepts/inter_warehouse.rst:21 msgid "This option should also be ticked if you wish to manage different locations and routes in your warehouse." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:26 +#: ../../inventory/routes/concepts/inter_warehouse.rst:25 msgid "Creating a new warehouse" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:28 +#: ../../inventory/routes/concepts/inter_warehouse.rst:27 msgid "The next step is to create your new warehouse. In the Inventory application click on :menuselection:`Configuration --> Warehouse Management --> Warehouses`. You are now able to create your warehouse by clicking on **Create**." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:33 +#: ../../inventory/routes/concepts/inter_warehouse.rst:32 msgid "Fill in a **Warehouse Name** and a **Short Name**. The short name is 5 characters maximum." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:41 -msgid "please note that the **Short Name** is very important as it will appear on your transfer orders and other warehouse documents. It might be smart to use an understandable one (e.g.: WH/[first letters of location])." +#: ../../inventory/routes/concepts/inter_warehouse.rst:39 +msgid "Please note that the **Short Name** is very important as it will appear on your transfer orders and other warehouse documents. It might be smart to use an understandable one (e.g.: WH/[first letters of location])." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:46 +#: ../../inventory/routes/concepts/inter_warehouse.rst:44 msgid "If you go back to your dashboard, new operations will automatically have been generated for your new warehouse." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:53 +#: ../../inventory/routes/concepts/inter_warehouse.rst:51 msgid "Creating a new inventory" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:55 +#: ../../inventory/routes/concepts/inter_warehouse.rst:53 msgid "If you create a new warehouse you might already have an existing physical inventory in it. In that case you should create an inventory in Odoo, if not you can skip this step." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:59 +#: ../../inventory/routes/concepts/inter_warehouse.rst:57 msgid "Go into the inventory application, select :menuselection:`Inventory Control --> Inventory Adjustment`. You can then create a new inventory by clicking on **Create**. Fill in the **Inventory Reference**, **Date** and be sure to select the right warehouse and location." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:67 +#: ../../inventory/routes/concepts/inter_warehouse.rst:65 msgid "Next, click on **Start Inventory**. A new window will open where you will be able to input your existing products. Select add an item and indicate the **Real Quantity** available in the warehouse. The theoretical quantity can not be changed as it represents a computed quantity from purchase and sales orders." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:76 +#: ../../inventory/routes/concepts/inter_warehouse.rst:74 msgid "Don't forget to validate your inventory once you have recorder the state of all yours product." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:80 +#: ../../inventory/routes/concepts/inter_warehouse.rst:78 msgid "Create an internal transfer" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:82 +#: ../../inventory/routes/concepts/inter_warehouse.rst:80 msgid "The final step is to create your internal transfer. If you want to tranfer 2 units of a product from your first warehouse to another one in Brussels, proceed as follows:" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:86 +#: ../../inventory/routes/concepts/inter_warehouse.rst:84 msgid "From your dashboard, select a internal movement of one of the two warehouses. To do so, click on :menuselection:`More --> Transfer`." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:92 +#: ../../inventory/routes/concepts/inter_warehouse.rst:90 msgid "A new window will open where you will be able to select the source location zone (in this case our \"old warehouse\") and the destination location zone (in this case our \"new\" warehouse located in Brussels)." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:96 +#: ../../inventory/routes/concepts/inter_warehouse.rst:94 msgid "Add the products you want to transfer by clicking on **Add an Item** and don't forget to **Validate** or **Mark as TODO** once you are done." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:102 +#: ../../inventory/routes/concepts/inter_warehouse.rst:100 msgid "If you select **Validate**, Odoo will process all quantities to transfer." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:104 +#: ../../inventory/routes/concepts/inter_warehouse.rst:102 msgid "If you select **Mark as TODO**, Odoo will put the transfer in **Waiting Availability** status. Click on **Reserve** to reserve the amount of products in your source warehouse." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:108 +#: ../../inventory/routes/concepts/inter_warehouse.rst:106 msgid "It is also possible to manually transfer each product:" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:110 +#: ../../inventory/routes/concepts/inter_warehouse.rst:108 msgid "Via your dashboard, select the transfer order in the source location." msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:115 +#: ../../inventory/routes/concepts/inter_warehouse.rst:113 msgid "Select the right transfer order" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:120 +#: ../../inventory/routes/concepts/inter_warehouse.rst:118 msgid "3. Click on the little pencil logo in the lower right corner in order to open the operation details window. In this new window you can manually indicate how much products you process" msgstr "" -#: ../../inventory/routes/concepts/inter_warehouse.rst:129 +#: ../../inventory/routes/concepts/inter_warehouse.rst:126 msgid "If you decide to partially process the transfer order (e.g. a part of the products can't be shipped yet due to an unexpected event), Odoo will automatically ask if you wish to create a **backorder**. Create a backorder if you expect to process the remaining products later, do not create a backorder if you will not supply/receive the remaining products." msgstr "" @@ -3333,7 +3337,7 @@ msgid "Procurement rules settings" msgstr "" #: ../../inventory/routes/concepts/procurement_rule.rst:37 -msgid "The procurement rules are set on the routes. In the inventory application, go to Configuration > Routes." +msgid "The procurement rules are set on the routes. In the inventory application, go to :menuselection:`Configuration --> Routes`." msgstr "" #: ../../inventory/routes/concepts/procurement_rule.rst:40 @@ -3636,30 +3640,30 @@ msgid "If, for example, a warehouse contains volatile substances, it is importan msgstr "" #: ../../inventory/routes/strategies/putaway.rst:12 -msgid "In the *Inventory* app, go to *Configuration > Settings* and activate the *Multi-Step Routes*. By doing so, the *Storage Locations* will be automatically activated." +msgid "In the *Inventory* app, go to :menuselection:`Configuration --> Settings` and activate the *Multi-Step Routes*. By doing so, the *Storage Locations* will be automatically activated." msgstr "" -#: ../../inventory/routes/strategies/putaway.rst:18 +#: ../../inventory/routes/strategies/putaway.rst:19 msgid "Setting up a Putaway Rule" msgstr "" -#: ../../inventory/routes/strategies/putaway.rst:20 +#: ../../inventory/routes/strategies/putaway.rst:21 msgid "In some cases, like for a retail shop storing vegetables and fruits, we have to store products in different locations to maintain product quality." msgstr "" -#: ../../inventory/routes/strategies/putaway.rst:22 +#: ../../inventory/routes/strategies/putaway.rst:23 msgid "Let’s suppose there are one warehouse location *WH/Stock* and two sub-locations *WH/Stock/Vegatable* and *WH/Stock/Fruits*." msgstr "" -#: ../../inventory/routes/strategies/putaway.rst:24 -msgid "To manage those locations, we will create putaway rules. To do so, open the *Inventory* app and go to *Configuration > Putaway Rules*. Then, click on create and configure your first rule indicating the main location the product will enter before being redirected to the right location." +#: ../../inventory/routes/strategies/putaway.rst:25 +msgid "To manage those locations, we will create putaway rules. To do so, open the *Inventory* app and go to :menuselection:`Configuration --> Putaway Rules`. Then, click on create and configure your first rule indicating the main location the product will enter before being redirected to the right location." msgstr "" -#: ../../inventory/routes/strategies/putaway.rst:27 +#: ../../inventory/routes/strategies/putaway.rst:31 msgid "The putaway rules can be defined either per product or per product category." msgstr "" -#: ../../inventory/routes/strategies/putaway.rst:32 +#: ../../inventory/routes/strategies/putaway.rst:36 msgid "Now, if I purchase apples and carrots to my supplier, they will be grouped in the same receipt but redirected to the right location automatically, thanks to putaway rules. This information is available from *Inventory Report*, under the reporting menu." msgstr "" @@ -4483,58 +4487,58 @@ msgid "If you already have a UPS account, you can add it to your online profile msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:39 -msgid "1. Log in to the UPS.com site (`http://www.ups.com `__) using your UPS.com User ID and Password." +msgid "Log in to the `UPS.com website `_) using your UPS.com User ID and Password." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:43 +#: ../../inventory/shipping/setup/ups_credentials.rst:41 msgid "Click the **My UPS** tab." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:45 +#: ../../inventory/shipping/setup/ups_credentials.rst:43 msgid "Click the **Account Summary** link." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:47 +#: ../../inventory/shipping/setup/ups_credentials.rst:45 msgid "4. Click the **Add an Existing UPS Account** link in the **UPS Account Details** section of the page." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:50 +#: ../../inventory/shipping/setup/ups_credentials.rst:48 msgid "5. In the **Add New Account** screen, enter the **UPS Account Number**, **Account Name**, and **Postal Code** fields. The country defaults to United States.q" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:54 +#: ../../inventory/shipping/setup/ups_credentials.rst:52 msgid "Click the **Next** button to continue." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:57 +#: ../../inventory/shipping/setup/ups_credentials.rst:55 msgid "Get an Access Key" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:59 +#: ../../inventory/shipping/setup/ups_credentials.rst:57 msgid "After you have added your UPS account number to your user profile you can request an Access Key from UPS using the steps below:" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:62 -msgid "1. Go to the **UPS Developer Kit** web page `https://www.ups.com/upsdeveloperkit?loc=en\\_US `__" +#: ../../inventory/shipping/setup/ups_credentials.rst:60 +msgid "Go to the `UPS Developer Kit web page `_" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:65 +#: ../../inventory/shipping/setup/ups_credentials.rst:61 msgid "Log into UPS.com with your user ID and password" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:67 +#: ../../inventory/shipping/setup/ups_credentials.rst:62 msgid "Click on the link **Request an access key**." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:69 +#: ../../inventory/shipping/setup/ups_credentials.rst:63 msgid "Verify your contact information" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:71 +#: ../../inventory/shipping/setup/ups_credentials.rst:64 msgid "Click the **Request Access Key** button." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:73 +#: ../../inventory/shipping/setup/ups_credentials.rst:66 msgid "The **Access Key** will be provided to you on the web page, and an email with the Access Key will be sent to the email address of the primary contact." msgstr "" diff --git a/locale/sources/iot.pot b/locale/sources/iot.pot index 5d9913a4e..afb40a776 100644 --- a/locale/sources/iot.pot +++ b/locale/sources/iot.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-10 14:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -105,7 +105,7 @@ msgid "Updating your SD Card with Etcher" msgstr "" #: ../../iot/config/flash_sdcard.rst:11 -msgid "Go to Balena’s website and download `Etcher `__, It’s a free and open-source utility used for burning image files. Install and launch it." +msgid "Go to Balena’s website and download `Etcher `__, It’s a free and open-source utility used for burning image files. Install and launch it." msgstr "" #: ../../iot/config/flash_sdcard.rst:15 @@ -140,8 +140,8 @@ msgstr "" msgid "If your IoT Box image is from an earlier version, then you will have to reflash the SD card of your IoT Box to update the image (the latest image can be found `here `__)." msgstr "" -#: ../../iot/config/iot_notfound.rst:23 -msgid "You can find the documentation about SD card flashing here (`here `__)." +#: ../../iot/config/iot_notfound.rst:24 +msgid ":doc:`flash_sdcard`" msgstr "" #: ../../iot/config/pos.rst:3 @@ -233,7 +233,7 @@ msgid "**Wi-Fi**: The current version of the IoT Box has Wi-Fi built in. Make su msgstr "" #: ../../iot/config/pos.rst:73 -msgid "Once it's done, you can connect the IoT Box to your PoS. For this, go in Point of Sale > Configuration > PoS, tick the box \"IoT Box\" and select the IoT Box you want to connect with. Save the changes." +msgid "Once it's done, you can connect the IoT Box to your PoS. For this, go in :menuselection:`Point of Sale --> Configuration --> PoS`, tick the box \"IoT Box\" and select the IoT Box you want to connect with. Save the changes." msgstr "" #: ../../iot/config/pos.rst:77 diff --git a/locale/sources/manufacturing.pot b/locale/sources/manufacturing.pot index 051dbe132..2a67ea6c4 100644 --- a/locale/sources/manufacturing.pot +++ b/locale/sources/manufacturing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -101,54 +101,54 @@ msgid "You can use BoMs without routings. You will use this if you choose to man msgstr "" #: ../../manufacturing/management/bill_configuration.rst:24 -msgid "Before creating your *BoM*, you have to create the product using the *BoM* and, at least, one of the components. Go to the *Master Data* menu > *Products* and create both the finished product and the component." +msgid "Before creating your *BoM*, you have to create the product using the *BoM* and, at least, one of the components. Go to the :menuselection:`Master Data menu --> Products` and create both the finished product and the component." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:29 +#: ../../manufacturing/management/bill_configuration.rst:28 msgid "Once done, go to the *Bills of Materials* menu under *Master Data*. Now, create it. Choose the product from the dropdown menu and add your components and the quantity. In this case, keep the default *BoM* type, which is *Manufacture this Product*." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:38 +#: ../../manufacturing/management/bill_configuration.rst:37 msgid "Using the same BoM to describe Variants" msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:40 +#: ../../manufacturing/management/bill_configuration.rst:39 msgid "As said above, you can use *BoM* for *Product Variants*. It is basically the same as for the standard product." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:43 +#: ../../manufacturing/management/bill_configuration.rst:42 msgid "If your *BoM* is for one variant only, then specify which one in the *Product Variant* field. If not, specify the variant it is consumed for on each component line. You can add several variants for each component." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:52 +#: ../../manufacturing/management/bill_configuration.rst:51 msgid "Adding a routing" msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:54 +#: ../../manufacturing/management/bill_configuration.rst:53 msgid "You can add routing to your *BoM*. You will do this if you need to define a series of operations required by your manufacturing process. To use it, enable the *Work Orders* feature in the *Manufacturing* app settings." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:63 +#: ../../manufacturing/management/bill_configuration.rst:62 msgid "Each *BoM* can have only one routing while each routing can be used multiple times." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:66 +#: ../../manufacturing/management/bill_configuration.rst:65 msgid "Now that you have created your routing, add it to your *BoM*. You can select when, in the work operations, your components are consumed with the dropdown menu." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:74 +#: ../../manufacturing/management/bill_configuration.rst:73 msgid "Adding By-Products" msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:76 +#: ../../manufacturing/management/bill_configuration.rst:75 msgid "In Odoo, a *by-product* is any product produced by a *BoM* in addition to the primary product." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:79 +#: ../../manufacturing/management/bill_configuration.rst:78 msgid "To add *by-products* to a *BoM*, you will first need to enable them from the *Manufacturing* app settings." msgstr "" -#: ../../manufacturing/management/bill_configuration.rst:85 +#: ../../manufacturing/management/bill_configuration.rst:84 msgid "Once the feature is enabled, you can add your *By-Products* to your *BoMs*. You can add as many *By-Products* as you want. Just keep in mind that you need to register during which operation your by-product is produced." msgstr "" @@ -501,27 +501,19 @@ msgid "Subcontract the manufacturing" msgstr "" #: ../../manufacturing/management/subcontracting.rst:5 -msgid "Some businesses subcontract the production of some finished products through subcontractors. This can be easily managed through Odoo." +msgid "Some businesses subcontract the production of finished products through subcontractors. This can be easily managed through Odoo." msgstr "" #: ../../manufacturing/management/subcontracting.rst:11 -msgid "Go to the *Manufacturing app > Configuration > Settings* and tick the box *Subcontracting*." +msgid "Go to the :menuselection:`Manufacturing app --> Configuration --> Settings` and tick the box *Subcontracting*." msgstr "" #: ../../manufacturing/management/subcontracting.rst:17 -msgid "You can now define subcontracted *Bill of Materials*. Therefore, you need to go to *Manufacturing > Master Data > Bill of Materials* and hit *Create*. In this *BoM*, list the components which will be used by the subcontractor to manufacture the subcontracted finished product. Specify that the *BoM* type is *Subcontracting*." +msgid "You can now define subcontracted *Bill of Materials*. Therefore, you need to go to :menuselection:`Manufacturing --> Master Data --> Bill of Materials` and hit *Create*. In this *BoM*, list the components which will be used by the subcontractor to manufacture the subcontracted finished product. Specify that the *BoM* type is *Subcontracting* and define one or several subcontractors who will provide you the product." msgstr "" -#: ../../manufacturing/management/subcontracting.rst:22 -msgid "You can also define subcontractors on the BoM." -msgstr "" - -#: ../../manufacturing/management/subcontracting.rst:24 -msgid "If no subcontractor is set, the BoM can be used by any subcontractor" -msgstr "" - -#: ../../manufacturing/management/subcontracting.rst:26 -msgid "If some are set, the BoM can only be used for those subcontractors" +#: ../../manufacturing/management/subcontracting.rst:29 +msgid "And... the configuration part is already done!" msgstr "" #: ../../manufacturing/management/subcontracting.rst:32 @@ -581,35 +573,43 @@ msgid "For option B, you can simply create the receipt manually with a partner o msgstr "" #: ../../manufacturing/management/subcontracting.rst:73 -msgid "Resupply the subcontractor with the components" +msgid "Receive or buy a subcontracted product with tracked components" msgstr "" #: ../../manufacturing/management/subcontracting.rst:75 -msgid "There are 3 ways to manage the resupply of your subcontractor with the components:" +msgid "In case the subcontracted product you receive from your subcontractor contains tracked components, you will need to specify the *serial/lot numbers* of the components in question for traceability. This operation is included in the receipt of the subcontracted product." msgstr "" #: ../../manufacturing/management/subcontracting.rst:80 -msgid "**Manually**: You create a delivery order in which you set the" +msgid "On the receipt, you see a *Record Components* button appearing when necessary. If you click on it, a *Produce* wizard opens in which you will have to enter the *serial/lot numbers* of the components, and the finished product if it is also tracked, like in the below example." msgstr "" -#: ../../manufacturing/management/subcontracting.rst:79 -msgid "subcontractor as a partner and you choose the components to deliver." +#: ../../manufacturing/management/subcontracting.rst:91 +msgid "Once this information has been entered, you will see a new icon on the receipt stock move, which will allow you to find back the components which are part of the finished product." msgstr "" -#: ../../manufacturing/management/subcontracting.rst:89 -msgid "**With reordering rules**: You can define a *reordering rule*" +#: ../../manufacturing/management/subcontracting.rst:99 +msgid "Resupply the subcontractor with the components" msgstr "" -#: ../../manufacturing/management/subcontracting.rst:86 -msgid "on the *Subcontracting location* to ensure that they are always enough components sent to your subcontractors. When the reordering rule is triggered, a delivery order is created for the product is automatically created." +#: ../../manufacturing/management/subcontracting.rst:101 +msgid "There are 3 ways to manage the resupply of your subcontractor with the components:" msgstr "" -#: ../../manufacturing/management/subcontracting.rst:97 -msgid "**On order**: You can also deliver the components to your" +#: ../../manufacturing/management/subcontracting.rst:104 +msgid "**Manually**: You create a delivery order in which you set the subcontractor as a partner and you choose the components to deliver." msgstr "" -#: ../../manufacturing/management/subcontracting.rst:95 -msgid "subcontractors each time you order a subcontracted product. For this, you need to tick the route *Resupply Subcontractor on Order* on the wanted components." +#: ../../manufacturing/management/subcontracting.rst:110 +msgid "You therefore need to activate *Multi-locations* in the inventory settings." +msgstr "" + +#: ../../manufacturing/management/subcontracting.rst:115 +msgid "**With reordering rules**: You can define a *reordering rule* on the *Subcontracting location* to ensure that they are always enough components sent to your subcontractors. When the reordering rule is triggered, a delivery order is created for the product is automatically created." +msgstr "" + +#: ../../manufacturing/management/subcontracting.rst:120 +msgid "**On order**: You can also deliver the components to your subcontractors each time you order a subcontracted product. For this, you need to tick the route *Resupply Subcontractor on Order* on the wanted components." msgstr "" #: ../../manufacturing/management/unbuild.rst:3 @@ -661,7 +661,7 @@ msgid "The Master Production Schedule (MPS) is a valuable tool to plan your prod msgstr "" #: ../../manufacturing/management/use_mps.rst:11 -msgid "Go to the *Manufacturing app > Configuration > Settings* and activate the Master Production Schedule feature before hitting save." +msgid "Go to the :menuselection:`Manufacturing app --> Configuration --> Settings` and activate the Master Production Schedule feature before hitting save." msgstr "" #: ../../manufacturing/management/use_mps.rst:18 @@ -669,7 +669,7 @@ msgid "In the manufacturing settings, you can define the time range of your MPS msgstr "" #: ../../manufacturing/management/use_mps.rst:20 -msgid "Now, go in *Planning > Master Production Schedule* and click on add a product. You can now define your safety stock target (= the stock you want to have on hand at the end of the period) and the minimum and maximum quantities to replenish." +msgid "Now, go in :menuselection:`Planning --> Master Production Schedule` and click on add a product. You can now define your safety stock target (= the stock you want to have on hand at the end of the period) and the minimum and maximum quantities to replenish." msgstr "" #: ../../manufacturing/management/use_mps.rst:29 diff --git a/locale/sources/mobile.pot b/locale/sources/mobile.pot index cc01794a3..ab1cecf27 100644 --- a/locale/sources/mobile.pot +++ b/locale/sources/mobile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-03 11:39+0200\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,6 +29,6 @@ msgid "As of Odoo 12.0, 13.0 or above, there is no more complex configuration to msgstr "" #: ../../mobile/firebase.rst:13 -msgid "Simply go to *Settings* > *General Settings* > *Odoo Cloud Notification (OCN)* and make sure that **Push Notifications** is checked." +msgid "Simply go to :menuselection:`Settings --> General Settings --> Odoo Cloud Notification (OCN)` and make sure that **Push Notifications** is checked." msgstr "" diff --git a/locale/sources/planning.pot b/locale/sources/planning.pot new file mode 100644 index 000000000..1a4eb2c7e --- /dev/null +++ b/locale/sources/planning.pot @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2015-TODAY, Odoo S.A. +# This file is distributed under the same license as the Odoo package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Odoo 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../planning.rst:5 +msgid "Planning" +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:3 +msgid "Create a schedule and make encoding easier" +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:4 +msgid "Organize regular schedules or forecast projects in a long term basis. Create shifts to manage your tasks, assign employees, and stay organized at a high level." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:8 +msgid "Organize your team by roles" +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:9 +msgid "Go to :menuselection:`Configuration --> Roles --> Create`. Optionally, go to the *Employees* application, select the respective employee, and under *Work Information* select the *Default Planning Role*." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:18 +msgid "Make shifts recurrent" +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:19 +msgid "While creating a shift, select *Repeat* and configure as needed, saving you from the need of re-planning it." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:28 +msgid "Repeated shifts are generated for the next six months. A modification is possible in developer mode, from *Settings*." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:32 +msgid "To duplicate a shift in the Gantt view, press CTRL + drag and drop." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:36 +msgid "Save shifts as templates" +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:37 +msgid "If creating a shift on the fly and knowing that you will use that template in the future, click on *Save as a Template*." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:46 +msgid "To create a template in advance, go to :menuselection:`Configuration --> Shifts Templates --> Create`." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:51 +msgid "Duplicate a planning from the previous week" +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:52 +msgid "When in the Gantt view, either under *Schedule by Employee, Role or Project*, instead of re-planning shifts that have been planned before, simply click on *Copy Previous Week*." +msgstr "" + +#: ../../planning/duplicate_a_planning.rst:61 +msgid "The integration with the *Time off* and *Employee* applications, show you grayed cells to the days when the employee does not work and is on vacation time, for example." +msgstr "" + +#: ../../planning/send_planned_shifts.rst:3 +msgid "Send planned shifts and give employees autonomy over shifts" +msgstr "" + +#: ../../planning/send_planned_shifts.rst:4 +msgid "If you are not on top of your tasks and shifts you might fall behind, loosing productivity. Allowing your employees to have a say over shifts helps you to be on top of your workload, and gives them flexibility." +msgstr "" + +#: ../../planning/send_planned_shifts.rst:9 +msgid "Publish and send the planned week by email" +msgstr "" + +#: ../../planning/send_planned_shifts.rst:10 +msgid "Once you have your shifts planned, click on *Send Schedule*. Select *Include Open shift* if you would like the *Unassigned* shifts to be seen." +msgstr "" + +#: ../../planning/send_planned_shifts.rst:17 +msgid "Choose if you just want to *Publish* or *Publish and Send*. If you *Publish and Send*, employees will get an email that will redirect them to their planned tasks:" +msgstr "" + +#: ../../planning/send_planned_shifts.rst:25 +msgid "Employees will not be able to see shifts until they have been published." +msgstr "" + +#: ../../planning/send_planned_shifts.rst:29 +msgid "Let employees unassign themselves from shifts" +msgstr "" + +#: ../../planning/send_planned_shifts.rst:30 +msgid "Go to *Configuration* and enable *Allow Unassignment*. From now on, when an employee opens his tasks, he can indicate his unavailability clicking on *I am unavailable*. The shift will be opened again, allowing someone else to take it." +msgstr "" + +#: ../../planning/send_planned_shifts.rst:45 +msgid "Employees have portal access; users have access to the database." +msgstr "" + diff --git a/locale/sources/point_of_sale.pot b/locale/sources/point_of_sale.pot index 4be1e945e..9de578c62 100644 --- a/locale/sources/point_of_sale.pot +++ b/locale/sources/point_of_sale.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-26 09:17+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -740,58 +740,58 @@ msgid "Connect a Payment Terminal" msgstr "" #: ../../point_of_sale/payment/ingenico.rst:17 -msgid "Connecting an Ingenico Payment Terminal to Odoo is a feature that requires an IoT Box. For more information on how to connect an IoT Box to your database, please refer to `this documentation `__." +msgid "Connecting an Ingenico Payment Terminal to Odoo is a feature that requires an IoT Box. For more information on how to connect an IoT Box to your database, please refer to the :doc:`IoT documentation <../../iot/config/connect>`." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:22 -msgid "Once the IoT Box is up and running, you’ll need to link your payment terminal to your PoS. Open the Point of Sale app and go to *Configuration > Point of Sale*. Select a PoS, tick the IoT Box Device option and select your payment terminal." +#: ../../point_of_sale/payment/ingenico.rst:21 +msgid "Once the IoT Box is up and running, you’ll need to link your payment terminal to your PoS. Open the *Point of Sale* app and go to :menuselection:`Configuration --> Point of Sale`. Select a PoS, tick the IoT Box Device option and select your payment terminal." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:31 +#: ../../point_of_sale/payment/ingenico.rst:30 msgid "Configure the Lane/5000 for Ingenico BENELUX" msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:33 -msgid "Click on the F button of the terminal, then go in the *PoS Menu* > settings menu and enter the settings password." +#: ../../point_of_sale/payment/ingenico.rst:32 +msgid "Click on the F button of the terminal, then go in the :menuselection:`PoS Menu --> Settings` and enter the settings password." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:36 +#: ../../point_of_sale/payment/ingenico.rst:35 msgid "Now, click on connexion change and TCP/IP. Type the IP of your *IoT Box* (you can find it on the form view of your IoT Box). Then, enter 9000 as port. The terminal will restart. Once it is done, go on your *IoT Box* form in Odoo and verify that the terminal has been found." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:45 +#: ../../point_of_sale/payment/ingenico.rst:44 msgid "Configure the payment method" msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:47 +#: ../../point_of_sale/payment/ingenico.rst:46 msgid "First, go in the general settings of the POS app, and activate the Ingenico setting." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:53 -msgid "Go back in *Point of Sale > Configuration > Point of Sale*, go in the payments section and access your payment methods. Create a new payment method for Ingenico, select the payment terminal option Ingenico, and select your payment terminal device." +#: ../../point_of_sale/payment/ingenico.rst:52 +msgid "Go back in :menuselection:`Point of Sale --> Configuration --> Point of Sale`, go in the payments section and access your payment methods. Create a new payment method for Ingenico, select the payment terminal option Ingenico, and select your payment terminal device." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:62 +#: ../../point_of_sale/payment/ingenico.rst:61 msgid "Pay with a payment terminal" msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:64 +#: ../../point_of_sale/payment/ingenico.rst:63 msgid "In your *PoS interface*, when processing a payment, select a *Payment Method* using a payment terminal. Check that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. When the payment is successful, the status will change to *Payment Successful*." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:73 +#: ../../point_of_sale/payment/ingenico.rst:72 msgid "If you want to cancel the payment request, click on cancel. You can still retry to send the payment request." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:76 +#: ../../point_of_sale/payment/ingenico.rst:75 msgid "If there is any issue with the payment terminal, you can still force the payment using the *Force Done*. This will allow you to validate the order in Odoo even if the connexion between the terminal and Odoo has issues." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:82 +#: ../../point_of_sale/payment/ingenico.rst:81 msgid "This option will only be available if you received an error message telling you the connexion failed." msgstr "" -#: ../../point_of_sale/payment/ingenico.rst:85 +#: ../../point_of_sale/payment/ingenico.rst:84 #: ../../point_of_sale/payment/six.rst:103 msgid "Once your payment is processed, on the payment record, you’ll find the type of card that has been used and the transaction ID." msgstr "" @@ -809,11 +809,11 @@ msgid "Please note SIX/Worldine is currently only available for UE customers." msgstr "" #: ../../point_of_sale/payment/six.rst:17 -msgid "Connecting a SIX/Worldline Payment Terminal to Odoo is a feature that requires an IoT Box. For more information on how to connect an IoT Box to your database, please refer to `this documentation `__." +msgid "Connecting a SIX/Worldline Payment Terminal to Odoo is a feature that requires an IoT Box. For more information on how to connect an IoT Box to your database, please refer to the :doc:`IoT documentation <../../iot/config/connect>`." msgstr "" #: ../../point_of_sale/payment/six.rst:22 -msgid "Once the *IoT Box* is up and running, you’ll need to link it to your PoS. Open the Point of Sale app and go to *Configuration > Point of Sale*. Select a PoS, tick the IoT Box Device option and select your payment terminal." +msgid "Once the *IoT Box* is up and running, you’ll need to link it to your PoS. Open the Point of Sale app and go to :menuselection:`Configuration --> Point of Sale`. Select a PoS, tick the IoT Box Device option and select your payment terminal." msgstr "" #: ../../point_of_sale/payment/six.rst:30 @@ -838,7 +838,7 @@ msgid "First, go in the general settings of the POS app, and activate the SIX se msgstr "" #: ../../point_of_sale/payment/six.rst:55 -msgid "Back in *Point of Sale > Configuration > Point of Sale*, go in the payments section and access your payment methods. Create a new payment method for SIX, select the payment terminal option SIX, and select your payment terminal device." +msgid "Back in :menuselection:`Point of Sale --> Configuration --> Point of Sale`, go in the payments section and access your payment methods. Create a new payment method for SIX, select the payment terminal option SIX, and select your payment terminal device." msgstr "" #: ../../point_of_sale/payment/six.rst:64 @@ -887,7 +887,7 @@ msgid "First, go in the general settings of the POS app, and activate the Vantiv msgstr "" #: ../../point_of_sale/payment/vantiv.rst:24 -msgid "Back in *Point of Sale > Configuration > Point of Sale*, go in the payments section and access your payment methods. Create a new payment method for Vantiv, select the payment terminal option Vantiv, and create new Vantiv credentials." +msgid "Back in :menuselection:`Point of Sale --> Configuration --> Point of Sale`, go in the payments section and access your payment methods. Create a new payment method for Vantiv, select the payment terminal option Vantiv, and create new Vantiv credentials." msgstr "" #: ../../point_of_sale/payment/vantiv.rst:32 diff --git a/locale/sources/portal.pot b/locale/sources/portal.pot index 953687aeb..f529fa1ad 100644 --- a/locale/sources/portal.pot +++ b/locale/sources/portal.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-03 11:39+0200\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,8 +24,8 @@ msgstr "" msgid "In this section of the portal, you will find all the communications between you and Odoo: documents such as quotations, sales orders, invoices and subscriptions." msgstr "" -#: ../../portal/my_odoo_portal.rst:11 -msgid "To access this section, you have to log with your username and password to `Odoo `__ . If you are already logged in, just click on your name on the top-right corner and select \"My Account\"." +#: ../../portal/my_odoo_portal.rst:12 +msgid "To access this section, you have to log with your username and password to `Odoo `_. If you are already logged in, just click on your name on the top-right corner and select \"My Account\"." msgstr "" #: ../../portal/my_odoo_portal.rst:20 @@ -96,8 +96,8 @@ msgstr "" msgid "If you want to remove the credit cards that are saved, you can do so by clicking on \"Manage your payment methods\" at the bottom of the page. Click \"Delete\" to delete the payment method." msgstr "" -#: ../../portal/my_odoo_portal.rst:101 -msgid "At the date of the next invoice, if there is no payment information provided or if your credit card has expired, the status of your subscription will change to \"To Renew\". You will then have 7 days to provide a valid method of payment. After this delay, the subscription will be closed, and you will no longer be able to access the database." +#: ../../portal/my_odoo_portal.rst:102 +msgid "At the date of the next invoice, if there is no payment information provided or if your credit card has expired, the status of your subscription will change to \"To Renew\". You will then have 7 days to provide a valid method of payment. After this delay, the subscription will be closed, and you will no longer be able to access the database." msgstr "" #: ../../portal/my_odoo_portal.rst:108 diff --git a/locale/sources/practical.pot b/locale/sources/practical.pot index 7a1c84f83..04cdd90a6 100644 --- a/locale/sources/practical.pot +++ b/locale/sources/practical.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/sources/purchase.pot b/locale/sources/purchase.pot index f2f5de878..0c681bbbf 100644 --- a/locale/sources/purchase.pot +++ b/locale/sources/purchase.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,7 +77,7 @@ msgid "See below a template of the columns used." msgstr "" #: ../../purchase/purchases/master/import.rst:33 -msgid "`Template download `__" +msgid ":download:`Click here to download the template <../../../_static/example_files/vendor_pricelists_template.csv>`" msgstr "" #: ../../purchase/purchases/master/suppliers.rst:3 diff --git a/locale/sources/quality.pot b/locale/sources/quality.pot index b218d37e8..d4625a3b7 100644 --- a/locale/sources/quality.pot +++ b/locale/sources/quality.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -124,7 +124,7 @@ msgid "Create the Quality Control Point" msgstr "" #: ../../quality/checks/quality_mo.rst:18 -msgid "To create a quality control point, open the quality app and go to *Control > Control Points*. There, hit create. Make sure to select *Manufacturing* as operation and choose the type of quality check you want to perform." +msgid "To create a quality control point, open the quality app and go to :menuselection:`Control --> Control Points`. There, hit create. Make sure to select *Manufacturing* as operation and choose the type of quality check you want to perform." msgstr "" #: ../../quality/checks/quality_mo.rst:27 @@ -146,7 +146,7 @@ msgid "If you want to access all your quality checks, you can do this by opening msgstr "" #: ../../quality/checks/quality_mo.rst:55 -msgid "If you want to create a *Quality Control Point*, open the *Quality* app and go to *Control > Control Points*. Then, click on create. Make sure to select *Manufacturing* as operation and select the work order operation on which the quality check should be performed." +msgid "If you want to create a *Quality Control Point*, open the *Quality* app and go to :menuselection:`Control --> Control Points`. Then, click on create. Make sure to select *Manufacturing* as operation and select the work order operation on which the quality check should be performed." msgstr "" #: ../../quality/checks/quality_mo.rst:64 @@ -166,7 +166,7 @@ msgid "Perform Quality Checks on Transfers" msgstr "" #: ../../quality/checks/quality_transfers.rst:8 -msgid "To create a *Quality Control Point*, open the *Quality* application. Then, go to *Quality Control > Control Points > Create*. Now, you can define the quality control point you want to apply to a specific product. Don’t forget to select a transfer operation type." +msgid "To create a *Quality Control Point*, open the *Quality* application. Then, go to :menuselection:`Quality Control --> Control Points --> Create`. Now, you can define the quality control point you want to apply to a specific product. Don’t forget to select a transfer operation type." msgstr "" #: ../../quality/checks/quality_transfers.rst:19 @@ -202,7 +202,7 @@ msgid "Quality Control Points" msgstr "" #: ../../quality/control/control_points.rst:8 -msgid "If it is the first *Quality Control Point* that you create, know that you need to open the *Quality* app. Then, go to *Quality Control > Control Points*. Once there, you have to define the product on which the quality control will take place, as well as the operation at which it should take place." +msgid "If it is the first *Quality Control Point* that you create, know that you need to open the *Quality* app. Then, go to :menuselection:`Quality Control --> Control Points`. Once there, you have to define the product on which the quality control will take place, as well as the operation at which it should take place." msgstr "" #: ../../quality/control/control_points.rst:14 diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index f25125ab7..55ecd40ea 100644 --- a/locale/sources/sales.pot +++ b/locale/sources/sales.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-10 14:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,127 +72,453 @@ msgstr "" msgid "An email will be sent to the specified email address, indicating that the contact is now a portal user of the respective instance." msgstr "" -#: ../../sales/ebay/manage.rst:3 +#: ../../sales/amazon_connector.rst:3 +msgid "Amazon Connector" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:3 +msgid "Apply for Amazon MWS Access Keys" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:8 +msgid "Submit the Amazon MWS Developer Registration and Assessment Form" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:10 +msgid "In order to synchronize your Amazon orders with Odoo, Amazon MWS access keys are required. They can be obtained by submitting the **Amazon MWS Developer Registration and Assessment form** to register as a developer. Once recognized by Amazon as a developer (i.e. you make use of an application connecting to MWS), you will be granted Amazon MWS access keys." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:15 +msgid "First, visit the `Amazon Marketplace Web Service documentation `_ and follow the instructions to register as a developer. Take care to choose the form \"I represent a seller organization integrating with Amazon MWS for its own selling account only.\"." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:20 +msgid "Fill out the *Developer Registration and Assessment form* as suggested below and provide your own contact information in the **Developer contact information** section. In the **Business use information** section, select the correct region of your seller account. For the other sections, adapt your responses in accordance with your business case." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:25 +msgid "Give a particular attention to **Merchant Fulfilled Shipping**. It should only be checked if you ship your products yourself. You should uncheck it if you sell exclusively with the *Fulfillment by Amazon* service. Please note that requesting this function is not recommended if you are hosted on *Odoo Online* or *Odoo.sh* as the additional security requirements asked by Amazon may not be met by Odoo." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:32 +msgid "Depending on several factors (your region, whether you checked the **Merchant Fulfilled Shipping** function (i.e. you request access to Personally Identifiable Information of your customers), etc.), Amazon may request you to fill out a second form before granting you MWS access keys. As that form depends on the data protection policy of the region of your seller account (e.g. GDPR in Europe), we cannot provide you with a pre-filled form. Instead, the answers of questions related to Odoo are listed in the `Answer the Additional Form`_ section." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:40 +msgid "If you need assistance for your application for Amazon MWS access keys, `submit a support ticket to Odoo `_." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:46 +msgid "Answer the Additional Form" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:49 +msgid "If you did not receive any additional form after your :ref:`initial application for Amazon MWS keys `, you may disregard this section." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:52 +msgid "This section lists all questions asked by Amazon in additional forms. The answers are tailored for *Odoo Online* and *Odoo.sh*. Wherever the answer does not depend on Odoo, you are requested to provide it yourself at the place indicated by square brackets." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:57 +msgid "If you are *not* hosted on Odoo.com (*online*) or on Odoo.sh, you should adapt the answers related to hosting according to your own infrastructure and data protection policy." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:60 +msgid "**Describe all functionalities in your application where Personally Identifiable Information (e.g. customer name, street address, billing address) is required.**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:64 +msgid "► If you did not apply for the *Merchant Fulfilled Shipping* function:" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:64 +msgid "Generation of customer invoices." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:67 +msgid "► If you applied for the *Merchant Fulfilled Shipping* function:" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:67 +msgid "Generation of delivery orders and customer invoices." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:69 +msgid "**List all outside parties with whom your organization shares Amazon Information (e.g. information exposed by Amazon through Amazon MWS, Seller Central, or Amazon's public-facing websites) and describe how your organization shares this information.**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:73 +msgid "We share Amazon Information with Odoo SA, our cloud service provider, for the exclusive purpose of hosting our enterprise management system (including the Amazon MWS integration). See also Odoo SA's Privacy Policy for details at https://www.odoo.com/privacy" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:79 +msgid "► If you share Amazon Information with outside parties:" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:78 +msgid "[Answer with the above text and add a description of your organization's policy regarding the sharing of Amazon Information with outside parties]" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:81 +msgid "**List all non-Amazon MWS sources where you retrieve Amazon Information.**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:83 +msgid "Our enterprise software only relies on MWS to retrieve Amazon Information." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:85 +msgid "**Describe how your organization restricts public access to databases, file servers, and desktop/developer endpoints.**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:88 +#: ../../sales/amazon_connector/apply.rst:122 +#: ../../sales/amazon_connector/apply.rst:134 +msgid "We rely on Odoo S.A., our cloud service provider for our database security management. Their Security Policy can be found at https://www.odoo.com/security" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:91 +msgid "**Describe how your organization uniquely identifies employees and restricts access to Amazon Information on a need-to-know basis.**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:102 +msgid "► If all your employees are properly assigned separate users and given only relevant access rights:" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:95 +msgid "Access rights are provided to employees based on their role within the company and are progressive, based on their responsibility." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:98 +msgid "For instance, salespersons only have access to their own leads/quotes (and thus no access to quotes generated through the Amazon API). A salesmanager has access to all quotes/leads for reporting purposes (including quotes generated through the Amazon API). A quote will generate a delivery order which will be accessible to a 'normal' user of the Inventory application for him to be able to print the delivery label and pack the products." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:106 +msgid "► If your employees share users or if they are given more rights than needed:" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:105 +msgid "[Answer with a description of your organization's policy for the assignation of users and access rights to your employees]" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:108 +msgid "**Describe how your organization prevents Amazon Information from being accessed from employee personal devices.**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:111 +msgid "Our enterprise software does not prevent employees from accessing the organization's data from personal devices. Role-based restrictions and access rights still apply." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:114 +msgid "**Provide details on your organization's privacy and data handling policies (a link to your policy is also acceptable).**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:117 +msgid "[Answer with a description of your organization's privacy and data handling policies]" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:119 +msgid "**Describe where your organization stores Amazon Information and provide details on how you encrypt this information (e.g., algorithm).**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:125 +msgid "**Describe how your organization backups or archives Amazon Information and provide details on how you encrypt this information (e.g., algorithm).**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:128 +msgid "We rely on Odoo S.A., our cloud service provider for our database backups management. Their Service Level Agreement can be found at https://www.odoo.com/cloud-sla" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:131 +msgid "**Describe where your organization monitors and detects malicious activity in your application(s).**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:137 +msgid "**Describe how your organization's incident response plan addresses database hacks, unauthorized access, and data leaks (a link to your policy is also acceptable).**" +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:140 +msgid "Our cloud service provider, Odoo S.A., will notify the customer in case of a data breach." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:142 +msgid "[Add a description of your organization's incident response plan or a link to your incident response policy.]" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:3 +msgid "Manage Amazon orders in Odoo" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:6 +msgid "Synchronization of orders" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:8 +msgid "Orders are automatically fetched from Amazon and synchronized in Odoo at regular intervals. The synchronization is based on the Amazon status: only orders whose status has changed since the last synchronization are fetched from Amazon. For **FBA** (Fulfilled by Amazon), only **Shipped** and **Canceled** orders are fetched. For **FBM** (Fulfilled by Merchant), the same is done for **Unshipped** and **Canceled** orders. For each synchronized order, a sales order and a customer are created in Odoo if they are not yet registered." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:16 +msgid "If you did not request access to Personally Identifiable Information of your customers in the :ref:`Developer Registration and Assessment form `, the customers are created anonymously (the name, postal address and phone number are omitted) and named **Amazon Customer**." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:21 +msgid "When an order is canceled in Amazon and was already synchronized in Odoo, the corresponding sales order is canceled in Odoo. When an order is canceled in Odoo, a notification is sent to Amazon who will mark it as such in Seller Central and notify the customer." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:27 +msgid "To force the synchronization of an order whose status has not changed since the last synchronization, activate the **Developer mode**, navigate to your Amazon account and modify the date under :menuselection:`Orders Follow-up --> Last Order Sync`. Pick a date anterior to the last status change of the order that you wish to synchronize and save." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:33 +msgid "To synchronize immediately the orders of your Amazon account switch to **Developer mode**, head to your Amazon account and click the button **SYNC ORDERS**. The same can be done with order cancellations and pickings by clicking the buttons **SYNC CANCELLATIONS** and **SYNC PICKINGS**." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:38 +msgid "Manage deliveries in FBM" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:40 +msgid "When a **FBM** (Fulfilled by Merchant) order is synchronized in Odoo, a picking is created along with the sales order and the customer. You can either ship all the ordered products to your customer at once or ship products partially by using backorders." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:44 +msgid "When a picking related to the order is confirmed, a notification is sent to Amazon who will, in turn, notify the customer that the order (or a part of it) is on its way." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:48 +msgid "Follow deliveries in FBA" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:50 +msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:57 +msgid "To follow your Amazon (FBA) stock in Odoo, you can make an inventory adjustment after replenishing it. You can also trigger an automated replenishment from reordering rules on the Amazon location." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:62 +msgid "The Amazon location is configurable by Amazon account managed in Odoo. All accounts of the same company use the same location by default. It is however possible to follow the stock by marketplace. First, remove the marketplace for which you want to follow the stock separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another stock location to the second registration of your account." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:70 +msgid "Issue invoices and register payments" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:72 +msgid "You can issue invoices for Amazon orders in Odoo. Click **Create Invoice** in the sales order to do so. You can also do it in batch from the list view of orders. Then, confirm and send the invoices to your customers." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:77 +msgid "To display only Amazon-related orders on the list view, you can filter orders based on the sales team." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:80 +msgid "As the customer has paid Amazon as an intermediary, you should register invoice payments in a payment journal dedicated to Amazon (e.g. Amazon Payments, with a dedicated intermediary account). You can do the same with the vendor bill received from Amazon and dedicated to commissions. When you receive the balance on your bank account at the end of the month and record your bank statements in Odoo, you simply credit the Amazon intermediary account by the amount received." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:87 +msgid "Follow your Amazon sales in sales reporting" +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:89 +msgid "As a sales team is set on your account under the tab **Order Follow-up**, this helps you give quick glances at the figures in just a few clicks in Sales reporting. By default, your account's sales team is shared between all of your company's accounts." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:93 +msgid "If you wish, you can change the sales team on your account for another to perform a separate reporting for the sales of this account." +msgstr "" + +#: ../../sales/amazon_connector/manage.rst:97 +msgid "It is also possible to perform reporting on a per-marketplace basis in a similar fashion. First, remove the marketplace you wish to track separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another sales team to one of the two registrations of your account." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:3 +msgid "Configure Amazon Connector in Odoo" +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:6 +msgid "Register your Amazon account in Odoo" +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:8 +msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on **CREATE**." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:11 +msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Access Key** and the **Secret Key** can be found in Developer Central (where the Developer Registration and Assessment form was located)." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:15 +msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:20 +msgid "Match database products in Amazon" +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:22 +msgid "When an Amazon order is synchronized, up to three sales order items are created in Odoo for each product sold on Amazon: one for the marketplace product, one for the shipping charges (if any) and one for the gift wrapping charges (if any)." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:28 +msgid "The selection of a database product for a sales order item is done by matching its **internal reference** with the **SKU** for marketplace items, the **shipping code** for delivery charges, and the **gift wrapping** code for gift wrapping charges." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:32 +msgid "For marketplace products, pairings are saved as **Amazon Offers** which are listed under the **Offers** stat button on the account form. Offers are automatically created when the pairing is established and are used for subsequent orders to lookup SKUs. If no offer with a matching SKU is found, :ref:`the internal reference is used instead `." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:38 +msgid "It is possible to force the pairing of a marketplace item with a specific product by changing either the product or the SKU of an offer. The offer can be manually created if it was not automatically done yet. This is useful if you do not use the internal reference as the SKU or if you sell the product under different conditions." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:43 +msgid "If no database product with a matching internal reference is found for a given SKU or gift wrapping code, a default database product **Amazon Sale** is used. The same is done with the default product **Amazon Shipping** and the shipping code." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:48 +msgid "To modify the default products, activate the **Developer mode** and navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Default Products`." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:53 +msgid "Configure taxes of products" +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:55 +msgid "To allow for tax reporting of Amazon sales with Odoo, the taxes applied to the sales order items are those set on the product or determined by the fiscal position. Make sure to have set the correct taxes on your products in Odoo or to have it done by a fiscal position, to avoid discrepancies in the subtotals between Seller Central and Odoo." +msgstr "" + +#: ../../sales/amazon_connector/setup.rst:61 +msgid "As Amazon does not necessarily apply the same taxes as those configured in Odoo, it may happen that order totals differ by a few cents from that on Seller Central. Those differences can be resolved with a write-off when reconciling the payments in Odoo." +msgstr "" + +#: ../../sales/ebay_connector.rst:3 +msgid "eBay Connector" +msgstr "" + +#: ../../sales/ebay_connector/manage.rst:3 msgid "How to list a product?" msgstr "" -#: ../../sales/ebay/manage.rst:6 +#: ../../sales/ebay_connector/manage.rst:6 msgid "Listing without variation" msgstr "" -#: ../../sales/ebay/manage.rst:8 +#: ../../sales/ebay_connector/manage.rst:8 msgid "In order to list a product, you need to check the **use eBay** field on a product form. The eBay tab will be available." msgstr "" -#: ../../sales/ebay/manage.rst:14 +#: ../../sales/ebay_connector/manage.rst:14 msgid "When the **Use Stock Quantity** field is checked, the quantity sets on eBay will be the Odoo **Forecast Quantity**." msgstr "" -#: ../../sales/ebay/manage.rst:17 +#: ../../sales/ebay_connector/manage.rst:17 msgid "The **Description Template** allows you to use templates for your listings. The default template only use the **eBay Description** field of the product. You can use html inside the **Description Template** and in the **eBay Description**." msgstr "" -#: ../../sales/ebay/manage.rst:21 +#: ../../sales/ebay_connector/manage.rst:21 msgid "To use pictures in your listing, you need to add them as **Attachments** on the product template." msgstr "" -#: ../../sales/ebay/manage.rst:24 +#: ../../sales/ebay_connector/manage.rst:24 msgid "Listing with variations" msgstr "" -#: ../../sales/ebay/manage.rst:26 +#: ../../sales/ebay_connector/manage.rst:26 msgid "When the **use eBay** on a product with variations is checked and with **Fixed Price** as **Listing Type**, the eBay form is sligthly different. In the variants array, you can choose which variant will be listed on eBay as well as set the price and the quantity for each variant." msgstr "" -#: ../../sales/ebay/manage.rst:35 +#: ../../sales/ebay_connector/manage.rst:35 msgid "Listing with item specifics" msgstr "" -#: ../../sales/ebay/manage.rst:37 +#: ../../sales/ebay_connector/manage.rst:37 msgid "In order to add item specifics, you should create a product attribute with one value in the **Variants** tab on the product form." msgstr "" -#: ../../sales/ebay/manage.rst:44 +#: ../../sales/ebay_connector/manage.rst:44 msgid "Product Identifiers" msgstr "" -#: ../../sales/ebay/manage.rst:46 +#: ../../sales/ebay_connector/manage.rst:46 msgid "Products identifiers such as EAN, UPC, Brand or MPN are required in most of the eBay category. The module manages the EAN and UPC identifiers with the **Barcode** field of the product variant. If the **Barcode** field is empty or is value is not valid, the EAN and UPC values will be set as 'Does not apply' as recommended by eBay. The Brand and MPN values are working as item specifics and should be define in the **Variants** tab on the product form. If theses values are not set, 'Does not apply' will be used for the eBay listing." msgstr "" -#: ../../sales/ebay/setup.rst:3 +#: ../../sales/ebay_connector/setup.rst:3 msgid "How to configure eBay in Odoo?" msgstr "" -#: ../../sales/ebay/setup.rst:6 +#: ../../sales/ebay_connector/setup.rst:6 msgid "Create eBay tokens" msgstr "" -#: ../../sales/ebay/setup.rst:8 +#: ../../sales/ebay_connector/setup.rst:8 msgid "In order to create your tokens, you need to create a developer account on the `developer portal `_. Once you are logged in, you can create **Sandbox Keys** and **Production Keys** by clicking on the adequate buttons." msgstr "" -#: ../../sales/ebay/setup.rst:16 +#: ../../sales/ebay_connector/setup.rst:16 msgid "After the creation of the keys, you can get the user token. To do so, click on the **Get a User Token** link in the bottom of the page. Go through the form, log in with you eBay account and you will get the keys and token needed to configure the module in Odoo." msgstr "" -#: ../../sales/ebay/setup.rst:22 +#: ../../sales/ebay_connector/setup.rst:22 msgid "Set up tokens in Odoo?" msgstr "" -#: ../../sales/ebay/setup.rst:24 +#: ../../sales/ebay_connector/setup.rst:24 msgid "To set up the eBay integration, go to :menuselection:`Sales --> Configuration --> Settings`." msgstr "" -#: ../../sales/ebay/setup.rst:29 +#: ../../sales/ebay_connector/setup.rst:29 msgid "First choose if you want to use the production or the sandbox eBay Site. Then fill in the fields **Developer Key**, **Token**, **App Key**, **Cert Key**. Apply the changes." msgstr "" -#: ../../sales/ebay/setup.rst:33 +#: ../../sales/ebay_connector/setup.rst:33 msgid "Once the page is reloaded, you need to synchronize information from eBay. Push on **Sync countries and currencies**, then you can fill in all the other fields." msgstr "" -#: ../../sales/ebay/setup.rst:36 +#: ../../sales/ebay_connector/setup.rst:36 msgid "When all the fields are filled in, you can synchronize the categories and the policies by clicking on the adequate buttons." msgstr "" -#: ../../sales/ebay/setup.rst:40 +#: ../../sales/ebay_connector/setup.rst:40 msgid "Using the updated synchronisation method" msgstr "" -#: ../../sales/ebay/setup.rst:42 +#: ../../sales/ebay_connector/setup.rst:42 msgid "If you have a lot of products, the eBay API can sometimes refuse some synchronization calls due to a time-based limit on the number of requests that eBay enforces." msgstr "" -#: ../../sales/ebay/setup.rst:45 +#: ../../sales/ebay_connector/setup.rst:45 msgid "To fix this issue, a new implementation mechanism has been developped; however this updated mechanism is disabled by default to avoid having the 2 systems running in parallel in existing installations." msgstr "" -#: ../../sales/ebay/setup.rst:49 +#: ../../sales/ebay_connector/setup.rst:49 msgid "To switch to the new synchronization mechanism:" msgstr "" -#: ../../sales/ebay/setup.rst:51 +#: ../../sales/ebay_connector/setup.rst:51 msgid "Enable the Developper Mode by going to :menuselection:`Settings --> Activate the developer mode`" msgstr "" -#: ../../sales/ebay/setup.rst:52 +#: ../../sales/ebay_connector/setup.rst:52 msgid "Go to :menuselection:`Settings --> Technical --> Scheduled Actions`" msgstr "" -#: ../../sales/ebay/setup.rst:53 +#: ../../sales/ebay_connector/setup.rst:53 msgid "Archive the old synchronization actions (both are named *Ebay: update product status*)" msgstr "" -#: ../../sales/ebay/setup.rst:54 +#: ../../sales/ebay_connector/setup.rst:54 msgid "Activate the new synchronization actions (*Ebay: get new orders* which runs every 15min by default and *Ebay: synchronise stock (for 'get new orders' synchronisation)* which runs once a day per default)" msgstr "" -#: ../../sales/ebay/setup.rst:55 +#: ../../sales/ebay_connector/setup.rst:55 msgid "Ensure that the **Next Execution Date** for both these actions are in the near future" msgstr "" -#: ../../sales/ebay/setup.rst:57 +#: ../../sales/ebay_connector/setup.rst:57 msgid "Starting with the next execution date, the new method will be used instead of the old one." msgstr "" @@ -356,7 +682,7 @@ msgid "If you set it in ordered quantities, you can invoice as soon as the sale msgstr "" #: ../../sales/invoicing/invoicing_policy.rst:47 -msgid "Once the products are delivered, you can invoice your customer. Odoo will automatically add the quantities to invoiced based on how many you delivered if you did a partial delivery." +msgid "Once the products are delivered, you can invoice your customer. Odoo will automatically add the quantities to invoice based on how many you delivered if you did a partial delivery." msgstr "" #: ../../sales/invoicing/milestone.rst:3 @@ -1022,363 +1348,18 @@ msgstr "" msgid "When you have entered all the extra values, click on **Save**." msgstr "" +#: ../../sales/products_prices/products/variants.rst:223 +msgid "`Accounting Memento: Details of Journal Entries <../../../accounting/overview/main_concepts/memento.html#journal-entries>`_" +msgstr "" + +#: ../../sales/products_prices/products/variants.rst:225 +msgid ":doc:`../../../accounting/overview/process_overview/supplier_bill`" +msgstr "" + #: ../../sales/products_prices/taxes.rst:3 msgid "Set taxes" msgstr "" -#: ../../sales/sale_amazon.rst:3 -msgid "Amazon Connector" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:3 -msgid "Apply for Amazon MWS Access Keys" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:8 -msgid "Submit the Amazon MWS Developer Registration and Assessment Form" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:10 -msgid "In order to synchronize your Amazon orders with Odoo, Amazon MWS access keys are required. They can be obtained by submitting the **Amazon MWS Developer Registration and Assessment form** to register as a developer. Once recognized by Amazon as a developer (i.e. you make use of an application connecting to MWS), you will be granted Amazon MWS access keys." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:15 -msgid "First, visit the `Amazon Marketplace Web Service documentation `_ and follow the instructions to register as a developer. Take care to choose the form \"I represent a seller organization integrating with Amazon MWS for its own selling account only.\"." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:20 -msgid "Fill out the *Developer Registration and Assessment form* as suggested below and provide your own contact information in the **Developer contact information** section. In the **Business use information** section, select the correct region of your seller account. For the other sections, adapt your responses in accordance with your business case." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:25 -msgid "Give a particular attention to **Merchant Fulfilled Shipping**. It should only be checked if you ship your products yourself. You should uncheck it if you sell exclusively with the *Fulfillment by Amazon* service. Please note that requesting this function is not recommended if you are hosted on *Odoo Online* or *Odoo.sh* as the additional security requirements asked by Amazon may not be met by Odoo." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:32 -msgid "Depending on several factors (your region, whether you checked the **Merchant Fulfilled Shipping** function (i.e. you request access to Personally Identifiable Information of your customers), etc.), Amazon may request you to fill out a second form before granting you MWS access keys. As that form depends on the data protection policy of the region of your seller account (e.g. GDPR in Europe), we cannot provide you with a pre-filled form. Instead, the answers of questions related to Odoo are listed in the `Answer the Additional Form`_ section." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:40 -msgid "If you need assistance for your application for Amazon MWS access keys, `submit a support ticket to Odoo `_." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:46 -msgid "Answer the Additional Form" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:48 -msgid "This section lists all questions asked by Amazon in additional forms. The answers are tailored for *Odoo Online* and *Odoo.sh*. If you did not receive any additional form after your :ref:`initial application for Amazon MWS keys `, you may disregard this section." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:53 -msgid "If you are not hosted on Odoo.com (*online*) or on Odoo.sh, you should adapt the answers related to hosting according to your own infrastructure and data protection policy." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:56 -msgid "**Describe all functionalities in your application where Personally Identifiable Information (e.g. customer name, street address, billing address) is required.**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:60 -msgid "► If you did not apply for the *Merchant Fulfilled Shipping* function:" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -#: ../../sales/sale_amazon/apply.rst:0 -msgid "- Generation of customer invoices" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:64 -msgid "► If you applied for the *Merchant Fulfilled Shipping* function:" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "- Generation of delivery orders" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:66 -msgid "**List all outside parties with whom your organization shares Amazon Information (e.g. information exposed by Amazon through Amazon MWS, Seller Central, or Amazon's public-facing websites) and describe how your organization shares this information.**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:71 -msgid "► If you do not share Amazon Information with outside parties:" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:71 -msgid "Odoo does not share any information with outside parties." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:74 -msgid "► If you share Amazon Information with outside parties:" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:74 -msgid "[Description of your organization's policy regarding Amazon Information]" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:76 -msgid "**List all non-Amazon MWS sources where you retrieve Amazon Information.**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:78 -msgid "Odoo only relies on MWS to retrieve Amazon Information." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:80 -msgid "**Describe how your organization restricts public access to databases, file servers, and desktop/developer endpoints.**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "- Access to the postgreSQL database through the network is disabled and standard ports are" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "closed. The database is only accessible through a socket on the server itself." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "- The reverse proxy only serves whitelisted directories that are only from sources controlled by" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "Odoo S.A." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "- API endpoints are password protected (PBKDF2 & SHA512 encryption, salted, and stretched for" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "thousands of rounds)." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:0 -msgid "- Login credentials are always transmitted securely over HTTPS." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:92 -msgid "**Describe how your organization uniquely identifies employees and restricts access to Amazon Information on a need-to-know basis.**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:103 -msgid "► If all your employees are properly assigned separate users and given only relevant access rights:" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:96 -msgid "Access rights are provided to employees based on their role within the company and are progressive, based on their responsibility." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:99 -msgid "For instance, salespersons only have access to their own leads/quotes (and thus no access to quotes generated through the Amazon API). A salesmanager has access to all quotes/leads for reporting purposes (including quotes generated through the Amazon API). A quote will generate a delivery order which will be accessible to a 'normal' user of the Inventory application for him to be able to print the delivery label and pack the products." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:107 -msgid "► If your employees share users or if they are given more rights than needed:" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:106 -msgid "[Description of your organization's policy for the assignation of users and access rights to your employees]" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:109 -msgid "**Describe how your organization prevents Amazon Information from being accessed from employee personal devices.**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:112 -msgid "Odoo does not prevent employees from accessing the organization's data from personal devices. Role-based restrictions and access rights still apply." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:115 -msgid "**Provide details on your organization's privacy and data handling policies (a link to your policy is also acceptable).**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:118 -msgid "[Description of your organization's privacy and data handling policies]" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:120 -msgid "**Describe where your organization stores Amazon Information and provide details on how you encrypt this information (e.g., algorithm).**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:123 -msgid "Amazon Information is stored in an unencrypted database. Direct access to the database is not possible for the customer outside of UI interactions or API calls. Granular access rights control ensures that access is not shared to all users of the database." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:127 -msgid "**Describe how your organization backups or archives Amazon Information and provide details on how you encrypt this information (e.g., algorithm).**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:130 -msgid "The entire database is backed up once a day and backups are kept for a minimum of three months according to the `Odoo Online SLA `_. Backups are hosted on several remote servers as unencrypted database dumps; these backups can only be retrieved by Odoo S.A. employees through support requests." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:135 -msgid "**Describe where your organization monitors and detects malicious activity in your application(s).**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:138 -msgid "Odoo Online uses automated probes on our server that report their status in Munin, an opensource monitoring tool. This tool automatically triggers alarms when probes detect values outside of their pre-defined range. We monitor (among many other things) access rates, response times, ssh connections, network activity." -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:143 -msgid "**Describe how your organization's incident response plan addresses database hacks, unauthorized access, and data leaks (a link to your policy is also acceptable).**" -msgstr "" - -#: ../../sales/sale_amazon/apply.rst:146 -msgid "[Description of your organization's incident response plan]" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:3 -msgid "Manage Amazon orders in Odoo" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:6 -msgid "Synchronization of orders" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:8 -msgid "Orders are automatically fetched from Amazon and synchronized in Odoo at regular intervals. The synchronization is based on the Amazon status: only orders whose status has changed since the last synchronization are fetched from Amazon. For **FBA** (Fulfilled by Amazon), only **Shipped** and **Canceled** orders are fetched. For **FBM** (Fulfilled by Merchant), the same is done for **Unshipped** and **Canceled** orders. For each synchronized order, a sales order and a customer are created in Odoo if they are not yet registered." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:16 -msgid "If you did not request access to Personally Identifiable Information of your customers in the :ref:`Developer Registration and Assessment form `, the customers are created anonymously (the name, postal address and phone number are omitted) and named **Amazon Customer**." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:21 -msgid "When an order is canceled in Amazon and was already synchronized in Odoo, the corresponding sales order is canceled in Odoo. When an order is canceled in Odoo, a notification is sent to Amazon who will mark it as such in Seller Central and notify the customer." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:27 -msgid "To force the synchronization of an order whose status has not changed since the last synchronization, activate the **Developer mode**, navigate to your Amazon account and modify the date under :menuselection:`Orders Follow-up --> Last Order Sync`. Pick a date anterior to the last status change of the order that you wish to synchronize and save." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:33 -msgid "To synchronize immediately the orders of your Amazon account switch to **Developer mode**, head to your Amazon account and click the button **SYNC ORDERS**. The same can be done with order cancellations and pickings by clicking the buttons **SYNC CANCELLATIONS** and **SYNC PICKINGS**." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:38 -msgid "Manage deliveries in FBM" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:40 -msgid "When a **FBM** (Fulfilled by Merchant) order is synchronized in Odoo, a picking is created along with the sales order and the customer. You can either ship all the ordered products to your customer at once or ship products partially by using backorders." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:44 -msgid "When a picking related to the order is confirmed, a notification is sent to Amazon who will, in turn, notify the customer that the order (or a part of it) is on its way." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:48 -msgid "Follow deliveries in FBA" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:50 -msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:57 -msgid "To follow your Amazon (FBA) stock in Odoo, you can make an inventory adjustment after replenishing it. You can also trigger an automated replenishment from reordering rules on the Amazon location." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:62 -msgid "The Amazon location is configurable by Amazon account managed in Odoo. All accounts of the same company use the same location by default. It is however possible to follow the stock by marketplace. First, remove the marketplace for which you want to follow the stock separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another stock location to the second registration of your account." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:70 -msgid "Issue invoices and register payments" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:72 -msgid "You can issue invoices for Amazon orders in Odoo. Click **Create Invoice** in the sales order to do so. You can also do it in batch from the list view of orders. Then, confirm and send the invoices to your customers." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:77 -msgid "To display only Amazon-related orders on the list view, you can filter orders based on the sales team." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:80 -msgid "As the customer has paid Amazon as an intermediary, you should register invoice payments in a payment journal dedicated to Amazon (e.g. Amazon Payments, with a dedicated intermediary account). You can do the same with the vendor bill received from Amazon and dedicated to commissions. When you receive the balance on your bank account at the end of the month and record your bank statements in Odoo, you simply credit the Amazon intermediary account by the amount received." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:87 -msgid "Follow your Amazon sales in sales reporting" -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:89 -msgid "As a sales team is set on your account under the tab **Order Follow-up**, this helps you give quick glances at the figures in just a few clicks in Sales reporting. By default, your account's sales team is shared between all of your company's accounts." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:93 -msgid "If you wish, you can change the sales team on your account for another to perform a separate reporting for the sales of this account." -msgstr "" - -#: ../../sales/sale_amazon/manage.rst:97 -msgid "It is also possible to perform reporting on a per-marketplace basis in a similar fashion. First, remove the marketplace you wish to track separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another sales team to one of the two registrations of your account." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:3 -msgid "Configure Amazon Connector in Odoo" -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:6 -msgid "Register your Amazon account in Odoo" -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:8 -msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on **CREATE**." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:11 -msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Access Key** and the **Secret Key** can be found in Developer Central (where the Developer Registration and Assessment form was located)." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:15 -msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:20 -msgid "Match database products in Amazon" -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:25 -msgid "When an Amazon order is synchronized, up to three sales order items are created in Odoo for each product sold on Amazon: one for the marketplace product, one for the shipping charges (if any) and one for the gift wrapping charges (if any)." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:29 -msgid "The selection of a database product for a sales order item is done by matching its **internal reference** with the **SKU** for marketplace items, the **shipping code** for delivery charges, and the **gift wrapping** code for gift wrapping charges." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:33 -msgid "For marketplace products, pairings are saved as **Amazon Offers** which are listed under the **Offers** stat button on the account form. Offers are automatically created when the pairing is established and are used for subsequent orders to lookup SKUs. If no offer with a matching SKU is found, :ref:`the internal reference is used instead `." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:39 -msgid "It is possible to force the pairing of a marketplace item with a specific product by changing either the product or the SKU of an offer. The offer can be manually created if it was not automatically done yet. This is useful if you do not use the internal reference as the SKU or if you sell the product under different conditions." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:44 -msgid "If no database product with a matching internal reference is found for a given SKU or gift wrapping code, a default database product **Amazon Sale** is used. The same is done with the default product **Amazon Shipping** and the shipping code." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:49 -msgid "To modify the default products, activate the **Developer mode** and navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Default Products`." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:54 -msgid "Configure taxes of products" -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:56 -msgid "To allow for tax reporting of Amazon sales with Odoo, the taxes applied to the sales order items are those set on the product or determined by the fiscal position. Make sure to have set the correct taxes on your products in Odoo or to have it done by a fiscal position, to avoid discrepancies in the subtotals between Seller Central and Odoo." -msgstr "" - -#: ../../sales/sale_amazon/setup.rst:62 -msgid "As Amazon does not necessarily apply the same taxes as those configured in Odoo, it may happen that order totals differ by a few cents from that on Seller Central. Those differences can be resolved with a write-off when reconciling the payments in Odoo." -msgstr "" - -#: ../../sales/sale_ebay.rst:3 -msgid "eBay" -msgstr "" - #: ../../sales/send_quotations.rst:3 msgid "Send Quotations" msgstr "" @@ -1404,10 +1385,10 @@ msgid "Use deadline in templates" msgstr "" #: ../../sales/send_quotations/deadline.rst:21 -msgid "You can also set a default deadline in a *Quotation Template*. Each time that template is used in a quotation, that deadline is applied. You can find more info about quotation templates `here `_." +msgid "You can also set a default deadline in a *Quotation Template*. Each time that template is used in a quotation, that deadline is applied. See :doc:`quote_template` for more information about quotation templates." msgstr "" -#: ../../sales/send_quotations/deadline.rst:29 +#: ../../sales/send_quotations/deadline.rst:28 msgid "On your customer side, they will see this:" msgstr "" @@ -1501,7 +1482,7 @@ msgid "Activate online signature" msgstr "" #: ../../sales/send_quotations/get_signature_to_validate.rst:19 -msgid "If you are using `quotation templates `_, you can also pick a default setting for each template." +msgid "If you are using :doc:`quotation templates `, you can also pick a default setting for each template." msgstr "" #: ../../sales/send_quotations/get_signature_to_validate.rst:23 @@ -1529,34 +1510,34 @@ msgid "Add suggested products to your quotation templates" msgstr "" #: ../../sales/send_quotations/optional_items.rst:13 -msgid "Suggested products can be set on *Quotation Templates*." +msgid "Suggested products can be set on *Quotation Templates*. See :doc:`quote_template`." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:17 +#: ../../sales/send_quotations/optional_items.rst:15 msgid "Once on a template, you can see a *Suggested Products* tab where you can add related products or services." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:23 +#: ../../sales/send_quotations/optional_items.rst:21 msgid "You can also add or modify suggested products on the quotation." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:26 +#: ../../sales/send_quotations/optional_items.rst:24 msgid "Add suggested products to the quotation" msgstr "" -#: ../../sales/send_quotations/optional_items.rst:28 +#: ../../sales/send_quotations/optional_items.rst:26 msgid "When opening the quotation from the received email, the customer can add the suggested products to the order." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:37 +#: ../../sales/send_quotations/optional_items.rst:35 msgid "The product(s) will be instantly added to their quotation when clicking on any of the little carts." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:43 +#: ../../sales/send_quotations/optional_items.rst:41 msgid "Depending on your confirmation process, they can either digitally sign or pay to confirm the quotation." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:46 +#: ../../sales/send_quotations/optional_items.rst:44 msgid "Each move done by the customer to the quotation will be tracked in the sales order, letting the salesperson see it." msgstr "" @@ -1585,57 +1566,69 @@ msgid "You can then create or edit an existing one. Once named, you will be able msgstr "" #: ../../sales/send_quotations/quote_template.rst:31 -msgid "On each template, you can also specify discounts if the option is activated in the *Sales* settings. The base price is set in the product configuration and can be alterated by customer pricelists." +msgid "On each template, you can also specify discounts if the option is activated in the *Sales* settings. The base price is set in the product configuration and can be changed by customer pricelists." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:38 +#: ../../sales/send_quotations/quote_template.rst:36 +msgid ":doc:`../products_prices/prices/pricing`" +msgstr "" + +#: ../../sales/send_quotations/quote_template.rst:39 msgid "Edit your template" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:40 +#: ../../sales/send_quotations/quote_template.rst:41 msgid "You can edit the customer interface of the template that they see to accept or pay the quotation. This lets you describe your company, services and products. When you click on *Edit Template* you will be brought to the quotation editor." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:51 +#: ../../sales/send_quotations/quote_template.rst:52 msgid "This lets you edit the description content thanks to drag & drop of building blocks. To describe your products add a content block in the zone dedicated to each product." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:59 +#: ../../sales/send_quotations/quote_template.rst:60 msgid "The description set for the products will be used in all quotations templates containing those products." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:63 +#: ../../sales/send_quotations/quote_template.rst:64 msgid "Use a quotation template" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:65 +#: ../../sales/send_quotations/quote_template.rst:66 msgid "When creating a quotation, you can select a template." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:70 +#: ../../sales/send_quotations/quote_template.rst:71 msgid "Each product in that template will be added to your quotation." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:73 +#: ../../sales/send_quotations/quote_template.rst:74 msgid "You can select a template to be suggested by default in the *Sales* settings." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:77 +#: ../../sales/send_quotations/quote_template.rst:78 msgid "Confirm the quotation" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:79 +#: ../../sales/send_quotations/quote_template.rst:80 msgid "Templates also ease the confirmation process for customers with a digital signature or online payment. You can select that in the template itself." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:86 +#: ../../sales/send_quotations/quote_template.rst:87 msgid "Every quotation will now have this setting added to it." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:88 +#: ../../sales/send_quotations/quote_template.rst:89 msgid "Of course you can still change it and make it specific for each quotation." msgstr "" +#: ../../sales/send_quotations/quote_template.rst:93 +msgid ":doc:`get_signature_to_validate`" +msgstr "" + +#: ../../sales/send_quotations/quote_template.rst:94 +msgid ":doc:`get_paid_to_validate`" +msgstr "" + #: ../../sales/send_quotations/terms_and_conditions.rst:3 msgid "Add terms & conditions on orders" msgstr "" diff --git a/locale/sources/sms_marketing.pot b/locale/sources/sms_marketing.pot index abea003ad..1c8618a96 100644 --- a/locale/sources/sms_marketing.pot +++ b/locale/sources/sms_marketing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,7 @@ msgid "Build an SMS mailing" msgstr "" #: ../../sms_marketing/SMS_mkt_build_send-and_get_reports_from_a_SMS_mailing.rst:19 -msgid "Go to *SMS Marketing > Create*." +msgid "Go to :menuselection:`SMS Marketing --> Create`." msgstr "" #: ../../sms_marketing/SMS_mkt_build_send-and_get_reports_from_a_SMS_mailing.rst:24 @@ -125,7 +125,7 @@ msgid "Creating my own list of contacts, or importing it, is useful when I want msgstr "" #: ../../sms_marketing/SMS_mkt_contact_lists_and_blacklist.rst:9 -msgid "Go to *Contacts lists > Contacts lists > Create*. I’ll choose a name for my *Mailing list*, and activate the option *Public* if I would like to make the mailing list accessible to my recipients in the unsubscription page to allow them to update their subscription preferences." +msgid "Go to :menuselection:`Contacts lists --> Contacts lists --> Create`. I’ll choose a name for my *Mailing list*, and activate the option *Public* if I would like to make the mailing list accessible to my recipients in the unsubscription page to allow them to update their subscription preferences." msgstr "" #: ../../sms_marketing/SMS_mkt_contact_lists_and_blacklist.rst:12 @@ -149,7 +149,7 @@ msgid "Blacklist" msgstr "" #: ../../sms_marketing/SMS_mkt_contact_lists_and_blacklist.rst:30 -msgid "If I’m coming from another software and have a list of clients who have already asked to be blacklisted from my news, I can import those entries in my database. For that, I’ll go to *Configuration > Phone Blacklist > Import*." +msgid "If I’m coming from another software and have a list of clients who have already asked to be blacklisted from my news, I can import those entries in my database. For that, I’ll go to :menuselection:`Configuration --> Phone Blacklist --> Import`." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:3 @@ -165,78 +165,78 @@ msgid "Organize Email Marketing and SMS campaigns" msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:10 -msgid "First, make sure to have the necessary feature activated. Go to the *Email Marketing app > Configuration > Settings> activate the option Mailing Campaigns*." +msgid "First, make sure to have the necessary feature activated. Go to the :menuselection:`Email Marketing app --> Configuration --> Settings --> activate the option Mailing Campaigns`." msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:15 +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:16 msgid "Now, I’ll also have the menu *Campaigns* included in my *SMS Marketing* page, allowing me to have an overview of my SMS mailings and my email marketing ones." msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:20 +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:21 msgid "This feature is especially useful if I have aggregated campaigns, as I have a global reporting view. In addition to that, I can create stages in my kanban view to better organize the work being done." msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:26 +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:27 msgid "Sending SMSs through the Contacts app" msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:27 +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:28 msgid "Sending SMSs through the contact’s form is available by default in Odoo. It makes my work easier if I need to send an SMS to a specific contact, for example. For that, I’ll go to the *Contacts* app, select the contact and click on the *SMS* icon next to the phone number." msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:33 -msgid "If I’d like to send a message in a batch here, I could go to *List View > select all the contacts > Action > Send SMS*." +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:34 +msgid "If I’d like to send a message in a batch here, I could go to :menuselection:`List View --> select all the contacts --> Action --> Send SMS`." msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:39 +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:41 msgid "Set up SMS Templates" msgstr "" -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:40 -msgid "To set up *SMS Templates*, I’ll go to the *Settings* app and activate the *developer mode*. Now, back to *Settings* app, I’ll go to *Technical > Phone/SMS section > SMS Templates* and create the content I need." -msgstr "" - -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:48 -msgid "Use *Dynamic Placeholders* to adapt automatically the content of the SMS to the context." +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:42 +msgid "To set up *SMS Templates*, I’ll go to the *Settings* app and activate the *developer mode*. Now, back to *Settings* app, I’ll go to :menuselection:`Technical --> Phone/SMS section --> SMS Templates` and create the content I need." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:52 -msgid "SMS Text Messaging is available throughout Odoo! Here are some of our extra notable integrations:" -msgstr "" - -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:54 -msgid "*CRM*: send SMSs to your leads and opportunities." -msgstr "" - -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:55 -msgid "*Subscription*: alert customers about their subscription." +msgid "Use *Dynamic Placeholders* to adapt automatically the content of the SMS to the context." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:56 -msgid "*Accounting*: send payment reminders." -msgstr "" - -#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:57 -msgid "*Marketing Automation*: automate your SMS marketing campaigns." +msgid "SMS Text Messaging is available throughout Odoo! Here are some of our extra notable integrations:" msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:58 -msgid "*Inventory*: send an automatic confirmation when a delivery order is done." +msgid "*CRM*: send SMSs to your leads and opportunities." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:59 -msgid "*Sign*: receive a validation code to verify your identity before signing a document online." +msgid "*Subscription*: alert customers about their subscription." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:60 -msgid "*SEPA debit payment provider*: send a verification code to your customers." +msgid "*Accounting*: send payment reminders." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:61 -msgid "*Studio*: send an SMS according to your needs by using automated actions." +msgid "*Marketing Automation*: automate your SMS marketing campaigns." +msgstr "" + +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:62 +msgid "*Inventory*: send an automatic confirmation when a delivery order is done." msgstr "" #: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:63 +msgid "*Sign*: receive a validation code to verify your identity before signing a document online." +msgstr "" + +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:64 +msgid "*SEPA debit payment provider*: send a verification code to your customers." +msgstr "" + +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:65 +msgid "*Studio*: send an SMS according to your needs by using automated actions." +msgstr "" + +#: ../../sms_marketing/SMS_mkt_integrations_and_template.rst:67 msgid "For more information about SMS integrations in Odoo and a list of frequently asked questions, go to `Pricing and FQA `__." msgstr "" @@ -252,123 +252,123 @@ msgstr "" msgid "SMS Text Messaging is an In-App Purchase (IAP) service which requires prepaid credits to work. The price of an SMS depends on the destination and the length of the message. With 1 credit, I can send up to 92 SMSs." msgstr "" -#: ../../sms_marketing/fqapricing.rst:9 +#: ../../sms_marketing/fqapricing.rst:11 msgid "**For more information, please consult our FAQ page**: `Odoo SMS - FAQ `_" msgstr "" -#: ../../sms_marketing/fqapricing.rst:11 -msgid "To buy credits I will go to *Settings > Buy Credits* (under *Send SMS*); or go to *Settings > View my Services* (under *Odoo IAP*)." +#: ../../sms_marketing/fqapricing.rst:14 +msgid "To buy credits I will go to :menuselection:`Settings --> Buy Credits` (under *Send SMS*); or go to :menuselection:`Settings --> View my Services` (under *Odoo IAP*)." msgstr "" -#: ../../sms_marketing/fqapricing.rst:18 +#: ../../sms_marketing/fqapricing.rst:23 msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature." msgstr "" -#: ../../sms_marketing/fqapricing.rst:21 +#: ../../sms_marketing/fqapricing.rst:27 msgid "FAQ" msgstr "" -#: ../../sms_marketing/fqapricing.rst:22 +#: ../../sms_marketing/fqapricing.rst:28 msgid "**Is there an expiration time for my credits?**" msgstr "" -#: ../../sms_marketing/fqapricing.rst:24 +#: ../../sms_marketing/fqapricing.rst:30 msgid "No, your credits won’t expire." msgstr "" -#: ../../sms_marketing/fqapricing.rst:26 +#: ../../sms_marketing/fqapricing.rst:32 msgid "**Can I send an SMS to a phone number (which is not a mobile phone) because I see the icon in front of the field “phone”?**" msgstr "" -#: ../../sms_marketing/fqapricing.rst:28 +#: ../../sms_marketing/fqapricing.rst:35 msgid "Only if that phone number supports SMS (e.g. SIP phones)." msgstr "" -#: ../../sms_marketing/fqapricing.rst:30 +#: ../../sms_marketing/fqapricing.rst:37 msgid "**Do I receive an invoice to buy my credits?**" msgstr "" -#: ../../sms_marketing/fqapricing.rst:32 +#: ../../sms_marketing/fqapricing.rst:39 msgid "Yes." msgstr "" -#: ../../sms_marketing/fqapricing.rst:34 +#: ../../sms_marketing/fqapricing.rst:41 msgid "**Can the recipient answer to me?**" msgstr "" -#: ../../sms_marketing/fqapricing.rst:36 +#: ../../sms_marketing/fqapricing.rst:43 msgid "No, it is not possible to reply to the SMS." msgstr "" -#: ../../sms_marketing/fqapricing.rst:38 +#: ../../sms_marketing/fqapricing.rst:45 msgid "**What happens if I send multiple SMS but I do not have enough credits to send them all?**" msgstr "" -#: ../../sms_marketing/fqapricing.rst:40 +#: ../../sms_marketing/fqapricing.rst:47 msgid "The whole transaction is counted as a single one, so no SMS will be sent until you have enough credits to send them all." msgstr "" -#: ../../sms_marketing/fqapricing.rst:42 +#: ../../sms_marketing/fqapricing.rst:50 msgid "**Do I have a history of the sent SMSs?**" msgstr "" -#: ../../sms_marketing/fqapricing.rst:44 -msgid "Yes, the SMS is logged as a note under the chatter of the corresponding record, and a complete history of SMS sent is available under Settings> Activate the developer mode > Technical > SMS." -msgstr "" - -#: ../../sms_marketing/fqapricing.rst:46 -msgid "**Can I send as many SMSs I want at once?**" -msgstr "" - -#: ../../sms_marketing/fqapricing.rst:48 -msgid "Yes, if you have enough credits." -msgstr "" - -#: ../../sms_marketing/fqapricing.rst:50 -msgid "**If I have a number that does not exist in the list of recipients, will I lose credits?**" -msgstr "" - #: ../../sms_marketing/fqapricing.rst:52 -msgid "Not if the phone number is in the wrong format (e.g. too many digits). Otherwise, if the SMS is sent to the wrong person or to a fake number, the credit will be lost." -msgstr "" - -#: ../../sms_marketing/fqapricing.rst:54 -msgid "**What happens if I send my SMS to a paying number (e.g.: a contest to win a ticket for a festival)?**" +msgid "Yes, the SMS is logged as a note under the chatter of the corresponding record, and a complete history of SMS sent is available under :menuselection:`Settings --> Activate the developer mode --> Technical --> SMS`." msgstr "" #: ../../sms_marketing/fqapricing.rst:56 -msgid "The SMS will not be delivered to that kind of number, so you won’t be charged." +msgid "**Can I send as many SMSs I want at once?**" msgstr "" #: ../../sms_marketing/fqapricing.rst:58 -msgid "**Can I identify the numbers that do not exist when I send several SMSs?**" +msgid "Yes, if you have enough credits." msgstr "" #: ../../sms_marketing/fqapricing.rst:60 -msgid "Only the ones that have an invalid format." +msgid "**If I have a number that does not exist in the list of recipients, will I lose credits?**" msgstr "" #: ../../sms_marketing/fqapricing.rst:62 -msgid "**How does the GDPR regulation affect this service?**" +msgid "Not if the phone number is in the wrong format (e.g. too many digits). Otherwise, if the SMS is sent to the wrong person or to a fake number, the credit will be lost." msgstr "" -#: ../../sms_marketing/fqapricing.rst:64 -msgid "Please find our Privacy Policy here: `Odoo IPA Purchase Privacy Policy `__" -msgstr "" - -#: ../../sms_marketing/fqapricing.rst:66 -msgid "**How many types of SMS exist and how many characters make 1 SMS?**" +#: ../../sms_marketing/fqapricing.rst:65 +msgid "**What happens if I send my SMS to a paying number (e.g.: a contest to win a ticket for a festival)?**" msgstr "" #: ../../sms_marketing/fqapricing.rst:68 -msgid "There are 2 types of SMS message:" +msgid "The SMS will not be delivered to that kind of number, so you won’t be charged." msgstr "" #: ../../sms_marketing/fqapricing.rst:70 +msgid "**Can I identify the numbers that do not exist when I send several SMSs?**" +msgstr "" + +#: ../../sms_marketing/fqapricing.rst:72 +msgid "Only the ones that have an invalid format." +msgstr "" + +#: ../../sms_marketing/fqapricing.rst:74 +msgid "**How does the GDPR regulation affect this service?**" +msgstr "" + +#: ../../sms_marketing/fqapricing.rst:76 +msgid "Please find our Privacy Policy here: `Odoo IPA Purchase Privacy Policy `__" +msgstr "" + +#: ../../sms_marketing/fqapricing.rst:79 +msgid "**How many types of SMS exist and how many characters make 1 SMS?**" +msgstr "" + +#: ../../sms_marketing/fqapricing.rst:81 +msgid "There are 2 types of SMS message:" +msgstr "" + +#: ../../sms_marketing/fqapricing.rst:83 msgid "*Standard* (GSM-7): contains only characters from the GSM-7 set, which can be seen in the following picture." msgstr "" -#: ../../sms_marketing/fqapricing.rst:75 +#: ../../sms_marketing/fqapricing.rst:89 msgid "*Unicode*: contains at least one character that is not in the previous table. For Standard SMS the size limit is 160 characters, and for Unicode is 70. Above these limits, the content is divided into a multi-part message. The system will inform you in real-time about the number of SMS your message represents." msgstr "" diff --git a/locale/sources/social_marketing.pot b/locale/sources/social_marketing.pot index 7d5340249..648e86ff7 100644 --- a/locale/sources/social_marketing.pot +++ b/locale/sources/social_marketing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-20 10:20+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,12 +53,8 @@ msgstr "" msgid "Engagement: Number of times people have engaged with your posts" msgstr "" -#: ../../social_marketing/social_marketing/social_marketing.rst:35 -msgid "Stories: Number of times people who have engaged with your channel" -msgstr "" - -#: ../../social_marketing/social_marketing/social_marketing.rst:35 -msgid "have created stories on their friend’s or follower’s feed (Shares, Retweet,..)" +#: ../../social_marketing/social_marketing/social_marketing.rst:34 +msgid "Stories: Number of times people who have engaged with your channel have created stories on their friend’s or follower’s feed (Shares, Retweet,..)" msgstr "" #: ../../social_marketing/social_marketing/social_marketing.rst:37 @@ -102,7 +98,7 @@ msgid "Configure your own Facebook and Twitter developer accounts" msgstr "" #: ../../social_marketing/social_marketing/social_marketing.rst:93 -msgid "By default, the Social application is already configured with a Facebook and Twitter developer accounts but you can use your own if necessary. Activate the developer mode, go to Configuration > Settings and enter your own API keys." +msgid "By default, the Social application is already configured with a Facebook and Twitter developer accounts but you can use your own if necessary. Activate the developer mode, go to :menuselection:`Configuration --> Settings` and enter your own API keys." msgstr "" #: ../../social_marketing/social_marketing/social_marketing.rst:102 diff --git a/locale/sources/support.pot b/locale/sources/support.pot index be6ee84e5..63e45ca43 100644 --- a/locale/sources/support.pot +++ b/locale/sources/support.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-26 09:17+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -261,182 +261,177 @@ msgid "Edit an existing page" msgstr "" #: ../../support/user_doc.rst:17 -msgid "As our documentation is maintained on GitHub, you'll need a free `GitHub account `_." -msgstr "" - -#: ../../support/user_doc.rst:18 -msgid "Pick a page in our `user documentation `_. **Please take care of choosing the right version of Odoo.**" +msgid "As our documentation is maintained on GitHub, you'll need a free `GitHub account `_." msgstr "" #: ../../support/user_doc.rst:19 +msgid "Pick a page in our :doc:`user documentation <../index>`. **Please take care of selecting the right version of Odoo.**" +msgstr "" + +#: ../../support/user_doc.rst:21 msgid "Click on **Edit on Github** in the left menu." msgstr "" -#: ../../support/user_doc.rst:25 -msgid "If this is the first time you edit our documentation, click on **Fork repository**, else you won't see this step." +#: ../../support/user_doc.rst:27 +msgid "If this is the first time you edit our documentation, click on **Fork repository**, otherwise you won't see this step." msgstr "" -#: ../../support/user_doc.rst:26 +#: ../../support/user_doc.rst:29 msgid "Use Github's editor to add your text. Text is tagged with a simple syntax called `RST `_. Don't worry, it's not so hard to learn 🤓... See the following section of this document for a quick overview of RST commands." msgstr "" -#: ../../support/user_doc.rst:32 +#: ../../support/user_doc.rst:37 msgid "Click on **Preview changes** to review your contribution in a human-readable format." msgstr "" -#: ../../support/user_doc.rst:38 +#: ../../support/user_doc.rst:43 msgid "In the **Propose file change** section, add a short title to your contribution. The title should summarize your changes. You may use the second box to add an extended description if your contribution requires a longer explanation." msgstr "" -#: ../../support/user_doc.rst:44 +#: ../../support/user_doc.rst:51 msgid "Submit your contribution by clicking on **Propose file change**." msgstr "" -#: ../../support/user_doc.rst:45 +#: ../../support/user_doc.rst:52 msgid "Click on **Create pull request**." msgstr "" -#: ../../support/user_doc.rst:46 +#: ../../support/user_doc.rst:53 msgid "Wait for an Odoo maintainer to add your contribution. Thank you for your help!" msgstr "" -#: ../../support/user_doc.rst:49 +#: ../../support/user_doc.rst:56 msgid "There is no automatic port of your edit to another version of the documentation." msgstr "" -#: ../../support/user_doc.rst:51 +#: ../../support/user_doc.rst:58 msgid "If your change should apply to multiple versions of Odoo, please warn us in your contribution message." msgstr "" -#: ../../support/user_doc.rst:55 +#: ../../support/user_doc.rst:62 msgid "RST Cheat Sheet" msgstr "" -#: ../../support/user_doc.rst:57 +#: ../../support/user_doc.rst:66 msgid "Here is a summary of the markup elements you may use while editing our documentation." msgstr "" -#: ../../support/user_doc.rst:60 +#: ../../support/user_doc.rst:69 msgid "Code" msgstr "" -#: ../../support/user_doc.rst:60 +#: ../../support/user_doc.rst:69 msgid "Display" msgstr "" -#: ../../support/user_doc.rst:60 +#: ../../support/user_doc.rst:69 msgid "Comments" msgstr "" -#: ../../support/user_doc.rst:62 +#: ../../support/user_doc.rst:71 msgid "Text in *italics*" msgstr "" -#: ../../support/user_doc.rst:66 +#: ../../support/user_doc.rst:75 msgid "Text in **bold** letters" msgstr "" -#: ../../support/user_doc.rst:70 -#: ../../support/user_doc.rst:76 +#: ../../support/user_doc.rst:79 +#: ../../support/user_doc.rst:85 msgid "Numbered" msgstr "" -#: ../../support/user_doc.rst:71 -#: ../../support/user_doc.rst:77 +#: ../../support/user_doc.rst:80 +#: ../../support/user_doc.rst:86 msgid "Bullet" msgstr "" -#: ../../support/user_doc.rst:72 -#: ../../support/user_doc.rst:78 +#: ../../support/user_doc.rst:81 +#: ../../support/user_doc.rst:87 msgid "List" msgstr "" -#: ../../support/user_doc.rst:70 -#: ../../support/user_doc.rst:76 +#: ../../support/user_doc.rst:79 +#: ../../support/user_doc.rst:85 msgid "Must be surrounded by white lines." msgstr "" -#: ../../support/user_doc.rst:82 +#: ../../support/user_doc.rst:91 msgid "This is `a hyper link `_." msgstr "" -#: ../../support/user_doc.rst:82 +#: ../../support/user_doc.rst:91 msgid "Here is `how to enter backticks on your keyboard `_." msgstr "" -#: ../../support/user_doc.rst:85 +#: ../../support/user_doc.rst:94 msgid "Don't forget terminal *underscore*." msgstr "" -#: ../../support/user_doc.rst:90 +#: ../../support/user_doc.rst:99 msgid "There are many more commands available, see `comprehensive documentation `_ of RST." msgstr "" -#: ../../support/user_doc.rst:94 +#: ../../support/user_doc.rst:104 msgid "Add images to your documents" msgstr "" -#: ../../support/user_doc.rst:98 +#: ../../support/user_doc.rst:108 msgid "This procedure is possible only for users who have **push** access on the documentation repository (eg: mainly, Odoo maintainers). We are working on improving this." msgstr "" -#: ../../support/user_doc.rst:101 +#: ../../support/user_doc.rst:111 msgid "First of all, prepare your screenshots." msgstr "" -#: ../../support/user_doc.rst:103 +#: ../../support/user_doc.rst:113 msgid "They must be good-quality PNG images." msgstr "" -#: ../../support/user_doc.rst:104 +#: ../../support/user_doc.rst:114 msgid "Crop your screenshots to display only the relevant part of the screen. Large screenshots are hard to read and don't display well in a documentation." msgstr "" -#: ../../support/user_doc.rst:106 +#: ../../support/user_doc.rst:116 msgid "Always take your screenshots on a demo instance of Odoo; **never** include any personal data." msgstr "" -#: ../../support/user_doc.rst:108 +#: ../../support/user_doc.rst:118 msgid "Upload them to the ``media/`` directory which is located next to the page you are editing. If the directory does not exist, create it." msgstr "" -#: ../../support/user_doc.rst:109 +#: ../../support/user_doc.rst:119 msgid "When editing your page, use this code piece in order to load your image:" msgstr "" -#: ../../support/user_doc.rst:117 +#: ../../support/user_doc.rst:127 msgid "Submit your changes" msgstr "" -#: ../../support/user_doc.rst:128 +#: ../../support/user_doc.rst:137 msgid "Technical Details for Nerds" msgstr "" -#: ../../support/user_doc.rst:130 -msgid "Advanced users may, of course, fork and clone `the GitHub repository `_. Then submit a pull request with the canonical Git/GitHub workflow." +#: ../../support/user_doc.rst:139 +msgid "Advanced users may, of course, fork and clone the `GitHub repository `_. Then submit a pull request with the canonical Git/GitHub workflow." msgstr "" -#: ../../support/user_doc.rst:133 +#: ../../support/user_doc.rst:142 msgid "See our `README `_ file about building the documentation." msgstr "" -#: ../../support/user_doc.rst:138 +#: ../../support/user_doc.rst:147 msgid "Developer documentation" msgstr "" -#: ../../support/user_doc.rst:140 +#: ../../support/user_doc.rst:149 msgid "Documentation that targets developers of Odoo apps is maintained alongside `the source code of Odoo `_." msgstr "" -#: ../../support/user_doc.rst:143 +#: ../../support/user_doc.rst:152 msgid "User documentation might contain technicalities yet, when they are related to configuration and everyday use of Odoo." msgstr "" -#: ../../support/user_doc.rst:149 -#: ../../support/where_can_i_get_support.rst:36 -msgid "*Last revision of this page:* |date|" -msgstr "" - #: ../../support/what_can_i_expect.rst:8 msgid "What can I expect from the support service?" msgstr "" @@ -533,43 +528,43 @@ msgstr "" msgid "Users who have a valid Odoo Enterprise subscription may always contact our support teams through our `support form `_, no matter the hosting type you chose (Odoo Online, Odoo.sh or on your own server)." msgstr "" -#: ../../support/where_can_i_get_support.rst:14 +#: ../../support/where_can_i_get_support.rst:16 msgid "Please include in your request:" msgstr "" -#: ../../support/where_can_i_get_support.rst:16 -msgid "your subscription number," -msgstr "" - -#: ../../support/where_can_i_get_support.rst:17 -msgid "if your database is hosted by Odoo (Odoo Online or Odoo.sh), please also send the URL of your database." +#: ../../support/where_can_i_get_support.rst:18 +msgid "your subscription number" msgstr "" #: ../../support/where_can_i_get_support.rst:19 +msgid "the URL of your database if your database is hosted by Odoo (Odoo Online or Odoo.sh)" +msgstr "" + +#: ../../support/where_can_i_get_support.rst:21 msgid "Our agents will get back to you as soon as possible." msgstr "" -#: ../../support/where_can_i_get_support.rst:23 +#: ../../support/where_can_i_get_support.rst:25 msgid "Odoo Community" msgstr "" -#: ../../support/where_can_i_get_support.rst:25 +#: ../../support/where_can_i_get_support.rst:27 msgid "*Odoo Community users don't get access to the support service.*" msgstr "" -#: ../../support/where_can_i_get_support.rst:27 +#: ../../support/where_can_i_get_support.rst:29 msgid "Here are some resources that might help you:" msgstr "" -#: ../../support/where_can_i_get_support.rst:29 +#: ../../support/where_can_i_get_support.rst:31 msgid "Our `documentation pages `_." msgstr "" -#: ../../support/where_can_i_get_support.rst:30 +#: ../../support/where_can_i_get_support.rst:32 msgid "Ask your question on the `community forum `_." msgstr "" -#: ../../support/where_can_i_get_support.rst:31 -msgid "`Buy Odoo Enterprise `_ to get the support and bugfix services." +#: ../../support/where_can_i_get_support.rst:33 +msgid "`Buy Odoo Enterprise `_ to get the support and bugfix services." msgstr "" diff --git a/locale/sources/website.pot b/locale/sources/website.pot index 150a57a3a..c4c5f602e 100644 --- a/locale/sources/website.pot +++ b/locale/sources/website.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-21 10:39+0100\n" +"POT-Creation-Date: 2020-01-16 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,10 +49,10 @@ msgid "Go to the *Configuration* menu of your Odoo's Website app. In the setting msgstr "" #: ../../website/optimize/google_analytics.rst:27 -msgid "To make your first steps in Google Analytics, refer to `Google Documentation. `__" +msgid "To make your first steps in Google Analytics, refer to `Google Documentation `_." msgstr "" -#: ../../website/optimize/google_analytics.rst:31 +#: ../../website/optimize/google_analytics.rst:32 msgid ":doc:`google_analytics_dashboard`" msgstr "" @@ -169,15 +169,15 @@ msgid "**Odoo Blogs**: write great contents." msgstr "" #: ../../website/optimize/seo.rst:62 -msgid "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their content is automatically indexed on the web page. Example: `https://www.odoo.com/slides/public-channel-1 `__" +msgid "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their content is automatically indexed on the web page. Example: `odoo.com/slides/public-channel-1 `_" msgstr "" #: ../../website/optimize/seo.rst:66 -msgid "**Odoo Forum**: let your community create contents for you. Example: `https://odoo.com/forum/1 `__ (accounts for 30% of Odoo.com landing pages)" +msgid "**Odoo Forum**: let your community create contents for you. Example: `odoo.com/forum/1 `_ (accounts for 30% of Odoo.com landing pages)" msgstr "" #: ../../website/optimize/seo.rst:70 -msgid "**Odoo Mailing List Archive**: publish mailing list archives on your website. Example: `https://www.odoo.com/groups/community-59 `__ (1000 pages created per month)" +msgid "**Odoo Mailing List Archive**: publish mailing list archives on your website. Example: `odoo.com/groups/community-59 `_ (1000 pages created per month)" msgstr "" #: ../../website/optimize/seo.rst:76 @@ -237,7 +237,7 @@ msgid "Test Your Website" msgstr "" #: ../../website/optimize/seo.rst:131 -msgid "You can compare how your website rank, in terms of SEO, against Odoo using WooRank free services: `https://www.woorank.com `__" +msgid "You can compare how your website rank, in terms of SEO, against Odoo using WooRank free services: `woorank.com `_" msgstr "" #: ../../website/optimize/seo.rst:136 @@ -737,7 +737,7 @@ msgid "Browser Caching" msgstr "" #: ../../website/optimize/seo.rst:548 -msgid "Javascript, images and CSS resources have an URL that changes dynamically when their content change. As an example, all CSS files are loaded through this URL: `http://localhost:8069/web/content/457-0da1d9d/web.assets\\_common.0.css `__. The ``457-0da1d9d`` part of this URL will change if you modify the CSS of your website." +msgid "Javascript, images and CSS resources have an URL that changes dynamically when their content change. As an example, all CSS files are loaded through this URL: `localhost:8069/web/content/457-0da1d9d/web.assets\\_common.0.css `__. The ``457-0da1d9d`` part of this URL will change if you modify the CSS of your website." msgstr "" #: ../../website/optimize/seo.rst:555 @@ -749,78 +749,78 @@ msgid "Scalability" msgstr "" #: ../../website/optimize/seo.rst:562 -msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link provides an analysis of the major open source CMS and eCommerce compared to Odoo when it comes to high query volumes: `*https://www.odoo.com/slides/slide/197* `__" +msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link provides an analysis of the major open source CMS and eCommerce compared to Odoo when it comes to high query volumes: `https://www.odoo.com/slides/slide/197 `_" msgstr "" -#: ../../website/optimize/seo.rst:568 +#: ../../website/optimize/seo.rst:571 msgid "Here is the slide that summarizes the scalability of Odoo Website & eCommerce." msgstr "" -#: ../../website/optimize/seo.rst:574 +#: ../../website/optimize/seo.rst:577 msgid "Search Engines Files" msgstr "" -#: ../../website/optimize/seo.rst:577 +#: ../../website/optimize/seo.rst:580 msgid "Sitemap" msgstr "" -#: ../../website/optimize/seo.rst:579 +#: ../../website/optimize/seo.rst:582 msgid "The sitemap points out pages to index to search engine robots. Odoo generates a ``/sitemap.xml`` file automatically for you. For performance reasons, this file is cached and updated every 12 hours." msgstr "" -#: ../../website/optimize/seo.rst:583 +#: ../../website/optimize/seo.rst:586 msgid "By default, all URLs will be in a single ``/sitemap.xml`` file, but if you have a lot of pages, Odoo will automatically create a Sitemap Index file, respecting the `sitemaps.org protocol `__ grouping sitemap URL's in 45000 chunks per file." msgstr "" -#: ../../website/optimize/seo.rst:589 +#: ../../website/optimize/seo.rst:592 msgid "Every sitemap entry has 4 attributes that are computed automatically:" msgstr "" -#: ../../website/optimize/seo.rst:591 +#: ../../website/optimize/seo.rst:594 msgid "```` : the URL of a page" msgstr "" -#: ../../website/optimize/seo.rst:593 +#: ../../website/optimize/seo.rst:596 msgid "```` : last modification date of the resource, computed automatically based on related object. For a page related to a product, this could be the last modification date of the product or the page." msgstr "" -#: ../../website/optimize/seo.rst:598 +#: ../../website/optimize/seo.rst:601 msgid "```` : modules may implement their own priority algorithm based on their content (example: a forum might assign a priority based on the number of votes on a specific post). The priority of a static page is defined by it's priority field, which is normalized (16 is the default)." msgstr "" -#: ../../website/optimize/seo.rst:605 +#: ../../website/optimize/seo.rst:608 msgid "Structured Data Markup" msgstr "" -#: ../../website/optimize/seo.rst:607 +#: ../../website/optimize/seo.rst:610 msgid "Structured Data Markup is used to generate Rich Snippets in search engine results. It is a way for website owners to send structured data to search engine robots; helping them understand your content and create well-presented search results." msgstr "" -#: ../../website/optimize/seo.rst:612 +#: ../../website/optimize/seo.rst:615 msgid "Google supports a number of rich snippets for content types, including: Reviews, People, Products, Businesses, Events and Organizations." msgstr "" -#: ../../website/optimize/seo.rst:615 +#: ../../website/optimize/seo.rst:618 msgid "Odoo implements micro data as defined in the `schema.org `__ specification for events, eCommerce products, forum posts and contact addresses. This allows your product pages to be displayed in Google using extra information like the price and rating of a product:" msgstr "" -#: ../../website/optimize/seo.rst:625 +#: ../../website/optimize/seo.rst:628 msgid "robots.txt" msgstr "" -#: ../../website/optimize/seo.rst:627 +#: ../../website/optimize/seo.rst:630 msgid "When indexing your website, search engines take a first look at the general indexing rules of the a``/robots.txt`` file (allowed robots, sitemap path, etc.). Odoo automatically creates it. Its content is:" msgstr "" -#: ../../website/optimize/seo.rst:631 +#: ../../website/optimize/seo.rst:634 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" msgstr "" -#: ../../website/optimize/seo.rst:634 +#: ../../website/optimize/seo.rst:637 msgid "It means that all robots are allowed to index your website and there is no other indexing rule than specified in the sitemap to be found at following address." msgstr "" -#: ../../website/optimize/seo.rst:638 +#: ../../website/optimize/seo.rst:641 msgid "You can customize the file *robots* in developer mode from *Settings --> Technical --> User Interface --> Views* (exclude robots, exclude some pages, redirect to a custom Sitemap). Make the Model Data of the view *Non Updatable* to not reset the file after system upgrades." msgstr "" @@ -968,19 +968,23 @@ msgstr "" msgid "It is not required anymore: Odoo generates the certificate for you automatically, using integration with `Let's Encrypt Certificate Authority and ACME protocol `__. In order to get this, simply add your domain name in your customer portal (a separate certificate is generated for each domain name specified)." msgstr "" -#: ../../website/publish/domain_name.rst:92 -msgid "If you already use CloudFlare or a similar service, you can keep using it or simply change for Odoo. The choice is yours." +#: ../../website/publish/domain_name.rst:93 +msgid "**Please note that the certificate generation may take up to 24h.**" msgstr "" #: ../../website/publish/domain_name.rst:95 +msgid "If you already use CloudFlare or a similar service, you can keep using it or simply change for Odoo. The choice is yours." +msgstr "" + +#: ../../website/publish/domain_name.rst:98 msgid "My website is indexed twice by Google" msgstr "" -#: ../../website/publish/domain_name.rst:97 +#: ../../website/publish/domain_name.rst:100 msgid "If you set up a custom domain *mydomain.com* name for *mydatabase.odoo.com*, Google indexes your website under both names. This is a limitation of the Odoo cloud platforms/" msgstr "" -#: ../../website/publish/domain_name.rst:102 +#: ../../website/publish/domain_name.rst:105 msgid ":doc:`../../discuss/email_servers`" msgstr "" @@ -1017,7 +1021,7 @@ msgid "Once the theme is selected, you can start to build the homepage of your w msgstr "" #: ../../website/publish/multi_website.rst:48 -msgid "If you run Odoo Online, don’t forget to redirect any new domain name to your Odoo database (CNAME) and to authorize it Odoo-side. `Read `__" +msgid "If you run Odoo Online, don’t forget to redirect any new domain name to your Odoo database (``CNAME``) and to authorize it Odoo-side. See :doc:`domain_name`." msgstr "" #: ../../website/publish/multi_website.rst:52 @@ -1025,7 +1029,7 @@ msgid "Create the menu" msgstr "" #: ../../website/publish/multi_website.rst:54 -msgid "The new website has a default menu with all the installed applications. To edit it, click *Pages > Edit Menu*. Moving forward you only edit the menu of the current website." +msgid "The new website has a default menu with all the installed applications. To edit it, click :menuselection:`Pages --> Edit Menu`. Moving forward you only edit the menu of the current website." msgstr "" #: ../../website/publish/multi_website.rst:59 @@ -1037,258 +1041,258 @@ msgid "As easy as ABC! There is a website switcher in the right corner of the ed msgstr "" #: ../../website/publish/multi_website.rst:71 -msgid "When switching, you are redirected to the same domain path on the other website (e.g.,/shop/myproduct). If this URL is not used, you will be redirected to a 404 page but suggested to create a new page from there." -msgstr "" - -#: ../../website/publish/multi_website.rst:74 -msgid "Add features" +msgid "When switching, you are redirected to the same domain path on the other website (e.g., ``/shop/myproduct``). If this URL is not used, you will be redirected to a 404 page but prompted to create a new page from there." msgstr "" #: ../../website/publish/multi_website.rst:76 +msgid "Add features" +msgstr "" + +#: ../../website/publish/multi_website.rst:78 msgid "The website apps you install (e.g., Slides, Blogs) are made available on all your websites. You can, of course, keep them hidden in one website by removing the menu item." msgstr "" -#: ../../website/publish/multi_website.rst:80 +#: ../../website/publish/multi_website.rst:82 msgid "Each website comes with a high range of specific options in the settings. First, select the website to configure." msgstr "" -#: ../../website/publish/multi_website.rst:86 +#: ../../website/publish/multi_website.rst:88 msgid "Then, take a look at the options flagged with the earth icon. It means they only impact the very website you are working on." msgstr "" -#: ../../website/publish/multi_website.rst:92 +#: ../../website/publish/multi_website.rst:94 msgid "You can, for instance, set specific :" msgstr "" -#: ../../website/publish/multi_website.rst:94 +#: ../../website/publish/multi_website.rst:96 msgid "languages," msgstr "" -#: ../../website/publish/multi_website.rst:96 +#: ../../website/publish/multi_website.rst:98 msgid "domain names," msgstr "" -#: ../../website/publish/multi_website.rst:98 +#: ../../website/publish/multi_website.rst:100 msgid "social media links," msgstr "" -#: ../../website/publish/multi_website.rst:100 +#: ../../website/publish/multi_website.rst:102 msgid "customer portal mode (B2C vs. B2B)," msgstr "" -#: ../../website/publish/multi_website.rst:102 +#: ../../website/publish/multi_website.rst:104 msgid "dedicated live chat channels," msgstr "" -#: ../../website/publish/multi_website.rst:104 +#: ../../website/publish/multi_website.rst:106 msgid "etc." msgstr "" -#: ../../website/publish/multi_website.rst:106 +#: ../../website/publish/multi_website.rst:108 msgid "The other options are global and apply to all your websites." msgstr "" -#: ../../website/publish/multi_website.rst:109 +#: ../../website/publish/multi_website.rst:111 msgid "Manage domain names" msgstr "" -#: ../../website/publish/multi_website.rst:111 -msgid "As said earlier, your websites can either share the same domain name or use a specific one. If you share it and want to adapt the content per region, set country groups in the setting of each website. Visitors will be redirected to the right website using Geo IP." +#: ../../website/publish/multi_website.rst:113 +msgid "As said earlier, your websites can either share the same domain name or use a specific one. If you share it and want to adapt the content per region, set country groups in the setting of each website. Visitors will be redirected to the right website using GeoIP." msgstr "" -#: ../../website/publish/multi_website.rst:120 -msgid "Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, don’t forget to install *Geoip* library." -msgstr "" - -#: ../../website/publish/multi_website.rst:123 -msgid "`Read the full documenation about domain names here `__," +#: ../../website/publish/multi_website.rst:122 +msgid "Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, don’t forget to install *GeoIP* library." msgstr "" #: ../../website/publish/multi_website.rst:126 -msgid "Customize the visitor experience" +msgid ":doc:`domain_name`" msgstr "" #: ../../website/publish/multi_website.rst:129 +msgid "Customize the visitor experience" +msgstr "" + +#: ../../website/publish/multi_website.rst:132 msgid "The customer experience can be customized very profoundly thanks to the menu \\*Customize\\*. All the visual options available there are specific to each website. Go through the different pages to adapt them to this new audience. Focus on workflows, and automatic pages (eCommerce checkout, blogs, events, etc.) as the number of available options is higher there." msgstr "" -#: ../../website/publish/multi_website.rst:139 +#: ../../website/publish/multi_website.rst:142 msgid "Publish specific content per website" msgstr "" -#: ../../website/publish/multi_website.rst:142 +#: ../../website/publish/multi_website.rst:145 msgid "Like static pages, any content created from the front-end (product, blog post, etc.) is always only published in the current website. You can change that from the edit form view in the backend and leave the *Website* field blank. This will publish it in all the websites." msgstr "" -#: ../../website/publish/multi_website.rst:150 +#: ../../website/publish/multi_website.rst:153 msgid "Here are all the objects that you can link to *either one or all the websites*:" msgstr "" -#: ../../website/publish/multi_website.rst:153 +#: ../../website/publish/multi_website.rst:156 msgid "Products" msgstr "" -#: ../../website/publish/multi_website.rst:155 +#: ../../website/publish/multi_website.rst:158 msgid "Product Categories for eCommerce" msgstr "" -#: ../../website/publish/multi_website.rst:157 +#: ../../website/publish/multi_website.rst:160 msgid "Blogs" msgstr "" -#: ../../website/publish/multi_website.rst:159 +#: ../../website/publish/multi_website.rst:162 msgid "Slide Channels" msgstr "" -#: ../../website/publish/multi_website.rst:161 +#: ../../website/publish/multi_website.rst:164 msgid "Forums" msgstr "" -#: ../../website/publish/multi_website.rst:163 +#: ../../website/publish/multi_website.rst:166 msgid "Events" msgstr "" -#: ../../website/publish/multi_website.rst:165 +#: ../../website/publish/multi_website.rst:168 msgid "Job Positions" msgstr "" -#: ../../website/publish/multi_website.rst:168 +#: ../../website/publish/multi_website.rst:171 msgid "When you create the record from the backend and publish it, typically a product or an event, it is made available in all websites." msgstr "" -#: ../../website/publish/multi_website.rst:172 +#: ../../website/publish/multi_website.rst:175 msgid "Publish a page in all websites" msgstr "" -#: ../../website/publish/multi_website.rst:174 +#: ../../website/publish/multi_website.rst:177 msgid "A new static page is created and only made available in the current website. You can duplicate it to other websites from :menuselection:`Website --> Configuration --> Pages`. To do so, leave the *Website* field empty." msgstr "" -#: ../../website/publish/multi_website.rst:178 +#: ../../website/publish/multi_website.rst:181 msgid "If you want to duplicate it in just one other website, duplicate the page and set the new website." msgstr "" -#: ../../website/publish/multi_website.rst:184 +#: ../../website/publish/multi_website.rst:187 msgid "When you edit the page again, the change only affects the current website. A new page is duplicated and tied up to the website. The original page still being linked to all websites." msgstr "" -#: ../../website/publish/multi_website.rst:189 +#: ../../website/publish/multi_website.rst:192 msgid "By grouping pages by URL in the page manager, you quickly find the original page behind each edited page." msgstr "" -#: ../../website/publish/multi_website.rst:196 +#: ../../website/publish/multi_website.rst:199 msgid "Multi-companies" msgstr "" -#: ../../website/publish/multi_website.rst:198 +#: ../../website/publish/multi_website.rst:201 msgid "Each website can be linked to a specific company of your system, in a multi-companies environment." msgstr "" -#: ../../website/publish/multi_website.rst:204 +#: ../../website/publish/multi_website.rst:207 msgid "With such a configuration, only company-related data appear on the website (products, jobs, events, etc.)." msgstr "" -#: ../../website/publish/multi_website.rst:207 +#: ../../website/publish/multi_website.rst:210 msgid "Website editors can only view and edit the pages of the records they have access to, typically the ones belonging to their current company (and to their subsidiaries, or child companies in Odoo language). And so is it for visitors." msgstr "" -#: ../../website/publish/multi_website.rst:213 +#: ../../website/publish/multi_website.rst:216 msgid "If websites are multi-companies, you don’t change company when switching websites. To change the company and see the related content, use the company selector in the menu." msgstr "" -#: ../../website/publish/multi_website.rst:219 +#: ../../website/publish/multi_website.rst:222 msgid "Configure your eCommerce website" msgstr "" -#: ../../website/publish/multi_website.rst:221 +#: ../../website/publish/multi_website.rst:224 msgid "eCommerce is a crucial feature in the multi-websites environment. We made it so that the entire flow can be customized to fit the very audience of each website." msgstr "" -#: ../../website/publish/multi_website.rst:226 +#: ../../website/publish/multi_website.rst:229 msgid "Products only available on one website" msgstr "" -#: ../../website/publish/multi_website.rst:228 +#: ../../website/publish/multi_website.rst:231 msgid "We already saw earlier how to publish a specific record in only one website. You will find the \\*Website\\* field in the eCommerce tab of the product edit form. Empty means available in all websites." msgstr "" -#: ../../website/publish/multi_website.rst:236 +#: ../../website/publish/multi_website.rst:239 msgid "Products available on *some* websites" msgstr "" -#: ../../website/publish/multi_website.rst:238 +#: ../../website/publish/multi_website.rst:241 msgid "To make a product available on some websites, but not all of them, you should duplicate the product for each website." msgstr "" -#: ../../website/publish/multi_website.rst:241 +#: ../../website/publish/multi_website.rst:244 msgid "If you need a unique reference to manage in your inventory, you should install *Manufacturing\\ and create *Kits* BoMs (bills of materials). Each kit will link each published “virtual” product to the main reference managed in your inventory. That way, any item sold from your website will be converted into the storable item in the delivery order." msgstr "" -#: ../../website/publish/multi_website.rst:248 +#: ../../website/publish/multi_website.rst:251 msgid "Pricelists" msgstr "" -#: ../../website/publish/multi_website.rst:250 +#: ../../website/publish/multi_website.rst:253 msgid "To manage specific prices by websites, you can activate *Multiple Sales Prices per Product* in Website settings." msgstr "" -#: ../../website/publish/multi_website.rst:253 -msgid "Then, go to :menuselection:`Website --> Products --> Pricelists` to create additional pricelists. Read `Pricelists Documentation `__," +#: ../../website/publish/multi_website.rst:256 +msgid "Then, go to :menuselection:`Website --> Products --> Pricelists` to create additional pricelists. See :doc:`../../ecommerce/maximizing_revenue/pricing`." msgstr "" -#: ../../website/publish/multi_website.rst:256 +#: ../../website/publish/multi_website.rst:259 msgid "If you need help. Select a website to make a pricelist only available on this website." msgstr "" -#: ../../website/publish/multi_website.rst:262 +#: ../../website/publish/multi_website.rst:265 msgid "Leaving the field empty means that you make it work in all websites if *Selectable* is selected. Otherwise, it makes it only available for backend operations of Sales and Point of Sale applications." msgstr "" -#: ../../website/publish/multi_website.rst:267 +#: ../../website/publish/multi_website.rst:270 msgid "Payment Acquirers and Delivery Methods" msgstr "" -#: ../../website/publish/multi_website.rst:269 +#: ../../website/publish/multi_website.rst:272 msgid "By default, published payment acquirers and delivery methods are deployed in all websites. You could already use specific payment acquirers per country using Geo IP by defining countries in their configuration. Now you can also do it per website by filling in the *Website* field." msgstr "" -#: ../../website/publish/multi_website.rst:275 +#: ../../website/publish/multi_website.rst:278 msgid "Customer accounts" msgstr "" -#: ../../website/publish/multi_website.rst:277 +#: ../../website/publish/multi_website.rst:280 msgid "There is a setting to choose how to manage customer accounts in Website settings. You can either allow customers to use one account through all the websites or compel them to create one account for each website. This last option is convenient if your websites shouldn’t be related to each other in the visitor mind." msgstr "" -#: ../../website/publish/multi_website.rst:287 +#: ../../website/publish/multi_website.rst:290 msgid "Technical hints for customization" msgstr "" -#: ../../website/publish/multi_website.rst:289 +#: ../../website/publish/multi_website.rst:292 msgid "If you want to publish custom objects on the website, here are a few tips to make it work with multi websites:" msgstr "" -#: ../../website/publish/multi_website.rst:293 +#: ../../website/publish/multi_website.rst:296 msgid "Sitemap: don’t forget the domain in the route to only publish" msgstr "" -#: ../../website/publish/multi_website.rst:293 +#: ../../website/publish/multi_website.rst:296 msgid "available records in each website’s sitemap." msgstr "" -#: ../../website/publish/multi_website.rst:297 +#: ../../website/publish/multi_website.rst:300 msgid "Access: you should call the method" msgstr "" -#: ../../website/publish/multi_website.rst:296 +#: ../../website/publish/multi_website.rst:299 msgid "*can_access_from_current_website* in the controller to make sure the visitor can see a record in the current website." msgstr "" -#: ../../website/publish/multi_website.rst:301 +#: ../../website/publish/multi_website.rst:304 msgid "Search: when a list of records is displayed, don’t forget to specify" msgstr "" -#: ../../website/publish/multi_website.rst:300 +#: ../../website/publish/multi_website.rst:303 msgid "the domain to only display records available for the current website." msgstr "" @@ -1333,7 +1337,7 @@ msgid "To translate the content of the website, click on **Translate** (here **T msgstr "" #: ../../website/publish/translate.rst:45 -msgid "There, if you have installed the Gengo Translator, You will see that next to the **Translate** button you also have a button **Translate automatically**. Once you click on that button, you will be asked some information on your account. If you don't have an account yet, go to `*https://gengo.com/auth/form/login/* `__ in order to create one. You need to ask for a public key and a private key." +msgid "There, if you have installed the Gengo Translator, You will see that next to the **Translate** button you also have a button **Translate automatically**. Once you click on that button, you will be asked some information on your account. If you don't have an account yet, follow `this link `_ in order to create one. You need to ask for a public key and a private key." msgstr "" #: ../../website/publish/translate.rst:53